projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'warnings-as-errors' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
search.ex
diff --git
a/lib/pleroma/web/admin_api/search.ex
b/lib/pleroma/web/admin_api/search.ex
index eeeebdf4ec7f1652a03c5bc72256a2e54238b239..da38fab56991f90cf2481baf0680c0e4b4116e5a 100644
(file)
--- a/
lib/pleroma/web/admin_api/search.ex
+++ b/
lib/pleroma/web/admin_api/search.ex
@@
-10,12
+10,6
@@
defmodule Pleroma.Web.AdminAPI.Search do
@page_size 50
@page_size 50
- defmacro not_empty_string(string) do
- quote do
- is_binary(unquote(string)) and unquote(string) != ""
- end
- end
-
@spec user(map()) :: {:ok, [User.t()], pos_integer()}
def user(params \\ %{}) do
query =
@spec user(map()) :: {:ok, [User.t()], pos_integer()}
def user(params \\ %{}) do
query =
@@
-23,7
+17,7
@@
defmodule Pleroma.Web.AdminAPI.Search do
|> Map.drop([:page, :page_size])
|> Map.put(:invisible, false)
|> User.Query.build()
|> Map.drop([:page, :page_size])
|> Map.put(:invisible, false)
|> User.Query.build()
- |> order_by(
[u], u.nickname
)
+ |> order_by(
desc: :id
)
paginated_query =
User.Query.paginate(query, params[:page] || 1, params[:page_size] || @page_size)
paginated_query =
User.Query.paginate(query, params[:page] || 1, params[:page_size] || @page_size)