emit Room.redactionCancelled event when undoing redaction local echo

matrix-org · Jun 4, 2019 · 58f163e · jryans · Jun 4, 2019 · 58f163e
1 parent c0c9f01
commit 58f163e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/models/room.js b/src/models/room.js
@@ -1323,7 +1323,7 @@ Room.prototype._revertRedactionLocalEcho = function(redactionEvent) {
     if (redactedEvent) {
         redactedEvent.unmarkLocallyRedacted();
         // re-render after undoing redaction
-        this.emit("Room.redaction", redactionEvent, this);
+        this.emit("Room.redactionCancelled", redactionEvent, this);
         // reapply relation now redaction failed
         if (redactedEvent.isRelation()) {
             this._aggregateNonLiveRelation(redactedEvent);
@@ -1838,6 +1838,17 @@ module.exports = Room;
  * @param {Room} room The room containing the redacted event
  */
 
+/**
+ * Fires when an event that was previously redacted isn't anymore.
+ * This happens when the redaction couldn't be sent and
+ * was subsequently cancelled by the user. Redactions have a local echo
+ * which is undone in this scenario.
+ *
+ * @event module:client~MatrixClient#"Room.redactionCancelled"
+ * @param {MatrixEvent} event The matrix event which isn't redacted anymore
+ * @param {Room} room The room containing the unredacted event
+ */
+
 /**
  * Fires whenever the name of a room is updated.
  * @event module:client~MatrixClient#"Room.name"

diff --git a/src/sync.js b/src/sync.js
@@ -127,7 +127,9 @@ SyncApi.prototype.createRoom = function(roomId) {
         timelineSupport,
         unstableClientRelationAggregation,
     });
-    client.reEmitter.reEmit(room, ["Room.name", "Room.timeline", "Room.redaction",
+    client.reEmitter.reEmit(room, ["Room.name", "Room.timeline",
+                          "Room.redaction",
+                          "Room.redactionCancelled",
                           "Room.receipt", "Room.tags",
                           "Room.timelineReset",
                           "Room.localEchoUpdated",