X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Ffollow_bot_policy.ex;h=7307c9c142c5fe8b16b8c7418918356faeeba2af;hb=75b94a2f352ea255b0785d0f3ba2c849c8355e04;hp=c7aaa6386ecddd83ac26ba99718db44ba147342f;hpb=a176914c73456eea7926235eb48e342ac1ab112d;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 c7aaa6386..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,13 +1,10 @@
 defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
   @behaviour Pleroma.Web.ActivityPub.MRF
-  alias Pleroma.Activity.Queries
   alias Pleroma.Config
-  alias Pleroma.Repo
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
-  require Logger
 
-  import Ecto.Query
+  require Logger
 
   @impl true
   def filter(message) do
@@ -31,45 +28,30 @@ 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()
-      |> Enum.uniq()
-      |> User.get_all_by_ap_id()
-      |> Enum.each(fn user ->
-        since_thirty_days_ago = NaiveDateTime.utc_now() |> NaiveDateTime.add(-(86_400 * 30))
+    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}"
+        )
 
-        with false <- User.following?(follower, user),
-             false <- User.locked?(user),
-             false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot"),
-             false <- outstanding_follow_request_since?(follower, user, since_thirty_days_ago) do
-          Logger.info("#{__MODULE__}: Follow request from #{follower.nickname} to #{user.nickname}")
-          CommonAPI.follow(follower, user)
-        end
-      end)
+        CommonAPI.follow(follower, user)
+      end
     end)
 
     {:ok, message}
   end
 
-  defp outstanding_follow_request_since?(
-         %User{ap_id: follower_id},
-         %User{ap_id: followee_id},
-         since_datetime
-       ) do
-    followee_id
-    |> Queries.by_object_id()
-    |> Queries.by_type("Follow")
-    |> where([a], a.inserted_at > ^since_datetime)
-    |> where([a], fragment("? ->> 'state' != 'accept'", a.data))
-    |> where([a], a.actor == ^follower_id)
-    |> Repo.exists?()
-  end
-
   @impl true
   def describe do
     {:ok, %{}}