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

Reduce number of SQL queries during conversation update

Browse source
This commit is contained in:
Fedor Indutny 2021-08-16 09:56:27 -07:00 • committed by GitHub
parent 765b3eddc4
commit 962515031d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 90 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

51
ts/models/conversations.ts
View file

@ -1061,11 +1061,6 @@ export class ConversationModel extends window.Backbone
// On successful fetch - mark contact as registered.
this.setRegistered();
// If we couldn't apply universal timer before - try it again.
this.queueJob('maybeSetPendingUniversalTimer', async () =>
this.maybeSetPendingUniversalTimer()
);
}
isValid(): boolean {
@ -2759,7 +2754,9 @@ export class ConversationModel extends window.Backbone
return id;
}
async maybeSetPendingUniversalTimer(): Promise<void> {
async maybeSetPendingUniversalTimer(
hasUserInitiatedMessages: boolean
): Promise<void> {
if (!isDirectConversation(this.attributes)) {
return;
}
@ -2768,7 +2765,8 @@ export class ConversationModel extends window.Backbone
return;
}
if (await window.Signal.Data.hasUserInitiatedMessages(this.get('id'))) {
if (hasUserInitiatedMessages) {
await this.maybeApplyUniversalTimer(true);
return;
}
@ -2787,7 +2785,7 @@ export class ConversationModel extends window.Backbone
this.set('pendingUniversalTimer', notificationId);
}
async maybeApplyUniversalTimer(): Promise<void> {
async maybeApplyUniversalTimer(forceRemove: boolean): Promise<void> {
const notificationId = this.get('pendingUniversalTimer');
if (!notificationId) {
return;
@ -2801,7 +2799,7 @@ export class ConversationModel extends window.Backbone
});
}
if (this.get('expireTimer')) {
if (this.get('expireTimer') || forceRemove) {
this.set('pendingUniversalTimer', undefined);
return;
}
@ -3405,7 +3403,7 @@ export class ConversationModel extends window.Backbone
timestamp
);
await this.maybeApplyUniversalTimer();
await this.maybeApplyUniversalTimer(false);
const expireTimer = this.get('expireTimer');
@ -3604,7 +3602,7 @@ export class ConversationModel extends window.Backbone
this.queueJob('sendMessage', async () => {
const now = timestamp || Date.now();
await this.maybeApplyUniversalTimer();
await this.maybeApplyUniversalTimer(false);
const expireTimer = this.get('expireTimer');
@ -3822,28 +3820,25 @@ export class ConversationModel extends window.Backbone
return;
}
this.queueJob('maybeSetPendingUniversalTimer', async () =>
this.maybeSetPendingUniversalTimer()
);
const ourConversationId = window.ConversationController.getOurConversationId();
if (!ourConversationId) {
throw new Error('updateLastMessage: Failed to fetch ourConversationId');
}
const conversationId = this.id;
let [previewMessage, activityMessage] = await Promise.all([
window.Signal.Data.getLastConversationPreview({
conversationId,
ourConversationId,
Message: window.Whisper.Message,
}),
window.Signal.Data.getLastConversationActivity({
conversationId,
ourConversationId,
Message: window.Whisper.Message,
}),
]);
const lastMessages = await window.Signal.Data.getLastConversationMessages({
conversationId,
ourConversationId,
Message: window.Whisper.Message,
});
// This runs as a job to avoid race conditions
this.queueJob('maybeSetPendingUniversalTimer', async () =>
this.maybeSetPendingUniversalTimer(lastMessages.hasUserInitiatedMessages)
);
let { preview: previewMessage, activity: activityMessage } = lastMessages;
// Register the message with MessageController so that if it already exists
// in memory we use that data instead of the data from the db which may
@ -4157,7 +4152,7 @@ export class ConversationModel extends window.Backbone
// This call actually removes universal timer notification and clears
// the pending flags.
await this.maybeApplyUniversalTimer();
await this.maybeApplyUniversalTimer(true);
window.Signal.Data.updateConversation(this.attributes);