jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop reaction messages

This commit is contained in:
Ken Powers 2019-12-16 12:45:57 -05:00 committed by Scott Nonnenberg
parent 2da39cca67
commit a83f5ce3e0
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/models/messages.js
View File

@ -1837,6 +1837,13 @@
`Starting handleDataMessage for message ${message.idForLogging()} in conversation ${conversation.idForLogging()}` `Starting handleDataMessage for message ${message.idForLogging()} in conversation ${conversation.idForLogging()}`
); );
// Drop reaction messages at this time
if (initialMessage.reaction) {
window.log.info('Dropping reaction message', this.idForLogging());
confirm();
return;
}
// First, check for duplicates. If we find one, stop processing here. // First, check for duplicates. If we find one, stop processing here.
const existingMessage = await getMessageBySender(this.attributes, { const existingMessage = await getMessageBySender(this.attributes, {
Message: Whisper.Message, Message: Whisper.Message,

12
protos/SignalService.proto
View File

@ -169,6 +169,14 @@ message DataMessage {
optional AttachmentPointer data = 4; optional AttachmentPointer data = 4;
} }
message Reaction {
optional string emoji = 1;
optional bool remove = 2;
optional string targetAuthorE164 = 3;
optional string targetAuthorUuid = 4;
optional uint64 targetTimestamp = 5;
}
enum ProtocolVersion { enum ProtocolVersion {
option allow_alias = true; option allow_alias = true;
@ -176,7 +184,8 @@ message DataMessage {
MESSAGE_TIMERS = 1; MESSAGE_TIMERS = 1;
VIEW_ONCE = 2; VIEW_ONCE = 2;
VIEW_ONCE_VIDEO = 3; VIEW_ONCE_VIDEO = 3;
CURRENT = 3; REACTIONS = 4;
CURRENT = 4;
} }
optional string body = 1; optional string body = 1;
@ -192,6 +201,7 @@ message DataMessage {
optional Sticker sticker = 11; optional Sticker sticker = 11;
optional uint32 requiredProtocolVersion = 12; optional uint32 requiredProtocolVersion = 12;
optional bool isViewOnce = 14; optional bool isViewOnce = 14;
optional Reaction reaction = 16;
} }
message NullMessage { message NullMessage {