about summary refs log tree commit diff
path: root/app/views/stream_entries/show.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/show.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/show.html.haml')
-rw-r--r--app/views/stream_entries/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index a87c51952..dfb83e747 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -11,8 +11,8 @@
 
   = opengraph 'og:site_name', site_title
   = opengraph 'og:type', 'article'
-  = opengraph 'og:title', "#{@account.display_name.presence || @account.username} on #{site_hostname}"
-  = opengraph 'og:url', account_stream_entry_url(@account, @stream_entry)
+  = opengraph 'og:title', "#{display_name(@account)} (@#{@account.local_username_and_domain})"
+  = opengraph 'og:url', short_account_status_url(@account, @stream_entry)
 
   = render 'stream_entries/og_description', activity: @stream_entry.activity
   = render 'stream_entries/og_image', activity: @stream_entry.activity, account: @account