diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb index 6098fc6abd..c9a8050ead 100644 --- a/app/controllers/api/v2/search_controller.rb +++ b/app/controllers/api/v2/search_controller.rb @@ -39,6 +39,6 @@ class Api::V2::SearchController < Api::BaseController end def search_params - params.permit(:type, :offset, :min_id, :max_id, :account_id) + params.permit(:type, :offset, :min_id, :max_id, :account_id, :searchability) end end diff --git a/app/services/search_service.rb b/app/services/search_service.rb index 94037e8566..85710f63ba 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -8,7 +8,7 @@ class SearchService < BaseService @limit = limit.to_i @offset = options[:type].blank? ? 0 : options[:offset].to_i @resolve = options[:resolve] || false - @searchability = options[:searchability] || @account.user&.setting_default_searchability || 'private' + @searchability = options[:searchability] || 'public' default_results.tap do |results| next if @query.blank? || @limit.zero? @@ -69,7 +69,7 @@ class SearchService < BaseService account_relations = relations_map_for_account(@account, account_ids, account_domains) # old name: preloaded_relations status_relations = relations_map_for_status(@account, results) - results.reject { |status| StatusFilter.new(status, @account, account_relations, status_relations).filtered? } + results.reject { |status| StatusFilter.new(status, @account, account_relations).filtered? } rescue Faraday::ConnectionFailed, Parslet::ParseFailed [] end @@ -139,18 +139,6 @@ class SearchService < BaseService } end - def relations_map_for_status(account, statuses) - presenter = StatusRelationshipsPresenter.new(statuses, account) - { - reblogs_map: presenter.reblogs_map, - favourites_map: presenter.favourites_map, - bookmarks_map: presenter.bookmarks_map, - emoji_reactions_map: presenter.emoji_reactions_map, - mutes_map: presenter.mutes_map, - pins_map: presenter.pins_map, - } - end - def parsed_query SearchQueryTransformer.new.apply(SearchQueryParser.new.parse(@query)) end