Merge branch 'fix/issue_433' into 'develop'

[#433] fix markdown formatting

See merge request pleroma/pleroma!545
This commit is contained in:
href 2018-12-14 20:30:35 +00:00
commit e74f384b68
7 changed files with 49 additions and 11 deletions

View file

@ -239,7 +239,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
{summary, content} = render_content(object)
html =
HTML.filter_tags(content, User.html_filter_policy(opts[:for]))
content
|> HTML.filter_tags(User.html_filter_policy(opts[:for]))
|> Formatter.emojify(object["emoji"])
reply_parent = Activity.get_in_reply_to_activity(activity)