about summary refs log tree commit diff
path: root/app/models/trends/statuses.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/trends/statuses.rb')
-rw-r--r--app/models/trends/statuses.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index d9b07446e..0ebda0fe1 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -78,7 +78,7 @@ class Trends::Statuses < Trends::Base
 
     original_status.public_visibility? &&
       original_status.account.discoverable? && !original_status.account.silenced? &&
-      original_status.spoiler_text.blank? && !original_status.sensitive? && !original_status.reply?
+      (original_status.spoiler_text.blank? || Setting.trending_status_cw) && !original_status.sensitive? && !original_status.reply?
   end
 
   def calculate_scores(statuses, at_time)