Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-24 10:28:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement video support in lightbox

Browse Source
This commit is contained in:
Daniel Gasienica
2018-04-25 18:15:57 -04:00
parent ac04f0648a
commit 45d6c7a5a8
5 changed files with 61 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ts/components/conversation/media-gallery/types/Message.tsx
View File

@@ -8,7 +8,6 @@ import * as MIME from '../../../../types/MIME';
import { arrayBufferToObjectURL } from '../../../../util/arrayBufferToObjectURL';
import { Attachment } from '../../../../types/Attachment';
import { MapAsync } from '../../../../types/MapAsync';
import { MIMEType } from '../../../../types/MIME';
export type Message = {
id: string;
@@ -16,8 +15,6 @@ export type Message = {
received_at: number;
} & { objectURL?: string };
const DEFAULT_CONTENT_TYPE: MIMEType = 'application/octet-stream' as MIMEType;
export const loadWithObjectURL = (loadMessage: MapAsync<Message>) => async (
messages: Array<Message>
): Promise<Array<Message>> => {
@@ -51,17 +48,17 @@ const hasVideoAttachment = (message: Message): boolean =>
MIME.isVideo(attachment.contentType)
);
const withObjectURL = (message: Message): Message => {
export const withObjectURL = (message: Message): Message => {
if (message.attachments.length === 0) {
throw new TypeError('`message.attachments` cannot be empty');
}
const attachment = message.attachments[0];
if (typeof attachment.contentType === 'undefined') {
if (is.undefined(attachment.contentType)) {
throw new TypeError('`attachment.contentType` is required');
}
if (MIME.isVideo(attachment.contentType)) {
if (is.undefined(attachment.data) && MIME.isVideo(attachment.contentType)) {
return {
...message,
objectURL: 'images/video.svg',
@@ -70,7 +67,7 @@ const withObjectURL = (message: Message): Message => {
const objectURL = arrayBufferToObjectURL({
data: attachment.data,
type: attachment.contentType || DEFAULT_CONTENT_TYPE,
type: attachment.contentType,
});
return {
...message,