tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	config/i18n-tasks.yml
This commit is contained in:
David Yip
2018-03-18 20:21:17 -05:00
parent 6a6f680d98 f02411da40
commit ab04be2f84
12 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/stream_entries/_og_description.html.haml
View File

@ -1 +1 @@
= opengraph 'og:description', [activity.spoiler_text, activity.text].reject(&:blank?).join("\n\n")
= opengraph 'og:description', status_description(activity)

2
app/views/stream_entries/_og_image.html.haml
View File

@ -1,4 +1,4 @@
- if activity.is_a?(Status) && activity.media_attachments.any?
- if activity.is_a?(Status) && activity.non_sensitive_with_media?
- player_card = false
- activity.media_attachments.each do |media|
- if media.image?

4
app/views/stream_entries/show.html.haml
View File

@ -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