diff options
| author | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
| commit | 383bb3804bdbd6caa442283cc96ef0cdbfdb4575 (patch) | |
| tree | 54ecc09c325567ab1cfc4af9ba13ad134d9c3c72 /app/controllers/api/v1 | |
| parent | 259470ec37dfc5c3d34ed5456adcd3ab1a622a18 (diff) | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/api/v1')
| -rw-r--r-- | app/controllers/api/v1/admin/accounts_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 4 |
2 files changed, 11 insertions, 1 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! diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index fbd99667c..493fe4776 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -38,7 +38,9 @@ class Api::V1::Timelines::PublicController < Api::BaseController local: truthy_param?(:local), remote: truthy_param?(:remote), only_media: truthy_param?(:only_media), - allow_local_only: truthy_param?(:allow_local_only) + allow_local_only: truthy_param?(:allow_local_only), + with_replies: Setting.show_replies_in_public_timelines, + with_reblogs: Setting.show_reblogs_in_public_timelines, ) end |