Fix punycode being rendered instead of unicode in some places (#13030)
This commit is contained in:
		| @ -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 | ||||
|  | ||||
| @ -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] | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
		Reference in New Issue
	
	Block a user