Merge remote-tracking branch 'pleroma/develop' into remote-deletions

[akkoma] / lib / pleroma / web / activity_pub / mrf / follow_bot_policy.ex

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 52ac9aef715d2a0bdce79e7bf8d543a579ae1831..7cf7de06834d015b3471e744c07d225edd544729 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
@@ -1,21 +1,23 @@
 defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
-  @behaviour Pleroma.Web.ActivityPub.MRF
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
   alias Pleroma.Config
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
+
   require Logger
 
   @impl true
   def filter(message) do
     with follower_nickname <- Config.get([:mrf_follow_bot, :follower_nickname]),
-         %User{} = follower <- User.get_cached_by_nickname(follower_nickname),
+         %User{actor_type: "Service"} = follower <-
+           User.get_cached_by_nickname(follower_nickname),
          %{"type" => "Create", "object" => %{"type" => "Note"}} <- message do
       try_follow(follower, message)
     else
       nil ->
         Logger.warn(
-          "#{__MODULE__} skipped because of missing :mrf_follow_bot, :follower_nickname configuration or the account
-            does not exist."
+          "#{__MODULE__} skipped because of missing `:mrf_follow_bot, :follower_nickname` configuration, the :follower_nickname
+            account does not exist, or the account is not correctly configured as a bot."
         )
 
         {:ok, message}
@@ -26,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}