From: William Pitcock <nenolod@dereferenced.org>
Date: Wed, 9 Jan 2019 04:46:03 +0000 (+0000)
Subject: user: use pattern matching to determine if user is local or remote instead of the... 
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=595a970493a9bae0dcc4b84de338766c2cc61a75;p=akkoma

user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
---

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) ||