aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api/admin_api_controller.ex
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2019-09-26 16:44:53 +0000
committerfeld <feld@feld.me>2019-09-26 16:44:53 +0000
commitcb282f2ccde11f877213988e288f4ba9578d0aed (patch)
treecccd19e6ca5263f414131eccb112018e79bafa8c /lib/pleroma/web/admin_api/admin_api_controller.ex
parent6abe12dceda8d0d32878208987a9631d5d546a3d (diff)
parent39a4892929e160186c7cbeef0f2abe6131758511 (diff)
downloadpleroma-cb282f2ccde11f877213988e288f4ba9578d0aed.tar.gz
Merge branch 'feature/moderation-log-filters' into 'develop'
Moderation log filters See merge request pleroma/pleroma!1607
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
-rw-r--r--lib/pleroma/web/admin_api/admin_api_controller.ex10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index e9a048b9b..90aef99f7 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -556,7 +556,15 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
def list_log(conn, params) do
{page, page_size} = page_params(params)
- log = ModerationLog.get_all(page, page_size)
+ log =
+ ModerationLog.get_all(%{
+ page: page,
+ page_size: page_size,
+ start_date: params["start_date"],
+ end_date: params["end_date"],
+ user_id: params["user_id"],
+ search: params["search"]
+ })
conn
|> put_view(ModerationLogView)