Fix pinned statuses being shown in a featured hashtag (#9971)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 6e3a23073b214bddf020663eab7e35098a1427f2..cbf1a8287b97cb1b5c1949099b4a85eaedd6723c 100644 (file)
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -52,7 +52,7 @@ class AccountsController < ApplicationController
   private
 
   def show_pinned_statuses?
-    [replies_requested?, media_requested?, params[:max_id].present?, params[:min_id].present?].none?
+    [replies_requested?, media_requested?, tag_requested?, params[:max_id].present?, params[:min_id].present?].none?
   end
 
   def filtered_statuses

diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb
index 19815e4168d133baf5a0ecd5aa306eb8364d534a..3a3241425d6066e0876e71c24ca0076be9028247 100644 (file)
--- a/app/controllers/settings/featured_tags_controller.rb
+++ b/app/controllers/settings/featured_tags_controller.rb
@@ -38,7 +38,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
   end
 
   def set_featured_tags
-    @featured_tags = current_account.featured_tags.reject(&:new_record?)
+    @featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?)
   end
 
   def set_most_used_tags

diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 23a595205c5f80a84b4cc1b41d860a71db7f5903..0da69728f32f62c13c380fa79f84f75529c591b4 100644 (file)
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -63,7 +63,7 @@
         - @endorsed_accounts.each do |account|
           = account_link_to account
 
-    - @account.featured_tags.each do |featured_tag|
+    - @account.featured_tags.order(statuses_count: :desc).each do |featured_tag|
       .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil }
         = link_to short_account_tag_path(@account, featured_tag.tag) do
           %h4