diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-19 20:04:19 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-19 20:04:19 +0000 |
| commit | 0ba3f1ffb28792c21809fa9a30fc03a7a52d9361 (patch) | |
| tree | 0b1a885f966c36e296d8d48048ddf25fc30b7a93 /lib/pleroma/user.ex | |
| parent | 36f4382b3367a889a191b124066fbbafab37d047 (diff) | |
| parent | 34206e4d7f2f5abe896882874e142374d987c44f (diff) | |
| download | pleroma-1.1.6.tar.gz | |
Merge branch 'release/1.1.6' into 'stable'v1.1.6
Release/1.1.6
See merge request pleroma/pleroma!1995
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index f0912fb10..f5d3245dc 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -70,6 +70,8 @@ defmodule Pleroma.User do def auth_active?(%User{info: %User.Info{confirmation_pending: true}}), do: !Pleroma.Config.get([:instance, :account_activation_required]) + def auth_active?(%User{info: %User.Info{deactivated: true}}), do: false + def auth_active?(%User{}), do: true def visible_for?(user, for_user \\ nil) |