diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-18 15:58:44 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-18 15:58:44 +0000 |
| commit | ed3403ad8be255480d7e41f899d74fe9e5ef3f84 (patch) | |
| tree | f2a5c041dc5879af9b56215bdd53311443027e05 /lib/pleroma/web/common_api/utils.ex | |
| parent | 146ec80285a7f4e8a64ce286f7ddd69c59841695 (diff) | |
| parent | 31e4277ba5a2a793a0bc94f5d7682a48349583a3 (diff) | |
| download | pleroma-ed3403ad8be255480d7e41f899d74fe9e5ef3f84.tar.gz | |
Merge branch 'formatting-fixes' into 'develop'
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 7 |
1 files changed, 4 insertions, 3 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 |