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

Improve story DOE flow

Browse source
This commit is contained in:
Fedor Indutny 2022-11-28 18:07:26 -08:00 • committed by GitHub
parent 5e9744d62a
commit 37d383f344
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 630 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ts/util/wrapWithSyncMessageSend.ts
View file

@ -15,7 +15,7 @@ import { areAllErrorsUnregistered } from '../jobs/helpers/areAllErrorsUnregister
export async function wrapWithSyncMessageSend({
conversation,
logId,
logId: parentLogId,
messageIds,
send,
sendType,
@ -28,11 +28,10 @@ export async function wrapWithSyncMessageSend({
sendType: SendTypesType;
timestamp: number;
}): Promise<void> {
const logId = `wrapWithSyncMessageSend(${parentLogId}, ${timestamp})`;
const sender = window.textsecure.messaging;
if (!sender) {
throw new Error(
`wrapWithSyncMessageSend/${logId}: textsecure.messaging is not available!`
);
throw new Error(`${logId}: textsecure.messaging is not available!`);
}
let response: CallbackResultType | undefined;
@ -52,17 +51,13 @@ export async function wrapWithSyncMessageSend({
if (thrown instanceof Error) {
error = thrown;
} else {
log.error(
`wrapWithSyncMessageSend/${logId}: Thrown value was not an Error, returning early`
);
log.error(`${logId}: Thrown value was not an Error, returning early`);
throw error;
}
}
if (!response && !error) {
throw new Error(
`wrapWithSyncMessageSend/${logId}: message send didn't return result or error!`
);
throw new Error(`${logId}: message send didn't return result or error!`);
}
const dataMessage =
@ -71,11 +66,9 @@ export async function wrapWithSyncMessageSend({
if (didSuccessfullySendOne) {
if (!dataMessage) {
log.error(
`wrapWithSyncMessageSend/${logId}: dataMessage was not returned by send!`
);
log.error(`${logId}: dataMessage was not returned by send!`);
} else {
log.info(`wrapWithSyncMessageSend/${logId}: Sending sync message...`);
log.info(`${logId}: Sending sync message... `);
const ourConversation =
window.ConversationController.getOurConversationOrThrow();
const options = await getSendOptions(ourConversation.attributes, {
@ -99,7 +92,8 @@ export async function wrapWithSyncMessageSend({
if (error instanceof Error) {
if (areAllErrorsUnregistered(conversation.attributes, error)) {
log.info(
`wrapWithSyncMessageSend/${logId}: Group send failures were all UnregisteredUserError, returning succcessfully.`
`${logId}: Group send failures were all UnregisteredUserError, ` +
'returning succcessfully.'
);
return;
}