gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 15:31:52 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fix some actions being logged on idempotent calls

Browse Source
This commit is contained in:
trwnh 2022-11-08 23:06:20 -06:00 committed by GitHub
parent 53817294fc
commit 0222970ab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/v1/admin/accounts_controller.rb
View File

@ -46,8 +46,10 @@ class Api::V1::Admin::AccountsController < Api::BaseController
def enable def enable
authorize @account.user, :enable? authorize @account.user, :enable?
if @account.user.disabled
@account.user.enable! @account.user.enable!
log_action :enable, @account.user log_action :enable, @account.user
end
render json: @account, serializer: REST::Admin::AccountSerializer render json: @account, serializer: REST::Admin::AccountSerializer
end end
@ -71,15 +73,19 @@ class Api::V1::Admin::AccountsController < Api::BaseController
def unsensitive def unsensitive
authorize @account, :unsensitive? authorize @account, :unsensitive?
if @account.sensitized?
@account.unsensitize! @account.unsensitize!
log_action :unsensitive, @account log_action :unsensitive, @account
end
render json: @account, serializer: REST::Admin::AccountSerializer render json: @account, serializer: REST::Admin::AccountSerializer
end end
def unsilence def unsilence
authorize @account, :unsilence? authorize @account, :unsilence?
if @account.silenced?
@account.unsilence! @account.unsilence!
log_action :unsilence, @account log_action :unsilence, @account
end
render json: @account, serializer: REST::Admin::AccountSerializer render json: @account, serializer: REST::Admin::AccountSerializer
end end