diff options
author | ThibG <thib@sitedethib.com> | 2019-08-20 19:46:41 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-08-20 19:46:41 +0200 |
commit | b48c7ee059d0e08fff4bdf7fe7b0e09565288252 (patch) | |
tree | 4412e92be769ebcfc7fa1e51dd4616736910e48b /app/javascript | |
parent | 97af209c3113926534fe8c5adb7ad51fa4527cbe (diff) |
Fix handling of audio files in account media gallery (#11629)
Fixes #11627
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/features/account_gallery/components/media_item.js | 6 | ||||
-rw-r--r-- | app/javascript/mastodon/features/account_gallery/index.js | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.js b/app/javascript/mastodon/features/account_gallery/components/media_item.js index 2609b96ff..d1b3c3bd4 100644 --- a/app/javascript/mastodon/features/account_gallery/components/media_item.js +++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js @@ -96,6 +96,12 @@ export default class MediaItem extends ImmutablePureComponent { if (attachment.get('type') === 'unknown') { // Skip + } else if (attachment.get('type') === 'audio') { + thumbnail = ( + <span className='account-gallery__item__icons'> + <Icon id='music' /> + </span> + ); } else if (attachment.get('type') === 'image') { const focusX = attachment.getIn(['meta', 'focus', 'x']) || 0; const focusY = attachment.getIn(['meta', 'focus', 'y']) || 0; diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js index f1a665d8f..f3bf7a2bd 100644 --- a/app/javascript/mastodon/features/account_gallery/index.js +++ b/app/javascript/mastodon/features/account_gallery/index.js @@ -100,7 +100,7 @@ class AccountGallery extends ImmutablePureComponent { } handleOpenMedia = attachment => { - if (attachment.get('type') === 'video') { + if (['video', 'audio'].includes(attachment.get('type'))) { this.props.dispatch(openModal('VIDEO', { media: attachment, status: attachment.get('status') })); } else { const media = attachment.getIn(['status', 'media_attachments']); |