diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-07 21:47:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 21:47:31 +0100 |
| commit | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (patch) | |
| tree | 6ba298899b376d0c8862d77c1e34339a08dc3121 /app/controllers/api/v1/admin/accounts_controller.rb | |
| parent | 5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994 (diff) | |
| parent | e4d62042bdb3b0d675c2367b4c48a2a48647af5e (diff) | |
Merge pull request #1453 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/admin/accounts_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/admin/accounts_controller.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb index 3af572f25..63cc521ed 100644 --- a/app/controllers/api/v1/admin/accounts_controller.rb +++ b/app/controllers/api/v1/admin/accounts_controller.rb @@ -22,6 +22,7 @@ class Api::V1::Admin::AccountsController < Api::BaseController active pending disabled + sensitized silenced suspended username @@ -68,6 +69,13 @@ class Api::V1::Admin::AccountsController < Api::BaseController render json: @account, serializer: REST::Admin::AccountSerializer end + def unsensitive + authorize @account, :unsensitive? + @account.unsensitize! + log_action :unsensitive, @account + render json: @account, serializer: REST::Admin::AccountSerializer + end + def unsilence authorize @account, :unsilence? @account.unsilence! |