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

2022-04-08 23:00:03 +02:00
parent c483101b4a ed5491e5de
commit eff62528de
6 changed files with 54 additions and 5 deletions
--- a/app/lib/search_query_transformer.rb
+++ b/app/lib/search_query_transformer.rb
@@ -88,14 +88,14 @@ class SearchQueryTransformer < Parslet::Transform
      case prefix
      when 'from'
        @filter = :account_id
-        username, domain = term.split('@')
-        account = Account.find_remote(username, domain)

-        raise "Account not found: #{term}" unless account
+        username, domain = term.gsub(/\A@/, '').split('@')
+        domain           = nil if TagManager.instance.local_domain?(domain)
+        account          = Account.find_remote!(username, domain)

        @term = account.id
      else
-        raise "Unknown prefix: #{prefix}"
+        raise Mastodon::SyntaxError
      end
    end
  end