Merge branch 'main' into glitch-soc/merge-upstream

2022-11-07 19:53:30 +01:00
parent c493c967d6 3114c826a7
commit be7032b9cf
193 changed files with 2791 additions and 1575 deletions
--- a/app/models/account_alias.rb
+++ b/app/models/account_alias.rb
@ -29,7 +29,7 @@ class AccountAlias < ApplicationRecord
  end

  def pretty_acct
-    username, domain = acct.split('@')
+    username, domain = acct.split('@', 2)
    domain.nil? ? username : "#{username}@#{Addressable::IDNA.to_unicode(domain)}"
  end