From 21a8612aaba7ca871c7b45ef6ef84e7b20f97a22 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 22 Nov 2024 16:58:48 +0100
Subject: [PATCH] Prevent delivery of posts to (even more) suspended followers
(#33030)
---
app/lib/status_reach_finder.rb | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
index d08c077c7..5fb196433 100644
--- a/app/lib/status_reach_finder.rb
+++ b/app/lib/status_reach_finder.rb
@@ -17,8 +17,7 @@ class StatusReachFinder
def reached_account_inboxes
scope = Account.where(id: reached_account_ids)
- scope.merge!(Account.without_suspended) unless unsafe?
- scope.inboxes
+ inboxes_without_suspended_for(scope)
end
def reached_account_ids
@@ -71,13 +70,8 @@ class StatusReachFinder
end
def followers_inboxes
- if @status.in_reply_to_local_account? && distributable?
- @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account)).inboxes
- elsif @status.direct_visibility? || @status.limited_visibility?
- []
- else
- @status.account.followers.inboxes
- end
+ scope = followers_scope
+ inboxes_without_suspended_for(scope)
end
def relay_inboxes
@@ -95,4 +89,19 @@ class StatusReachFinder
def unsafe?
@options[:unsafe]
end
+
+ def followers_scope
+ if @status.in_reply_to_local_account? && distributable?
+ @status.account.followers.or(@status.thread.account.followers.not_domain_blocked_by_account(@status.account))
+ elsif @status.direct_visibility? || @status.limited_visibility?
+ Account.none
+ else
+ @status.account.followers
+ end
+ end
+
+ def inboxes_without_suspended_for(scope)
+ scope.merge!(Account.without_suspended) unless unsafe?
+ scope.inboxes
+ end
end