From eb62778bec35e99eeadda1c77029142306ef1083 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 26 Jan 2017 03:45:14 +0100
Subject: [PATCH] Fix #537 - opengraph description should display spoiler text
when present
---
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
index d106173d2e..6bad457051 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)) }/
--
GitLab