mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 08:54:40 +00:00
c790ecb14d
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.
31 lines
747 B
Ruby
31 lines
747 B
Ruby
# frozen_string_literal: true
|
|
|
|
class Api::V2::SearchController < Api::BaseController
|
|
include Authorization
|
|
|
|
RESULTS_LIMIT = (ENV['MAX_SEARCH_RESULTS'] || 20).to_i
|
|
|
|
before_action -> { doorkeeper_authorize! :read, :'read:search' }
|
|
before_action :require_user!
|
|
|
|
def index
|
|
@search = Search.new(search_results)
|
|
render json: @search, serializer: REST::SearchSerializer
|
|
end
|
|
|
|
private
|
|
|
|
def search_results
|
|
SearchService.new.call(
|
|
params[:q],
|
|
current_account,
|
|
limit_param(RESULTS_LIMIT),
|
|
search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed))
|
|
)
|
|
end
|
|
|
|
def search_params
|
|
params.permit(:type, :offset, :min_id, :max_id, :account_id)
|
|
end
|
|
end
|