diff options
| author | OSAMU SATO <satosamu@gmail.com> | 2020-10-13 08:01:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 01:01:14 +0200 |
| commit | 96761752eccfc0d239974a24e0cc2d74c6aee7ac (patch) | |
| tree | 1590275b4f8a1f954d90e870ef2bfb8ac00d7109 /app/controllers | |
| parent | f54ca3d08e068af07a5b7a8b139e7658b3236db8 (diff) | |
Add duration parameter to muting. (#13831)
* Adding duration to muting. * Remove useless checks
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/mutes_controller.rb | 2 |
2 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 4a97f0251..3e66ff212 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -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 diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb index 805d0dee2..fd52511d7 100644 --- a/app/controllers/api/v1/mutes_controller.rb +++ b/app/controllers/api/v1/mutes_controller.rb @@ -7,7 +7,7 @@ class Api::V1::MutesController < Api::BaseController def index @accounts = load_accounts - render json: @accounts, each_serializer: REST::AccountSerializer + render json: @accounts, each_serializer: REST::MutedAccountSerializer end private |