aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user.ex10
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