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

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index c91fbb68a..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
@@ -1211,7 +1214,7 @@ defmodule Pleroma.User do
     data
     |> Map.put(:name, blank?(data[:name]) || data[:nickname])
     |> remote_user_creation()
-    |> Repo.insert(on_conflict: :replace_all, conflict_target: :nickname)
+    |> Repo.insert(on_conflict: :replace_all_except_primary_key, conflict_target: :nickname)
     |> set_cache()
   end