projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'
[akkoma]
/
lib
/
pleroma
/
plugs
/
user_enabled_plug.ex
diff --git
a/lib/pleroma/plugs/user_enabled_plug.ex
b/lib/pleroma/plugs/user_enabled_plug.ex
index 9c32858969876bb675bde138d20104b19dece3c2..23e800a74740c6c3ccee0d130400857522985ba4 100644
(file)
--- a/
lib/pleroma/plugs/user_enabled_plug.ex
+++ b/
lib/pleroma/plugs/user_enabled_plug.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Plugs.UserEnabledPlug do
import Plug.Conn
alias Pleroma.User
defmodule Pleroma.Plugs.UserEnabledPlug do
import Plug.Conn
alias Pleroma.User
@@
-6,9
+10,11
@@
defmodule Pleroma.Plugs.UserEnabledPlug do
options
end
options
end
- def call(%{assigns: %{user: %User{info: %{"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
end
def call(conn, _) do