summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2021-02-19 09:47:25 -0600
committerMark Felder <feld@feld.me>2021-03-30 11:10:43 -0500
commit3949cfdc249bb508c1171851fa2ec076126003cc (patch)
tree9a372a792fab1bc7a311bb97fd97061e455cf4d0
parent2689463c7e8e99f25964072360b4c6955b7fcea0 (diff)
Make the followbot only dispatch follow requests once per 30 day period
-rw-r--r--lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex27
1 files changed, 23 insertions, 4 deletions
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..044febe0c 100644
--- a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
@@ -1,10 +1,14 @@
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
+
@impl true
def filter(message) do
with follower_nickname <- Config.get([:mrf_follow_bot, :follower_nickname]),
@@ -36,12 +40,13 @@ defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
|> List.flatten()
|> User.get_all_by_ap_id()
|> Enum.each(fn user ->
- Logger.info("Checking if #{user.nickname} can be followed")
+ since_thirty_days_ago = NaiveDateTime.utc_now() |> NaiveDateTime.add(-(86_400 * 30))
with false <- User.following?(follower, user),
- false <- user.locked,
- false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot") do
- Logger.info("Following #{user.nickname}")
+ 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)
@@ -50,6 +55,20 @@ defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
{: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' = 'pending'", a.data))
+ |> where([a], a.actor == ^follower_id)
+ |> Repo.exists?()
+ end
+
@impl true
def describe do
{:ok, %{}}