Change module name to FollowbotPolicy

This commit is contained in:
Mark Felder 2021-02-19 15:17:33 -06:00
parent 1926d0804b
commit 86182ef8e4

View File

@ -1,13 +1,11 @@
defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do defmodule Pleroma.Web.ActivityPub.MRF.FollowbotPolicy do
@behaviour Pleroma.Web.ActivityPub.MRF @behaviour Pleroma.Web.ActivityPub.MRF
alias Pleroma.Activity.Queries alias Pleroma.Activity
alias Pleroma.Config alias Pleroma.Config
alias Pleroma.Repo
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
require Logger
import Ecto.Query require Logger
@impl true @impl true
def filter(message) do def filter(message) do
@ -46,7 +44,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
with false <- User.following?(follower, user), with false <- User.following?(follower, user),
false <- User.locked?(user), false <- User.locked?(user),
false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot"), false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot"),
false <- outstanding_follow_request_since?(follower, user, since_thirty_days_ago) do false <-
Activity.follow_requests_outstanding_since?(follower, user, since_thirty_days_ago) do
Logger.info( Logger.info(
"#{__MODULE__}: Follow request from #{follower.nickname} to #{user.nickname}" "#{__MODULE__}: Follow request from #{follower.nickname} to #{user.nickname}"
) )
@ -59,20 +58,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
{:ok, message} {:ok, message}
end 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 @impl true
def describe do def describe do
{:ok, %{}} {:ok, %{}}