diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-10 17:28:42 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-10 17:28:42 +0000 |
| commit | 84505e01f5f6b2d0ba462cdccefcedc631ab09ba (patch) | |
| tree | b49893d5b9087d8eb8a92d8b54eca79b822c6a53 /src/services/notification_utils/notification_utils.js | |
| parent | d94a7b63185ce72bd9a61ebc7f6141178176fc4e (diff) | |
| parent | 76cd01e99b832944c5f6faff3167935346438b53 (diff) | |
Merge branch 'issue-436-mastoapi-notifications' into 'develop'
#436: integrate mastoAPI notifications
Closes #436
See merge request pleroma/pleroma-fe!678
Diffstat (limited to 'src/services/notification_utils/notification_utils.js')
| -rw-r--r-- | src/services/notification_utils/notification_utils.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js index cd8f3f9e..8afd114e 100644 --- a/src/services/notification_utils/notification_utils.js +++ b/src/services/notification_utils/notification_utils.js @@ -10,8 +10,8 @@ export const visibleTypes = store => ([ ].filter(_ => _)) 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) { @@ -21,7 +21,7 @@ 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 } } |
