Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream

2025-12-14 00:08:46 +00:00 · 2024-03-13 19:16:47 +01:00
parent 8c0673037a 2c0441acd7
commit 06881a8669
96 changed files with 232 additions and 277 deletions
--- a/app/controllers/api/v1/timelines/base_controller.rb
+++ b/app/controllers/api/v1/timelines/base_controller.rb
@@ -9,12 +9,8 @@ class Api::V1::Timelines::BaseController < Api::BaseController
    set_pagination_headers(next_path, prev_path)
  end

-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
+  def pagination_collection
+    @statuses
  end

  def next_path_params