mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Consistent sorting for messages in reducer

Browse source
This commit is contained in:
Fedor Indutny 2021-09-28 15:11:01 -07:00 • committed by GitHub
parent 0291830d16
commit 29de067c0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/state/ducks/conversations.ts
View file

@ -2329,17 +2329,22 @@ export function reducer(
: 0; : 0;
const lookup = fromPairs(messages.map(message => [message.id, message])); const lookup = fromPairs(messages.map(message => [message.id, message]));
const sorted = orderBy(
values(lookup),
['received_at', 'sent_at'],
['ASC', 'ASC']
);
let { newest, oldest } = metrics; let { newest, oldest } = metrics;
// If our metrics are a little out of date, we'll fix them up // If our metrics are a little out of date, we'll fix them up
if (messages.length > 0) { if (sorted.length > 0) {
const first = messages[0]; const first = sorted[0];
if (first && (!oldest || first.received_at <= oldest.received_at)) { if (first && (!oldest || first.received_at <= oldest.received_at)) {
oldest = pick(first, ['id', 'received_at', 'sent_at']); oldest = pick(first, ['id', 'received_at', 'sent_at']);
} }
const last = messages[messages.length - 1]; const last = sorted[sorted.length - 1];
if ( if (
last && last &&
(!newest || unboundedFetch || last.received_at >= newest.received_at) (!newest || unboundedFetch || last.received_at >= newest.received_at)
@ -2348,11 +2353,6 @@ export function reducer(
} }
} }
const sorted = orderBy(
values(lookup),
['received_at', 'sent_at'],
['ASC', 'ASC']
);
const messageIds = sorted.map(message => message.id); const messageIds = sorted.map(message => message.id);
return { return {