about summary refs log tree commit diff
path: root/app/models/trending_tags.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-10-10 02:22:04 +0200
committerGitHub <noreply@github.com>2019-10-10 02:22:04 +0200
commit915f3712ae7ae44c0cbe50c9694c25e3ee87a540 (patch)
tree9cd778546fbc4bbe076d3a55a9b142f875845eaf /app/models/trending_tags.rb
parent30a28a2eb7bdd39de877ae8171555307986b3e06 (diff)
Fix admin setting to auto-approve hashtags not affecting query (#12130)
Follow-up to #12122
Diffstat (limited to 'app/models/trending_tags.rb')
-rw-r--r--app/models/trending_tags.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/trending_tags.rb b/app/models/trending_tags.rb
index 8cdade42d..c69f6d3c3 100644
--- a/app/models/trending_tags.rb
+++ b/app/models/trending_tags.rb
@@ -90,7 +90,7 @@ class TrendingTags
       tag_ids = redis.zrevrange(KEY, 0, LIMIT - 1).map(&:to_i)
 
       tags = Tag.where(id: tag_ids)
-      tags = tags.where(trendable: true) if filtered
+      tags = tags.trendable if filtered
       tags = tags.each_with_object({}) { |tag, h| h[tag.id] = tag }
 
       tag_ids.map { |tag_id| tags[tag_id] }.compact.take(limit)