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)

app/controllers/statuses_controller.rb

@@ -4,9 +4,9 @@ class StatusesController < ApplicationController
   include SignatureAuthentication
   include Authorization
 
-  ANCESTORS_LIMIT = 20
+  ANCESTORS_LIMIT         = 40
-  DESCENDANTS_LIMIT = 20
+  DESCENDANTS_LIMIT       = 60
-  DESCENDANTS_DEPTH_LIMIT = 4
+  DESCENDANTS_DEPTH_LIMIT = 20
 
   layout 'public'
 
@@ -84,6 +84,7 @@ class StatusesController < ApplicationController
       ),
       Status
     )
+
     @descendant_threads = []
 
     if descendants.present?

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

app/views/stream_entries/_status.html.haml

@@ -16,7 +16,8 @@
 - if status.reply? && include_threads
   - if @next_ancestor
     .entry{ class: entry_classes }
-      = render 'stream_entries/more', url: short_account_status_url(@next_ancestor.account.username, @next_ancestor)
+      = render 'stream_entries/more', url: TagManager.instance.url_for(@next_ancestor)
+
   = render partial: 'stream_entries/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }
 
 .entry{ class: entry_classes }
@@ -44,9 +45,10 @@
       = render 'stream_entries/more', url: short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1)
   - @descendant_threads.each do |thread|
     = render partial: 'stream_entries/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id }
+
     - if thread[:next_status]
       .entry{ class: entry_classes }
-        = render 'stream_entries/more', url: short_account_status_url(thread[:next_status].account.username, thread[:next_status])
+        = render 'stream_entries/more', url: TagManager.instance.url_for(thread[:next_status])
   - if @next_descendant_thread
     .entry{ class: entry_classes }
       = render 'stream_entries/more', url: short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)