X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Ffollow_bot_policy.ex;h=7307c9c142c5fe8b16b8c7418918356faeeba2af;hb=e7ac15905e04ba33b0dd0ed32ab42cdea5dab8f9;hp=fb123dbd3c4bb1a815c878d4baf717ce75a1ebda;hpb=8b81d6222773180c9632b7b53ebe7f5ee19f4f65;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 fb123dbd3..7307c9c14 100644
--- a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
@@ -1,33 +1,51 @@
 defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
   @behaviour Pleroma.Web.ActivityPub.MRF
+  alias Pleroma.Config
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
+
   require Logger
 
   @impl true
   def filter(message) do
-    Task.start(fn ->
-      follower_nickname = Pleroma.Config.get([:mrf_follow_bot, :follower_nickname])
-
-      with %User{} = follower <- User.get_cached_by_nickname(follower_nickname),
-           %{"type" => "Create", "object" => %{"type" => "Note"}} <- message do
-        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)
+    with follower_nickname <- Config.get([:mrf_follow_bot, :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, the :follower_nickname
+            account does not exist, or the account is not correctly configured as a bot."
+        )
+
+        {:ok, message}
+
+      _ ->
+        {:ok, message}
+    end
+  end
+
+  defp try_follow(follower, message) do
+    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)