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

Skip conversation save when applying MRR from storage service

Browse Source
This commit is contained in:
trevor-signal
2025-12-29 14:43:29 -05:00
committed by GitHub
parent 963c94a2a2
commit 4bfdc0719a
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ts/services/storageRecordOps.preload.ts
View File

@@ -994,24 +994,32 @@ export function toNotificationProfileRecord(
type MessageRequestCapableRecord = Proto.IContactRecord | Proto.IGroupV2Record;
function applyMessageRequestState(
async function applyMessageRequestState(
record: MessageRequestCapableRecord,
conversation: ConversationModel
): void {
): Promise<void> {
const messageRequestEnum = Proto.SyncMessage.MessageRequestResponse.Type;
if (record.blocked) {
void conversation.applyMessageRequestResponse(messageRequestEnum.BLOCK, {
source: MessageRequestResponseSource.STORAGE_SERVICE,
learnedAtMs: Date.now(),
});
await conversation.applyMessageRequestResponse(
messageRequestEnum.BLOCK,
{
source: MessageRequestResponseSource.STORAGE_SERVICE,
learnedAtMs: Date.now(),
},
{ shouldSave: false }
);
} else if (record.whitelisted) {
// unblocking is also handled by this function which is why the next
// condition is part of the else-if and not separate
void conversation.applyMessageRequestResponse(messageRequestEnum.ACCEPT, {
source: MessageRequestResponseSource.STORAGE_SERVICE,
learnedAtMs: Date.now(),
});
await conversation.applyMessageRequestResponse(
messageRequestEnum.ACCEPT,
{
source: MessageRequestResponseSource.STORAGE_SERVICE,
learnedAtMs: Date.now(),
},
{ shouldSave: false }
);
} else if (!record.blocked) {
// if the condition above failed the state could still be blocked=false
// in which case we should unblock the conversation
@@ -1048,7 +1056,12 @@ function logRecordChanges(
return details;
}
for (const key of Object.keys(remoteRecord)) {
const allKeys = new Set([
...Object.keys(remoteRecord),
...Object.keys(localRecord),
]);
for (const key of allKeys) {
const localValue = localRecord[key];
const remoteValue = remoteRecord[key];
@@ -1339,7 +1352,7 @@ export async function mergeGroupV2Record(
}
);
applyMessageRequestState(groupV2Record, conversation);
await applyMessageRequestState(groupV2Record, conversation);
applyAvatarColor(conversation, groupV2Record.avatarColor);
@@ -1539,7 +1552,7 @@ export async function mergeContactRecord(
}
}
applyMessageRequestState(contactRecord, conversation);
await applyMessageRequestState(contactRecord, conversation);
addUnknownFieldsToConversation(contactRecord, conversation, details);