From 0763cf14a3a862cb1631b604e46d2660142ec3f8 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Tue, 8 Mar 2016 12:02:47 -0800
Subject: [PATCH] Remove messages from notifications when read

Remove individual messages from Notifications when marked read.
Previously this was only done from the conversation model when marking
the entire conversation as read.

Fixes #717

// FREEBIE
---
 js/models/conversations.js | 3 ++-
 js/models/messages.js      | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 028bfe4b1..d557e7d13 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -403,7 +403,8 @@
                     message        : message.getNotificationText(),
                     iconUrl        : iconUrl,
                     imageUrl       : message.getImageUrl(),
-                    conversationId : conversationId
+                    conversationId : conversationId,
+                    messageId      : message.id
                 });
             });
         });
diff --git a/js/models/messages.js b/js/models/messages.js
index 688f25cde..b017956da 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -367,6 +367,9 @@
         },
         markRead: function(sync) {
             this.unset('unread');
+            Whisper.Notifications.remove(Whisper.Notifications.where({
+                messageId: this.id
+            }));
             return this.save();
         }