Merge pull request #2013 from codidact/0valt/2008/user-post-list-sort

Author: ArtOfCode-

app/controllers/users_controller.rb

@@ -45,20 +45,13 @@ def index
 
   def show
     @abilities = Ability.on_user(@user)
+    @limit = params[:limit]&.to_i || 15
 
-    all_posts = if current_user&.privilege?('flag_curate') || @user == current_user
-                  @user.posts
-                else
-                  @user.posts.undeleted
-                end
-                .list_includes
-                .joins(:category)
-                .where('IFNULL(categories.min_view_trust_level, 0) <= ?', current_user&.trust_level || 0)
-                .user_sort({ term: params[:sort], default: :score },
-                           age: :created_at, score: :score)
-
-    @posts = all_posts.first(15)
-    @total_post_count = all_posts.count
+    @posts = set_posts.user_sort({ term: params[:sort], default: :score },
+                                 age: :created_at, score: :score)
+
+    @total_post_count = @posts.count
+    @posts = @posts.first(@limit)
     render layout: 'without_sidebar'
   end
 
@@ -215,17 +208,13 @@ def set_preference
   end
 
   def posts
-    @posts = if current_user&.privilege?('flag_curate') || @user == current_user
-               Post.all
-             else
-               Post.undeleted
-             end.by(@user).list_includes.joins(:category)
-             .where('IFNULL(categories.min_view_trust_level, 0) <= ?', current_user&.trust_level || 0)
-             .user_sort({ term: params[:sort], default: :score },
-                        activity: :last_activity,
-                        age: :created_at,
-                        score: :score)
-             .paginate(page: params[:page], per_page: 25)
+    @posts = set_posts.user_sort({ term: params[:sort], default: :score },
+                                 activity: :last_activity,
+                                 age: :created_at,
+                                 score: :score)
+                      .order(created_at: :desc)
+                      .paginate(page: params[:page], per_page: 25)
+
     respond_to do |format|
       format.html do
         render :posts
@@ -661,6 +650,17 @@ def filter_params
                   include_tags: [], exclude_tags: [])
   end
 
+  def set_posts
+    @posts = if current_user&.privilege?('flag_curate') || @user == current_user
+               @user.posts
+             else
+               @user.posts.undeleted
+             end
+             .list_includes
+             .joins(:category)
+             .where('IFNULL(categories.min_view_trust_level, 0) <= ?', current_user&.trust_level || 0)
+  end
+
   def set_user
     user_id = if params[:id] == 'me' && user_signed_in?
                 current_user.id

test/controllers/users_controller_test.rb

@@ -48,6 +48,20 @@ class UsersControllerTest < ActionController::TestCase
     assert_response(:not_found)
   end
 
+  test 'should correctly show user post count' do
+    std = users(:standard_user)
+    post_count = Post.all.by(std).count
+    limit = post_count - 1
+
+    assert post_count.positive? && limit.positive?
+
+    sign_in std
+    get :show, params: { id: std.id, limit: limit }
+
+    assert_equal assigns(:posts)&.count, limit
+    assert_equal assigns(:total_post_count), post_count
+  end
+
   test 'should get mod tools page' do
     sign_in users(:moderator)
     get :mod, params: { id: users(:standard_user).id }