Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-26 03:18:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to the latest SignalService.proto

Browse Source
This commit is contained in:
Scott Nonnenberg
2025-02-11 08:20:14 +10:00
committed by GitHub
parent cf5dc4b940
commit d26d915a44
26 changed files with 464 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ts/messageModifiers/MessageRequests.ts
View File

@@ -13,7 +13,6 @@ export type MessageRequestAttributesType = {
groupV2Id?: string;
removeFromMessageReceiverCache: () => unknown;
threadAci?: AciString;
threadE164?: string;
type: number;
};
@@ -33,17 +32,6 @@ export function forConversation(
const messageRequestValues = Array.from(messageRequests.values());
if (conversation.get('e164')) {
const syncByE164 = messageRequestValues.find(
item => item.threadE164 === conversation.get('e164')
);
if (syncByE164) {
log.info(`${logId}: Found early message request response for E164`);
remove(syncByE164);
return syncByE164;
}
}
if (conversation.getServiceId()) {
const syncByServiceId = messageRequestValues.find(
item => item.threadAci === conversation.getServiceId()
@@ -74,9 +62,9 @@ export async function onResponse(
sync: MessageRequestAttributesType
): Promise<void> {
messageRequests.set(sync.envelopeId, sync);
const { threadE164, threadAci, groupV2Id } = sync;
const { threadAci, groupV2Id } = sync;
const logId = `MessageRequests.onResponse(groupv2(${groupV2Id}) ${threadAci} ${threadE164})`;
const logId = `MessageRequests.onResponse(groupv2(${groupV2Id}) ${threadAci}`;
try {
let conversation;
@@ -85,9 +73,8 @@ export async function onResponse(
if (groupV2Id) {
conversation = window.ConversationController.get(groupV2Id);
}
if (!conversation && (threadE164 || threadAci)) {
if (!conversation && threadAci) {
conversation = window.ConversationController.lookupOrCreate({
e164: threadE164,
serviceId: threadAci,
reason: logId,
});