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

Fetch profiles for conversations needing verification, more logging too

Browse source
This commit is contained in:
Scott Nonnenberg 2022-04-14 15:27:16 -07:00 committed by GitHub
parent 6856e246e2
commit 14ab7b9e0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ts/state/ducks/conversations.ts
View file

@ -2,6 +2,8 @@
// SPDX-License-Identifier: AGPL-3.0-only
/* eslint-disable camelcase */
import PQueue from 'p-queue';
import type { ThunkAction } from 'redux-thunk';
import {
difference,
@ -1272,6 +1274,10 @@ function verifyConversationsStoppingSend(): ThunkAction<
const conversationIdsStoppingSend = getConversationIdsStoppingSend(state);
const conversationIdsBlocked =
getConversationIdsStoppedForVerification(state);
log.info(
`verifyConversationsStoppingSend: Starting with ${conversationIdsBlocked.length} blocked ` +
`conversations and ${conversationIdsStoppingSend.length} conversations to verify.`
);
// Mark conversations as approved/verified as appropriate
const promises: Array<Promise<unknown>> = [];
@ -1280,6 +1286,10 @@ function verifyConversationsStoppingSend(): ThunkAction<
if (!conversation) {
return;
}
log.info(
`verifyConversationsStoppingSend: Verifying conversation ${conversation.idForLogging()}`
);
if (conversation.isUnverified()) {
promises.push(conversation.setVerifiedDefault());
}
@ -1495,6 +1505,27 @@ function conversationStoppedByMissingVerification(payload: {
conversationId: string;
untrustedConversationIds: ReadonlyArray<string>;
}): ConversationStoppedByMissingVerificationActionType {
// Fetching profiles to ensure that we have their latest identity key in storage
const profileFetchQueue = new PQueue({
concurrency: 3,
});
payload.untrustedConversationIds.forEach(untrustedConversationId => {
const conversation = window.ConversationController.get(
untrustedConversationId
);
if (!conversation) {
log.error(
`conversationStoppedByMissingVerification: conversationId ${untrustedConversationId} not found!`
);
return;
}
profileFetchQueue.add(() => {
const active = conversation.getActiveProfileFetch();
return active || conversation.getProfiles();
});
});
return {
type: CONVERSATION_STOPPED_BY_MISSING_VERIFICATION,
payload,