about summary refs log tree commit diff
path: root/app/models/trends
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/trends')
-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 84bff9c02..d4d5b1c24 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -91,7 +91,7 @@ class Trends::Statuses < Trends::Base
   private
 
   def eligible?(status)
-    status.public_visibility? && status.account.discoverable? && !status.account.silenced? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language)
+    status.public_visibility? && status.account.discoverable? && !status.account.silenced? && (status.spoiler_text.blank? || Setting.trending_status_cw) && !status.sensitive? && !status.reply? && valid_locale?(status.language)
   end
 
   def calculate_scores(statuses, at_time)