Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Display AttachmentList in timelines in compact style when media missing (#6680)

Browse source
This commit is contained in:
Eugen Rochko 2018-03-08 04:54:26 +01:00 • committed by GitHub
parent 83c982b458
commit 86a9de6753
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 74 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/components/status.js
View file

@ -7,6 +7,7 @@ import RelativeTimestamp from './relative_timestamp';
import DisplayName from './display_name';
import StatusContent from './status_content';
import StatusActionBar from './status_action_bar';
import AttachmentList from './attachment_list';
import { FormattedMessage } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { MediaGallery, Video } from '../features/ui/util/async-components';
@ -179,7 +180,12 @@ export default class Status extends ImmutablePureComponent {
if (status.get('media_attachments').size > 0 && !this.props.muted) {
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
media = (
<AttachmentList
compact
media={status.get('media_attachments')}
/>
);
} else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
const video = status.getIn(['media_attachments', 0]);