aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-01-09 04:46:03 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-01-09 06:02:18 +0000
commit595a970493a9bae0dcc4b84de338766c2cc61a75 (patch)
tree7eb87c1f32dc184161bc1824aacbf1fdfb3f5fb0 /lib
parent4e5b1560479df7dd553a2132186f9701e1d56871 (diff)
downloadpleroma-595a970493a9bae0dcc4b84de338766c2cc61a75.tar.gz
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 85d0f9fce..ce909601d 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -49,7 +49,8 @@ defmodule Pleroma.User do
!Pleroma.Config.get([:instance, :account_activation_required])
end
- def remote_or_auth_active?(%User{} = user), do: !user.local || auth_active?(user)
+ def remote_or_auth_active?(%User{local: false}), do: true
+ def remote_or_auth_active?(%User{local: true} = user), do: auth_active?(user)
def visible_for?(%User{} = user, for_user \\ nil) do
User.remote_or_auth_active?(user) || (for_user && for_user.id == user.id) ||