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

Fixes left pane sorting when messages come in from the future

Browse source
This commit is contained in:
Josh Perez 2023-03-10 16:30:43 -05:00 • committed by GitHub
parent 53be6c8e89
commit 676abfbdfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/models/conversations.ts
View file

@ -4384,11 +4384,15 @@ export class ConversationModel extends window.Backbone
} }
const currentTimestamp = this.get('timestamp') || null; const currentTimestamp = this.get('timestamp') || null;
const timestamp = activityMessage
? activityMessage.get('sent_at') || let timestamp = currentTimestamp;
activityMessage.get('received_at') || if (activityMessage) {
currentTimestamp const receivedAt = activityMessage.get('received_at_ms');
: currentTimestamp; timestamp = receivedAt
? Math.min(activityMessage.get('sent_at'), receivedAt)
: activityMessage.get('sent_at');
}
timestamp = timestamp || currentTimestamp;
this.set({ this.set({
lastMessage: lastMessage: