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

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

Browse source
This commit is contained in:
Ivan Tashkinov 2018-12-06 22:26:25 +03:00
parent abbf347dc7
commit 7a2162bbcb
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -59,8 +59,11 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
privacy: user_info.default_scope,
sensitive: false
},
# Pleroma extension
tags: user.tags
pleroma: %{
tags: user.tags
}
}
end

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

@ -78,8 +78,11 @@ defmodule Pleroma.Web.TwitterAPI.UserView 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

4
test/web/mastodon_api/account_view_test.exs
View file

@ -55,7 +55,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
privacy: "public",
sensitive: false
},
tags: []
pleroma: %{tags: []}
}
assert expected == AccountView.render("account.json", %{user: user})
@ -93,7 +93,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
privacy: "public",
sensitive: false
},
tags: []
pleroma: %{tags: []}
}
assert expected == AccountView.render("account.json", %{user: user})

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

@ -97,7 +97,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"default_scope" => "public",
"no_rich_text" => false,
"fields" => [],
"tags" => []
"pleroma" => %{"tags" => []}
}
assert represented == UserView.render("show.json", %{user: user})
@ -139,7 +139,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest 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 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest 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 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"default_scope" => "public",
"no_rich_text" => false,
"fields" => [],
"tags" => []
"pleroma" => %{"tags" => []}
}
blocker = Repo.get(User, blocker.id)