diff options
author | Erin <sylphofelectricity@gmail.com> | 2017-12-11 15:28:04 -0600 |
---|---|---|
committer | Erin <sylphofelectricity@gmail.com> | 2017-12-11 15:28:04 -0600 |
commit | c5a4eda6946cc2b7afa466e5c4abe0673fa235ad (patch) | |
tree | 5b85932f2becdf7ca7db60d17bd25968ec3a2979 /app/controllers | |
parent | 3ec47e732b0ae05095c733bd91ab4313f54025dc (diff) |
move outbox filtering to Status#permitted_for (as per @ekiru)
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/activitypub/outboxes_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index e19ca6521..9f97ff622 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -4,7 +4,7 @@ class ActivityPub::OutboxesController < Api::BaseController before_action :set_account def show - @statuses = @account.statuses.not_local_only.permitted_for(@account, current_account).paginate_by_max_id(20, params[:max_id], params[:since_id]) + @statuses = @account.statuses.permitted_for(@account, current_account).paginate_by_max_id(20, params[:max_id], params[:since_id]) @statuses = cache_collection(@statuses, Status) render json: outbox_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json' |