aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
diff options
context:
space:
mode:
authorhref <href+git-pleroma@random.sh>2018-12-14 20:30:35 +0000
committerhref <href+git-pleroma@random.sh>2018-12-14 20:30:35 +0000
commite74f384b685edff5e4fac9da788a7516dd83fe94 (patch)
tree85c4462b333b2d8d58291fc81b6e8db002cddb8c /lib/pleroma/web/twitter_api
parentbfe27c1b557b19c171c8168c5f1244987246c47f (diff)
parentbc6262d2503fa5a9656898fa2dcd91b2111cf2b5 (diff)
downloadpleroma-e74f384b685edff5e4fac9da788a7516dd83fe94.tar.gz
Merge branch 'fix/issue_433' into 'develop'
[#433] fix markdown formatting See merge request pleroma/pleroma!545
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r--lib/pleroma/web/twitter_api/views/activity_view.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex
index e5caed28f..433c3b141 100644
--- a/lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/lib/pleroma/web/twitter_api/views/activity_view.ex
@@ -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)