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

Set correct fromId on reactions in all circumstances

Browse source
This commit is contained in:
Ken Powers 2020-01-23 14:52:40 -05:00 • committed by Scott Nonnenberg
parent 2906ff0ce4
commit 109c40e055
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/background.js
View file

@ -2086,7 +2086,7 @@
targetAuthorUuid: reaction.targetAuthorUuid, targetAuthorUuid: reaction.targetAuthorUuid,
targetTimestamp: reaction.targetTimestamp.toNumber(), targetTimestamp: reaction.targetTimestamp.toNumber(),
timestamp: Date.now(), timestamp: Date.now(),
fromId: messageDescriptor.id, fromId: data.source,
}); });
// Note: We do not wait for completion here // Note: We do not wait for completion here
Whisper.Reactions.onReaction(reactionModel); Whisper.Reactions.onReaction(reactionModel);
@ -2214,6 +2214,7 @@
event.confirm(); event.confirm();
} else if (data.message.reaction) { } else if (data.message.reaction) {
const { reaction } = data.message; const { reaction } = data.message;
const ourNumber = textsecure.storage.user.getNumber();
const reactionModel = Whisper.Reactions.add({ const reactionModel = Whisper.Reactions.add({
emoji: reaction.emoji, emoji: reaction.emoji,
remove: reaction.remove, remove: reaction.remove,
@ -2221,7 +2222,7 @@
targetAuthorUuid: reaction.targetAuthorUuid, targetAuthorUuid: reaction.targetAuthorUuid,
targetTimestamp: reaction.targetTimestamp.toNumber(), targetTimestamp: reaction.targetTimestamp.toNumber(),
timestamp: Date.now(), timestamp: Date.now(),
fromId: messageDescriptor.id, fromId: ourNumber,
}); });
// Note: We do not wait for completion here // Note: We do not wait for completion here
Whisper.Reactions.onReaction(reactionModel); Whisper.Reactions.onReaction(reactionModel);