Merge branch '394_user_tags' into 'develop'
[#394] User tags Closes #394 See merge request pleroma/pleroma!508
This commit is contained in:
commit
94d8f1ab30
10 changed files with 168 additions and 7 deletions
|
|
@ -77,7 +77,12 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
|
|||
"locked" => user.info.locked,
|
||||
"default_scope" => user.info.default_scope,
|
||||
"no_rich_text" => user.info.no_rich_text,
|
||||
"fields" => fields
|
||||
"fields" => fields,
|
||||
|
||||
# Pleroma extension
|
||||
"pleroma" => %{
|
||||
"tags" => user.tags
|
||||
}
|
||||
}
|
||||
|
||||
if assigns[:token] do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue