mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 22:29:07 +09:00
Merge pull request #1741 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
This commit is contained in:
commit
b9b9192432
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user