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

Allow receiving group stories from senders with profileSharing=false

Browse source
This commit is contained in:
Alvaro 2022-11-09 15:53:19 -07:00 • committed by GitHub
parent 4a5da95c1d
commit 9de31d1b1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ts/textsecure/MessageReceiver.ts
View file

@ -1352,7 +1352,9 @@ export default class MessageReceiver
try { try {
const content = Proto.Content.decode(plaintext); const content = Proto.Content.decode(plaintext);
isGroupV2 = Boolean(content.dataMessage?.groupV2); isGroupV2 =
Boolean(content.dataMessage?.groupV2) ||
Boolean(content.storyMessage?.group);
if ( if (
content.senderKeyDistributionMessage && content.senderKeyDistributionMessage &&
@ -1372,10 +1374,13 @@ export default class MessageReceiver
isStoryReply && content.dataMessage?.groupV2 isStoryReply && content.dataMessage?.groupV2
); );
const isStory = Boolean(content.storyMessage); const isStory = Boolean(content.storyMessage);
const isGroupStorySend = isGroupStoryReply || isStory;
const isDeleteForEveryone = Boolean(content.dataMessage?.delete); const isDeleteForEveryone = Boolean(content.dataMessage?.delete);
if (envelope.story && !isGroupStorySend && !isDeleteForEveryone) { if (
envelope.story &&
!(isGroupStoryReply || isStory) &&
!isDeleteForEveryone
) {
log.warn( log.warn(
`${logId}: Dropping story message - story=true on envelope, but message was not a group story send or delete` `${logId}: Dropping story message - story=true on envelope, but message was not a group story send or delete`
); );
@ -1383,7 +1388,7 @@ export default class MessageReceiver
return { plaintext: undefined, envelope }; return { plaintext: undefined, envelope };
} }
if (!envelope.story && isGroupStorySend) { if (!envelope.story && (isGroupStoryReply || isStory)) {
log.warn( log.warn(
`${logId}: Malformed story - story=false on envelope, but was a group story send` `${logId}: Malformed story - story=false on envelope, but was a group story send`
); );
@ -1404,8 +1409,9 @@ export default class MessageReceiver
envelope.sourceUuid || envelope.source envelope.sourceUuid || envelope.source
); );
if ( if (
(!sender || !sender.get('profileSharing')) && (isStoryReply || isStory) &&
(isStoryReply || isStory) !isGroupV2 &&
(!sender || !sender.get('profileSharing'))
) { ) {
log.warn( log.warn(
`${logId}: Dropping story message - !profileSharing for sender` `${logId}: Dropping story message - !profileSharing for sender`