diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-11-17 19:11:45 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-11-17 19:11:45 -0600 |
| commit | d9e6204cd6293d747f6051166aff52f3f2b1b410 (patch) | |
| tree | 7c5916cd5efaf4e7779c12eb56acc60c953d671b /app/controllers/api/v1 | |
| parent | a5c518b1df9ad6253f9d3f79c35e27429b792e8e (diff) | |
Do away with the kludgy solution of applying users' filters from API controllers; we will do this in the `Status` model instead, and at the database level.
Diffstat (limited to 'app/controllers/api/v1')
| -rw-r--r-- | app/controllers/api/v1/statuses_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/timelines/tag_controller.rb | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index a5ea12591..601e400ca 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -19,8 +19,6 @@ class Api::V1::StatusesController < Api::BaseController def show @status = cache_collection([@status], Status).first - # make sure any custom cws are applied - phrase_filtered?(@status, current_account.id, 'thread') unless current_account.nil? render json: @status, serializer: REST::StatusSerializer end diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index 66079140b..86307271a 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -8,7 +8,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController respond_to :json def show - @statuses = current_account ? load_statuses.reject { |status| phrase_filtered?(status, current_account.id, 'public') } : load_statuses + @statuses = load_statuses render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id) end diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb index f6ca033c7..35202b1fa 100644 --- a/app/controllers/api/v1/timelines/tag_controller.rb +++ b/app/controllers/api/v1/timelines/tag_controller.rb @@ -9,7 +9,7 @@ class Api::V1::Timelines::TagController < Api::BaseController respond_to :json def show - @statuses = current_account ? load_statuses.reject { |status| phrase_filtered?(status, current_account.id, 'public') } : load_statuses + @statuses = load_statuses render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id) end |