formatting

[akkoma] / lib / pleroma / user.ex

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 75e173d0c8eead31074fff12d19a21f901506dce..dd645b2e5a54ca5dc8123bf3a9625d362da79e36 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -168,17 +168,21 @@ defmodule Pleroma.User do
     end
   end
 
+  @user_config Application.get_env(:pleroma, :user)
+  @deny_follow_blocked Keyword.get(@user_config, :deny_follow_blocked)
+
   def maybe_direct_follow(%User{} = follower, %User{info: info} = followed) do
     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 ->
+        user_info[:locked] == true ->
           false
 
         # if the users are blocking each other, we shouldn't even be here, but check for it anyway
-        User.blocks?(follower, followed) == true or User.blocks?(followed, follower) == true ->
+        @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
@@ -193,10 +197,13 @@ defmodule Pleroma.User do
     if should_direct_follow do
       follow(follower, followed)
     else
-      follower
+      {:ok, follower}
     end
   end
 
+  @user_config Application.get_env(:pleroma, :user)
+  @deny_follow_blocked Keyword.get(@user_config, :deny_follow_blocked)
+
   def follow(%User{} = follower, %User{info: info} = followed) do
     ap_followers = followed.follower_address
 
@@ -204,7 +211,7 @@ defmodule Pleroma.User do
       following?(follower, followed) or info["deactivated"] ->
         {:error, "Could not follow user: #{followed.nickname} is already on your list."}
 
-      blocks?(followed, follower) ->
+      @deny_follow_blocked and blocks?(followed, follower) ->
         {:error, "Could not follow user: #{followed.nickname} blocked you."}
 
       true ->