aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2018-12-06 22:26:25 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2018-12-06 22:26:25 +0300
commit7a2162bbcb2e3a64ed6b56229311aa9fd487351a (patch)
tree7e157c224d2e83c83561863968c6c1a1847e11b4 /lib
parentabbf347dc7de80d2c09d461fd39f9959f8b666b9 (diff)
downloadpleroma-7a2162bbcb2e3a64ed6b56229311aa9fd487351a.tar.gz
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/views/account_view.ex5
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex5
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 2762813ae..ebcf9230b 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -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
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index f460ddd80..b3459af9a 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -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