From cad884aa412dbfa61bbbf47b3201a1e53c81bdac Mon Sep 17 00:00:00 2001
From: Bruno Windels <bruno@windels.cloud>
Date: Thu, 17 Jun 2021 16:07:09 +0200
Subject: [PATCH] fix local redaction echo while already sending target

---
 .../room/timeline/entries/BaseEventEntry.js       | 15 ++++++++-------
 .../room/timeline/entries/PendingEventEntry.js    |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/matrix/room/timeline/entries/BaseEventEntry.js b/src/matrix/room/timeline/entries/BaseEventEntry.js
index 3ac98c8c..45874dcb 100644
--- a/src/matrix/room/timeline/entries/BaseEventEntry.js
+++ b/src/matrix/room/timeline/entries/BaseEventEntry.js
@@ -52,7 +52,7 @@ export class BaseEventEntry extends BaseEntry {
         @return [string] returns the name of the field that has changed, if any
     */
     addLocalRelation(entry) {
-        if (entry.eventType === REDACTION_TYPE && entry.relatedEventId === this.id) {
+        if (entry.eventType === REDACTION_TYPE && entry.isRelatedToId(this.id)) {
             if (!this._pendingRedactions) {
                 this._pendingRedactions = [];
             }
@@ -62,7 +62,7 @@ export class BaseEventEntry extends BaseEntry {
             }
         } else {
             const relationEntry = entry.redactingEntry || entry;
-            if (relationEntry.isRelationForId(this.id)) {
+            if (relationEntry.isRelatedToId(this.id)) {
                 if (relationEntry.relation.rel_type === ANNOTATION_RELATION_TYPE) {
                     if (!this._pendingAnnotations) {
                         this._pendingAnnotations = new PendingAnnotations();
@@ -79,7 +79,7 @@ export class BaseEventEntry extends BaseEntry {
         @return [string] returns the name of the field that has changed, if any
     */
     removeLocalRelation(entry) {
-        if (entry.eventType === REDACTION_TYPE && entry.relatedEventId === this.id && this._pendingRedactions) {
+        if (entry.eventType === REDACTION_TYPE && entry.isRelatedToId(this.id) && this._pendingRedactions) {
             const countBefore = this._pendingRedactions.length;
             this._pendingRedactions = this._pendingRedactions.filter(e => e !== entry);
             if (this._pendingRedactions.length === 0) {
@@ -90,8 +90,8 @@ export class BaseEventEntry extends BaseEntry {
             }
         } else {
             const relationEntry = entry.redactingEntry || entry;
-            if (relationEntry.isRelationForId(this.id)) {
-                if (relationEntry.relation.rel_type === ANNOTATION_RELATION_TYPE && this._pendingAnnotations) {
+            if (relationEntry.isRelatedToId(this.id)) {
+                if (relationEntry.relation?.rel_type === ANNOTATION_RELATION_TYPE && this._pendingAnnotations) {
                     this._pendingAnnotations.remove(entry);
                     if (this._pendingAnnotations.isEmpty) {
                         this._pendingAnnotations = null;
@@ -123,8 +123,9 @@ export class BaseEventEntry extends BaseEntry {
         return createAnnotation(this.id, key);
     }
 
-    isRelationForId(id) {
-        return id && this.relation?.event_id === id;
+    /** takes both remote event id and local txn id into account, see overriding in PendingEventEntry */
+    isRelatedToId(id) {
+        return id && this.relatedEventId === id;
     }
 
     get relation() {
diff --git a/src/matrix/room/timeline/entries/PendingEventEntry.js b/src/matrix/room/timeline/entries/PendingEventEntry.js
index 7f5a87af..d42211ef 100644
--- a/src/matrix/room/timeline/entries/PendingEventEntry.js
+++ b/src/matrix/room/timeline/entries/PendingEventEntry.js
@@ -83,11 +83,11 @@ export class PendingEventEntry extends BaseEventEntry {
         
     }
 
-    isRelationForId(id) {
+    isRelatedToId(id) {
         if (id && id === this._pendingEvent.relatedTxnId) {
             return true;
         }
-        return super.isRelationForId(id);
+        return super.isRelatedToId(id);
     }
 
     get relatedEventId() {