pleroma-fe

commit: a733a33d36af6fed3f338449218686d22b1c9354
parent: 28d1571530277e54be08e15d11e030f7722d1807
Author: HJ <spam@hjkos.com>
Date:   Fri, 25 Jan 2019 13:29:24 +0000

Merge branch 'hotfix-broken-convos' into 'develop'

Hotfix broken convos

See merge request pleroma/pleroma-fe!476
Diffstat:
M
src/components/conversation/conversation.js
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
@@ -1,9 +1,9 @@
-import { reduce, filter, sortBy } from 'lodash'
+import { reduce, filter } from 'lodash'
 import Status from '../status/status.vue'
 
 const sortById = (a, b) => {
-  const seqA = Number(a.action.id)
-  const seqB = Number(b.action.id)
+  const seqA = Number(a.id)
+  const seqB = Number(b.id)
   const isSeqA = !Number.isNaN(seqA)
   const isSeqB = !Number.isNaN(seqB)
   if (isSeqA && isSeqB) {
@@ -13,13 +13,13 @@ const sortById = (a, b) => {
   } else if (!isSeqA && isSeqB) {
     return -1
   } else {
-    return a.action.id > b.action.id ? -1 : 1
+    return a.id > b.id ? -1 : 1
   }
 }
 
 const sortAndFilterConversation = (conversation) => {
   conversation = filter(conversation, (status) => status.type !== 'retweet')
-  return sortBy(conversation, sortById)
+  return conversation.filter(_ => _).sort(sortById)
 }
 
 const conversation = {