Cache hashtag sample accounts, and exclude ineligible ones (#9465)

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 41e58e3ca..99830ae92 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -12,6 +12,7 @@
 class Tag < ApplicationRecord
   has_and_belongs_to_many :statuses
   has_and_belongs_to_many :accounts
+  has_and_belongs_to_many :sample_accounts, -> { searchable.discoverable.popular.limit(3) }, class_name: 'Account'
 
   has_one :account_tag_stat, dependent: :destroy
 
@@ -20,7 +21,7 @@ class Tag < ApplicationRecord
 
   validates :name, presence: true, uniqueness: true, format: { with: /\A#{HASHTAG_NAME_RE}\z/i }
 
-  scope :discoverable, -> { joins(:account_tag_stat).where(AccountTagStat.arel_table[:accounts_count].gt(0)).where(account_tag_stats: { hidden: false }).order('account_tag_stats.accounts_count desc') }
+  scope :discoverable, -> { joins(:account_tag_stat).where(AccountTagStat.arel_table[:accounts_count].gt(0)).where(account_tag_stats: { hidden: false }).order(Arel.sql('account_tag_stats.accounts_count desc')) }
   scope :hidden, -> { where(account_tag_stats: { hidden: true }) }
 
   delegate :accounts_count,
@@ -36,6 +37,10 @@ class Tag < ApplicationRecord
     super || build_account_tag_stat
   end
 
+  def cached_sample_accounts
+    Rails.cache.fetch("#{cache_key}/sample_accounts", expires_in: 12.hours) { sample_accounts }
+  end
+
   def to_param
     name
   end