diff options
| author | Starfall <root@starfall.blue> | 2020-02-04 17:44:29 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-02-04 17:44:29 -0600 |
| commit | 6d24d3bcb84abd04f31da95f97f6d60ef0afdc00 (patch) | |
| tree | e7c38251a9e92bdf3a464b4aa7f1880aa5139bf0 /app/helpers/accounts_helper.rb | |
| parent | c0c9529df269816f52915a9802e5e30fbce9576b (diff) | |
| parent | 885e9227c6e8e1ce5e4a5625d5126ba76dce2c00 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/helpers/accounts_helper.rb')
| -rw-r--r-- | app/helpers/accounts_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index 7fcc4e816..c9e95d8d8 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -3,7 +3,7 @@ module AccountsHelper def display_name(account, **options) if options[:custom_emojify] - Formatter.instance.format_display_name(account, options) + Formatter.instance.format_display_name(account, **options) else account.display_name.presence || account.username end @@ -13,7 +13,7 @@ module AccountsHelper if account.local? "@#{account.acct}@#{Rails.configuration.x.local_domain}" else - "@#{account.acct}" + "@#{account.pretty_acct}" end end |