Merge branch 'develop' into 0valt/1790/preferences

Author: Oaphi

app/controllers/application_controller.rb

@@ -259,6 +259,10 @@ def pull_pinned_links_and_hot_questions
             .order('score DESC').limit(SiteSetting['HotQuestionsCount']).all
       end
     end
+
+    # eager loading revived collections' used relation to prevent N+1 queries
+    @pinned_links = @pinned_links.list_includes
+    @hot_questions = @hot_questions.list_includes
   end
 
   def pull_categories

app/controllers/categories_controller.rb

@@ -167,8 +167,10 @@ def set_list_posts
                               SiteSetting['LotteryAgeDeprecationSpeed']],
                     native: Arel.sql('att_source IS NULL DESC, last_activity DESC') }
     sort_param = sort_params[params[:sort]&.to_sym] || { last_activity: :desc }
-    @posts = @category.posts.undeleted.where(post_type_id: @category.display_post_types)
-                      .includes(:post_type, :tags).list_includes
+    @posts = @category.posts
+                      .undeleted
+                      .where(post_type_id: @category.display_post_types)
+                      .list_includes
     filter_qualifiers = helpers.params_to_qualifiers(params)
     @active_filter = helpers.active_filter
 

app/models/pinned_link.rb

@@ -2,6 +2,10 @@ class PinnedLink < ApplicationRecord
   include MaybeCommunityRelated
   belongs_to :post, optional: true
 
+  scope :list_includes, lambda {
+    includes(:post, post: [:community])
+  }
+
   validate :check_post_or_url
 
   # Is the link time-constrained?

app/models/post.rb

@@ -51,7 +51,8 @@ class Post < ApplicationRecord
   scope :parent_by, ->(user) { includes(:parent).where(parents_posts: { user_id: user.id }) }
   scope :qa_only, -> { where(post_type_id: [Question.post_type_id, Answer.post_type_id, Article.post_type_id]) }
   scope :list_includes, lambda {
-                          includes(:user, :tags, :post_type, :category, :last_activity_by,
+                          includes(:user, :tags, :post_type, :category, :community, :last_activity_by,
+                                   category: [:moderator_tags, :required_tags, :topic_tags],
                                    user: :avatar_attachment)
                         }
   scope :has_duplicates, -> { joins(:inbound_duplicates) } # uses INNER JOIN by default so no where required

app/views/posts/_list.html.erb

@@ -1,6 +1,3 @@
-<%# is_question = post.post_type_id == Question.post_type_id %>
-<%# is_article = post.post_type_id == Article.post_type_id %>
-<%# is_meta = (is_question && post.meta?) || (!is_question && post.parent&.meta?) %>
 <% @show_type_tag = !!defined?(show_type_tag) ? show_type_tag : false %>
 <% @show_category_tag = !!defined?(show_category_tag) ? show_category_tag : false %>
 <% @last_activity = !!defined?(last_activity) ? last_activity : true %>