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

Fix out-of-order applications of reaction and delete-for-everyone

Browse source
This commit is contained in:
Scott Nonnenberg 2020-11-01 07:06:41 -08:00 committed by GitHub
parent 05f905fd10
commit e8759fc81b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/deletes.js
View file

@ -14,7 +14,7 @@
forMessage(message) { forMessage(message) {
const matchingDeletes = this.filter({ const matchingDeletes = this.filter({
targetSentTimestamp: message.get('sent_at'), targetSentTimestamp: message.get('sent_at'),
fromId: message.getContact().get('id'), fromId: message.getContactId(),
}); });
if (matchingDeletes.length > 0) { if (matchingDeletes.length > 0) {

10
js/reactions.js
View file

@ -24,15 +24,15 @@
} }
} }
const senderId = message.getContactId();
const sentAt = message.get('sent_at');
const reactionsBySource = this.filter(re => { const reactionsBySource = this.filter(re => {
const mcid = message.get('conversationId'); const targetSenderId = ConversationController.ensureContactIds({
const recid = ConversationController.ensureContactIds({
e164: re.get('targetAuthorE164'), e164: re.get('targetAuthorE164'),
uuid: re.get('targetAuthorUuid'), uuid: re.get('targetAuthorUuid'),
}); });
const mTime = message.get('sent_at'); const targetTimestamp = re.get('targetTimestamp');
const rTime = re.get('targetTimestamp'); return targetSenderId === senderId && targetTimestamp === sentAt;
return mcid === recid && mTime === rTime;
}); });
if (reactionsBySource.length > 0) { if (reactionsBySource.length > 0) {

14
ts/models/messages.ts
View file

@ -3344,16 +3344,18 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
// Does this message have any pending, previously-received associated reactions? // Does this message have any pending, previously-received associated reactions?
const reactions = window.Whisper.Reactions.forMessage(message); const reactions = window.Whisper.Reactions.forMessage(message);
reactions.forEach(reaction => { await Promise.all(
message.handleReaction(reaction, false); reactions.map(reaction => message.handleReaction(reaction, false))
}); );
// Does this message have any pending, previously-received associated // Does this message have any pending, previously-received associated
// delete for everyone messages? // delete for everyone messages?
const deletes = window.Whisper.Deletes.forMessage(message); const deletes = window.Whisper.Deletes.forMessage(message);
deletes.forEach(del => { await Promise.all(
window.Signal.Util.deleteForEveryone(message, del, false); deletes.map(del =>
}); window.Signal.Util.deleteForEveryone(message, del, false)
)
);
await window.Signal.Data.saveMessage(message.attributes, { await window.Signal.Data.saveMessage(message.attributes, {
Message: window.Whisper.Message, Message: window.Whisper.Message,