X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=a3f6add28cb13f033ecba47fc604733a75155771;hb=6a79bb12c38bce6287b29c79c1ad3b7f9b967b69;hp=5ea2b518bc55c97c05b5eb730a7fa7e3f1472b6f;hpb=d0198fe215a7542ce506e40e1e4860a27ee2d01e;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 5ea2b518b..a3f6add28 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -873,10 +873,13 @@ defmodule Pleroma.User do
 
   def blocks?(%User{info: info} = _user, %{ap_id: ap_id}) do
     blocks = info.blocks
-    domain_blocks = info.domain_blocks
+
+    domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(info.domain_blocks)
+
     %{host: host} = URI.parse(ap_id)
 
-    Enum.member?(blocks, ap_id) || Enum.any?(domain_blocks, &(&1 == host))
+    Enum.member?(blocks, ap_id) ||
+      Pleroma.Web.ActivityPub.MRF.subdomain_match?(domain_blocks, host)
   end
 
   def subscribed_to?(user, %{ap_id: ap_id}) do