From a896f601fa0744c4d28cdeab1a2d008a3276a46b Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 8 Apr 2018 12:22:12 +0200
Subject: [PATCH 1/2] Fix video playback in glitch-soc detailed statuses
---
.../glitch/features/status/components/detailed_status.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.js b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
index 538aa3d288..b1835844c6 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.js
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
@@ -53,10 +53,12 @@ export default class DetailedStatus extends ImmutablePureComponent {
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
media = <AttachmentList media={status.get('media_attachments')} />;
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+ const video = status.getIn(['media_attachments', 0]);
media = (
<Video
+ preview={video.get('preview_url')}
+ src={video.get('url')}
sensitive={status.get('sensitive')}
- media={status.getIn(['media_attachments', 0])}
letterbox={settings.getIn(['media', 'letterbox'])}
fullwidth={settings.getIn(['media', 'fullwidth'])}
onOpenVideo={this.props.onOpenVideo}
From 0fb5ea5d15b4d110ae725c7f232a6d78c05995cf Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 9 Apr 2018 00:11:10 +0200
Subject: [PATCH 2/2] Fix video modal
---
.../glitch/features/status/components/detailed_status.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.js b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
index b1835844c6..9e42481c5a 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.js
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
@@ -35,9 +35,9 @@ export default class DetailedStatus extends ImmutablePureComponent {
e.stopPropagation();
}
- // handleOpenVideo = startTime => {
- // this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), startTime);
- // }
+ handleOpenVideo = startTime => {
+ this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), startTime);
+ }
render () {
const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
@@ -61,7 +61,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
sensitive={status.get('sensitive')}
letterbox={settings.getIn(['media', 'letterbox'])}
fullwidth={settings.getIn(['media', 'fullwidth'])}
- onOpenVideo={this.props.onOpenVideo}
+ onOpenVideo={this.handleOpenVideo}
autoplay
/>
);