X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fuser_enabled_plug.ex;h=23e800a74740c6c3ccee0d130400857522985ba4;hb=6d688f14fa0e1f15893e39bcbff2ba0aac4b085c;hp=fbb4bf11575e41178bf0dcdfe55c05511f682567;hpb=1bd1f62af55e01613e6362661b36a19091c87424;p=akkoma

diff --git a/lib/pleroma/plugs/user_enabled_plug.ex b/lib/pleroma/plugs/user_enabled_plug.ex
index fbb4bf115..23e800a74 100644
--- a/lib/pleroma/plugs/user_enabled_plug.ex
+++ b/lib/pleroma/plugs/user_enabled_plug.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.UserEnabledPlug do
@@ -10,9 +10,11 @@ defmodule Pleroma.Plugs.UserEnabledPlug do
     options
   end
 
-  def call(%{assigns: %{user: %User{deactivated: true}}} = conn, _) do
-    conn
-    |> assign(:user, nil)
+  def call(%{assigns: %{user: %User{} = user}} = conn, _) do
+    case User.account_status(user) do
+      :active -> conn
+      _ -> assign(conn, :user, nil)
+    end
   end
 
   def call(conn, _) do