diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-26 16:59:46 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-26 16:59:46 +0000 |
commit | 09478c9cf713eefdfdf585f0196efdf00b9c0baf (patch) | |
tree | 4c4ae81b1eea4e0ed33702b0e47d15cf8d91b629 /lib | |
parent | 6db9f7cdb3adeda547b6e3e9ca887b685344351a (diff) | |
parent | 04abee782b8745b21d0f9e58b27a805db6a94aa7 (diff) | |
download | pleroma-09478c9cf713eefdfdf585f0196efdf00b9c0baf.tar.gz pleroma-09478c9cf713eefdfdf585f0196efdf00b9c0baf.zip |
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users.
Closes #1258
See merge request pleroma/pleroma!2686
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex b/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex index 9e7800997..a7e187b5e 100644 --- a/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex @@ -27,11 +27,14 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy do @impl true def filter(%{"type" => "Create", "actor" => actor, "object" => object} = message) do - with {:ok, %User{} = u} <- User.get_or_fetch_by_ap_id(actor), + with {:ok, %User{local: false} = u} <- User.get_or_fetch_by_ap_id(actor), {:contains_links, true} <- {:contains_links, contains_links?(object)}, {:old_user, true} <- {:old_user, old_user?(u)} do {:ok, message} else + {:ok, %User{local: true}} -> + {:ok, message} + {:contains_links, false} -> {:ok, message} |