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

Audio messages: move countdown under waveform

Browse source
This commit is contained in:
Evan Hahn 2021-07-09 15:27:16 -05:00 • committed by GitHub
parent e4efa01073
commit 831ec98418
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 338 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

52
ts/types/Attachment.ts
View file

@ -118,31 +118,27 @@ export function getExtensionForDisplay({
return undefined;
}
export function isAudio(
attachments?: Array<AttachmentType>
): boolean | undefined {
return (
export function isAudio(attachments?: Array<AttachmentType>): boolean {
return Boolean(
attachments &&
attachments[0] &&
attachments[0].contentType &&
!attachments[0].isCorrupted &&
MIME.isAudio(attachments[0].contentType)
attachments[0] &&
attachments[0].contentType &&
!attachments[0].isCorrupted &&
MIME.isAudio(attachments[0].contentType)
);
}
export function canDisplayImage(
attachments?: Array<AttachmentType>
): boolean | 0 | undefined {
export function canDisplayImage(attachments?: Array<AttachmentType>): boolean {
const { height, width } =
attachments && attachments[0] ? attachments[0] : { height: 0, width: 0 };
return (
return Boolean(
height &&
height > 0 &&
height <= 4096 &&
width &&
width > 0 &&
width <= 4096
height > 0 &&
height <= 4096 &&
width &&
width > 0 &&
width <= 4096
);
}
@ -164,14 +160,12 @@ export function getUrl(attachment: AttachmentType): string | undefined {
return attachment.url;
}
export function isImage(
attachments?: Array<AttachmentType>
): boolean | undefined {
return (
export function isImage(attachments?: Array<AttachmentType>): boolean {
return Boolean(
attachments &&
attachments[0] &&
attachments[0].contentType &&
isImageTypeSupported(attachments[0].contentType)
attachments[0] &&
attachments[0].contentType &&
isImageTypeSupported(attachments[0].contentType)
);
}
@ -193,13 +187,11 @@ export function canBeTranscoded(
);
}
export function hasImage(
attachments?: Array<AttachmentType>
): string | boolean | undefined {
return (
export function hasImage(attachments?: Array<AttachmentType>): boolean {
return Boolean(
attachments &&
attachments[0] &&
(attachments[0].url || attachments[0].pending || attachments[0].blurHash)
attachments[0] &&
(attachments[0].url || attachments[0].pending || attachments[0].blurHash)
);
}