move outbox filtering to Status#permitted_for (as per @ekiru)

diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index e19ca652125fb64a8b5878d86dbfda72e62151f8..9f97ff6226d67480861a8672cf54f3d41717787a 100644 (file)
--- 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 94b2a1aa9411bfa2fad6a471441545483ad2d697..1bc4c633d3fb5786fb6f07ea48f5cf6c009e4514 100644 (file)
--- 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