about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-10-10 02:57:55 -0500
committerFire Demon <firedemon@creature.cafe>2020-10-10 02:57:55 -0500
commitf89fd296ce59f00db47bfe85305b87aa3f3fdc00 (patch)
tree5a624577c5ea0a06da932098bc76e265d3a403aa /app/services
parenteb4358efb766b383ae40304c23d30727d405ccc5 (diff)
Roll back passive federation when resolving replies; do not resolve replies of silenced accounts
Diffstat (limited to 'app/services')
-rw-r--r--app/services/activitypub/fetch_replies_service.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb
index e113e4937..e36ca9f39 100644
--- a/app/services/activitypub/fetch_replies_service.rb
+++ b/app/services/activitypub/fetch_replies_service.rb
@@ -3,12 +3,7 @@
 class ActivityPub::FetchRepliesService < BaseService
   def call(parent_status, collection, **options)
     @account = parent_status.account
-    return if @account.suspended?
-
     fetch_collection_items(collection, **options)
-    return if (collection.is_a?(String) && collection == @account.outbox_url) || @account.local? || @account.silenced? || @account.passive_relationships.exists? || !@account.active_relationships.exists?
-
-    fetch_collection_items(@account.outbox_url, **options)
   rescue ActiveRecord::RecordNotFound
     nil
   end