|
|
@@ -169,8 +169,8 @@ defmodule Pleroma.User do |
|
|
|
end |
|
|
|
|
|
|
|
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_config Application.get_env(:pleroma, :user) |
|
|
|
deny_follow_blocked Keyword.get(user_config, :deny_follow_blocked) |
|
|
|
|
|
|
|
user_info = user_info(followed) |
|
|
|
|
|
|
@@ -181,7 +181,7 @@ defmodule Pleroma.User do |
|
|
|
false |
|
|
|
|
|
|
|
# if the users are blocking each other, we shouldn't even be here, but check for it anyway |
|
|
|
@deny_follow_blocked and |
|
|
|
deny_follow_blocked and |
|
|
|
(User.blocks?(follower, followed) or User.blocks?(followed, follower)) -> |
|
|
|
false |
|
|
|
|
|
|
@@ -210,8 +210,8 @@ defmodule Pleroma.User do |
|
|
|
end |
|
|
|
|
|
|
|
def 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_config Application.get_env(:pleroma, :user) |
|
|
|
deny_follow_blocked Keyword.get(user_config, :deny_follow_blocked) |
|
|
|
|
|
|
|
ap_followers = followed.follower_address |
|
|
|
|
|
|
@@ -219,7 +219,7 @@ defmodule Pleroma.User do |
|
|
|
following?(follower, followed) or info["deactivated"] -> |
|
|
|
{:error, "Could not follow user: #{followed.nickname} is already on your list."} |
|
|
|
|
|
|
|
@deny_follow_blocked and blocks?(followed, follower) -> |
|
|
|
deny_follow_blocked and blocks?(followed, follower) -> |
|
|
|
{:error, "Could not follow user: #{followed.nickname} blocked you."} |
|
|
|
|
|
|
|
true -> |
|
|
|