projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1411
[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 79d6a9b993542269c0ec92c96e8d063789b6dc6e..8d102ee5b8d47207aa1e527c79f47866326f9b90 100644
(file)
--- 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
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.UserEnabledPlug do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.UserEnabledPlug do
@@
-10,9
+10,13
@@
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
+ if User.auth_active?(user) do
+ conn
+ else
+ conn
+ |> assign(:user, nil)
+ end
end
def call(conn, _) do
end
def call(conn, _) do