projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add timestamp
[akkoma]
/
lib
/
pleroma
/
user
/
query.ex
diff --git
a/lib/pleroma/user/query.ex
b/lib/pleroma/user/query.ex
index ab9554bd212a64639397073e98d4f4317f477569..ac807fc7927f5340cf37c9fbc83329b222e987c7 100644
(file)
--- a/
lib/pleroma/user/query.ex
+++ b/
lib/pleroma/user/query.ex
@@
-27,7
+27,7
@@
defmodule Pleroma.User.Query do
- e.g. Pleroma.User.Query.build(%{ap_id: ["http://ap_id1", "http://ap_id2"]})
"""
import Ecto.Query
- e.g. Pleroma.User.Query.build(%{ap_id: ["http://ap_id1", "http://ap_id2"]})
"""
import Ecto.Query
- import Pleroma.Web.
AdminAPI.Search
, only: [not_empty_string: 1]
+ import Pleroma.Web.
Utils.Guards
, only: [not_empty_string: 1]
alias Pleroma.FollowingRelationship
alias Pleroma.User
alias Pleroma.FollowingRelationship
alias Pleroma.User
@@
-137,8
+137,9
@@
defmodule Pleroma.User.Query do
defp compose_query({:external, _}, query), do: location_query(query, false)
defp compose_query({:active, _}, query) do
defp compose_query({:external, _}, query), do: location_query(query, false)
defp compose_query({:active, _}, query) do
- User.restrict_deactivated(query)
- |> where([u], u.approval_pending == false)
+ where(query, [u], u.is_active == true)
+ |> where([u], u.is_approved == true)
+ |> where([u], u.is_confirmed == true)
end
defp compose_query({:legacy_active, _}, query) do
end
defp compose_query({:legacy_active, _}, query) do
@@
-147,23
+148,23
@@
defmodule Pleroma.User.Query do
end
defp compose_query({:deactivated, false}, query) do
end
defp compose_query({:deactivated, false}, query) do
-
User.restrict_deactivated(query
)
+
where(query, [u], u.is_active == true
)
end
defp compose_query({:deactivated, true}, query) do
end
defp compose_query({:deactivated, true}, query) do
- where(query, [u], u.
deactivated == ^tru
e)
+ where(query, [u], u.
is_active == fals
e)
end
defp compose_query({:confirmation_pending, bool}, query) do
end
defp compose_query({:confirmation_pending, bool}, query) do
- where(query, [u], u.
confirmation_pending =
= ^bool)
+ where(query, [u], u.
is_confirmed !
= ^bool)
end
defp compose_query({:need_approval, _}, query) do
end
defp compose_query({:need_approval, _}, query) do
- where(query, [u], u.
approval_pending
)
+ where(query, [u], u.
is_approved == false
)
end
defp compose_query({:unconfirmed, _}, query) do
end
defp compose_query({:unconfirmed, _}, query) do
- where(query, [u], u.
confirmation_pending
)
+ where(query, [u], u.
is_confirmed == false
)
end
defp compose_query({:followers, %User{id: id}}, query) do
end
defp compose_query({:followers, %User{id: id}}, query) do