forked from AkkomaGang/akkoma
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
This commit is contained in:
parent
3de12c194f
commit
82b57ebad1
2 changed files with 17 additions and 5 deletions
|
@ -37,6 +37,13 @@ def render("user.json", %{user: user = %User{}} = assigns) do
|
|||
{String.trim(name, ":"), url}
|
||||
end)
|
||||
|
||||
# ``fields`` is an array of mastodon profile field, containing ``{"name": "…", "value": "…"}``.
|
||||
# For example: [{"name": "Pronoun", "value": "she/her"}, …]
|
||||
fields =
|
||||
(user.info["source_data"]["attachment"] || [])
|
||||
|> Enum.filter(fn %{"type" => t} -> t == "PropertyValue" end)
|
||||
|> Enum.map(fn fields -> Map.take(fields, ["name", "value"]) end)
|
||||
|
||||
data = %{
|
||||
"created_at" => user.inserted_at |> Utils.format_naive_asctime(),
|
||||
"description" => HTML.strip_tags((user.bio || "") |> String.replace("<br>", "\n")),
|
||||
|
@ -65,7 +72,8 @@ def render("user.json", %{user: user = %User{}} = assigns) do
|
|||
"is_local" => user.local,
|
||||
"locked" => !!user.info["locked"],
|
||||
"default_scope" => user.info["default_scope"] || "public",
|
||||
"no_rich_text" => user.info["no_rich_text"] || false
|
||||
"no_rich_text" => user.info["no_rich_text"] || false,
|
||||
"fields" => fields
|
||||
}
|
||||
|
||||
if assigns[:token] do
|
||||
|
|
|
@ -88,7 +88,8 @@ test "A user" 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 @@ test "A user for a given other follower", %{user: user} 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 @@ test "A user that follows you", %{user: user} 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,7 +220,8 @@ test "A blocked user for the blocker" do
|
|||
"is_local" => true,
|
||||
"locked" => false,
|
||||
"default_scope" => "public",
|
||||
"no_rich_text" => false
|
||||
"no_rich_text" => false,
|
||||
"fields" => []
|
||||
}
|
||||
|
||||
blocker = Repo.get(User, blocker.id)
|
||||
|
|
Loading…
Reference in a new issue