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

Use timestamp instead of full model for tap-to-view age outs

Browse source
This commit is contained in:
Evan Hahn 2021-05-19 11:17:51 -05:00 • committed by Scott Nonnenberg
parent 80da8bb47b
commit f3e207d0b0
4 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/sql/Server.ts
View file

@ -178,7 +178,7 @@ const dataInterface: ServerInterface = {
getExpiredMessages,
getOutgoingWithoutExpiresAt,
getNextExpiringMessage,
getNextTapToViewMessageToAgeOut,
getNextTapToViewMessageTimestampToAgeOut,
getTapToViewMessagesNeedingErase,
getOlderMessagesByConversation,
getNewerMessagesByConversation,
@ -3924,11 +3924,11 @@ async function getNextExpiringMessage(): Promise<MessageType | undefined> {
return jsonToObject(rows[0].json);
}
async function getNextTapToViewMessageToAgeOut(): Promise<
MessageType | undefined
async function getNextTapToViewMessageTimestampToAgeOut(): Promise<
undefined | number
> {
const db = getInstance();
const rows = db
const row = db
.prepare<EmptyQuery>(
`
SELECT json FROM messages
@ -3939,13 +3939,15 @@ async function getNextTapToViewMessageToAgeOut(): Promise<
LIMIT 1;
`
)
.all();
.get();
if (!rows || rows.length < 1) {
if (!row) {
return undefined;
}
return jsonToObject(rows[0].json);
const data = jsonToObject(row.json);
const result = data.received_at_ms || data.received_at;
return isNormalNumber(result) ? result : undefined;
}
async function getTapToViewMessagesNeedingErase(): Promise<Array<MessageType>> {