Revert "Fix error resposes for `from` search prefix (#17963)"

This reverts commit 012537452a1b9087ea085253e8d42fe4129cea42. This
version of the fix is incompatible with changes introduced here, and we
prefer the functionality of our change.

diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index 77eeab5b0ba5849dc22331bdd44409b5c8fcfb8b..ddcf92200966ffef3913006a807a1c11a087e78b 100644 (file)
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -11,10 +11,6 @@ class Api::V2::SearchController < Api::BaseController
   def index
     @search = Search.new(search_results)
     render json: @search, serializer: REST::SearchSerializer
-  rescue Mastodon::SyntaxError
-    unprocessable_entity
-  rescue ActiveRecord::RecordNotFound
-    not_found
   end
 
   private

diff --git a/app/lib/search_query_transformer.rb b/app/lib/search_query_transformer.rb
index aef05e9d9d883c1e58c76c6a3ecda9a10d7fb02d..c685d7b6fd7b0dc0cf86c83d675fa01ed5906067 100644 (file)
--- 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)
 
-        username, domain = term.gsub(/\A@/, '').split('@')
-        domain           = nil if TagManager.instance.local_domain?(domain)
-        account          = Account.find_remote!(username, domain)
+        raise "Account not found: #{term}" unless account
 
         @term = account.id
       else
-        raise Mastodon::SyntaxError
+        raise "Unknown prefix: #{prefix}"
       end
     end
   end

diff --git a/lib/exceptions.rb b/lib/exceptions.rb
index 0c677b6605d24689d75dee2ed47715d133d2364a..eb472abaabfb67d9a853d8c38c3b77325ffdad29 100644 (file)
--- a/lib/exceptions.rb
+++ b/lib/exceptions.rb
@@ -10,7 +10,6 @@ module Mastodon
   class StreamValidationError < ValidationError; end
   class RaceConditionError < Error; end
   class RateLimitExceededError < Error; end
-  class SyntaxError < Error; end
 
   class UnexpectedResponseError < Error
     attr_reader :response