about summary refs log tree commit diff
path: root/app/services/notify_service.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/notify_service.rb')
-rw-r--r--app/services/notify_service.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index fc187db40..c241c3ca0 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -51,6 +51,11 @@ class NotifyService < BaseService
     @following_sender = @recipient.following?(@notification.from_account) || @recipient.requested?(@notification.from_account)
   end
 
+  def following_recipient?
+    return @following_recipient if defined?(@following_recipient)
+    @following_recipient = @notification.from_account.following?(@recipient)
+  end
+
   def optional_non_follower?
     @recipient.user.settings.interactions['must_be_follower']  && !@notification.from_account.following?(@recipient)
   end
@@ -83,7 +88,7 @@ class NotifyService < BaseService
   end
 
   def hellbanned?
-    @notification.from_account.silenced? && !following_sender?
+    @notification.from_account.silenced? && !(following_sender? || following_recipient?)
   end
 
   def from_self?