Merge branch 'feature/twitter_api/fields' into 'develop'

[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"

See merge request pleroma/pleroma!360

1 files changed, 34 insertions, 4 deletions

diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs
index 50687f450..2deb22fb1 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -88,7 +88,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "is_local" => true,
       "locked" => false,
       "default_scope" => "public",
-      "no_rich_text" => false
+      "no_rich_text" => false,
+      "fields" => []
     }
 
     assert represented == UserView.render("show.json", %{user: user})
@@ -128,7 +129,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "is_local" => true,
       "locked" => false,
       "default_scope" => "public",
-      "no_rich_text" => false
+      "no_rich_text" => false,
+      "fields" => []
     }
 
     assert represented == UserView.render("show.json", %{user: user, for: follower})
@@ -169,7 +171,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "is_local" => true,
       "locked" => false,
       "default_scope" => "public",
-      "no_rich_text" => false
+      "no_rich_text" => false,
+      "fields" => []
     }
 
     assert represented == UserView.render("show.json", %{user: follower, for: user})
@@ -217,10 +220,37 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "is_local" => true,
       "locked" => false,
       "default_scope" => "public",
-      "no_rich_text" => false
+      "no_rich_text" => false,
+      "fields" => []
     }
 
     blocker = Repo.get(User, blocker.id)
     assert represented == UserView.render("show.json", %{user: user, for: blocker})
   end
+
+  test "a user with mastodon fields" do
+    fields = [
+      %{
+        "name" => "Pronouns",
+        "value" => "she/her"
+      },
+      %{
+        "name" => "Website",
+        "value" => "https://example.org/"
+      }
+    ]
+
+    user =
+      insert(:user, %{
+        info: %{
+          "source_data" => %{
+            "attachment" =>
+              Enum.map(fields, fn field -> Map.put(field, "type", "PropertyValue") end)
+          }
+        }
+      })
+
+    userview = UserView.render("show.json", %{user: user})
+    assert userview["fields"] == fields
+  end
 end