summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-08 12:41:01 -0500
committerMark Felder <feld@feld.me>2021-03-30 11:10:43 -0500
commite78738173aefd512bbce33c12b4ee3372bdc904b (patch)
treed6068b82e42f6568b7e2b3649b2a891a1b657721
parent840dc4b44ba3ea2613b1a8dc110a9008ffc618c3 (diff)
Enforce that the followbot must be marked as a bot.
-rw-r--r--lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex7
1 files changed, 4 insertions, 3 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 52ac9aef7..d10b7b480 100644
--- a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
@@ -8,14 +8,15 @@ defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
@impl true
def filter(message) do
with follower_nickname <- Config.get([:mrf_follow_bot, :follower_nickname]),
- %User{} = follower <- User.get_cached_by_nickname(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 or the account
- does not exist."
+ "#{__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}