aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/controller_helper.ex
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-05-08 03:05:56 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-05-29 16:14:45 +0200
commita43b435c0ad8a1198241fbd18e1a5f1be830f4b5 (patch)
tree4c7806ca08151851fe00651dcaa32902130f637e /lib/pleroma/web/controller_helper.ex
parent2c18830d0dbd7f63cd20dcf5167254fede538930 (diff)
downloadpleroma-a43b435c0ad8a1198241fbd18e1a5f1be830f4b5.tar.gz
AP C2S: allow limit & order on outbox & read_inbox
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
-rw-r--r--lib/pleroma/web/controller_helper.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index 2d35bb56c..9e5444817 100644
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -63,8 +63,8 @@ defmodule Pleroma.Web.ControllerHelper do
params =
conn.params
|> Map.drop(Map.keys(conn.path_params))
- |> Map.drop(["since_id", "max_id", "min_id"])
|> Map.merge(extra_params)
+ |> Map.drop(Pagination.page_keys() -- ["limit", "order"])
min_id =
activities