diff options
| author | Starfall <root@starfall.blue> | 2020-02-13 17:55:53 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-02-13 17:55:53 -0600 |
| commit | 5902299384d15249fe4b84b8761d4a49f3c7f6fd (patch) | |
| tree | 66f1db08a2f6f9ae2254ba7a81b71835039d671e /app/views | |
| parent | 6d24d3bcb84abd04f31da95f97f6d60ef0afdc00 (diff) | |
| parent | 0cbd6d696b8937066cde297ad2eae4b558353b7c (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/_og.html.haml | 2 | ||||
| -rw-r--r-- | app/views/accounts/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/statuses/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/accounts/_og.html.haml b/app/views/accounts/_og.html.haml index de948ec6a..839576372 100644 --- a/app/views/accounts/_og.html.haml +++ b/app/views/accounts/_og.html.haml @@ -10,4 +10,4 @@ = opengraph 'og:image:width', '120' = opengraph 'og:image:height', '120' = opengraph 'twitter:card', 'summary' -= opengraph 'profile:username', account.local_username_and_domain += opengraph 'profile:username', acct(account)[1..-1] diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index c312fe2bd..c9688ea88 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = "#{display_name(@account)} (@#{@account.local_username_and_domain})" + = "#{display_name(@account)} (#{acct(@account)})" - content_for :header_tags do - if @account.user&.setting_noindex diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml index 0f22d106b..873df7fbd 100644 --- a/app/views/statuses/show.html.haml +++ b/app/views/statuses/show.html.haml @@ -10,7 +10,7 @@ = opengraph 'og:site_name', site_title = opengraph 'og:type', 'article' - = opengraph 'og:title', "#{display_name(@account)} (@#{@account.local_username_and_domain})" + = opengraph 'og:title', "#{display_name(@account)} (#{acct(@account)})" = opengraph 'og:url', short_account_status_url(@account, @status) = render 'og_description', activity: @status |