projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'email-blacklist' into 'develop'
[akkoma]
/
lib
/
pleroma
/
user
/
query.ex
diff --git
a/lib/pleroma/user/query.ex
b/lib/pleroma/user/query.ex
index 66ffe909031637f284f66c2450a8701ffc4e8add..45553cb6c9a6b407f4aace4ce7c917f508cf6aec 100644
(file)
--- a/
lib/pleroma/user/query.ex
+++ b/
lib/pleroma/user/query.ex
@@
-42,6
+42,7
@@
defmodule Pleroma.User.Query do
external: boolean(),
active: boolean(),
deactivated: boolean(),
external: boolean(),
active: boolean(),
deactivated: boolean(),
+ need_approval: boolean(),
is_admin: boolean(),
is_moderator: boolean(),
super_users: boolean(),
is_admin: boolean(),
is_moderator: boolean(),
super_users: boolean(),
@@
-146,6
+147,10
@@
defmodule Pleroma.User.Query do
|> where([u], not is_nil(u.nickname))
end
|> where([u], not is_nil(u.nickname))
end
+ defp compose_query({:need_approval, _}, query) do
+ where(query, [u], u.approval_pending)
+ end
+
defp compose_query({:followers, %User{id: id}}, query) do
query
|> where([u], u.id != ^id)
defp compose_query({:followers, %User{id: id}}, query) do
query
|> where([u], u.id != ^id)