From 9681bb7bfd6b861fe2bfaa4532a4c36d476ae5cf Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 28 Nov 2016 21:25:36 +0100
Subject: [PATCH] Add noIdUpdate option for addNewStatuses action.

This fixes #11.
---
 src/modules/statuses.js                          |  8 ++++----
 .../status_poster/status_poster.service.js       |  8 ++++++--
 test/unit/specs/modules/statuses.spec.js         | 16 +++++++++++++++-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 5d604f0d34..34fca47f7f 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -86,7 +86,7 @@ const mergeOrAdd = (arr, item) => {
   }
 }
 
-const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {} }) => {
+const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {}, noIdUpdate = false }) => {
   // Sanity check
   if (!isArray(statuses)) {
     return false
@@ -97,7 +97,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
 
   // Set the maxId to the new id if it's larger.
   const updateMaxId = ({id}) => {
-    if (!timeline) { return false }
+    if (!timeline || noIdUpdate) { return false }
     timelineObject.maxId = max([id, timelineObject.maxId])
   }
 
@@ -242,8 +242,8 @@ export const mutations = {
 const statuses = {
   state: defaultState,
   actions: {
-    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false }) {
-      commit('addNewStatuses', { statuses, showImmediately, timeline, user: rootState.users.currentUser })
+    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false, noIdUpdate = false }) {
+      commit('addNewStatuses', { statuses, showImmediately, timeline, noIdUpdate, user: rootState.users.currentUser })
     },
     favorite ({ rootState, commit }, status) {
       // Optimistic favoriting...
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 5b50231ab9..850993f7e7 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -7,8 +7,12 @@ const postStatus = ({ store, status, media = [], inReplyToStatusId = undefined }
   return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, mediaIds, inReplyToStatusId})
     .then((data) => data.json())
     .then((data) => {
-      store.dispatch('addNewStatuses',
-        { statuses: [data], timeline: 'friends', showImmediately: true })
+      store.dispatch('addNewStatuses', {
+        statuses: [data],
+        timeline: 'friends',
+        showImmediately: true,
+        noIdUpdate: true // To prevent missing notices on next pull.
+      })
     })
 }
 
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 6358002b56..c9c1ad2c38 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -104,7 +104,7 @@ describe('The Statuses module', () => {
     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'
+    deletion.uri = 'xxx'
 
     mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
     mutations.addNewStatuses(state, { statuses: [deletion], showImmediately: true, timeline: 'public' })
@@ -115,6 +115,20 @@ describe('The Statuses module', () => {
     expect(state.timelines.public.maxId).to.eql(2)
   })
 
+  it('does not update the maxId when the noIdUpdate flag is set', () => {
+    const state = cloneDeep(defaultState)
+    const status = makeMockStatus({id: 1})
+    const secondStatus = makeMockStatus({id: 2})
+
+    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+    expect(state.timelines.public.maxId).to.eql(1)
+
+    mutations.addNewStatuses(state, { statuses: [secondStatus], showImmediately: true, timeline: 'public', noIdUpdate: true })
+    expect(state.timelines.public.statuses).to.eql([secondStatus, status])
+    expect(state.timelines.public.visibleStatuses).to.eql([secondStatus, status])
+    expect(state.timelines.public.maxId).to.eql(1)
+  })
+
   it('keeps a descending by id order in timeline.visibleStatuses and timeline.statuses', () => {
     const state = cloneDeep(defaultState)
     const status = makeMockStatus({id: 2})