hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'

Browse source 
added tests /activity_pub/transmogrifier.ex

See merge request pleroma/pleroma!1651
This commit is contained in:
kaniini 2019-09-23 22:34:52 +00:00
commit ad9595ca55
5 changed files with 448 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/activity_pub/views/user_view.ex
View file

@ -75,10 +75,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
endpoints = render("endpoints.json", %{user: user})
user_tags =
user
|> Transmogrifier.add_emoji_tags()
|> Map.get("tag", [])
emoji_tags = Transmogrifier.take_emoji_tags(user)
fields =
user.info
@ -110,7 +107,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
},
"endpoints" => endpoints,
"attachment" => fields,
"tag" => (user.info.source_data["tag"] || []) ++ user_tags
"tag" => (user.info.source_data["tag"] || []) ++ emoji_tags
}
|> Map.merge(maybe_make_image(&User.avatar_url/2, "icon", user))
|> Map.merge(maybe_make_image(&User.banner_url/2, "image", user))