Remove notification on reaction remove/change

js/notifications.js

@@ -47,6 +47,7 @@
     //       isExpiringMessage: boolean;
     //       reaction: {
     //         emoji: string;
+    //         fromId: string;
     //       };
     //     }
     notificationData: null,
@@ -56,16 +57,40 @@
       this.update();
     },
 
-    removeBy({ conversationId, messageId }) {
+    // Remove the last notification if both conditions hold:
-      const shouldClear =
+    //
-        Boolean(this.notificationData) &&
+    // 1. Either `conversationId` or `messageId` matches (if present)
-        ((conversationId &&
+    // 2. `reactionFromId` matches (if present)
-          this.notificationData.conversationId === conversationId) ||
+    removeBy({ conversationId, messageId, reactionFromId }) {
-          (messageId && this.notificationData.messageId === messageId));
+      if (!this.notificationData) {
-      if (shouldClear) {
+        return;
-        this.clear();
-        this.update();
       }
+
+      let shouldClear = false;
+      if (
+        conversationId &&
+        this.notificationData.conversationId === conversationId
+      ) {
+        shouldClear = true;
+      }
+      if (messageId && this.notificationData.messageId === messageId) {
+        shouldClear = true;
+      }
+
+      if (!shouldClear) {
+        return;
+      }
+
+      if (
+        reactionFromId &&
+        this.notificationData.reaction &&
+        this.notificationData.reaction.fromId !== reactionFromId
+      ) {
+        return;
+      }
+
+      this.clear();
+      this.update();
     },
 
     fastUpdate() {

ts/models/messages.ts

@@ -3642,6 +3642,12 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
     const messageId = this.idForLogging();
     const count = reactions.length;
 
+    const conversation = window.ConversationController.get(
+      this.get('conversationId')
+    );
+
+    let staleReactionFromId: string | undefined;
+
     if (reaction.get('remove')) {
       window.log.info('Removing reaction for message', messageId);
       const newReactions = reactions.filter(
@@ -3650,6 +3656,8 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
           re.fromId !== reaction.get('fromId')
       );
       this.set({ reactions: newReactions });
+
+      staleReactionFromId = reaction.get('fromId');
     } else {
       window.log.info('Adding reaction for message', messageId);
       const newReactions = reactions.filter(
@@ -3658,9 +3666,12 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
       newReactions.push(reaction.toJSON());
       this.set({ reactions: newReactions });
 
-      const conversation = window.ConversationController.get(
+      const oldReaction = reactions.find(
-        this.get('conversationId')
+        re => re.fromId === reaction.get('fromId')
       );
+      if (oldReaction) {
+        staleReactionFromId = oldReaction.fromId;
+      }
 
       // Only notify for reactions to our own messages
       if (conversation && this.isOutgoing() && !reaction.get('fromSync')) {
@@ -3668,6 +3679,10 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
       }
     }
 
+    if (staleReactionFromId) {
+      this.clearNotifications(reaction.get('fromId'));
+    }
+
     const newCount = this.get('reactions').length;
     window.log.info(
       `Done processing reaction for message ${messageId}. Went from ${count} to ${newCount} reactions.`
@@ -3704,6 +3719,13 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     this.getConversation()!.updateLastMessage();
   }
+
+  clearNotifications(reactionFromId?: string): void {
+    window.Whisper.Notifications.removeBy({
+      messageId: this.id,
+      reactionFromId,
+    });
+  }
 }
 
 window.Whisper.Message = MessageModel as typeof window.WhatIsThis;