diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-01 00:18:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 00:18:49 +0200 |
| commit | 814d3f343f8caae3366410900eec0b90b9bbbb7b (patch) | |
| tree | 5d0b779a144afd2bff33503804cd5dcc58012ff6 /app/views/statuses/_simple_status.html.haml | |
| parent | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff) | |
| parent | 3d7ce178dd7be9ef02d34bf6734365d0aefa3120 (diff) | |
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/statuses/_simple_status.html.haml')
| -rw-r--r-- | app/views/statuses/_simple_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index cf6d62b2a..a84f51e3b 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -39,7 +39,7 @@ = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments } - elsif status.media_attachments.first.audio? - audio = status.media_attachments.first - = react_component :audio, src: audio.file.url(:original), poster: full_asset_url(status.account.avatar_static_url), width: 610, height: 343, alt: audio.description, duration: audio.file.meta.dig(:original, :duration) do + = react_component :audio, src: audio.file.url(:original), poster: audio.thumbnail.present? ? audio.thumbnail.url : status.account.avatar_static_url, blurhash: audio.blurhash, width: 610, height: 343, alt: audio.description, duration: audio.file.meta.dig('original', 'duration') do = render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments } - else = react_component :media_gallery, height: 343, sensitive: status.sensitive?, autoplay: autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do |