diff --git a/app/controllers/api/v1/search_controller.rb b/app/controllers/api/v1/search_controller.rb deleted file mode 100644 index 901c6ab3..00000000 --- a/app/controllers/api/v1/search_controller.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true - -class Api::V1::SearchController < Api::BaseController - before_action :require_user! - - RESULTS_LIMIT = 25 - - 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)) - ) - end - - def search_params - params.permit(:type, :onlyVerified, :offset, :min_id, :max_id, :account_id) - end -end diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb index 9aa6edc6..ac779ec4 100644 --- a/app/controllers/api/v2/search_controller.rb +++ b/app/controllers/api/v2/search_controller.rb @@ -1,8 +1,29 @@ # frozen_string_literal: true -class Api::V2::SearchController < Api::V1::SearchController +class Api::V2::SearchController < Api::BaseController + before_action :require_user! + + RESULTS_LIMIT = 25 + def index @search = Search.new(search_results) render json: @search, serializer: REST::V2::SearchSerializer end + + private + + def search_results + SearchService.new.call( + params[:q], + current_account, + limit_param(RESULTS_LIMIT), + search_params.merge(resolve: truthy_param?(:resolve)) + ) + end + + def search_params + params.permit(:type, :onlyVerified, :offset, :min_id, :max_id, :account_id) + end end + + diff --git a/config/routes.rb b/config/routes.rb index d8d34abc..23b3ab2c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -294,7 +294,6 @@ Rails.application.routes.draw do end end - get '/search', to: 'search#index', as: :search get '/account_by_username/:username', to: 'account_by_username#show', username: username_regex namespace :apps do