diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
| commit | f5f6d23d554b3a81020feebc65188cc64f644095 (patch) | |
| tree | b30197858c2018a32be559f5b4b479571c75dee3 /app/controllers/api/v1/accounts/statuses_controller.rb | |
| parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
| parent | 3f036ac6b8f9919b3b141012db163476f18fe299 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
Diffstat (limited to 'app/controllers/api/v1/accounts/statuses_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index 7aba2d0bd..8cd8f8e79 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -3,8 +3,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController before_action -> { authorize_if_got_token! :read, :'read:statuses' } before_action :set_account - before_action :check_account_suspension - before_action :check_account_block after_action :insert_pagination_headers respond_to :json @@ -20,14 +18,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController @account = Account.find(params[:account_id]) end - def check_account_suspension - gone if @account.suspended? - end - - def check_account_block - gone if current_account.present? && @account.blocking?(current_account) - end - def load_statuses cached_account_statuses end |