about summary refs log tree commit diff
path: root/app/views/stream_entries/_og_description.html.haml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-03-18 20:33:07 +0100
committerGitHub <noreply@github.com>2018-03-18 20:33:07 +0100
commita568e3ca8e754b690224ae79e75aeb60efa49b78 (patch)
tree33bd913d090c4f1c32a6f4bda917d38e3c538db7 /app/views/stream_entries/_og_description.html.haml
parent3b440bd5af92682c388140035c1bcdc6f9711b1d (diff)
Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)
Display summary of attachments in description, and mark up content
warning if present, e.g.:

    Attached: 3 images · Content warning: Dota 2

When text is not supposed to be hidden, it looks more like:

    Attached: 3 images

    Here is the text of the toot

With #6817, multilinguagility should be assured...
Diffstat (limited to 'app/views/stream_entries/_og_description.html.haml')
-rw-r--r--app/views/stream_entries/_og_description.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_og_description.html.haml b/app/views/stream_entries/_og_description.html.haml
index 9c24e0a61..3d122b94e 100644
--- a/app/views/stream_entries/_og_description.html.haml
+++ b/app/views/stream_entries/_og_description.html.haml
@@ -1 +1 @@
-= opengraph 'og:description', [activity.spoiler_text, activity.text].reject(&:blank?).join("\n\n")
+= opengraph 'og:description', status_description(activity)