diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-02-06 21:36:38 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-06 21:36:38 +0100 |
| commit | 1a54b9b99e85e9d6b3c52bfe654659019960eb24 (patch) | |
| tree | 33fe0d6c546dade46cf7842959feff686db4f909 /app/views | |
| parent | ccaefd139d33f2f0bf4d097131bcf91960bee956 (diff) | |
| parent | aeb6efbb03cd98c0425d094677fc748e0c36c240 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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 |