fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-25 02:19:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

user: only pre-create follow relationships on OStatus

Browse source 
closes #306
This commit is contained in:
William Pitcock 2018-10-05 22:53:59 +00:00
parent 614e47aa7c
commit 4f7a468659
1 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/pleroma/user.ex
View file

@ -185,32 +185,7 @@ defmodule Pleroma.User do
def needs_update?(_), do: true def needs_update?(_), do: true
def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do
user_config = Application.get_env(:pleroma, :user) if !User.ap_enabled?(followed) do
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 ->
false
# 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)) ->
false
# if OStatus, then there is no three-way handshake to follow
User.ap_enabled?(followed) != true ->
true
# if there are no other reasons not to, just pre-create the relationship
true ->
true
end
if should_direct_follow do
follow(follower, followed) follow(follower, followed)
else else
{:ok, follower} {:ok, follower}