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

Optimize markAllCallHistoryReadSync

Browse source
This commit is contained in:
Jamie Kyle 2024-07-10 14:10:08 -07:00 • committed by GitHub
parent 133f12cfd1
commit 01dda86538
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 215 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

102
ts/sql/Server.ts
View file

@ -2253,7 +2253,7 @@ export function getAllSyncTasksSync(db: Database): Array<SyncTaskType> {
})();
}
function saveMessageSync(
export function saveMessageSync(
db: Database,
data: MessageType,
options: {
@ -3638,7 +3638,7 @@ async function clearCallHistory(
): Promise<ReadonlyArray<string>> {
const db = await getWritableInstance();
return db.transaction(() => {
const timestamp = getTimestampForCallLogEventTarget(db, target);
const timestamp = getMessageTimestampForCallLogEventTarget(db, target);
const [selectCallIdsQuery, selectCallIdsParams] = sql`
SELECT callsHistory.callId
@ -3807,48 +3807,76 @@ async function markCallHistoryRead(callId: string): Promise<void> {
db.prepare(query).run(params);
}
function getTimestampForCallLogEventTarget(
function getMessageTimestampForCallLogEventTarget(
db: Database,
target: CallLogEventTarget
): number {
let { timestamp } = target;
let { callId, peerId } = target;
const { timestamp } = target;
if (target.peerId != null && target.callId != null) {
if (callId == null || peerId == null) {
const predicate =
peerId != null
? sqlFragment`callsHistory.peerId IS ${target.peerId}`
: sqlFragment`TRUE`;
// Get the most recent call history timestamp for the target.timestamp
const [selectQuery, selectParams] = sql`
SELECT callsHistory.timestamp
SELECT callsHistory.callId, callsHistory.peerId
FROM callsHistory
WHERE callsHistory.callId IS ${target.callId}
AND callsHistory.peerId IS ${target.peerId}
WHERE ${predicate}
AND callsHistory.timestamp <= ${timestamp}
ORDER BY callsHistory.timestamp DESC
LIMIT 1
`;
const value = db.prepare(selectQuery).pluck().get(selectParams);
if (value != null) {
timestamp = value;
} else {
log.warn(
'getTimestampForCallLogEventTarget: Target call not found',
target.callId
);
const row = db.prepare(selectQuery).get(selectParams);
if (row == null) {
log.warn('getTimestampForCallLogEventTarget: Target call not found');
return timestamp;
}
callId = row.callId as string;
peerId = row.peerId as AciString;
}
return timestamp;
const [selectQuery, selectParams] = sql`
SELECT messages.sent_at
FROM messages
WHERE messages.type IS 'call-history'
AND messages.conversationId IS ${peerId}
AND messages.callId IS ${callId}
LIMIT 1
`;
const messageTimestamp = db.prepare(selectQuery).pluck().get(selectParams);
if (messageTimestamp == null) {
log.warn(
'getTimestampForCallLogEventTarget: Target call message not found'
);
}
return messageTimestamp ?? target.timestamp;
}
async function markAllCallHistoryReadWithPredicate(
export function markAllCallHistoryReadSync(
db: Database,
target: CallLogEventTarget,
inConversation: boolean
) {
const db = await getWritableInstance();
): void {
if (inConversation) {
strictAssert(target.peerId, 'peerId is required');
}
db.transaction(() => {
const jsonPatch = JSON.stringify({
seenStatus: SeenStatus.Seen,
});
const timestamp = getTimestampForCallLogEventTarget(db, target);
const timestamp = getMessageTimestampForCallLogEventTarget(db, target);
const predicate = inConversation
? sqlFragment`callsHistory.peerId IS ${target.peerId}`
? sqlFragment`messages.conversationId IS ${target.peerId}`
: sqlFragment`TRUE`;
const [updateQuery, updateParams] = sql`
@ -3856,14 +3884,10 @@ async function markAllCallHistoryReadWithPredicate(
SET
seenStatus = ${SEEN_STATUS_SEEN},
json = json_patch(json, ${jsonPatch})
WHERE id IN (
SELECT id FROM messages
INNER JOIN callsHistory ON callsHistory.callId IS messages.callId
WHERE messages.type IS 'call-history'
AND messages.seenStatus IS ${SEEN_STATUS_UNSEEN}
AND callsHistory.timestamp <= ${timestamp}
AND ${predicate}
)
WHERE messages.type IS 'call-history'
AND ${predicate}
AND messages.seenStatus IS ${SEEN_STATUS_UNSEEN}
AND messages.sent_at <= ${timestamp}
`;
db.prepare(updateQuery).run(updateParams);
@ -3873,14 +3897,16 @@ async function markAllCallHistoryReadWithPredicate(
async function markAllCallHistoryRead(
target: CallLogEventTarget
): Promise<void> {
await markAllCallHistoryReadWithPredicate(target, false);
const db = await getWritableInstance();
markAllCallHistoryReadSync(db, target, false);
}
async function markAllCallHistoryReadInConversation(
target: CallLogEventTarget
): Promise<void> {
strictAssert(target.peerId, 'peerId is required');
await markAllCallHistoryReadWithPredicate(target, true);
const db = await getWritableInstance();
markAllCallHistoryReadSync(db, target, true);
}
function getCallHistoryGroupDataSync(
@ -4173,9 +4199,10 @@ async function getCallHistoryGroups(
.reverse();
}
async function saveCallHistory(callHistory: CallHistoryDetails): Promise<void> {
const db = await getWritableInstance();
export function saveCallHistorySync(
db: Database,
callHistory: CallHistoryDetails
): void {
const [insertQuery, insertParams] = sql`
INSERT OR REPLACE INTO callsHistory (
callId,
@ -4201,6 +4228,11 @@ async function saveCallHistory(callHistory: CallHistoryDetails): Promise<void> {
db.prepare(insertQuery).run(insertParams);
}
async function saveCallHistory(callHistory: CallHistoryDetails): Promise<void> {
const db = await getWritableInstance();
saveCallHistorySync(db, callHistory);
}
async function hasGroupCallHistoryMessage(
conversationId: string,
eraId: string