summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-08 12:09:31 -0500
committerMark Felder <feld@feld.me>2021-03-30 11:10:03 -0500
commitfba770b3ea861d0fdf7811b61a297278a617136b (patch)
treed5ed07236bd25eecf9671b07245c835de05938aa
parent8b81d6222773180c9632b7b53ebe7f5ee19f4f65 (diff)
Try to handle misconfiguration scenarios gracefully
-rw-r--r--lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex59
1 files changed, 37 insertions, 22 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 fb123dbd3..52ac9aef7 100644
--- a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
@@ -1,34 +1,49 @@
defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
@behaviour Pleroma.Web.ActivityPub.MRF
+ alias Pleroma.Config
alias Pleroma.User
alias Pleroma.Web.CommonAPI
require Logger
@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),
+ %{"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."
+ )
+
+ {:ok, message}
+
+ _ ->
+ {:ok, message}
+ end
+ end
+
+ defp try_follow(follower, message) do
Task.start(fn ->
- follower_nickname = Pleroma.Config.get([:mrf_follow_bot, :follower_nickname])
-
- with %User{} = follower <- User.get_cached_by_nickname(follower_nickname),
- %{"type" => "Create", "object" => %{"type" => "Note"}} <- message do
- to = Map.get(message, "to", [])
- cc = Map.get(message, "cc", [])
- actor = [message["actor"]]
-
- Enum.concat([to, cc, actor])
- |> List.flatten()
- |> User.get_all_by_ap_id()
- |> Enum.each(fn user ->
- Logger.info("Checking if #{user.nickname} can be followed")
-
- with false <- User.following?(follower, user),
- false <- user.locked,
- false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot") do
- Logger.info("Following #{user.nickname}")
- CommonAPI.follow(follower, user)
- end
- end)
- end
+ to = Map.get(message, "to", [])
+ cc = Map.get(message, "cc", [])
+ actor = [message["actor"]]
+
+ Enum.concat([to, cc, actor])
+ |> List.flatten()
+ |> User.get_all_by_ap_id()
+ |> Enum.each(fn user ->
+ Logger.info("Checking if #{user.nickname} can be followed")
+
+ with false <- User.following?(follower, user),
+ false <- user.locked,
+ false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot") do
+ Logger.info("Following #{user.nickname}")
+ CommonAPI.follow(follower, user)
+ end
+ end)
end)
{:ok, message}