squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Haelwenn (lanodan) Monnier 2018-09-27 20:17:44 +02:00
parent 3de12c194f
commit 82b57ebad1
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
2 changed files with 17 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} {String.trim(name, ":"), url}
end) 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 = %{ data = %{
"created_at" => user.inserted_at |> Utils.format_naive_asctime(), "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
"description" => HTML.strip_tags((user.bio || "") |> String.replace("<br>", "\n")), "description" => HTML.strip_tags((user.bio || "") |> String.replace("<br>", "\n")),
@ -65,7 +72,8 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"is_local" => user.local, "is_local" => user.local,
"locked" => !!user.info["locked"], "locked" => !!user.info["locked"],
"default_scope" => user.info["default_scope"] || "public", "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 if assigns[:token] do

12
test/web/twitter_api/views/user_view_test.exs
View File

@ -88,7 +88,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"is_local" => true, "is_local" => true,
"locked" => false, "locked" => false,
"default_scope" => "public", "default_scope" => "public",
"no_rich_text" => false "no_rich_text" => false,
"fields" => []
} }
assert represented == UserView.render("show.json", %{user: user}) assert represented == UserView.render("show.json", %{user: user})
@ -128,7 +129,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"is_local" => true, "is_local" => true,
"locked" => false, "locked" => false,
"default_scope" => "public", "default_scope" => "public",
"no_rich_text" => false "no_rich_text" => false,
"fields" => []
} }
assert represented == UserView.render("show.json", %{user: user, for: follower}) assert represented == UserView.render("show.json", %{user: user, for: follower})
@ -169,7 +171,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"is_local" => true, "is_local" => true,
"locked" => false, "locked" => false,
"default_scope" => "public", "default_scope" => "public",
"no_rich_text" => false "no_rich_text" => false,
"fields" => []
} }
assert represented == UserView.render("show.json", %{user: follower, for: user}) assert represented == UserView.render("show.json", %{user: follower, for: user})
@ -217,7 +220,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"is_local" => true, "is_local" => true,
"locked" => false, "locked" => false,
"default_scope" => "public", "default_scope" => "public",
"no_rich_text" => false "no_rich_text" => false,
"fields" => []
} }
blocker = Repo.get(User, blocker.id) blocker = Repo.get(User, blocker.id)