projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into notice-routes
[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 0bfb8f02261ec953ca675edc00cfb601de46986d..da38fab56991f90cf2481baf0680c0e4b4116e5a 100644
(file)
--- 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
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.Search do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.Search do
@@
-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)