Merge branch 'fix-bot-policy' into 'develop'

ForceBotUnlistedPolicy: fix to stop unlisting my posts >:(

See merge request pleroma/pleroma!3623
This commit is contained in:
Alex Gleason 2022-01-26 23:25:58 +00:00
commit 2bab9dd175

View File

@ -10,7 +10,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy do
require Pleroma.Constants require Pleroma.Constants
defp check_by_actor_type(user), do: user.actor_type in ["Application", "Service"] defp check_by_actor_type(user), do: user.actor_type in ["Application", "Service"]
defp check_by_nickname(user), do: Regex.match?(~r/bot@|ebooks@/i, user.nickname) defp check_by_nickname(user), do: Regex.match?(~r/.bot@|ebooks@/i, user.nickname)
defp check_if_bot(user), do: check_by_actor_type(user) or check_by_nickname(user) defp check_if_bot(user), do: check_by_actor_type(user) or check_by_nickname(user)