Fix: Status policy

atsu1125 · Dec 30, 2022 · a4222d4 · a4222d4
1 parent 509e57f
commit a4222d4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb
@@ -11,7 +11,7 @@ def initialize(status, account, preloaded_relations = {})
 
   def filtered?
     return false if !account.nil? && account.id == status.account_id
-    (account_present? && filtered_status?) || silenced_account?
+    blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
   end
 
   private
@@ -48,6 +48,10 @@ def account_following_status_account?
     @preloaded_relations[:following] ? @preloaded_relations[:following][status.account_id] : account&.following?(status.account_id)
   end
 
+  def blocked_by_policy?
+    !policy_allows_show?
+  end
+
   def policy_allows_show?
     StatusPolicy.new(account, status, @preloaded_relations).show?
   end