From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 2 Oct 2022 16:10:49 +0000 (+0200)
Subject: Revert "Change search API to be accessible without being logged in (#18963)"
X-Git-Url: https://awoo.directory/?a=commitdiff_plain;h=6148f699a0533c1627cf17509d8724ee0a4b32fb;p=mastodon.git

Revert "Change search API to be accessible without being logged in (#18963)"

This reverts commit c57907737a35d05d4bb936acd662df6ce725456f.
---

diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index 51335f4a6..116f53618 100644
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -5,7 +5,8 @@ class Api::V2::SearchController < Api::BaseController
 
   RESULTS_LIMIT = (ENV['MAX_SEARCH_RESULTS'] || 20).to_i
 
-  before_action -> { authorize_if_got_token! :read, :'read:search' }
+  before_action -> { doorkeeper_authorize! :read, :'read:search' }
+  before_action :require_user!
 
   def index
     @search = Search.new(search_results)
@@ -29,7 +30,7 @@ class Api::V2::SearchController < Api::BaseController
       params[:q],
       current_account,
       limit_param(RESULTS_LIMIT),
-      search_params.merge(resolve: user_signed_in? ? truthy_param?(:resolve) : false, exclude_unreviewed: truthy_param?(:exclude_unreviewed))
+      search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed))
     )
   end