mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 08:36:29 +00:00
Code Issues Projects Releases Wiki Activity

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

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

See merge request pleroma/pleroma!360
This commit is contained in:
Haelwenn 2018-09-28 09:25:27 +00:00
commit 34b6d444d6
2 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/twitter_api/views/user_view.ex
View file

@ -37,6 +37,13 @@ defmodule Pleroma.Web.TwitterAPI.UserView 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 @@ defmodule Pleroma.Web.TwitterAPI.UserView 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

38
test/web/twitter_api/views/user_view_test.exs
View file

@ -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