From 5888697c0dccb02eb3fdefba28bc359c32ec264e Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 13 Nov 2016 22:09:27 +0100
Subject: Better maxId calculation.

---
 src/modules/statuses.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 8238644d..6fe2558c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find } from 'lodash'
+import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find, flatten, maxBy } from 'lodash'
 import moment from 'moment'
 import apiService from '../services/api/api.service.js'
 import parse from '../services/status_parser/status_parser.js'
@@ -41,7 +41,7 @@ const statusType = (status) => {
   return !status.is_post_verb && status.uri.match(/fave/) ? 'fave' : 'status'
 }
 
-const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visibleStatuses, newStatusCount, faves, loading }) => {
+const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visibleStatuses, newStatusCount, faves, loading, maxId }) => {
   const statusesAndFaves = groupBy(addedStatuses, statusType)
   const addedFaves = statusesAndFaves['fave'] || []
   const unseenFaves = differenceBy(addedFaves, faves, 'id')
@@ -92,9 +92,9 @@ const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visib
     statuses: newStatuses,
     visibleStatuses: newVisibleStatuses,
     newStatusCount: newNewStatusCount,
-    maxId: newStatuses[0].id,
     minVisibleId: (last(newVisibleStatuses) || { id: undefined }).id,
     faves: unionBy(faves, addedFaves, 'id'),
+    maxId,
     loading
   }
 }
@@ -109,8 +109,18 @@ const updateTimestampsInStatuses = (statuses) => {
   })
 }
 
+
+export const findMaxId = (...args) => {
+  return (maxBy(flatten(args), 'id') || {}).id
+}
+
 export const mutations = {
   addNewStatuses (state, { statuses, showImmediately = false, timeline }) {
+    const timelineObject = state.timelines[timeline]
+
+    // Set new maxId
+    const maxId = findMaxId(statuses, timelineObject.statuses)
+    timelineObject.maxId = maxId
     state.timelines[timeline] = addStatusesToTimeline(statuses, showImmediately, state.timelines[timeline])
     state.allStatuses = unionBy(state.timelines[timeline].statuses, state.allStatuses, 'id')
 
-- 
cgit v1.2.3-70-g09d2


From 59647798b97615d43710dde8f6c52894f39b8c4a Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 13 Nov 2016 22:40:33 +0100
Subject: prepareStatus: nsfw tag parsing.

---
 src/modules/statuses.js                  |  9 +++++++++
 test/unit/specs/modules/statuses.spec.js | 21 +++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 6fe2558c..5e3a373a 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -114,6 +114,15 @@ export const findMaxId = (...args) => {
   return (maxBy(flatten(args), 'id') || {}).id
 }
 
+export const prepareStatus = (status) => {
+  if (status.nsfw === undefined) {
+    const nsfwRegex = /#nsfw/i
+    status.nsfw = !!status.text.match(nsfwRegex)
+  }
+
+  return status
+}
+
 export const mutations = {
   addNewStatuses (state, { statuses, showImmediately = false, timeline }) {
     const timelineObject = state.timelines[timeline]
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 372ab3ca..1de15e6a 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash'
-import { defaultState, mutations, findMaxId } from '../../../../src/modules/statuses.js'
+import { defaultState, mutations, findMaxId, prepareStatus } from '../../../../src/modules/statuses.js'
 
 const makeMockStatus = ({id, text}) => {
   return {
@@ -11,7 +11,24 @@ const makeMockStatus = ({id, text}) => {
   }
 }
 
-describe('findMaxId', () => {
+describe('Statuses.prepareStatus', () => {
+  it('sets nsfw for statuses with the #nsfw tag', () => {
+    const safe = makeMockStatus({id: 1, text: 'Hello oniichan'})
+    const nsfw = makeMockStatus({id: 1, text: 'Hello oniichan #nsfw'})
+
+    expect(prepareStatus(safe).nsfw).to.eq(false)
+    expect(prepareStatus(nsfw).nsfw).to.eq(true)
+  })
+
+  it('leaves existing nsfw settings alone', () => {
+    const nsfw = makeMockStatus({id: 1, text: 'Hello oniichan #nsfw'})
+    nsfw.nsfw = false
+
+    expect(prepareStatus(nsfw).nsfw).to.eq(false)
+  })
+})
+
+describe('Statuses.findMaxId', () => {
   it('returns the largest id in any of the given arrays', () => {
     const statusesOne = [{ id: 100 }, { id: 2 }]
     const statusesTwo = [{ id: 3 }]
-- 
cgit v1.2.3-70-g09d2


From aeb8868b82c767e6c8bf19aa8e6355f71941fea5 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 13 Nov 2016 22:54:49 +0100
Subject: prepareStatus: created_at_parsed.

---
 src/modules/statuses.js                  | 4 ++++
 test/unit/specs/modules/statuses.spec.js | 9 +++++++++
 2 files changed, 13 insertions(+)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 5e3a373a..86995b03 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -115,11 +115,15 @@ export const findMaxId = (...args) => {
 }
 
 export const prepareStatus = (status) => {
+  // Parse nsfw tags
   if (status.nsfw === undefined) {
     const nsfwRegex = /#nsfw/i
     status.nsfw = !!status.text.match(nsfwRegex)
   }
 
+  // Set created_at_parsed to initial value
+  status.created_at_parsed = status.created_at
+
   return status
 }
 
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 1de15e6a..28ecbdfb 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -26,6 +26,15 @@ describe('Statuses.prepareStatus', () => {
 
     expect(prepareStatus(nsfw).nsfw).to.eq(false)
   })
+
+  it('sets the created_at_parsed property', () => {
+    const status = makeMockStatus({id: 1})
+    status.created_at = ''
+    expect(status.created_at_parsed).to.eq(undefined)
+
+    const prepared = prepareStatus(status)
+    expect(prepared.created_at_parsed).to.not.eq(undefined)
+  })
 })
 
 describe('Statuses.findMaxId', () => {
-- 
cgit v1.2.3-70-g09d2


From d10a58f26ab9b22fd9dba499a9f097ac177e1cae Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 15 Nov 2016 10:35:16 +0100
Subject: Some reducer changes for statuses.

---
 src/modules/statuses.js | 55 +++++++++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 86995b03..d7607bf1 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,7 +1,7 @@
 import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find, flatten, maxBy } from 'lodash'
 import moment from 'moment'
 import apiService from '../services/api/api.service.js'
-import parse from '../services/status_parser/status_parser.js'
+// import parse from '../services/status_parser/status_parser.js'
 
 export const defaultState = {
   allStatuses: [],
@@ -41,6 +41,19 @@ const statusType = (status) => {
   return !status.is_post_verb && status.uri.match(/fave/) ? 'fave' : 'status'
 }
 
+export const prepareStatus = (status) => {
+  // Parse nsfw tags
+  if (status.nsfw === undefined) {
+    const nsfwRegex = /#nsfw/i
+    status.nsfw = !!status.text.match(nsfwRegex)
+  }
+
+  // Set created_at_parsed to initial value
+  status.created_at_parsed = status.created_at
+
+  return status
+}
+
 const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visibleStatuses, newStatusCount, faves, loading, maxId }) => {
   const statusesAndFaves = groupBy(addedStatuses, statusType)
   const addedFaves = statusesAndFaves['fave'] || []
@@ -60,13 +73,7 @@ const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visib
   addedStatuses = map(addedStatuses, (status) => {
     const statusoid = status.retweeted_status || status
 
-    statusoid.created_at_parsed = statusoid.created_at
-    statusoid.statusnet_html = parse(statusoid.statusnet_html)
-
-    if (statusoid.nsfw === undefined) {
-      const nsfwRegex = /#nsfw/i
-      statusoid.nsfw = statusoid.text.match(nsfwRegex)
-    }
+    prepareStatus(statusoid)
 
     return status
   })
@@ -109,22 +116,26 @@ const updateTimestampsInStatuses = (statuses) => {
   })
 }
 
+// const groupStatusesByType = (statuses) => {
+//   return groupBy(statuses, (status) => {
+//     if (status.is_post_verb) {
+//       return 'status'
+//     }
 
-export const findMaxId = (...args) => {
-  return (maxBy(flatten(args), 'id') || {}).id
-}
+//     if (status.retweeted_status) {
+//       return 'retweet'
+//     }
 
-export const prepareStatus = (status) => {
-  // Parse nsfw tags
-  if (status.nsfw === undefined) {
-    const nsfwRegex = /#nsfw/i
-    status.nsfw = !!status.text.match(nsfwRegex)
-  }
+//     if (typeof status.uri === 'string' && status.uri.match(/fave/)) {
+//       return 'favorite'
+//     }
 
-  // Set created_at_parsed to initial value
-  status.created_at_parsed = status.created_at
+//     return 'unknown'
+//   })
+// }
 
-  return status
+export const findMaxId = (...args) => {
+  return (maxBy(flatten(args), 'id') || {}).id
 }
 
 export const mutations = {
@@ -134,6 +145,10 @@ export const mutations = {
     // Set new maxId
     const maxId = findMaxId(statuses, timelineObject.statuses)
     timelineObject.maxId = maxId
+
+    // Split statuses by type
+    // const statusesByType = groupStatusesByType(statuses)
+
     state.timelines[timeline] = addStatusesToTimeline(statuses, showImmediately, state.timelines[timeline])
     state.allStatuses = unionBy(state.timelines[timeline].statuses, state.allStatuses, 'id')
 
-- 
cgit v1.2.3-70-g09d2


From 4fcb60487cbe034d12d42852354c7522033dc23c Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 17 Nov 2016 18:31:26 +0100
Subject: Do more mutation-y status reducing.

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

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index d7607bf1..7fa8a7b2 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find, flatten, maxBy } from 'lodash'
+import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find, flatten, maxBy, merge } from 'lodash'
 import moment from 'moment'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
@@ -54,6 +54,19 @@ export const prepareStatus = (status) => {
   return status
 }
 
+// Merges old and new status collections.
+const mergeStatuses = (oldStatuses, newStatuses) => {
+  each(newStatuses, (status) => {
+    let oldStatus = find(oldStatuses, { id: status.id })
+    if (oldStatus) {
+      merge(oldStatus, status)
+    } else {
+      oldStatuses.push(status)
+    }
+  })
+  return oldStatuses
+}
+
 const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visibleStatuses, newStatusCount, faves, loading, maxId }) => {
   const statusesAndFaves = groupBy(addedStatuses, statusType)
   const addedFaves = statusesAndFaves['fave'] || []
@@ -150,7 +163,7 @@ export const mutations = {
     // const statusesByType = groupStatusesByType(statuses)
 
     state.timelines[timeline] = addStatusesToTimeline(statuses, showImmediately, state.timelines[timeline])
-    state.allStatuses = unionBy(state.timelines[timeline].statuses, state.allStatuses, 'id')
+    mergeStatuses(state.allStatuses, state.timelines[timeline].statuses)
 
     // Set up retweets with most current status
     const getRetweets = (result, status) => {
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 28ecbdfb..02013039 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -90,7 +90,7 @@ describe('The Statuses module', () => {
 
     // It refers to the modified status.
     mutations.addNewStatuses(state, { statuses: [modStatus], timeline: 'public' })
-    expect(state.allStatuses).to.eql([retweet, modStatus])
+    expect(state.allStatuses).to.eql([modStatus, retweet])
     expect(retweet.retweeted_status).to.eql(modStatus)
   })
 
@@ -108,7 +108,7 @@ describe('The Statuses module', () => {
     mutations.addNewStatuses(state, { statuses: [modStatus], showImmediately: true, timeline: 'public' })
     expect(state.timelines.public.visibleStatuses).to.have.length(1)
     expect(state.allStatuses).to.have.length(1)
-    expect(state.allStatuses[0]).to.equal(modStatus)
+    expect(state.allStatuses[0]).to.eql(modStatus)
   })
 
   it('replaces existing statuses with the same id, coming from a retweet', () => {
-- 
cgit v1.2.3-70-g09d2


From 8723c35d4305a4ff5d01dee8707c1cc25b405cd2 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 18 Nov 2016 16:05:04 +0100
Subject: A bit more advanced status merging.

---
 src/modules/statuses.js                  | 10 ++++++++--
 test/unit/specs/modules/statuses.spec.js |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 7fa8a7b2..268e64fb 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -153,6 +153,11 @@ export const findMaxId = (...args) => {
 
 export const mutations = {
   addNewStatuses (state, { statuses, showImmediately = false, timeline }) {
+
+    // Merge in the new status into the old ones.
+    mergeStatuses(state.allStatuses, statuses)
+
+    // Get relevant timeline
     const timelineObject = state.timelines[timeline]
 
     // Set new maxId
@@ -163,7 +168,6 @@ export const mutations = {
     // const statusesByType = groupStatusesByType(statuses)
 
     state.timelines[timeline] = addStatusesToTimeline(statuses, showImmediately, state.timelines[timeline])
-    mergeStatuses(state.allStatuses, state.timelines[timeline].statuses)
 
     // Set up retweets with most current status
     const getRetweets = (result, status) => {
@@ -175,7 +179,9 @@ export const mutations = {
 
     const retweets = reduce(statuses, getRetweets, [])
 
-    state.allStatuses = unionBy(retweets, state.allStatuses, 'id')
+    // state.allStatuses = unionBy(retweets, state.allStatuses, 'id')
+
+    mergeStatuses(state.allStatuses, retweets)
 
     each(state.allStatuses, (status) => {
       if (status.retweeted_status) {
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 02013039..0370d4ae 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -86,11 +86,11 @@ describe('The Statuses module', () => {
     // It adds both statuses, but only the retweet to visible.
     mutations.addNewStatuses(state, { statuses: [retweet], timeline: 'public', showImmediately: true })
     expect(state.timelines.public.visibleStatuses).to.have.length(1)
-    expect(state.allStatuses).to.eql([status, retweet])
+    expect(state.allStatuses).to.eql([retweet, status])
 
     // It refers to the modified status.
     mutations.addNewStatuses(state, { statuses: [modStatus], timeline: 'public' })
-    expect(state.allStatuses).to.eql([modStatus, retweet])
+    expect(state.allStatuses).to.eql([retweet, modStatus])
     expect(retweet.retweeted_status).to.eql(modStatus)
   })
 
@@ -127,7 +127,7 @@ describe('The Statuses module', () => {
     mutations.addNewStatuses(state, { statuses: [retweet], showImmediately: false, timeline: 'public' })
     expect(state.timelines.public.visibleStatuses).to.have.length(1)
     expect(state.allStatuses).to.have.length(2)
-    expect(state.allStatuses[0]).to.equal(modStatus)
+    expect(state.allStatuses[0]).to.eql(modStatus)
   })
 
   it('handles favorite actions', () => {
-- 
cgit v1.2.3-70-g09d2


From 9171b382fe51778165d32410d1ce28185d01c947 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 18 Nov 2016 19:48:02 +0100
Subject: Complete rewrite of status adding code.

This now uses nearly only mutation, to take advantage
of vue's mutation tracking.
---
 src/modules/statuses.js                  | 190 +++++++++++++------------------
 test/unit/specs/modules/statuses.spec.js |  50 +++++---
 2 files changed, 117 insertions(+), 123 deletions(-)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 268e64fb..c088fa1a 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { reduce, map, slice, last, intersectionBy, sortBy, unionBy, toInteger, groupBy, differenceBy, each, find, flatten, maxBy, merge } from 'lodash'
+import { map, slice, sortBy, toInteger, each, find, flatten, maxBy, last, merge, max } from 'lodash'
 import moment from 'moment'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
@@ -37,10 +37,6 @@ export const defaultState = {
   }
 }
 
-const statusType = (status) => {
-  return !status.is_post_verb && status.uri.match(/fave/) ? 'fave' : 'status'
-}
-
 export const prepareStatus = (status) => {
   // Parse nsfw tags
   if (status.nsfw === undefined) {
@@ -54,71 +50,6 @@ export const prepareStatus = (status) => {
   return status
 }
 
-// Merges old and new status collections.
-const mergeStatuses = (oldStatuses, newStatuses) => {
-  each(newStatuses, (status) => {
-    let oldStatus = find(oldStatuses, { id: status.id })
-    if (oldStatus) {
-      merge(oldStatus, status)
-    } else {
-      oldStatuses.push(status)
-    }
-  })
-  return oldStatuses
-}
-
-const addStatusesToTimeline = (addedStatuses, showImmediately, { statuses, visibleStatuses, newStatusCount, faves, loading, maxId }) => {
-  const statusesAndFaves = groupBy(addedStatuses, statusType)
-  const addedFaves = statusesAndFaves['fave'] || []
-  const unseenFaves = differenceBy(addedFaves, faves, 'id')
-
-  // Update fave count
-  each(unseenFaves, ({in_reply_to_status_id}) => {
-    const status = find(statuses, { id: toInteger(in_reply_to_status_id) })
-    if (status) {
-      status.fave_num += 1
-    }
-  })
-
-  addedStatuses = statusesAndFaves['status'] || []
-
-  // Add some html and nsfw to the statuses.
-  addedStatuses = map(addedStatuses, (status) => {
-    const statusoid = status.retweeted_status || status
-
-    prepareStatus(statusoid)
-
-    return status
-  })
-
-  const newStatuses = sortBy(
-    unionBy(addedStatuses, statuses, 'id'),
-    ({id}) => -id
-  )
-
-  let newNewStatusCount = newStatusCount + (newStatuses.length - statuses.length)
-
-  let newVisibleStatuses = visibleStatuses
-
-  if (showImmediately) {
-    newVisibleStatuses = unionBy(addedStatuses, newVisibleStatuses, 'id')
-    newVisibleStatuses = sortBy(newVisibleStatuses, ({id}) => -id)
-    newNewStatusCount = newStatusCount
-  };
-
-  newVisibleStatuses = intersectionBy(newStatuses, newVisibleStatuses, 'id')
-
-  return {
-    statuses: newStatuses,
-    visibleStatuses: newVisibleStatuses,
-    newStatusCount: newNewStatusCount,
-    minVisibleId: (last(newVisibleStatuses) || { id: undefined }).id,
-    faves: unionBy(faves, addedFaves, 'id'),
-    maxId,
-    loading
-  }
-}
-
 const updateTimestampsInStatuses = (statuses) => {
   return map(statuses, (statusoid) => {
     const status = statusoid.retweeted_status || statusoid
@@ -129,66 +60,109 @@ const updateTimestampsInStatuses = (statuses) => {
   })
 }
 
-// const groupStatusesByType = (statuses) => {
-//   return groupBy(statuses, (status) => {
-//     if (status.is_post_verb) {
-//       return 'status'
-//     }
+const statusType = (status) => {
+  if (status.is_post_verb) {
+    return 'status'
+  }
 
-//     if (status.retweeted_status) {
-//       return 'retweet'
-//     }
+  if (status.retweeted_status) {
+    return 'retweet'
+  }
 
-//     if (typeof status.uri === 'string' && status.uri.match(/fave/)) {
-//       return 'favorite'
-//     }
+  if (typeof status.uri === 'string' && status.uri.match(/fave/)) {
+    return 'favorite'
+  }
 
-//     return 'unknown'
-//   })
-// }
+  return 'unknown'
+}
 
 export const findMaxId = (...args) => {
   return (maxBy(flatten(args), 'id') || {}).id
 }
 
+const mergeOrAdd = (arr, item) => {
+  const oldItem = find(arr, {id: item.id})
+  if (oldItem) {
+    // We already have this, so only merge the new info.
+    merge(oldItem, item)
+    return oldItem
+  } else {
+    // This is a new item, prepare it
+    prepareStatus(item)
+    arr.push(item)
+    return item
+  }
+}
+
 export const mutations = {
   addNewStatuses (state, { statuses, showImmediately = false, timeline }) {
-
-    // Merge in the new status into the old ones.
-    mergeStatuses(state.allStatuses, statuses)
-
-    // Get relevant timeline
+    const allStatuses = state.allStatuses
     const timelineObject = state.timelines[timeline]
 
-    // Set new maxId
-    const maxId = findMaxId(statuses, timelineObject.statuses)
-    timelineObject.maxId = maxId
+    // Set the maxId to the new id if it's larger.
+    const updateMaxId = ({id}) => {
+      timelineObject.maxId = max([id, timelineObject.maxId])
+    }
+
+    const addStatus = (status, showImmediately, addToTimeline = true) => {
+      // Remember the current amount of statuses
+      // We need that to calculate new status count.
+      const prevLength = timelineObject.statuses.length
 
-    // Split statuses by type
-    // const statusesByType = groupStatusesByType(statuses)
+      updateMaxId(status)
 
-    state.timelines[timeline] = addStatusesToTimeline(statuses, showImmediately, state.timelines[timeline])
+      status = mergeOrAdd(allStatuses, status)
 
-    // Set up retweets with most current status
-    const getRetweets = (result, status) => {
-      if (status.retweeted_status) {
-        result.push(status.retweeted_status)
+      // Some statuses should only be added to the global status repository.
+      if (addToTimeline) {
+        mergeOrAdd(timelineObject.statuses, status)
       }
-      return result
-    }
 
-    const retweets = reduce(statuses, getRetweets, [])
+      if (showImmediately) {
+        // Add it directly to the visibleStatuses, don't change
+        // newStatusCount
+        mergeOrAdd(timelineObject.visibleStatuses, status)
+      } else {
+        // Just change newStatuscount
+        timelineObject.newStatusCount += (timelineObject.statuses.length - prevLength)
+      }
 
-    // state.allStatuses = unionBy(retweets, state.allStatuses, 'id')
+      return status
+    }
 
-    mergeStatuses(state.allStatuses, retweets)
+    const favoriteStatus = (favorite) => {
+      const status = find(allStatuses, { id: toInteger(favorite.in_reply_to_status_id) })
+      if (status) {
+        status.fave_num += 1
+      }
+      return status
+    }
 
-    each(state.allStatuses, (status) => {
-      if (status.retweeted_status) {
-        const retweetedStatus = find(state.allStatuses, { id: status.retweeted_status.id })
-        status.retweeted_status = retweetedStatus
+    const processors = {
+      'status': (status) => {
+        addStatus(status, showImmediately)
+      },
+      'retweet': (status) => {
+        // RetweetedStatuses are never shown immediately
+        const retweetedStatus = addStatus(status.retweeted_status, false, false)
+        const retweet = addStatus(status, showImmediately)
+        retweet.retweeted_status = retweetedStatus
+      },
+      'favorite': (status) => {
+        updateMaxId(status)
+        favoriteStatus(status)
       }
+    }
+
+    each(statuses, (status) => {
+      const type = statusType(status)
+      processors[type](status)
     })
+
+    // Keep the visible statuses sorted
+    timelineObject.visibleStatuses = sortBy(timelineObject.visibleStatuses, ({id}) => -id)
+    timelineObject.statuses = sortBy(timelineObject.statuses, ({id}) => -id)
+    timelineObject.minVisibleId = (last(timelineObject.statuses) || {}).id
   },
   showNewStatuses (state, { timeline }) {
     const oldTimeline = (state.timelines[timeline])
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index 0370d4ae..80bb5fc6 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -1,13 +1,14 @@
 import { cloneDeep } from 'lodash'
 import { defaultState, mutations, findMaxId, prepareStatus } from '../../../../src/modules/statuses.js'
 
-const makeMockStatus = ({id, text}) => {
+const makeMockStatus = ({id, text, is_post_verb = true}) => {
   return {
     id,
     name: 'status',
     text: text || `Text number ${id}`,
     fave_num: 0,
-    uri: ''
+    uri: '',
+    is_post_verb
   }
 }
 
@@ -62,6 +63,7 @@ describe('The Statuses module', () => {
     expect(state.allStatuses).to.eql([status])
     expect(state.timelines.public.statuses).to.eql([status])
     expect(state.timelines.public.visibleStatuses).to.eql([])
+    expect(state.timelines.public.newStatusCount).to.equal(1)
   })
 
   it('adds the status to allStatuses and to the given timeline, directly visible', () => {
@@ -73,12 +75,30 @@ describe('The Statuses module', () => {
     expect(state.allStatuses).to.eql([status])
     expect(state.timelines.public.statuses).to.eql([status])
     expect(state.timelines.public.visibleStatuses).to.eql([status])
+    expect(state.timelines.public.newStatusCount).to.equal(0)
+  })
+
+  it('keeps a descending by id order in timeline.visibleStatuses and timeline.statuses', () => {
+    const state = cloneDeep(defaultState)
+    const status = makeMockStatus({id: 2})
+    const statusTwo = makeMockStatus({id: 1})
+    const statusThree = makeMockStatus({id: 3})
+
+    mutations.addNewStatuses(state, { statuses: [status], showImmediately: true, timeline: 'public' })
+    mutations.addNewStatuses(state, { statuses: [statusTwo], showImmediately: true, timeline: 'public' })
+
+    expect(state.timelines.public.minVisibleId).to.equal(1)
+
+    mutations.addNewStatuses(state, { statuses: [statusThree], showImmediately: true, timeline: 'public' })
+
+    expect(state.timelines.public.statuses).to.eql([statusThree, status, statusTwo])
+    expect(state.timelines.public.visibleStatuses).to.eql([statusThree, status, statusTwo])
   })
 
   it('splits retweets from their status and links them', () => {
     const state = cloneDeep(defaultState)
     const status = makeMockStatus({id: 1})
-    const retweet = makeMockStatus({id: 2})
+    const retweet = makeMockStatus({id: 2, is_post_verb: false})
     const modStatus = makeMockStatus({id: 1, text: 'something else'})
 
     retweet.retweeted_status = status
@@ -86,12 +106,18 @@ describe('The Statuses module', () => {
     // It adds both statuses, but only the retweet to visible.
     mutations.addNewStatuses(state, { statuses: [retweet], timeline: 'public', showImmediately: true })
     expect(state.timelines.public.visibleStatuses).to.have.length(1)
-    expect(state.allStatuses).to.eql([retweet, status])
+    expect(state.timelines.public.statuses).to.have.length(1)
+    expect(state.allStatuses).to.have.length(2)
+    expect(state.allStatuses[0].id).to.equal(1)
+    expect(state.allStatuses[1].id).to.equal(2)
 
     // It refers to the modified status.
     mutations.addNewStatuses(state, { statuses: [modStatus], timeline: 'public' })
-    expect(state.allStatuses).to.eql([retweet, modStatus])
-    expect(retweet.retweeted_status).to.eql(modStatus)
+    expect(state.allStatuses).to.have.length(2)
+    expect(state.allStatuses[0].id).to.equal(1)
+    expect(state.allStatuses[0].text).to.equal(modStatus.text)
+    expect(state.allStatuses[1].id).to.equal(2)
+    expect(retweet.retweeted_status.text).to.eql(modStatus.text)
   })
 
   it('replaces existing statuses with the same id', () => {
@@ -108,14 +134,14 @@ describe('The Statuses module', () => {
     mutations.addNewStatuses(state, { statuses: [modStatus], showImmediately: true, timeline: 'public' })
     expect(state.timelines.public.visibleStatuses).to.have.length(1)
     expect(state.allStatuses).to.have.length(1)
-    expect(state.allStatuses[0]).to.eql(modStatus)
+    expect(state.allStatuses[0].text).to.eql(modStatus.text)
   })
 
   it('replaces existing statuses with the same id, coming from a retweet', () => {
     const state = cloneDeep(defaultState)
     const status = makeMockStatus({id: 1})
     const modStatus = makeMockStatus({id: 1, text: 'something else'})
-    const retweet = makeMockStatus({id: 2})
+    const retweet = makeMockStatus({id: 2, is_post_verb: false})
     retweet.retweeted_status = modStatus
 
     // Add original status
@@ -127,7 +153,7 @@ describe('The Statuses module', () => {
     mutations.addNewStatuses(state, { statuses: [retweet], showImmediately: false, timeline: 'public' })
     expect(state.timelines.public.visibleStatuses).to.have.length(1)
     expect(state.allStatuses).to.have.length(2)
-    expect(state.allStatuses[0]).to.eql(modStatus)
+    expect(state.allStatuses[0].text).to.eql(modStatus.text)
   })
 
   it('handles favorite actions', () => {
@@ -148,11 +174,5 @@ describe('The Statuses module', () => {
     expect(state.timelines.public.visibleStatuses.length).to.eql(1)
     expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
     expect(state.timelines.public.maxId).to.eq(favorite.id)
-
-    // Adding again shouldn't change anything
-    mutations.addNewStatuses(state, { statuses: [favorite], showImmediately: true, timeline: 'public' })
-
-    expect(state.timelines.public.visibleStatuses.length).to.eql(1)
-    expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
   })
 })
-- 
cgit v1.2.3-70-g09d2