Merge pull request #1741 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Claire 2022-04-11 22:36:22 +02:00 committed by GitHub
commit b9b9192432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions

View File

@ -28,6 +28,11 @@ class AccountAlias < ApplicationRecord
super(val.start_with?('@') ? val[1..-1] : val)
end
def pretty_acct
username, domain = acct.split('@')
domain.nil? ? username : "#{username}@#{Addressable::IDNA.to_unicode(domain)}"
end
private
def set_uri