X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Ffollow_bot_policy.ex;h=7307c9c142c5fe8b16b8c7418918356faeeba2af;hb=da1ee5c46ac4296232ac5cd43f4357136608af48;hp=d10b7b480190005b18c86c428673b8d3ce09732a;hpb=e78738173aefd512bbce33c12b4ee3372bdc904b;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
index d10b7b480..7307c9c14 100644
--- a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
@@ -3,6 +3,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
   alias Pleroma.Config
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
+
   require Logger
 
   @impl true
@@ -27,24 +28,25 @@ defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
   end
 
   defp try_follow(follower, message) do
-    Task.start(fn ->
-      to = Map.get(message, "to", [])
-      cc = Map.get(message, "cc", [])
-      actor = [message["actor"]]
-
-      Enum.concat([to, cc, actor])
-      |> List.flatten()
-      |> User.get_all_by_ap_id()
-      |> Enum.each(fn user ->
-        Logger.info("Checking if #{user.nickname} can be followed")
-
-        with false <- User.following?(follower, user),
-             false <- user.locked,
-             false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot") do
-          Logger.info("Following #{user.nickname}")
-          CommonAPI.follow(follower, user)
-        end
-      end)
+    to = Map.get(message, "to", [])
+    cc = Map.get(message, "cc", [])
+    actor = [message["actor"]]
+
+    Enum.concat([to, cc, actor])
+    |> List.flatten()
+    |> Enum.uniq()
+    |> User.get_all_by_ap_id()
+    |> Enum.each(fn user ->
+      with false <- user.local,
+           false <- User.following?(follower, user),
+           false <- User.locked?(user),
+           false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot") do
+        Logger.debug(
+          "#{__MODULE__}: Follow request from #{follower.nickname} to #{user.nickname}"
+        )
+
+        CommonAPI.follow(follower, user)
+      end
     end)
 
     {:ok, message}