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

Always provide isGroup/storyId to message-fetching functions

Browse source
This commit is contained in:
Scott Nonnenberg 2022-05-11 15:20:47 -07:00 • committed by GitHub
parent e1392a2cca
commit 69d0ed3309
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 74 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ts/sql/Server.ts
View file

@ -2352,13 +2352,13 @@ async function _removeAllReactions(): Promise<void> {
async function getOlderMessagesByConversation(
conversationId: string,
options?: {
isGroup?: boolean;
options: {
isGroup: boolean;
limit?: number;
messageId?: string;
receivedAt?: number;
sentAt?: number;
storyId?: string;
storyId: string | undefined;
}
): Promise<Array<MessageTypeUnhydrated>> {
return getOlderMessagesByConversationSync(conversationId, options);
@ -2373,13 +2373,13 @@ function getOlderMessagesByConversationSync(
sentAt = Number.MAX_VALUE,
storyId,
}: {
isGroup?: boolean;
isGroup: boolean;
limit?: number;
messageId?: string;
receivedAt?: number;
sentAt?: number;
storyId?: string;
} = {}
storyId: string | undefined;
}
): Array<MessageTypeUnhydrated> {
const db = getInstance();
@ -2453,11 +2453,12 @@ async function getOlderStories({
async function getNewerMessagesByConversation(
conversationId: string,
options?: {
options: {
isGroup: boolean;
limit?: number;
receivedAt?: number;
sentAt?: number;
storyId?: UUIDStringType;
storyId: UUIDStringType | undefined;
}
): Promise<Array<MessageTypeUnhydrated>> {
return getNewerMessagesByConversationSync(conversationId, options);
@ -2471,12 +2472,12 @@ function getNewerMessagesByConversationSync(
sentAt = 0,
storyId,
}: {
isGroup?: boolean;
isGroup: boolean;
limit?: number;
receivedAt?: number;
sentAt?: number;
storyId?: UUIDStringType;
} = {}
storyId: UUIDStringType | undefined;
}
): Array<MessageTypeUnhydrated> {
const db = getInstance();
const rows: JSONRows = db
@ -2830,6 +2831,7 @@ function getMessageMetricsForConversationSync(
async function getConversationRangeCenteredOnMessage({
conversationId,
isGroup,
limit,
messageId,
receivedAt,
@ -2837,11 +2839,12 @@ async function getConversationRangeCenteredOnMessage({
storyId,
}: {
conversationId: string;
isGroup: boolean;
limit?: number;
messageId: string;
receivedAt: number;
sentAt?: number;
storyId?: UUIDStringType;
storyId: UUIDStringType | undefined;
}): Promise<{
older: Array<MessageTypeUnhydrated>;
newer: Array<MessageTypeUnhydrated>;
@ -2852,6 +2855,7 @@ async function getConversationRangeCenteredOnMessage({
return db.transaction(() => {
return {
older: getOlderMessagesByConversationSync(conversationId, {
isGroup,
limit,
messageId,
receivedAt,
@ -2859,6 +2863,7 @@ async function getConversationRangeCenteredOnMessage({
storyId,
}),
newer: getNewerMessagesByConversationSync(conversationId, {
isGroup,
limit,
receivedAt,
sentAt,