Simplify the og:image and og:description code in stream_entries/show (#1934)

4 files changed, 16 insertions, 11 deletions

diff --git a/app/models/status.rb b/app/models/status.rb
index 16cd4383f..c0a5d9d1b 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -110,6 +110,10 @@ class Status < ApplicationRecord
     results
   end
 
+  def non_sensitive_with_media?
+    !sensitive? && media_attachments.any?
+  end
+
   class << self
     def as_home_timeline(account)
       where(account: [account] + account.following)
diff --git a/app/views/stream_entries/_og_description.html.haml b/app/views/stream_entries/_og_description.html.haml
new file mode 100644
index 000000000..5762aca04
--- /dev/null
+++ b/app/views/stream_entries/_og_description.html.haml
@@ -0,0 +1,4 @@
+- if activity.is_a?(Status) && activity.spoiler_text?
+  %meta{ property: 'og:description', content: activity.spoiler_text }/
+- else
+  %meta{ property: 'og:description', content: activity.content }/
diff --git a/app/views/stream_entries/_og_image.html.haml b/app/views/stream_entries/_og_image.html.haml
new file mode 100644
index 000000000..f725209d8
--- /dev/null
+++ b/app/views/stream_entries/_og_image.html.haml
@@ -0,0 +1,6 @@
+- if activity.is_a?(Status) && activity.non_sensitive_with_media?
+  %meta{ property: 'og:image', content: full_asset_url(activity.media_attachments.first.file.url(:small)) }/
+- else
+  %meta{ property: 'og:image', content: full_asset_url(account.avatar.url(:original)) }/
+  %meta{ property: 'og:image:width', content: '120' }/
+  %meta{ property: 'og:image:height', content: '120' }/
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index eb8387ccb..dea5e9d40 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -6,17 +6,8 @@
   %meta{ property: 'og:type', content: 'article' }/
   %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
 
-  - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.spoiler_text.blank?
-    %meta{ property: 'og:description', content: @stream_entry.activity.spoiler_text }/
-  - else
-    %meta{ property: 'og:description', content: @stream_entry.activity.content }/
-
-  - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.sensitive? && @stream_entry.activity.media_attachments.size > 0
-    %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/
-  - else
-    %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/
-    %meta{ property: 'og:image:width', content: '120' }/
-    %meta{ property: 'og:image:height', content: '120' }/
+  = render 'stream_entries/og_description', activity: @stream_entry.activity
+  = render 'stream_entries/og_image', activity: @stream_entry.activity, account: @account
 
   %meta{ property: 'twitter:card', content: 'summary' }/