diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-05 22:20:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 22:20:58 +0100 |
| commit | 772b4ba24c60e0394d25d0fad4eefb338a9befea (patch) | |
| tree | 804bb8ba01b1ff55471cc558d72456d2b9d0aea9 /app/views/stream_entries/_simple_status.html.haml | |
| parent | 2a4ce7458a16c64029842fde210089453be2ede1 (diff) | |
| parent | 866496ac16b47ee17138db600519a630be833e4e (diff) | |
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/stream_entries/_simple_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 28b4e3217..d3441ca90 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -27,7 +27,10 @@ .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }< = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay) - - if !status.media_attachments.empty? + - if status.poll + = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do + = render partial: 'stream_entries/poll', locals: { poll: status.poll } + - elsif !status.media_attachments.empty? - if status.media_attachments.first.video? - video = status.media_attachments.first = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description do |