From 9d0d6b86c83a4fad4038077a65149f0f3677fb82 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Fri, 25 Jan 2019 00:49:37 +0300 Subject: this attempts converting id to number to sort them numerically, since "99" > "100" while 99 < 100 --- src/components/conversation/conversation.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src/components/conversation/conversation.js') diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 9bf5e136..07b7c692 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -1,9 +1,25 @@ import { reduce, filter, sortBy } 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 isSeqA = Number.isNaN(seqA) + const isSeqB = Number.isNaN(seqB) + if (isSeqA && isSeqB) { + return seqA > seqB ? -1 : 1 + } else if (isSeqA && !isSeqB) { + return 1 + } else if (!isSeqA && isSeqB) { + return -1 + } else { + return a.action.id > b.action.id ? -1 : 1 + } +} + const sortAndFilterConversation = (conversation) => { conversation = filter(conversation, (status) => status.type !== 'retweet') - return sortBy(conversation, 'id') + return sortBy(conversation, sortById) } const conversation = { -- cgit v1.2.3-70-g09d2