zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge 91f6ffaf64 into 65093c619f

This commit is contained in:
Matt Jankowski 2024-04-26 18:07:06 +00:00 committed by GitHub
parent 65093c619f 91f6ffaf64
commit 743ac3995b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/featured_tags_controller.rb
View File

@ -29,6 +29,6 @@ class Api::V1::FeaturedTagsController < Api::BaseController
end
def set_featured_tags
@featured_tags = current_account.featured_tags.order(statuses_count: :desc)
@featured_tags = current_account.featured_tags.by_status_count
end
end

2
app/controllers/settings/featured_tags_controller.rb
View File

@ -34,7 +34,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
end
def set_featured_tags
@featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?)
@featured_tags = current_account.featured_tags.by_status_count.reject(&:new_record?)
end
def set_recently_used_tags

1
app/models/featured_tag.rb
View File

@ -29,6 +29,7 @@ class FeaturedTag < ApplicationRecord
before_create :reset_data
scope :by_name, ->(name) { joins(:tag).where(tag: { name: HashtagNormalizer.new.normalize(name) }) }
scope :by_status_count, -> { order(statuses_count: :desc) }
LIMIT = 10