Merge pull request 'Allow attaching emojis to user lists' (#7929) from mkljczk/pleroma:list-emoji into develop

Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7929

test/pleroma/list_test.exs

@@ -23,6 +23,29 @@ defmodule Pleroma.ListTest do
     assert changeset.errors == [title: {"can't be blank", [validation: :required]}]
   end
 
+  test "creating a list with an emoji" do
+    user = insert(:user)
+    {:ok, %Pleroma.List{} = list} = Pleroma.List.create(%{title: "title", emoji: "🕓"}, user)
+    %Pleroma.List{emoji: emoji} = Pleroma.List.get(list.id, user)
+    assert emoji == "🕓"
+  end
+
+  test "validates emoji" do
+    user = insert(:user)
+
+    assert {:error, changeset} =
+             Pleroma.List.create(%{title: "title", emoji: "not an emoji"}, user)
+
+    assert changeset.errors == [emoji: {"Invalid emoji", []}]
+  end
+
+  test "updating a list's emoji" do
+    user = insert(:user)
+    {:ok, list} = Pleroma.List.create(%{title: "title"}, user)
+    {:ok, %{emoji: emoji}} = Pleroma.List.update(list, %{emoji: "🕓"})
+    assert "🕓" == emoji
+  end
+
   test "getting a list not belonging to the user" do
     user = insert(:user)
     other_user = insert(:user)

test/pleroma/web/mastodon_api/controllers/list_controller_test.exs

@@ -19,6 +19,16 @@ defmodule Pleroma.Web.MastodonAPI.ListControllerTest do
              |> json_response_and_validate_schema(:ok)
   end
 
+  test "creating a list with an emoji" do
+    %{conn: conn} = oauth_access(["write:lists"])
+
+    assert %{"title" => "cuties", "pleroma" => %{"emoji" => "🕓", "emoji_url" => nil}} =
+             conn
+             |> put_req_header("content-type", "application/json")
+             |> post("/api/v1/lists", %{"title" => "cuties", "emoji" => "🕓"})
+             |> json_response_and_validate_schema(:ok)
+  end
+
   test "renders error for invalid params" do
     %{conn: conn} = oauth_access(["write:lists"])
 
@@ -31,6 +41,18 @@ defmodule Pleroma.Web.MastodonAPI.ListControllerTest do
              json_response_and_validate_schema(conn, 400)
   end
 
+  test "renders error for an invalid emoji" do
+    %{conn: conn} = oauth_access(["write:lists"])
+
+    conn =
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> post("/api/v1/lists", %{"title" => "cuties", "emoji" => "not an emoji"})
+
+    assert %{"error" => "Invalid emoji"} =
+             json_response_and_validate_schema(conn, :unprocessable_entity)
+  end
+
   test "listing a user's lists" do
     %{conn: conn} = oauth_access(["read:lists", "write:lists"])
 
@@ -159,6 +181,17 @@ defmodule Pleroma.Web.MastodonAPI.ListControllerTest do
              |> json_response_and_validate_schema(:ok)
   end
 
+  test "updating a list's emoji" do
+    %{user: user, conn: conn} = oauth_access(["write:lists"])
+    {:ok, list} = Pleroma.List.create(%{title: "name"}, user)
+
+    assert %{"pleroma" => %{"emoji" => "🕓", "emoji_url" => nil}} =
+             conn
+             |> put_req_header("content-type", "application/json")
+             |> put("/api/v1/lists/#{list.id}", %{"title" => "name", "emoji" => "🕓"})
+             |> json_response_and_validate_schema(:ok)
+  end
+
   test "validates title when renaming a list" do
     %{user: user, conn: conn} = oauth_access(["write:lists"])
     {:ok, list} = Pleroma.List.create(%{title: "name"}, user)

test/pleroma/web/mastodon_api/views/list_view_test.exs

@@ -15,12 +15,28 @@ defmodule Pleroma.Web.MastodonAPI.ListViewTest do
     expected = %{
       id: to_string(list.id),
       title: title,
-      exclusive: false
+      exclusive: false,
+      pleroma: %{
+        emoji: nil,
+        emoji_url: nil
+      }
     }
 
     assert expected == ListView.render("show.json", %{list: list})
   end
 
+  test "show with a unicode emoji" do
+    user = insert(:user)
+    {:ok, list} = Pleroma.List.create(%{title: "mortal enemies", emoji: "🕓"}, user)
+
+    assert %{
+             pleroma: %{
+               emoji: "🕓",
+               emoji_url: nil
+             }
+           } = ListView.render("show.json", %{list: list})
+  end
+
   test "index" do
     user = insert(:user)