Merge branch 'develop' into activation-meta

[akkoma] / lib / pleroma / web / controller_helper.ex

diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index 6cb19d539fcfaa9b7ed4fa8eca3c0cb311b4ab09..69946fb81ee6a5571728586e8c8fbde681ccb351 100644 (file)
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -63,23 +63,13 @@ defmodule Pleroma.Web.ControllerHelper do
       conn.params
       |> Map.drop(Map.keys(conn.path_params))
       |> Map.merge(extra_params)
-      |> Map.drop(Pagination.page_keys() -- ["limit", "order"])
+      |> Map.drop(@id_keys)
 
-    fields = %{
+    %{
       "next" => current_url(conn, Map.put(params, :max_id, max_id)),
-      "prev" => current_url(conn, Map.put(params, :min_id, min_id))
+      "prev" => current_url(conn, Map.put(params, :min_id, min_id)),
+      "id" => current_url(conn)
     }
-
-    #  Generating an `id` without already present pagination keys would
-    # need a query-restriction with an `q.id >= ^id` or `q.id <= ^id`
-    # instead of the `q.id > ^min_id` and `q.id < ^max_id`.
-    #  This is because we only have ids present inside of the page, while
-    # `min_id`, `since_id` and `max_id` requires to know one outside of it.
-    if Map.take(conn.params, Pagination.page_keys() -- ["limit", "order"]) != [] do
-      Map.put(fields, "id", current_url(conn, conn.params))
-    else
-      fields
-    end
   end
 
   def get_pagination_fields(conn, activities, extra_params \\ %{}) do