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

Improve story cleanup on expiration/deletion

Browse source
This commit is contained in:
Scott Nonnenberg 2024-07-02 16:15:17 -07:00 • committed by GitHub
parent 39d15ba620
commit bde4fa40fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ts/util/hydrateStoryContext.ts
View file

@ -14,8 +14,10 @@ export async function hydrateStoryContext(
storyMessageParam?: MessageAttributesType,
{
shouldSave,
isStoryErased,
}: {
shouldSave?: boolean;
isStoryErased?: boolean;
} = {}
): Promise<void> {
let messageAttributes: MessageAttributesType;
@ -35,7 +37,11 @@ export async function hydrateStoryContext(
const { storyReplyContext: context } = messageAttributes;
// We'll continue trying to get the attachment as long as the message still exists
if (context && (context.attachment?.url || !context.messageId)) {
if (
!isStoryErased &&
context &&
(context.attachment?.url || !context.messageId)
) {
return;
}
@ -52,7 +58,7 @@ export async function hydrateStoryContext(
storyMessage = undefined;
}
if (!storyMessage) {
if (!storyMessage || isStoryErased) {
const conversation = window.ConversationController.get(
messageAttributes.conversationId
);