Commit 7a2162bb authored by Ivan Tashkinov's avatar Ivan Tashkinov
Browse files

[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.

parent abbf347d
......@@ -59,8 +59,11 @@ def render("account.json", %{user: user} = opts) do
privacy: user_info.default_scope,
sensitive: false
},
# Pleroma extension
tags: user.tags
pleroma: %{
tags: user.tags
}
}
end
......
......@@ -78,8 +78,11 @@ def render("user.json", %{user: user = %User{}} = assigns) do
"default_scope" => user.info.default_scope,
"no_rich_text" => user.info.no_rich_text,
"fields" => fields,
# Pleroma extension
"tags" => user.tags
"pleroma" => %{
"tags" => user.tags
}
}
if assigns[:token] do
......
......@@ -55,7 +55,7 @@ test "Represent a user account" do
privacy: "public",
sensitive: false
},
tags: []
pleroma: %{tags: []}
}
assert expected == AccountView.render("account.json", %{user: user})
......@@ -93,7 +93,7 @@ test "Represent a Service(bot) account" do
privacy: "public",
sensitive: false
},
tags: []
pleroma: %{tags: []}
}
assert expected == AccountView.render("account.json", %{user: user})
......
......@@ -97,7 +97,7 @@ test "A user" do
"default_scope" => "public",
"no_rich_text" => false,
"fields" => [],
"tags" => []
"pleroma" => %{"tags" => []}
}
assert represented == UserView.render("show.json", %{user: user})
......@@ -139,7 +139,7 @@ test "A user for a given other follower", %{user: user} do
"default_scope" => "public",
"no_rich_text" => false,
"fields" => [],
"tags" => []
"pleroma" => %{"tags" => []}
}
assert represented == UserView.render("show.json", %{user: user, for: follower})
......@@ -182,7 +182,7 @@ test "A user that follows you", %{user: user} do
"default_scope" => "public",
"no_rich_text" => false,
"fields" => [],
"tags" => []
"pleroma" => %{"tags" => []}
}
assert represented == UserView.render("show.json", %{user: follower, for: user})
......@@ -232,7 +232,7 @@ test "A blocked user for the blocker" do
"default_scope" => "public",
"no_rich_text" => false,
"fields" => [],
"tags" => []
"pleroma" => %{"tags" => []}
}
blocker = Repo.get(User, blocker.id)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment