X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Fanti_link_spam_policy.ex;h=9e78009975e8cda92ee599ac83b81e542c436632;hb=5b74976c8d8b00b66ba8c5dff9e83fbe357b0ee7;hp=14e5955ee17b37d985437dc1a5cea4477eb2893e;hpb=21dacd4b15f92726f8a26fb4ec7b06b7f98d97f1;p=akkoma

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 14e5955ee..9e7800997 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
@@ -1,20 +1,23 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 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
-    u.info.note_count > 0 || u.info.follower_count > 0
+  defp old_user?(%User{} = u) do
+    u.note_count > 0 || u.follower_count > 0
   end
 
   # does the post contain links?
   defp contains_links?(%{"content" => content} = _object) do
     content
+    |> Floki.parse_fragment!()
     |> Floki.filter_out("a.mention,a.hashtag,a[rel~=\"tag\"],a.zrl")
     |> Floki.attribute("a", "href")
     |> length() > 0
@@ -22,16 +25,17 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy do
 
   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, _} ->
@@ -45,4 +49,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