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

Conversation reducer: sort by received_at then sent_at like Backbone

Browse source
This commit is contained in:
Scott Nonnenberg 2020-10-23 12:20:21 -07:00
parent 1c057323ba
commit 89d29b49a3
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,6 +97,7 @@ export type MessageType = {
| 'call-history'; | 'call-history';
quote?: { author: string }; quote?: { author: string };
received_at: number; received_at: number;
sent_at?: number;
hasSignalAccount?: boolean; hasSignalAccount?: boolean;
bodyPending?: boolean; bodyPending?: boolean;
attachments: Array<AttachmentType>; attachments: Array<AttachmentType>;
@ -829,7 +830,11 @@ export function reducer(
? existingConversation.resetCounter + 1 ? existingConversation.resetCounter + 1
: 0; : 0;
const sorted = orderBy(messages, ['received_at'], ['ASC']); const sorted = orderBy(
messages,
['received_at', 'sent_at'],
['ASC', 'ASC']
);
const messageIds = sorted.map(message => message.id); const messageIds = sorted.map(message => message.id);
const lookup = fromPairs(messages.map(message => [message.id, message])); const lookup = fromPairs(messages.map(message => [message.id, message]));
@ -1071,7 +1076,11 @@ export function reducer(
lookup[message.id] = message; lookup[message.id] = message;
}); });
const sorted = orderBy(values(lookup), ['received_at'], ['ASC']); 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);
const first = sorted[0]; const first = sorted[0];