diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 7 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 83a656011..7cce77b10 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -54,13 +54,14 @@ defmodule Pleroma.Web.CommonAPI.Utils do "<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>" _ -> "" end) - Enum.join([text | attachment_text], "<br>\n") + Enum.join([text | attachment_text], "<br>") end def format_input(text, mentions, tags) do - HtmlSanitizeEx.strip_tags(text) + Phoenix.HTML.html_escape(text) + |> elem(1) |> Formatter.linkify - |> String.replace("\n", "<br>\n") + |> String.replace("\n", "<br>") |> add_user_links(mentions) # |> add_tag_links(tags) end diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index 3fbeb86ba..b17013d87 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -135,8 +135,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do tags = activity.data["object"]["tag"] || [] possibly_sensitive = Enum.member?(tags, "nsfw") - content = if activity.data["object"]["summary"] do - "<span>#{activity.data["object"]["summary"]}</span><br>#{content}</span>" + summary = activity.data["object"]["summary"] + content = if !!summary and summary != "" do + "<span>#{activity.data["object"]["summary"]}</span><br />#{content}</span>" else content end |