From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 28 Aug 2022 01:45:19 +0000 (+0200)
Subject: Change search API to be accessible without being logged in (#18963)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b045f467cccd02f184c0ac706e06119fe0abd475;p=mastodon.git

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

But with the resolve option turned off
---

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