From c5a4eda6946cc2b7afa466e5c4abe0673fa235ad Mon Sep 17 00:00:00 2001 From: Erin Date: Mon, 11 Dec 2017 15:28:04 -0600 Subject: [PATCH] move outbox filtering to Status#permitted_for (as per @ekiru) --- app/controllers/activitypub/outboxes_controller.rb | 2 +- app/models/status.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index e19ca65212..9f97ff6226 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' diff --git a/app/models/status.rb b/app/models/status.rb index 94b2a1aa94..1bc4c633d3 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -223,7 +223,7 @@ class Status < ApplicationRecord visibility = [:public, :unlisted] if account.nil? - where(visibility: visibility) + where(visibility: visibility).not_local_only elsif target_account.blocking?(account) # get rid of blocked peeps none elsif account.id == target_account.id # author can see own stuff