Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Left pane preview/timestamp: Further refine logic

Browse Source
This commit is contained in:
Scott Nonnenberg
2020-08-27 11:36:11 -07:00
committed by Josh Perez
parent bcd4f6407f
commit 8d5e832ed6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/models/conversations.js
View File

@@ -1884,11 +1884,6 @@
}),
]);
// This is the less-restrictive of these two fetches; if it's falsey, both will be
if (!previewMessage) {
return;
}
if (
this.hasDraft() &&
this.get('draftTimestamp') &&
@@ -1903,10 +1898,15 @@
: currentTimestamp;
this.set({
lastMessage: previewMessage.getNotificationText() || '',
lastMessageStatus: previewMessage.getMessagePropStatus() || null,
lastMessage:
(previewMessage ? previewMessage.getNotificationText() : '') || '',
lastMessageStatus:
(previewMessage ? previewMessage.getMessagePropStatus() : null) ||
null,
timestamp,
lastMessageDeletedForEveryone: previewMessage.deletedForEveryone,
lastMessageDeletedForEveryone: previewMessage
? previewMessage.deletedForEveryone
: false,
});
window.Signal.Data.updateConversation(this.attributes);