From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 26 Jan 2017 02:45:14 +0000 (+0100)
Subject: Fix #537 - opengraph description should display spoiler text when present
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=eb62778bec35e99eeadda1c77029142306ef1083;p=mastodon.git

Fix #537 - opengraph description should display spoiler text when present
---

diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index d106173d2..6bad45705 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -5,7 +5,11 @@
   %meta{ property: 'og:site_name', content: 'Mastodon' }/
   %meta{ property: 'og:type', content: 'article' }/
   %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
-  %meta{ property: 'og:description', content: @stream_entry.activity.content }/
+
+  - 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.media_attachments.size > 0
     %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/