aboutsummaryrefslogtreecommitdiff
path: root/src/modules/statuses.js
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2019-01-11 02:40:17 +0300
committerHenry Jameson <me@hjkos.com>2019-01-11 02:40:17 +0300
commitef2585e32b546722f2157bd6203701deb495d2e9 (patch)
tree57c0b051fe061643c0583da521cfc8a89fb45a28 /src/modules/statuses.js
parent1fb9ceb59bf0dca5f755f5988f90bdd24a89dd53 (diff)
Remove all explicit and implicit conversions of statusId to number, changed
explicit ones so that they convert them to string
Diffstat (limited to 'src/modules/statuses.js')
-rw-r--r--src/modules/statuses.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index dccccf72..fe65d843 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { includes, remove, slice, sortBy, toInteger, each, find, flatten, maxBy, minBy, merge, last, isArray } from 'lodash'
+import { includes, remove, slice, each, find, flatten, maxBy, minBy, merge, last, isArray } from 'lodash'
import apiService from '../services/api/api.service.js'
// import parse from '../services/status_parser/status_parser.js'
@@ -122,9 +122,11 @@ const mergeOrAdd = (arr, obj, item) => {
}
}
+const sortById = (a, b) => a.id > b.id ? -1 : 1
+
const sortTimeline = (timeline) => {
- timeline.visibleStatuses = sortBy(timeline.visibleStatuses, ({id}) => -id)
- timeline.statuses = sortBy(timeline.statuses, ({id}) => -id)
+ timeline.visibleStatuses = timeline.visibleStatuses.sort(sortById)
+ timeline.statuses = timeline.statuses.sort(sortById)
timeline.minVisibleId = (last(timeline.visibleStatuses) || {}).id
return timeline
}
@@ -200,7 +202,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
}
const favoriteStatus = (favorite, counter) => {
- const status = find(allStatuses, { id: toInteger(favorite.in_reply_to_status_id) })
+ const status = find(allStatuses, { id: String(favorite.in_reply_to_status_id) })
if (status) {
// This is our favorite, so the relevant bit.
if (favorite.user.id === user.id) {