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

beforeMessageSend: Set lastMessage properly to avoid duplicate @mentions

Browse source
This commit is contained in:
Scott Nonnenberg 2023-05-30 10:05:07 -07:00 • committed by GitHub
parent cc233fb980
commit 3c84acc758
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/models/conversations.ts
View file

@ -4162,6 +4162,7 @@ export class ConversationModel extends window.Backbone
if (!dontAddMessage) { if (!dontAddMessage) {
this.doAddSingleMessage(message, { isJustSent: true }); this.doAddSingleMessage(message, { isJustSent: true });
} }
const notificationData = message.getNotificationData();
const draftProperties = dontClearDraft const draftProperties = dontClearDraft
? {} ? {}
: { : {
@ -4172,7 +4173,8 @@ export class ConversationModel extends window.Backbone
quotedMessageId: undefined, quotedMessageId: undefined,
lastMessageAuthor: message.getAuthorText(), lastMessageAuthor: message.getAuthorText(),
lastMessageBodyRanges: message.get('bodyRanges'), lastMessageBodyRanges: message.get('bodyRanges'),
lastMessage: message.getNotificationText(), lastMessage:
notificationData?.text || message.getNotificationText() || '',
lastMessageStatus: 'sending' as const, lastMessageStatus: 'sending' as const,
}; };