diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2018-08-31 03:13:59 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-08-31 03:13:59 +0000 |
| commit | 6aa65b68b82c8ad7f6246dc5ccf1ac7673ce3e22 (patch) | |
| tree | 4fd80172a392a9ff32f572aa3a95c7c00c0d77a8 /lib/pleroma/formatter.ex | |
| parent | 1a70d41f8e7ce0eb30242d58077b69816e443c10 (diff) | |
| download | pleroma-6aa65b68b82c8ad7f6246dc5ccf1ac7673ce3e22.tar.gz | |
common api: add support for formatting messages outside of twitter-style plain text
Diffstat (limited to 'lib/pleroma/formatter.ex')
| -rw-r--r-- | lib/pleroma/formatter.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index cf2944c38..93cd12fa6 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -188,7 +188,11 @@ defmodule Pleroma.Formatter do ] # TODO: make it use something other than @link_regex - def html_escape(text) do + def html_escape(text, "text/html") do + HtmlSanitizeEx.basic_html(text) + end + + def html_escape(text, "text/plain") do Regex.split(@link_regex, text, include_captures: true) |> Enum.map_every(2, fn chunk -> {:safe, part} = Phoenix.HTML.html_escape(chunk) |