Merge remote-tracking branch 'parent/main' into upstream-20241015

2024-10-15 07:24:37 +09:00 · 2024-10-15 07:24:37 +09:00 · ebdf1ecf49
commit ebdf1ecf49
parent fde85684c0 7c10b0fb7a
24 changed files with 560 additions and 439 deletions
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@ -70,7 +70,9 @@ class DomainBlock < ApplicationRecord
       reject_friend? ? :reject_friend : nil,
       block_trends? ? :block_trends : nil,
       detect_invalid_subscription? ? :detect_invalid_subscription : nil,
-       reject_reports? ? :reject_reports : nil].reject { |policy| policy == :noop || policy.nil? }
+       reject_reports? ? :reject_reports : nil]
+        .reject { |policy| policy == :noop }
+        .compact
    end
  end