From e663420260bc135f0851a996a67a87a947580bf4 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 13 Jun 2017 12:01:47 +0200
Subject: [PATCH] Fix notification deletion.

---
 src/modules/statuses.js                  |  2 +-
 test/unit/specs/modules/statuses.spec.js | 33 +++++++++++++-----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 0b4069c6..c3753c5a 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -259,7 +259,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
         return
       }
 
-      remove(state.notifications, ({action: {id}}) => status.id)
+      remove(state.notifications, ({action: {id}}) => id === status.id)
 
       remove(allStatuses, { uri })
       if (timeline) {
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 66d6cfd7..d25cc108 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -125,18 +125,19 @@ describe('The Statuses module', () => {
   it('removes statuses by tag on deletion', () => {
     const state = cloneDeep(defaultState)
     const status = makeMockStatus({id: 1})
+    const otherStatus = makeMockStatus({id: 3})
     status.uri = 'xxx'
     const deletion = makeMockStatus({id: 2, is_post_verb: false})
     deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
     deletion.uri = 'xxx'
 
-    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+    mutations.addNewStatuses(state, { statuses: [status, otherStatus], showImmediately: true, timeline: 'public' })
     mutations.addNewStatuses(state, { statuses: [deletion], showImmediately: true, timeline: 'public' })
 
-    expect(state.allStatuses).to.eql([])
-    expect(state.timelines.public.statuses).to.eql([])
-    expect(state.timelines.public.visibleStatuses).to.eql([])
-    expect(state.timelines.public.maxId).to.eql(2)
+    expect(state.allStatuses).to.eql([otherStatus])
+    expect(state.timelines.public.statuses).to.eql([otherStatus])
+    expect(state.timelines.public.visibleStatuses).to.eql([otherStatus])
+    expect(state.timelines.public.maxId).to.eql(3)
   })
 
   it('does not update the maxId when the noIdUpdate flag is set', () => {
@@ -323,28 +324,30 @@ describe('The Statuses module', () => {
       const user = { id: 1 }
       const state = cloneDeep(defaultState)
       const status = makeMockStatus({id: 1})
+      const otherStatus = makeMockStatus({id: 3})
       const mentionedStatus = makeMockStatus({id: 2})
       mentionedStatus.attentions = [user]
       mentionedStatus.uri = 'xxx'
+      otherStatus.attentions = [user]
 
-      const deletion = makeMockStatus({id: 3, is_post_verb: false})
+      const deletion = makeMockStatus({id: 4, is_post_verb: false})
       deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.'
       deletion.uri = 'xxx'
 
-      mutations.addNewStatuses(state, { statuses: [status], user })
+      mutations.addNewStatuses(state, { statuses: [status, otherStatus], user })
 
-      expect(state.notifications.length).to.eql(0)
+      expect(state.notifications.length).to.eql(1)
 
       mutations.addNewStatuses(state, { statuses: [mentionedStatus], user })
-      expect(state.allStatuses.length).to.eql(2)
-      expect(state.notifications.length).to.eql(1)
-      expect(state.notifications[0].status).to.eql(mentionedStatus)
-      expect(state.notifications[0].action).to.eql(mentionedStatus)
-      expect(state.notifications[0].type).to.eql('mention')
+      expect(state.allStatuses.length).to.eql(3)
+      expect(state.notifications.length).to.eql(2)
+      expect(state.notifications[1].status).to.eql(mentionedStatus)
+      expect(state.notifications[1].action).to.eql(mentionedStatus)
+      expect(state.notifications[1].type).to.eql('mention')
 
       mutations.addNewStatuses(state, { statuses: [deletion], user })
-      expect(state.allStatuses.length).to.eql(1)
-      expect(state.notifications.length).to.eql(0)
+      expect(state.allStatuses.length).to.eql(2)
+      expect(state.notifications.length).to.eql(1)
     })
 
     it('adds the message to mentions when you are mentioned', () => {