Merge branch 'hotifx-convos' into 'develop'

Fix ordering in convos

See merge request pleroma/pleroma-fe!477
This commit is contained in:
HJ 2019-01-25 15:00:06 +00:00
commit 8197c77f75

View file

@ -7,13 +7,13 @@ const sortById = (a, b) => {
const isSeqA = !Number.isNaN(seqA) const isSeqA = !Number.isNaN(seqA)
const isSeqB = !Number.isNaN(seqB) const isSeqB = !Number.isNaN(seqB)
if (isSeqA && isSeqB) { if (isSeqA && isSeqB) {
return seqA > seqB ? -1 : 1 return seqA < seqB ? -1 : 1
} else if (isSeqA && !isSeqB) { } else if (isSeqA && !isSeqB) {
return 1 return 1
} else if (!isSeqA && isSeqB) { } else if (!isSeqA && isSeqB) {
return -1 return -1
} else { } else {
return a.id > b.id ? -1 : 1 return a.id < b.id ? -1 : 1
} }
} }