X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser%2Fquery.ex;h=fa46545dad167478f6705394e00145adeaf35fb8;hb=e7b1f0f5f4d9bb6f7eb384785bd2b0823059e086;hp=4076925aaa1853a73ee5ce1680c1c1a8e3595786;hpb=2905df841bb820c0016782483567beef68252f89;p=akkoma

diff --git a/lib/pleroma/user/query.ex b/lib/pleroma/user/query.ex
index 4076925aa..fa46545da 100644
--- a/lib/pleroma/user/query.ex
+++ b/lib/pleroma/user/query.ex
@@ -137,7 +137,7 @@ defmodule Pleroma.User.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_confirmed == true)
   end
@@ -148,11 +148,11 @@ defmodule Pleroma.User.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
-    where(query, [u], u.deactivated == ^true)
+    where(query, [u], u.is_active == false)
   end
 
   defp compose_query({:confirmation_pending, bool}, query) do