Fix punycode being rendered instead of unicode in some places (#13030)

diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index e02bc24475dff54b2aab3bb75b3f80796e95dacd..134217734e5cd413f7f96255de7d5097829bed02 100644 (file)
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -11,7 +11,7 @@ module AccountsHelper
 
   def acct(account)
     if account.local?
-      "@#{account.acct}@#{Rails.configuration.x.local_domain}"
+      "@#{account.acct}@#{site_hostname}"
     else
       "@#{account.pretty_acct}"
     end

diff --git a/app/views/accounts/_og.html.haml b/app/views/accounts/_og.html.haml
index de948ec6ab56cf5237db3f11cfcf8d0d3f9900f0..839576372b1c45d778cb34a0dc8601a9da55c8d6 100644 (file)
--- 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 c312fe2bdd5613e0543f3ea58c35650841b591d3..c9688ea88d55b6cbf783a7ee9b3ddd1b5bc03fa4 100644 (file)
--- 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 0f22d106b560c12a79a8f2cace6da89d93dfe445..873df7fbd1dbe7d7f8bcafc9b731205a68fc56e4 100644 (file)
--- 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