Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
		
			
				
	
	
		
			40 lines
		
	
	
	
		
			769 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			40 lines
		
	
	
	
		
			769 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class Api::V1::SearchController < Api::BaseController
 | |
|   include Authorization
 | |
| 
 | |
|   RESULTS_LIMIT = 10
 | |
| 
 | |
|   before_action -> { doorkeeper_authorize! :read, :'read:search' }
 | |
|   before_action :require_user!
 | |
| 
 | |
|   respond_to :json
 | |
| 
 | |
|   def index
 | |
|     @search = Search.new(search)
 | |
|     render json: @search, serializer: REST::SearchSerializer
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def search
 | |
|     search_results.tap do |search|
 | |
|       search[:statuses].keep_if do |status|
 | |
|         begin
 | |
|           authorize status, :show?
 | |
|         rescue Mastodon::NotPermittedError
 | |
|           false
 | |
|         end
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def search_results
 | |
|     SearchService.new.call(
 | |
|       params[:q],
 | |
|       RESULTS_LIMIT,
 | |
|       truthy_param?(:resolve),
 | |
|       current_account
 | |
|     )
 | |
|   end
 | |
| end
 |