luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 03:43:08 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Merge upstream changes
This commit is contained in:
Claire 2022-04-11 22:36:22 +02:00 committed by GitHub
parent f2b2614d0a f9fbff8539
commit b9b9192432
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/account_alias.rb
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