projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2689463
)
Make the followbot only dispatch follow requests once per 30 day period
author
Mark Felder
<feld@feld.me>
Fri, 19 Feb 2021 15:47:25 +0000
(09:47 -0600)
committer
Mark Felder
<feld@feld.me>
Tue, 30 Mar 2021 16:10:43 +0000
(11:10 -0500)
lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
patch
|
blob
|
history
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 d10b7b480190005b18c86c428673b8d3ce09732a..044febe0c0b107b5dc9ac38a87e99148e3502300 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,10
+1,14
@@
defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
@behaviour Pleroma.Web.ActivityPub.MRF
defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
@behaviour Pleroma.Web.ActivityPub.MRF
+ alias Pleroma.Activity.Queries
alias Pleroma.Config
alias Pleroma.Config
+ alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.CommonAPI
require Logger
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]),
@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 ->
|> 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),
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)
CommonAPI.follow(follower, user)
end
end)
@@
-50,6
+55,20
@@
defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
{:ok, message}
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' = 'pending'", a.data))
+ |> where([a], a.actor == ^follower_id)
+ |> Repo.exists?()
+ end
+
@impl true
def describe do
{:ok, %{}}
@impl true
def describe do
{:ok, %{}}