Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-02-15 07:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix foreign key error pinning in-memory messages

Browse Source
This commit is contained in:
Jamie
2025-12-23 09:50:43 -08:00
committed by GitHub
parent 17c08f7c81
commit 7fd8a440c3
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ts/messageModifiers/PinnedMessages.preload.ts
View File

@@ -14,6 +14,8 @@ import { getPinnedMessagesLimit } from '../util/pinnedMessages.dom.js';
import { getPinnedMessageExpiresAt } from '../util/pinnedMessages.std.js';
import { pinnedMessagesCleanupService } from '../services/expiring/pinnedMessagesCleanupService.preload.js';
import { drop } from '../util/drop.std.js';
import type { AppendPinnedMessageResult } from '../sql/server/pinnedMessages.std.js';
import * as Errors from '../types/errors.std.js';
const { AccessRequired } = Proto.AccessControl;
const { Role } = Proto.Member;
@@ -37,9 +39,8 @@ export type PinnedMessageRemoveProps = Readonly<{
export async function onPinnedMessageAdd(
props: PinnedMessageAddProps
): Promise<void> {
const log = parentLog.child(
`onPinnedMessageAdd(timestamp=${props.targetSentTimestamp}, aci=${props.targetAuthorAci})`
);
const logPrefix = `onPinnedMessageAdd(timestamp=${props.targetSentTimestamp}, aci=${props.targetAuthorAci})`;
const log = parentLog.child(logPrefix);
const target = await findMessageModifierTarget(
props.targetSentTimestamp,
@@ -61,18 +62,34 @@ export async function onPinnedMessageAdd(
const { targetMessage, targetConversation } = target;
const expiresAt = getPinnedMessageExpiresAt(
props.receivedAtTimestamp,
props.pinDuration
);
const result = await targetConversation.queueJob(logPrefix, async () => {
const promises = targetConversation.getSavePromises();
log.info(`Waiting for message saves (${promises.length} items)...`);
await Promise.all(promises);
const pinnedMessagesLimit = getPinnedMessagesLimit();
const expiresAt = getPinnedMessageExpiresAt(
props.receivedAtTimestamp,
props.pinDuration
);
const result = await DataWriter.appendPinnedMessage(pinnedMessagesLimit, {
conversationId: targetConversation.id,
messageId: targetMessage.id,
expiresAt,
pinnedAt: props.receivedAtTimestamp,
const pinnedMessagesLimit = getPinnedMessagesLimit();
let appendResult: AppendPinnedMessageResult;
try {
appendResult = await DataWriter.appendPinnedMessage(pinnedMessagesLimit, {
conversationId: targetConversation.id,
messageId: targetMessage.id,
expiresAt,
pinnedAt: props.receivedAtTimestamp,
});
} catch (error) {
log.error(
`Failed to append pinned message: ${Errors.toLogFormat(error)}`
);
throw error;
}
return appendResult;
});
if (result.change == null) {