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

Sort left pane via receivedAt/receivedAtMs, even via edits

Browse source
This commit is contained in:
Scott Nonnenberg 2024-03-25 12:21:14 -07:00 • committed by GitHub
parent a39e46db5c
commit 6bc6cc64c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 55 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ts/models/conversations.ts
View file

@ -4173,16 +4173,23 @@ export class ConversationModel extends window.Backbone
return;
}
const currentTimestamp = this.get('timestamp') || null;
let timestamp = currentTimestamp;
let timestamp = this.get('timestamp') || null;
let lastMessageReceivedAt = this.get('lastMessageReceivedAt');
let lastMessageReceivedAtMs = this.get('lastMessageReceivedAtMs');
if (activityMessage) {
const receivedAt = activityMessage.get('received_at_ms');
timestamp = receivedAt
? Math.min(activityMessage.get('sent_at'), receivedAt)
: activityMessage.get('sent_at');
timestamp =
activityMessage.get('editMessageTimestamp') ||
activityMessage.get('sent_at') ||
timestamp;
lastMessageReceivedAt =
activityMessage.get('editMessageReceivedAt') ||
activityMessage.get('received_at') ||
lastMessageReceivedAt;
lastMessageReceivedAtMs =
activityMessage.get('editMessageReceivedAtMs') ||
activityMessage.get('received_at_ms') ||
lastMessageReceivedAtMs;
}
timestamp = timestamp || currentTimestamp;
const notificationData = previewMessage?.getNotificationData();
@ -4196,6 +4203,8 @@ export class ConversationModel extends window.Backbone
(previewMessage
? getMessagePropStatus(previewMessage.attributes, ourConversationId)
: null) || null,
lastMessageReceivedAt,
lastMessageReceivedAtMs,
timestamp,
lastMessageDeletedForEveryone: previewMessage
? previewMessage.get('deletedForEveryone')