Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-02-15 07:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for unpin sync message

Browse Source 
Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
This commit is contained in:
automated-signal
2026-01-21 13:24:40 -06:00
committed by GitHub
parent c5c0d798fe
commit 1a09c683c6
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ts/jobs/helpers/createSendMessageJob.preload.ts
View File

@@ -20,7 +20,6 @@ import {
handleMultipleSendErrors,
maybeExpandErrors,
} from './handleMultipleSendErrors.std.js';
import { itemStorage } from '../../textsecure/Storage.preload.js';
export type SendMessageJobOptions<Data> = Readonly<{
sendName: string; // ex: 'sendExampleMessage'
@@ -58,14 +57,17 @@ export function createSendMessageJob<Data>(
return;
}
const { recipientServiceIdsWithoutMe, untrustedServiceIds } =
getSendRecipientLists({
log,
conversation,
conversationIds: isSyncOnly(data)
? [window.ConversationController.getOurConversationIdOrThrow()]
: Array.from(conversation.getMemberConversationIds()),
});
const {
allRecipientServiceIds,
recipientServiceIdsWithoutMe,
untrustedServiceIds,
} = getSendRecipientLists({
log,
conversation,
conversationIds: isSyncOnly(data)
? [window.ConversationController.getOurConversationIdOrThrow()]
: Array.from(conversation.getMemberConversationIds()),
});
if (untrustedServiceIds.length > 0) {
window.reduxActions.conversations.conversationStoppedByMissingVerification(
@@ -90,25 +92,29 @@ export function createSendMessageJob<Data>(
try {
if (recipientServiceIdsWithoutMe.length === 0) {
const sendOptions = await getSendOptions(conversation.attributes, {
const ourConversation =
window.ConversationController.getOurConversationOrThrow();
const sendOptions = await getSendOptions(ourConversation.attributes, {
syncMessage: true,
});
// Only sending a sync to ourselves
await conversation.queueJob(
`conversationQueue/${sendName}/sync`,
async () => {
const ourAci = itemStorage.user.getCheckedAci();
const encodedDataMessage = await job.messaging.getDataOrEditMessage(
{
...messageOptions,
recipients: [ourAci],
groupV2: conversation.getGroupV2Info({
members: recipientServiceIdsWithoutMe,
}),
recipients: allRecipientServiceIds,
}
);
return handleMessageSend(
job.messaging.sendSyncMessage({
encodedDataMessage,
timestamp: job.timestamp,
timestamp: messageOptions.timestamp,
destinationE164: conversation.get('e164'),
destinationServiceId: conversation.getServiceId(),
expirationStartTimestamp,
@@ -152,7 +158,7 @@ export function createSendMessageJob<Data>(
});
},
sendType,
timestamp: job.timestamp,
timestamp: messageOptions.timestamp,
expirationStartTimestamp,
});
}
@@ -189,7 +195,7 @@ export function createSendMessageJob<Data>(
});
},
sendType,
timestamp: job.timestamp,
timestamp: messageOptions.timestamp,
expirationStartTimestamp,
});
}