diff options
author | ThibG <thib@sitedethib.com> | 2019-02-26 21:40:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-26 21:40:28 +0100 |
commit | ff2270cd061b2dc3fc86a5b2bd77d0a3408b5716 (patch) | |
tree | 75adb7dc4d3c37ecf87b43659538e20ec198d804 /app/controllers/api/v1/accounts/search_controller.rb | |
parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
parent | 1e06ca1c0af98cf61b1114b93249fb447e795edb (diff) |
Merge pull request #930 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/accounts/search_controller.rb')
-rw-r--r-- | app/controllers/api/v1/accounts/search_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb index 91c9f1547..4217b527a 100644 --- a/app/controllers/api/v1/accounts/search_controller.rb +++ b/app/controllers/api/v1/accounts/search_controller.rb @@ -16,10 +16,11 @@ class Api::V1::Accounts::SearchController < Api::BaseController def account_search AccountSearchService.new.call( params[:q], - limit_param(DEFAULT_ACCOUNTS_LIMIT), current_account, + limit: limit_param(DEFAULT_ACCOUNTS_LIMIT), resolve: truthy_param?(:resolve), - following: truthy_param?(:following) + following: truthy_param?(:following), + offset: params[:offset] ) end end |