diff options
author | William Pitcock <nenolod@dereferenced.org> | 2018-10-11 10:49:54 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2018-10-11 10:49:54 +0000 |
commit | 51eaece3ea68226f1780e37e46f25e74f3392782 (patch) | |
tree | 73a4ef5e0215fa3c10779adddc517911d270e0ba /lib | |
parent | ebc32045f0e2d0baa47fb45f9bd4e6c8e3507b5d (diff) | |
download | pleroma-51eaece3ea68226f1780e37e46f25e74f3392782.tar.gz |
user: break out local cases for maybe_direct_follow
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/user.ex | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 70726d399..db6f96daa 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -184,7 +184,15 @@ defmodule Pleroma.User do def needs_update?(_), do: true - def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do + def maybe_direct_follow(%User{} = follower, %User{local: true, info: %{"locked" => true}}) do + {:ok, follower} + end + + def maybe_direct_follow(%User{} = follower, %User{local: true} = followed) do + follow(follower, followed) + end + + def maybe_direct_follow(%User{} = follower, %User{} = followed) do if !User.ap_enabled?(followed) do follow(follower, followed) else |