From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 23 Sep 2020 16:56:22 +0000 (-0500)
Subject: Merge branch 'develop' into feature/bulk-confirmation
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f;p=akkoma

Merge branch 'develop' into feature/bulk-confirmation
---

f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f
diff --cc lib/pleroma/user/query.ex
index 64bb24c0e,193b90d9d..2440bf890
--- a/lib/pleroma/user/query.ex
+++ b/lib/pleroma/user/query.ex
@@@ -145,13 -146,8 +146,12 @@@ defmodule Pleroma.User.Query d
  
    defp compose_query({:deactivated, true}, query) do
      where(query, [u], u.deactivated == ^true)
-     |> where([u], not is_nil(u.nickname))
    end
  
 +  defp compose_query({:confirmation_pending, bool}, query) do
 +    where(query, [u], u.confirmation_pending == ^bool)
 +  end
 +
    defp compose_query({:need_approval, _}, query) do
      where(query, [u], u.approval_pending)
    end