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

Disappearing message cleanups

Browse source
This commit is contained in:
Evan Hahn 2021-06-16 17:20:17 -05:00 • committed by GitHub
parent dfa6fb5d61
commit 03a187097f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 149 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ts/sql/Client.ts
View file

@ -189,8 +189,8 @@ const dataInterface: ClientInterface = {
getAllMessageIds,
getMessagesBySentAt,
getExpiredMessages,
getOutgoingWithoutExpiresAt,
getNextExpiringMessage,
getOutgoingWithoutExpirationStartTimestamp,
getSoonestMessageExpiry,
getNextTapToViewMessageTimestampToAgeOut,
getTapToViewMessagesNeedingErase,
getOlderMessagesByConversation,
@ -997,12 +997,13 @@ async function saveMessage(
async function saveMessages(
arrayOfMessages: Array<MessageType>,
{ forceSave }: { forceSave?: boolean } = {}
{ forceSave, Message }: { forceSave?: boolean; Message: typeof MessageModel }
) {
await channels.saveMessages(
arrayOfMessages.map(message => _cleanMessageData(message)),
{ forceSave }
);
Message.updateTimers();
}
async function removeMessage(
@ -1300,28 +1301,18 @@ async function getExpiredMessages({
return new MessageCollection(messages);
}
async function getOutgoingWithoutExpiresAt({
async function getOutgoingWithoutExpirationStartTimestamp({
MessageCollection,
}: {
MessageCollection: typeof MessageModelCollectionType;
}) {
const messages = await channels.getOutgoingWithoutExpiresAt();
const messages = await channels.getOutgoingWithoutExpirationStartTimestamp();
return new MessageCollection(messages);
}
async function getNextExpiringMessage({
Message,
}: {
Message: typeof MessageModel;
}) {
const message = await channels.getNextExpiringMessage();
if (message) {
return new Message(message);
}
return null;
function getSoonestMessageExpiry() {
return channels.getSoonestMessageExpiry();
}
async function getNextTapToViewMessageTimestampToAgeOut() {