From: Mark Felder <feld@feld.me>
Date: Wed, 20 Jan 2021 17:14:15 +0000 (-0600)
Subject: Special handling for unconfirmed users based on instance config no longer needed.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=704eef3c2d29c92316f4860c50982512824dd514;p=akkoma

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

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index d81abbd2b..2aeacf816 100644
--- 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) ::