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

sendNormalMessage: Only send just sync message in Note to Self, groups

Browse source
This commit is contained in:
Scott Nonnenberg 2022-05-05 09:27:56 -07:00 • committed by GitHub
parent 8b3f0e11db
commit 232004cdd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ts/jobs/helpers/sendNormalMessage.ts
View file

@ -7,7 +7,7 @@ import * as Errors from '../../types/errors';
import type { MessageModel } from '../../models/messages'; import type { MessageModel } from '../../models/messages';
import { getMessageById } from '../../messages/getMessageById'; import { getMessageById } from '../../messages/getMessageById';
import type { ConversationModel } from '../../models/conversations'; import type { ConversationModel } from '../../models/conversations';
import { isGroupV2, isMe } from '../../util/whatTypeOfConversation'; import { isGroup, isGroupV2, isMe } from '../../util/whatTypeOfConversation';
import { getSendOptions } from '../../util/getSendOptions'; import { getSendOptions } from '../../util/getSendOptions';
import { SignalService as Proto } from '../../protobuf'; import { SignalService as Proto } from '../../protobuf';
import { handleMessageSend } from '../../util/handleMessageSend'; import { handleMessageSend } from '../../util/handleMessageSend';
@ -148,6 +148,15 @@ export async function sendNormalMessage(
let messageSendPromise: Promise<CallbackResultType | void>; let messageSendPromise: Promise<CallbackResultType | void>;
if (recipientIdentifiersWithoutMe.length === 0) { if (recipientIdentifiersWithoutMe.length === 0) {
if (!isMe(conversation.attributes) && !isGroup(conversation.attributes)) {
log.info(
'No recipients, but we are not sending to ourselves or to group. Failing job.'
);
markMessageFailed(message, [new Error('No valid recipients')]);
return;
}
// We're sending to Note to Self or a 'lonely group' with just us in it
log.info('sending sync message only'); log.info('sending sync message only');
const dataMessage = await window.textsecure.messaging.getDataMessage({ const dataMessage = await window.textsecure.messaging.getDataMessage({
attachments, attachments,