pleroma

commit: 704eef3c2d29c92316f4860c50982512824dd514
parent e759579f9749ac4198054ddab2d3bb77cc5f04ae
Author: Mark Felder <feld@feld.me>
Date:   Wed, 20 Jan 2021 11:14:15 -0600

Special handling for unconfirmed users based on instance config no longer needed.

Diffstat:
M
lib/pleroma/user.ex
10
+---------

1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -289,15 +289,7 @@ defmodule Pleroma.User do
   def account_status(%User{deactivated: true}), do: :deactivated
   def account_status(%User{password_reset_pending: true}), do: :password_reset_pending
   def account_status(%User{local: true, is_approved: false}), do: :approval_pending
-
-  def account_status(%User{local: true, is_confirmed: false}) do
-    if Config.get([:instance, :account_activation_required]) do
-      :confirmation_pending
-    else
-      :active
-    end
-  end
-
+  def account_status(%User{local: true, is_confirmed: false}), do: :confirmation_pending
   def account_status(%User{}), do: :active
 
   @spec visible_for(User.t(), User.t() | nil) ::