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

Ensure that we resolve attachments before displaying them

Browse source
This commit is contained in:
Josh Perez 2022-04-25 13:25:50 -04:00 • committed by GitHub
parent 72f979ea1d
commit d8708e4e73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 319 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ts/util/getStoryDuration.ts
View file

@ -2,7 +2,12 @@
// SPDX-License-Identifier: AGPL-3.0-only
import type { AttachmentType } from '../types/Attachment';
import { isGIF, isVideo } from '../types/Attachment';
import {
hasNotResolved,
isDownloaded,
isGIF,
isVideo,
} from '../types/Attachment';
import { count } from './grapheme';
import { SECOND } from './durations';
@ -12,7 +17,11 @@ const MIN_TEXT_DURATION = 3 * SECOND;
export async function getStoryDuration(
attachment: AttachmentType
): Promise<number> {
): Promise<number | undefined> {
if (!isDownloaded(attachment) || hasNotResolved(attachment)) {
return;
}
if (isGIF([attachment]) || isVideo([attachment])) {
const videoEl = document.createElement('video');
if (!attachment.url) {