commit: 63df815dd946be74d23c0d5cc2832c7aa28fbda6
parent: 03ffa7e84e648f1114605c338e6b40c214199e9d
Author: HJ <spam@hjkos.com>
Date: Thu, 24 Jan 2019 22:16:26 +0000
Merge branch 'fixSortingSequentials' into 'develop'
Fix TL sorting
See merge request pleroma/pleroma-fe!474
Diffstat:
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git 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 = {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
@@ -81,7 +81,21 @@ const mergeOrAdd = (arr, obj, item) => {
}
}
-const sortById = (a, b) => a.id > b.id ? -1 : 1
+const sortById = (a, b) => {
+ const seqA = Number(a.id)
+ const seqB = Number(b.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.id > b.id ? -1 : 1
+ }
+}
const sortTimeline = (timeline) => {
timeline.visibleStatuses = timeline.visibleStatuses.sort(sortById)
@@ -239,7 +253,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
processor(status)
})
- // Keep the visible statuses sorted
+ // Keep the visible statuses sorted
if (timeline) {
sortTimeline(timelineObject)
if ((older || timelineObject.minVisibleId <= 0) && statuses.length > 0) {
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
@@ -9,9 +9,25 @@ export const visibleTypes = store => ([
store.state.config.notificationVisibility.follows && 'follow'
].filter(_ => _))
+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
+ }
+}
+
export const visibleNotificationsFromStore = store => {
// map is just to clone the array since sort mutates it and it causes some issues
- let sortedNotifications = notificationsFromStore(store).map(_ => _).sort((a, b) => a.action.id > b.action.id ? -1 : 1)
+ let sortedNotifications = notificationsFromStore(store).map(_ => _).sort(sortById)
sortedNotifications = sortBy(sortedNotifications, 'seen')
return sortedNotifications.filter((notification) => visibleTypes(store).includes(notification.type))
}