Merge remote-tracking branch 'origin/develop' into reactions

[akkoma] / lib / pleroma / web / activity_pub / mrf / anti_link_spam_policy.ex

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 33ea61f5c6430ee82600fd8be4f73c1330607144..b90193ca03841f04c1cc3f8140056f7aec6a9f93 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
@@ -5,10 +5,12 @@
 defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy do
   alias Pleroma.User
 
+  @behaviour Pleroma.Web.ActivityPub.MRF
+
   require Logger
 
   # has the user successfully posted before?
-  defp user_has_posted_before?(%User{} = u) do
+  defp old_user?(%User{} = u) do
     u.info.note_count > 0 || u.info.follower_count > 0
   end
 
@@ -20,16 +22,19 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy do
     |> length() > 0
   end
 
+  defp contains_links?(_), do: false
+
+  @impl true
   def filter(%{"type" => "Create", "actor" => actor, "object" => object} = message) do
     with {:ok, %User{} = u} <- User.get_or_fetch_by_ap_id(actor),
          {:contains_links, true} <- {:contains_links, contains_links?(object)},
-         {:posted_before, true} <- {:posted_before, user_has_posted_before?(u)} do
+         {:old_user, true} <- {:old_user, old_user?(u)} do
       {:ok, message}
     else
       {:contains_links, false} ->
         {:ok, message}
 
-      {:posted_before, false} ->
+      {:old_user, false} ->
         {:reject, nil}
 
       {:error, _} ->
@@ -43,4 +48,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy do
 
   # in all other cases, pass through
   def filter(message), do: {:ok, message}
+
+  @impl true
+  def describe, do: {:ok, %{}}
 end