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

Merge branch 'fix/1691-feed-render' into 'develop'

Browse source 
Fix for use of `published` field from different entities

Closes #1691

See merge request pleroma/pleroma!2395
This commit is contained in:
rinpatch 2020-04-16 18:38:58 +00:00
commit 28bcde5d98
6 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/web/feed/tag_controller_test.exs
View file

@ -150,8 +150,8 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
obj2 = Object.normalize(activity2)
assert xpath(xml, ~x"//channel/item/description/text()"sl) == [
HtmlEntities.decode(FeedView.activity_content(obj2)),
HtmlEntities.decode(FeedView.activity_content(obj1))
HtmlEntities.decode(FeedView.activity_content(obj2.data)),
HtmlEntities.decode(FeedView.activity_content(obj1.data))
]
response =