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

loadAndScroll: Use one transaction to pull all data: old/new/metrics

Browse source
This commit is contained in:
Scott Nonnenberg 2021-12-20 13:05:13 -08:00 • committed by GitHub
parent 60a53656af
commit 0163ef203b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 132 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

83
ts/sql/Server.ts
View file

@ -236,6 +236,7 @@ const dataInterface: ServerInterface = {
getNewerMessagesByConversation,
getTotalUnreadForConversation,
getMessageMetricsForConversation,
getConversationRangeCenteredOnMessage,
getLastConversationMessages,
hasGroupCallHistoryMessage,
migrateConversationMessages,
@ -2304,6 +2305,18 @@ async function _removeAllReactions(): Promise<void> {
}
async function getOlderMessagesByConversation(
conversationId: string,
options?: {
limit?: number;
messageId?: string;
receivedAt?: number;
sentAt?: number;
storyId?: UUIDStringType;
}
): Promise<Array<MessageTypeUnhydrated>> {
return getOlderMessagesByConversationSync(conversationId, options);
}
function getOlderMessagesByConversationSync(
conversationId: string,
{
limit = 100,
@ -2318,7 +2331,7 @@ async function getOlderMessagesByConversation(
sentAt?: number;
storyId?: UUIDStringType;
} = {}
): Promise<Array<MessageTypeUnhydrated>> {
): Array<MessageTypeUnhydrated> {
const db = getInstance();
return db
@ -2390,6 +2403,17 @@ async function getOlderStories({
}
async function getNewerMessagesByConversation(
conversationId: string,
options?: {
limit?: number;
receivedAt?: number;
sentAt?: number;
storyId?: UUIDStringType;
}
): Promise<Array<MessageTypeUnhydrated>> {
return getNewerMessagesByConversationSync(conversationId, options);
}
function getNewerMessagesByConversationSync(
conversationId: string,
{
limit = 100,
@ -2402,7 +2426,7 @@ async function getNewerMessagesByConversation(
sentAt?: number;
storyId?: UUIDStringType;
} = {}
): Promise<Array<MessageTypeUnhydrated>> {
): Array<MessageTypeUnhydrated> {
const db = getInstance();
const rows: JSONRows = db
.prepare<Query>(
@ -2609,6 +2633,12 @@ async function getTotalUnreadForConversation(
conversationId: string,
storyId?: UUIDStringType
): Promise<number> {
return getTotalUnreadForConversationSync(conversationId, storyId);
}
function getTotalUnreadForConversationSync(
conversationId: string,
storyId?: UUIDStringType
): number {
const db = getInstance();
const row = db
.prepare<Query>(
@ -2638,13 +2668,19 @@ async function getMessageMetricsForConversation(
conversationId: string,
storyId?: UUIDStringType
): Promise<ConversationMetricsType> {
return getMessageMetricsForConversationSync(conversationId, storyId);
}
function getMessageMetricsForConversationSync(
conversationId: string,
storyId?: UUIDStringType
): ConversationMetricsType {
const oldest = getOldestMessageForConversation(conversationId, storyId);
const newest = getNewestMessageForConversation(conversationId, storyId);
const oldestUnread = getOldestUnreadMessageForConversation(
conversationId,
storyId
);
const totalUnread = await getTotalUnreadForConversation(
const totalUnread = getTotalUnreadForConversationSync(
conversationId,
storyId
);
@ -2659,6 +2695,47 @@ async function getMessageMetricsForConversation(
};
}
async function getConversationRangeCenteredOnMessage({
conversationId,
limit,
messageId,
receivedAt,
sentAt,
storyId,
}: {
conversationId: string;
limit?: number;
messageId: string;
receivedAt: number;
sentAt?: number;
storyId?: UUIDStringType;
}): Promise<{
older: Array<MessageTypeUnhydrated>;
newer: Array<MessageTypeUnhydrated>;
metrics: ConversationMetricsType;
}> {
const db = getInstance();
return db.transaction(() => {
return {
older: getOlderMessagesByConversationSync(conversationId, {
limit,
messageId,
receivedAt,
sentAt,
storyId,
}),
newer: getNewerMessagesByConversationSync(conversationId, {
limit,
receivedAt,
sentAt,
storyId,
}),
metrics: getMessageMetricsForConversationSync(conversationId, storyId),
};
})();
}
async function hasGroupCallHistoryMessage(
conversationId: string,
eraId: string