X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fadmin_api%2Fsearch.ex;h=c28efadd566e7a1905d6d00d9b29be7ebe78ce44;hb=c3f1ce80ebc6caf85b2f874c31d6b98fd0ef5876;hp=ed919833e895c2c4d8b3867a71c07145b1ab99d4;hpb=f1f7a11222f4689f000825147d16b366d915f393;p=akkoma

diff --git a/lib/pleroma/web/admin_api/search.ex b/lib/pleroma/web/admin_api/search.ex
index ed919833e..c28efadd5 100644
--- a/lib/pleroma/web/admin_api/search.ex
+++ b/lib/pleroma/web/admin_api/search.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.AdminAPI.Search do
@@ -18,7 +18,12 @@ defmodule Pleroma.Web.AdminAPI.Search do
 
   @spec user(map()) :: {:ok, [User.t()], pos_integer()}
   def user(params \\ %{}) do
-    query = User.Query.build(params) |> order_by([u], u.nickname)
+    query =
+      params
+      |> Map.drop([:page, :page_size])
+      |> Map.put(:exclude_service_users, true)
+      |> User.Query.build()
+      |> order_by([u], u.nickname)
 
     paginated_query =
       User.Query.paginate(query, params[:page] || 1, params[:page_size] || @page_size)