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

ProjectMyosotis · Oct 2, 2019 · 3eb723c · 3eb723c
1 parent 10d3a40
commit 3eb723c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -52,7 +52,7 @@ def show
   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
@@ -38,7 +38,7 @@ def set_featured_tag
   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
@@ -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