projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feat/chat-list-pagination' into 'develop'
[akkoma]
/
lib
/
pleroma
/
user
/
query.ex
diff --git
a/lib/pleroma/user/query.ex
b/lib/pleroma/user/query.ex
index 90548677f7f00725cd3103779c9857f686a2fced..fa46545dad167478f6705394e00145adeaf35fb8 100644
(file)
--- a/
lib/pleroma/user/query.ex
+++ b/
lib/pleroma/user/query.ex
@@
-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(query, [u], u.is_active == true
)
|> where([u], u.is_approved == 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,15
+148,15
@@
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
@@
-163,7
+164,7
@@
defmodule Pleroma.User.Query do
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