From eb339511864a89ecf2e8381a161034fdd6a8b130 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 25 Jan 2019 16:20:42 +0300 Subject: [PATCH] hotfix --- 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 index ae8ab4fc..0ecbaddc 100644 --- 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 = {