diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-27 08:45:43 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-27 08:45:43 +0000 |
| commit | 14bc6bd40f0ea7879cd75444939669ee6e6ac85c (patch) | |
| tree | 89261d7cae8c7edc474d2d27a951a1b5eb8d0ba4 /lib | |
| parent | a50a47a0114dab06205eabf5bd42369328ce80e2 (diff) | |
| parent | 5d961d536cd190c8201d53624680a6f3384ffd9b (diff) | |
| download | pleroma-14bc6bd40f0ea7879cd75444939669ee6e6ac85c.tar.gz | |
Merge branch 'fix/formatter' into 'develop'
Bugfix: markdown in formatter
Closes #688
See merge request pleroma/pleroma!869
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/formatter.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 51d08c5ee..048c032ed 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -91,6 +91,10 @@ defmodule Pleroma.Formatter do def get_emoji(_), do: [] + def html_escape({text, mentions, hashtags}, type) do + {html_escape(text, type), mentions, hashtags} + end + def html_escape(text, "text/html") do HTML.filter_tags(text) end diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 20123854d..e4b9102c5 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -186,9 +186,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do options = Keyword.put(options, :mentions_escape, true) text - |> Formatter.html_escape("text/html") |> Formatter.linkify(options) |> (fn {text, mentions, tags} -> {Earmark.as_html!(text), mentions, tags} end).() + |> Formatter.html_escape("text/html") end def make_note_data( |