mastofe

commit: eb62778bec35e99eeadda1c77029142306ef1083
parent: 1c507ff17205e825e5f0b91fb44f4c4acdef8d2d
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu, 26 Jan 2017 03:45:14 +0100

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

Diffstat:
M
app/views/stream_entries/show.html.haml
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git 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)) }/