squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Demojify does not decode for us

Browse Source
This commit is contained in:
Mark Felder 2021-06-11 19:23:35 -05:00
parent 45146b0010
commit bb4130d48c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/metadata/utils.ex
View File

@ -36,8 +36,9 @@ defmodule Pleroma.Web.Metadata.Utils do
end end
defp do_filter_html_and_truncate(content, max_length \\ 200) when is_binary(content) do defp do_filter_html_and_truncate(content, max_length \\ 200) when is_binary(content) do
# html content comes from DB already encoded, but demojify decodes for us # html content comes from DB already encoded
content content
|> HtmlEntities.decode()
|> Emoji.Formatter.demojify() |> Emoji.Formatter.demojify()
|> HTML.filter_tags(Pleroma.HTML.Scrubber.BreaksOnly) |> HTML.filter_tags(Pleroma.HTML.Scrubber.BreaksOnly)
|> HtmlEntities.decode() |> HtmlEntities.decode()
@ -46,8 +47,9 @@ defmodule Pleroma.Web.Metadata.Utils do
end end
defp do_scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) do defp do_scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) do
# html content comes from DB already encoded, but demojify decodes for us # html content comes from DB already encoded
content content
|> HtmlEntities.decode()
|> Emoji.Formatter.demojify() |> Emoji.Formatter.demojify()
|> String.replace(~r/<br\s?\/?>/, " ") |> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags() |> HTML.strip_tags()