CommonValidations: More refactors.

lib/pleroma/web/activity_pub/object_validators/common_validations.ex

@@ -84,20 +84,7 @@ def validate_object_or_user_presence(cng, options \\ []) do
   end
 
   def validate_host_match(cng, fields \\ [:id, :actor]) do
-    unique_hosts =
+    if same_domain?(cng, fields) do
-      fields
-      |> Enum.map(fn field ->
-        %URI{host: host} =
-          cng
-          |> get_field(field)
-          |> URI.parse()
-
-        host
-      end)
-      |> Enum.uniq()
-      |> Enum.count()
-
-    if unique_hosts == 1 do
       cng
     else
       fields
@@ -109,13 +96,7 @@ def validate_host_match(cng, fields \\ [:id, :actor]) do
   end
 
   def validate_fields_match(cng, fields) do
-    unique_fields =
+    if map_unique?(cng, fields) do
-      fields
-      |> Enum.map(fn field -> get_field(cng, field) end)
-      |> Enum.uniq()
-      |> Enum.count()
-
-    if unique_fields == 1 do
       cng
     else
       fields
@@ -126,21 +107,23 @@ def validate_fields_match(cng, fields) do
     end
   end
 
-  def same_domain?(cng, fields \\ [:actor, :object]) do
+  defp map_unique?(cng, fields, func \\ & &1) do
-    unique_domains =
+    Enum.reduce_while(fields, nil, fn field, acc ->
-      fields
+      value =
-      |> Enum.map(fn field ->
-        %URI{host: host} =
         cng
         |> get_field(field)
-          |> URI.parse()
+        |> func.()
 
-        host
+      case {value, acc} do
+        {value, nil} -> {:cont, value}
+        {value, value} -> {:cont, value}
+        _ -> {:halt, false}
+      end
     end)
-      |> Enum.uniq()
+  end
-      |> Enum.count()
 
-    unique_domains == 1
+  def same_domain?(cng, fields \\ [:actor, :object]) do
+    map_unique?(cng, fields, fn value -> URI.parse(value).host end)
   end
 
   # This figures out if a user is able to create, delete or modify something