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

Media Gallery: Scroll down and into the past

Browse source 
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
Scott Nonnenberg 2024-09-05 07:15:30 +10:00 • committed by GitHub
parent 6f83043eb4
commit 0d5a480c1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 844 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

80
ts/sql/Server.ts
View file

@ -336,8 +336,6 @@ export const DataReader: ServerReadableInterface = {
_getAllStoryReads,
getLastStoryReadsForAuthor,
getMessagesNeedingUpgrade,
getMessagesWithVisualMediaAttachments,
getMessagesWithFileAttachments,
getMessageServerGuidsForSpam,
getJobsInQueue,
@ -2872,6 +2870,7 @@ function getAdjacentMessagesByConversation(
receivedAt = direction === AdjacentDirection.Older ? Number.MAX_VALUE : 0,
sentAt = direction === AdjacentDirection.Older ? Number.MAX_VALUE : 0,
requireVisualMediaAttachments,
requireFileAttachments,
storyId,
}: AdjacentMessagesByConversationOptionsType
): Array<MessageTypeUnhydrated> {
@ -2893,7 +2892,9 @@ function getAdjacentMessagesByConversation(
}
const requireDifferentMessage =
direction === AdjacentDirection.Older || requireVisualMediaAttachments;
direction === AdjacentDirection.Older ||
requireVisualMediaAttachments ||
requireFileAttachments;
const createQuery = (timeFilter: QueryFragment): QueryFragment => sqlFragment`
SELECT json FROM messages WHERE
@ -2908,6 +2909,11 @@ function getAdjacentMessagesByConversation(
? sqlFragment`hasVisualMediaAttachments IS 1 AND`
: sqlFragment``
}
${
requireFileAttachments
? sqlFragment`hasFileAttachments IS 1 AND`
: sqlFragment``
}
isStory IS 0 AND
(${_storyIdPredicate(storyId, includeStoryReplies)}) AND
(
@ -2938,6 +2944,20 @@ function getAdjacentMessagesByConversation(
) > 0
LIMIT ${limit};
`;
} else if (requireFileAttachments) {
template = sqlFragment`
SELECT json
FROM (${template}) as messages
WHERE
(
SELECT COUNT(*)
FROM json_each(messages.json ->> 'attachments') AS attachment
WHERE
attachment.value ->> 'pending' IS NOT 1 AND
attachment.value ->> 'error' IS NULL
) > 0
LIMIT ${limit};
`;
} else {
template = sqlFragment`${template} LIMIT ${limit}`;
}
@ -6515,60 +6535,6 @@ export function incrementMessagesMigrationAttempts(
});
}
function getMessagesWithVisualMediaAttachments(
db: ReadableDB,
conversationId: string,
{ limit }: { limit: number }
): Array<MessageType> {
const rows: JSONRows = db
.prepare<Query>(
`
SELECT json FROM messages
INDEXED BY messages_hasVisualMediaAttachments
WHERE
isStory IS 0 AND
storyId IS NULL AND
conversationId = $conversationId AND
-- Note that this check has to use 'IS' to utilize
-- 'messages_hasVisualMediaAttachments' INDEX
hasVisualMediaAttachments IS 1
ORDER BY received_at DESC, sent_at DESC
LIMIT $limit;
`
)
.all({
conversationId,
limit,
});
return rows.map(row => jsonToObject(row.json));
}
function getMessagesWithFileAttachments(
db: ReadableDB,
conversationId: string,
{ limit }: { limit: number }
): Array<MessageType> {
const rows = db
.prepare<Query>(
`
SELECT json FROM messages WHERE
isStory IS 0 AND
storyId IS NULL AND
conversationId = $conversationId AND
hasFileAttachments = 1
ORDER BY received_at DESC, sent_at DESC
LIMIT $limit;
`
)
.all({
conversationId,
limit,
});
return map(rows, row => jsonToObject(row.json));
}
function getMessageServerGuidsForSpam(
db: ReadableDB,
conversationId: string