new HAML for statuses

app/views/stream_entries/_detailed_status.html.haml

@@ -17,20 +17,16 @@
       %p{ style: 'margin-bottom: 0' }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
         %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
-    .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
+    .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true)
-      = Formatter.instance.format(status)
 
-      - unless status.media_attachments.empty?
+      - if !status.media_attachments.empty?
         - if status.media_attachments.first.video?
-          .video-player><
+          - video = status.media_attachments.first
-            = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
+          %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380) }}><
-            %video.u-video{ src: status.media_attachments.first.file.url(:original), loop: true }
         - else
-          .detailed-status__attachments><
+          %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}><
-            = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
+      - elsif status.preview_cards.first
-            .status__attachments__inner<
+        %div{ data: { component: 'Card', props: Oj.dump('maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json) }}><
-              - status.media_attachments.each do |media|
-                = render partial: 'stream_entries/media', locals: { media: media }
 
   .detailed-status__meta
     %data.dt-published{ value: status.created_at.to_time.iso8601 }

app/views/stream_entries/_simple_status.html.haml

@@ -18,19 +18,11 @@
       %p{ style: 'margin-bottom: 0' }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
         %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
-    .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
+    .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true)
-      = Formatter.instance.format(status)
 
       - unless status.media_attachments.empty?
-        .status__attachments><
-          = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
         - if status.media_attachments.first.video?
-            .status__attachments__inner<
+          - video = status.media_attachments.first
-              .video-item<
+          %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 610, height: 343) }}><
-                = link_to (status.media_attachments.first.remote_url.blank? ? status.media_attachments.first.file.url(:original) : status.media_attachments.first.remote_url), style: "background-image: url(#{status.media_attachments.first.file.url(:small)})", target: '_blank', rel: 'noopener', class: 'u-video' do
-                  .video-item__play
-                    = fa_icon('play')
         - else
-            .status__attachments__inner<
+          %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 343, sensitive: status.sensitive?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}><
-              - status.media_attachments.each do |media|
-                = render partial: 'stream_entries/media', locals: { media: media }