diff options
author | ThibG <thib@sitedethib.com> | 2020-10-22 22:38:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-22 22:38:11 +0200 |
commit | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (patch) | |
tree | 3f5e2b47d242c4044f0cd69433501834399879d5 /app/controllers/api/v1/accounts_controller.rb | |
parent | 29870d2be6c0e78132416b5561aba20d6ca3c746 (diff) | |
parent | 5c60f7eaedbc2dc6184f8b2a4d99f58fdbd5b26b (diff) |
Merge pull request #1441 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/accounts_controller.rb')
-rw-r--r-- | app/controllers/api/v1/accounts_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index aef51a647..3e66ff212 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -20,7 +20,7 @@ class Api::V1::AccountsController < Api::BaseController end def create - token = AppSignUpService.new.call(doorkeeper_token.application, account_params) + token = AppSignUpService.new.call(doorkeeper_token.application, request.remote_ip, account_params) response = Doorkeeper::OAuth::TokenResponse.new(token) headers.merge!(response.headers) @@ -42,7 +42,7 @@ class Api::V1::AccountsController < Api::BaseController end def mute - MuteService.new.call(current_user.account, @account, notifications: truthy_param?(:notifications)) + MuteService.new.call(current_user.account, @account, notifications: truthy_param?(:notifications), duration: (params[:duration] || 0)) render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships end |