about summary refs log tree commit diff
path: root/app/lib
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/lib
parenteb4358efb766b383ae40304c23d30727d405ccc5 (diff)
Roll back passive federation when resolving replies; do not resolve replies of silenced accounts
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/activitypub/activity/create.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index f6d81af99..cc585eb10 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -91,7 +91,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
       @status = UpdateStatusService.new.call(@status, @params, @mentions, @tags)
       resolve_thread(@status)
-      fetch_replies(@status)
+      fetch_replies(@status) unless @account.silenced?
       return @status
     end
 
@@ -106,7 +106,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     end
 
     resolve_thread(@status)
-    fetch_replies(@status)
+    fetch_replies(@status) unless @account.silenced?
     check_for_spam
     distribute(@status)
     forward_for_reply