tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-05-19 17:46:31 +02:00
parent 4beb8d7788 692e7cea2a
commit f509815379
10 changed files with 56 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/status/components/detailed_status.js
View File

@@ -106,7 +106,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
}
if (status.get('poll')) {
media = <PollContainer pollId={status.get('poll')} />;
media = <PollContainer pollId={status.get('poll')} visible={!status.get('hidden')} />;
} else if (status.get('media_attachments').size > 0) {
if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
const video = status.getIn(['media_attachments', 0]);