Move maybe_add_content_map out of Transmogrifier, use code from tusooa's branch for MapOfString

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

test/pleroma/ecto_type/activity_pub/object_validators/map_of_string_test.exs

@@ -0,0 +1,55 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.EctoType.ActivityPub.ObjectValidators.MapOfStringTest do
+  alias Pleroma.EctoType.ActivityPub.ObjectValidators.MapOfString
+  use Pleroma.DataCase, async: true
+
+  test "it validates" do
+    data = %{
+      "en-US" => "mew mew",
+      "en-GB" => "meow meow"
+    }
+
+    assert {:ok, ^data} = MapOfString.cast(data)
+  end
+
+  test "it validates empty strings" do
+    data = %{
+      "en-US" => "mew mew",
+      "en-GB" => ""
+    }
+
+    assert {:ok, ^data} = MapOfString.cast(data)
+  end
+
+  test "it ignores non-strings within the map" do
+    data = %{
+      "en-US" => "mew mew",
+      "en-GB" => 123
+    }
+
+    assert {:ok, validated_data} = MapOfString.cast(data)
+
+    assert validated_data == %{"en-US" => "mew mew"}
+  end
+
+  test "it ignores bad locale codes" do
+    data = %{
+      "en-US" => "mew mew",
+      "en_GB" => "meow meow",
+      "en<<#@!$#!@%!GB" => "meow meow"
+    }
+
+    assert {:ok, validated_data} = MapOfString.cast(data)
+
+    assert validated_data == %{"en-US" => "mew mew"}
+  end
+
+  test "it complains with non-map data" do
+    assert :error = MapOfString.cast("mew")
+    assert :error = MapOfString.cast(["mew"])
+    assert :error = MapOfString.cast([%{"en-US" => "mew"}])
+  end
+end

test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs

@@ -116,4 +116,74 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest
 
     %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
   end
+
+  describe "Note language" do
+    test "it detects language from context" do
+      user = insert(:user)
+
+      note_activity = %{
+        "@context" => ["https://www.w3.org/ns/activitystreams", %{"@language" => "pl"}],
+        "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+        "cc" => [],
+        "type" => "Create",
+        "object" => %{
+          "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+          "cc" => [],
+          "id" => Utils.generate_object_id(),
+          "type" => "Note",
+          "content" => "Szczęść Boże",
+          "attributedTo" => user.ap_id
+        },
+        "actor" => user.ap_id
+      }
+
+      {:ok, object} =
+        ArticleNotePageValidator.cast_and_apply(note_activity["object"],
+          activity_data: note_activity
+        )
+
+      assert object.language == "pl"
+    end
+
+    test "it detects language from contentMap" do
+      user = insert(:user)
+
+      note = %{
+        "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+        "cc" => [],
+        "id" => Utils.generate_object_id(),
+        "type" => "Note",
+        "content" => "Szczęść Boże",
+        "contentMap" => %{
+          "de" => "Gott segne",
+          "pl" => "Szczęść Boże"
+        },
+        "attributedTo" => user.ap_id
+      }
+
+      {:ok, object} = ArticleNotePageValidator.cast_and_apply(note)
+
+      assert object.language == "pl"
+    end
+
+    test "it adds contentMap if language is specified" do
+      user = insert(:user)
+
+      note = %{
+        "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+        "cc" => [],
+        "id" => Utils.generate_object_id(),
+        "type" => "Note",
+        "content" => "тест",
+        "language" => "uk",
+        "attributedTo" => user.ap_id
+      }
+
+      {:ok, object} = ArticleNotePageValidator.cast_and_apply(note)
+
+      assert object.contentMap == %{
+               "uk" => "тест"
+             }
+    end
+  end
 end

test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs

@@ -388,60 +388,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.NoteHandlingTest do
     end
   end
 
-  test "it detects language from context" do
-    user = insert(:user)
-
-    message = %{
-      "@context" => ["https://www.w3.org/ns/activitystreams", %{"@language" => "pl"}],
-      "to" => ["https://www.w3.org/ns/activitystreams#Public"],
-      "cc" => [],
-      "type" => "Create",
-      "object" => %{
-        "to" => ["https://www.w3.org/ns/activitystreams#Public"],
-        "cc" => [],
-        "id" => Utils.generate_object_id(),
-        "type" => "Note",
-        "content" => "Szczęść Boże",
-        "attributedTo" => user.ap_id
-      },
-      "actor" => user.ap_id
-    }
-
-    {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(message)
-    object = Object.normalize(data["object"], fetch: false)
-
-    assert object.data["language"] == "pl"
-  end
-
-  test "it detects language from contentMap" do
-    user = insert(:user)
-
-    message = %{
-      "@context" => "https://www.w3.org/ns/activitystreams",
-      "to" => ["https://www.w3.org/ns/activitystreams#Public"],
-      "cc" => [],
-      "type" => "Create",
-      "object" => %{
-        "to" => ["https://www.w3.org/ns/activitystreams#Public"],
-        "cc" => [],
-        "id" => Utils.generate_object_id(),
-        "type" => "Note",
-        "content" => "Szczęść Boże",
-        "contentMap" => %{
-          "de" => "Gott segne",
-          "pl" => "Szczęść Boże"
-        },
-        "attributedTo" => user.ap_id
-      },
-      "actor" => user.ap_id
-    }
-
-    {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(message)
-    object = Object.normalize(data["object"], fetch: false)
-
-    assert object.data["language"] == "pl"
-  end
-
   describe "`handle_incoming/2`, Mastodon format `replies` handling" do
     setup do: clear_config([:activitypub, :note_replies_output_limit], 5)
     setup do: clear_config([:instance, :federation_incoming_replies_max_depth])