formatting

[akkoma] / lib / pleroma / user.ex

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index e4fb57308749173b211519280f7ed2bb52087b10..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,32 +197,40 @@ 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
 
-    if following?(follower, followed) or info["deactivated"] do
-      {:error, "Could not follow user: #{followed.nickname} is already on your list."}
-    else
-      if !followed.local && follower.local && !ap_enabled?(followed) do
-        Websub.subscribe(follower, followed)
-      end
+    cond do
+      following?(follower, followed) or info["deactivated"] ->
+        {:error, "Could not follow user: #{followed.nickname} is already on your list."}
 
-      following =
-        [ap_followers | follower.following]
-        |> Enum.uniq()
+      @deny_follow_blocked and blocks?(followed, follower) ->
+        {:error, "Could not follow user: #{followed.nickname} blocked you."}
 
-      follower =
-        follower
-        |> follow_changeset(%{following: following})
-        |> update_and_set_cache
+      true ->
+        if !followed.local && follower.local && !ap_enabled?(followed) do
+          Websub.subscribe(follower, followed)
+        end
 
-      {:ok, _} = update_follower_count(followed)
+        following =
+          [ap_followers | follower.following]
+          |> Enum.uniq()
 
-      follower
+        follower =
+          follower
+          |> follow_changeset(%{following: following})
+          |> update_and_set_cache
+
+        {:ok, _} = update_follower_count(followed)
+
+        follower
     end
   end