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

hydrateStoryContext: Let through in more situations

Browse source
This commit is contained in:
Scott Nonnenberg 2024-07-30 12:21:53 -07:00 committed by GitHub
parent 90d345549a
commit 9ae3485334
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ts/util/hydrateStoryContext.ts
View file

@ -2,12 +2,16 @@
// SPDX-License-Identifier: AGPL-3.0-only
import omit from 'lodash/omit';
import * as log from '../logging/log';
import type { AttachmentType } from '../types/Attachment';
import type { MessageAttributesType } from '../model-types.d';
import { getAttachmentsForMessage } from '../state/selectors/message';
import { isAciString } from './isAciString';
import { isDirectConversation } from './whatTypeOfConversation';
import { softAssert, strictAssert } from './assert';
import { getMessageSentTimestamp } from './getMessageSentTimestamp';
import { isOlderThan } from './timestamp';
import { DAY } from './durations';
export async function hydrateStoryContext(
messageId: string,
@ -36,11 +40,17 @@ export async function hydrateStoryContext(
}
const { storyReplyContext: context } = messageAttributes;
// We'll continue trying to get the attachment as long as the message still exists
const sentTimestamp = getMessageSentTimestamp(messageAttributes, {
includeEdits: false,
log,
});
const olderThanADay = isOlderThan(sentTimestamp, DAY);
const didNotFindMessage = context && !context.messageId;
const weHaveData = context && context.attachment?.url;
if (
!isStoryErased &&
context &&
(context.attachment?.url || !context.messageId)
((!olderThanADay && weHaveData) || (olderThanADay && didNotFindMessage))
) {
return undefined;
}