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

Drop stories and their replies if feature flag is disabled

Browse source
This commit is contained in:
Scott Nonnenberg 2022-03-21 16:17:55 -07:00 committed by GitHub
parent f536421390
commit 1d268da50b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ts/textsecure/MessageReceiver.ts
View file

@ -54,6 +54,7 @@ import { QualifiedAddress } from '../types/QualifiedAddress';
import type { UUIDStringType } from '../types/UUID'; import type { UUIDStringType } from '../types/UUID';
import { UUID, UUIDKind } from '../types/UUID'; import { UUID, UUIDKind } from '../types/UUID';
import * as Errors from '../types/errors'; import * as Errors from '../types/errors';
import { isEnabled } from '../RemoteConfig';
import { SignalService as Proto } from '../protobuf'; import { SignalService as Proto } from '../protobuf';
import type { UnprocessedType } from '../textsecure.d'; import type { UnprocessedType } from '../textsecure.d';
@ -1859,6 +1860,16 @@ export default class MessageReceiver
const logId = this.getEnvelopeId(envelope); const logId = this.getEnvelopeId(envelope);
log.info('MessageReceiver.handleDataMessage', logId); log.info('MessageReceiver.handleDataMessage', logId);
const isStoriesEnabled =
isEnabled('desktop.stories') && isEnabled('desktop.internalUser');
if (!isStoriesEnabled && msg.storyContext) {
log.info(
`MessageReceiver.handleDataMessage/${logId}: Dropping incoming dataMessage with storyContext field`
);
this.removeFromCache(envelope);
return undefined;
}
let p: Promise<void> = Promise.resolve(); let p: Promise<void> = Promise.resolve();
// eslint-disable-next-line no-bitwise // eslint-disable-next-line no-bitwise
const destination = envelope.sourceUuid; const destination = envelope.sourceUuid;
@ -2049,8 +2060,20 @@ export default class MessageReceiver
await this.handleTypingMessage(envelope, content.typingMessage); await this.handleTypingMessage(envelope, content.typingMessage);
return; return;
} }
const isStoriesEnabled =
isEnabled('desktop.stories') && isEnabled('desktop.internalUser');
if (content.storyMessage) { if (content.storyMessage) {
await this.handleStoryMessage(envelope, content.storyMessage); if (isStoriesEnabled) {
await this.handleStoryMessage(envelope, content.storyMessage);
return;
}
const logId = this.getEnvelopeId(envelope);
log.info(
`innerHandleContentMessage/${logId}: Dropping incoming message with storyMessage field`
);
this.removeFromCache(envelope);
return; return;
} }