Commit 4f7a4686 authored by kaniini's avatar kaniini
Browse files

user: only pre-create follow relationships on OStatus

closes #306
parent 614e47aa
......@@ -185,32 +185,7 @@ def needs_update?(%User{local: false} = user) do
def needs_update?(_), do: true
def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do
user_config = Application.get_env(:pleroma, :user)
deny_follow_blocked = Keyword.get(user_config, :deny_follow_blocked)
user_info = user_info(followed)
should_direct_follow =
cond do
# if the account is locked, don't pre-create the relationship
user_info[:locked] == true ->
# if the users are blocking each other, we shouldn't even be here, but check for it anyway
deny_follow_blocked and
(User.blocks?(follower, followed) or User.blocks?(followed, follower)) ->
# if OStatus, then there is no three-way handshake to follow
User.ap_enabled?(followed) != true ->
# if there are no other reasons not to, just pre-create the relationship
true ->
if should_direct_follow do
if !User.ap_enabled?(followed) do
follow(follower, followed)
{:ok, follower}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment