Fix "Show more" URL on paginated threads for remote statuses (#7285)

* Fix URL of "Show more" link in paginated threads (ancestors side)

Increase item limits in threads

Fix #7268

* Fix "Show more" link in paginated threads (descendants side)

2 files changed, 7 insertions, 5 deletions

diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 01dac35e4..645995c2a 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -4,9 +4,9 @@ class StatusesController < ApplicationController
   include SignatureAuthentication
   include Authorization
 
-  ANCESTORS_LIMIT = 20
-  DESCENDANTS_LIMIT = 20
-  DESCENDANTS_DEPTH_LIMIT = 4
+  ANCESTORS_LIMIT         = 40
+  DESCENDANTS_LIMIT       = 60
+  DESCENDANTS_DEPTH_LIMIT = 20
 
   layout 'public'
 
@@ -71,7 +71,7 @@ class StatusesController < ApplicationController
   end
 
   def set_descendants
-    @max_descendant_thread_id = params[:max_descendant_thread_id]&.to_i
+    @max_descendant_thread_id   = params[:max_descendant_thread_id]&.to_i
     @since_descendant_thread_id = params[:since_descendant_thread_id]&.to_i
 
     descendants = cache_collection(
@@ -84,11 +84,12 @@ class StatusesController < ApplicationController
       ),
       Status
     )
+
     @descendant_threads = []
 
     if descendants.present?
       statuses = [descendants.first]
-      depth = 1
+      depth    = 1
 
       descendants.drop(1).each_with_index do |descendant, index|
         if descendants[index].id == descendant.in_reply_to_id
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index 97cf85079..8568b151c 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -23,6 +23,7 @@ class StreamEntriesController < ApplicationController
           skip_session!
           expires_in 3.minutes, public: true
         end
+
         render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.entry(@stream_entry, true))
       end
     end