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

onSentMessage: Create destination conversation before further processing

Browse source 
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
Scott Nonnenberg 2024-03-06 10:10:44 -08:00 • committed by GitHub
parent a8ec995173
commit db623d13b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 184 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ts/background.ts
View file

@ -138,7 +138,11 @@ import {
import { themeChanged } from './shims/themeChanged';
import { createIPCEvents } from './util/createIPCEvents';
import type { ServiceIdString } from './types/ServiceId';
import { ServiceIdKind, isServiceIdString } from './types/ServiceId';
import {
ServiceIdKind,
isPniString,
isServiceIdString,
} from './types/ServiceId';
import { isAciString } from './util/isAciString';
import { normalizeAci } from './util/normalizeAci';
import * as log from './logging/log';
@ -2727,6 +2731,25 @@ export async function startApp(): Promise<void> {
const sourceServiceId = window.textsecure.storage.user.getAci();
strictAssert(source && sourceServiceId, 'Missing user number and uuid');
// Make sure destination conversation is created before we hit getMessageDescriptor
if (data.destinationServiceId !== sourceServiceId) {
const { mergePromises } =
window.ConversationController.maybeMergeContacts({
e164: data.destination,
aci: isAciString(data.destinationServiceId)
? data.destinationServiceId
: undefined,
pni: isPniString(data.destinationServiceId)
? data.destinationServiceId
: undefined,
reason: `onSentMessage(${data.timestamp})`,
});
if (mergePromises.length > 0) {
await Promise.all(mergePromises);
}
}
const messageDescriptor = getMessageDescriptor({
...data,
});