scrub_html_and_truncate/1 -> filter_html_and_truncate/1

They shouldn't share the same name when /1 was used for a different type of incoming data anyway

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex
index 649319db5..f5b79a82c 100644
--- a/lib/pleroma/web/metadata/utils.ex
+++ b/lib/pleroma/web/metadata/utils.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Web.Metadata.Utils do
   alias Pleroma.Formatter
   alias Pleroma.HTML
 
-  def scrub_html_and_truncate(%{data: %{"content" => content}} = _object) do
+  def filter_html_and_truncate(%{data: %{"content" => content}} = _object) do
     content
     # html content comes from DB already encoded, decode first and scrub after
     |> Emoji.Formatter.demojify()
@@ -20,9 +20,10 @@ defmodule Pleroma.Web.Metadata.Utils do
   def scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) do
     content
     |> Emoji.Formatter.demojify()
-    |> HTML.filter_tags(Pleroma.HTML.Scrubber.BreaksOnly)
     |> HtmlEntities.decode()
-    |> String.replace(~r/<br\s?\/?>/, "&#10;&#13;")
+    |> String.replace(~r/<br\s?\/?>/, " ")
+    |> HTML.strip_tags()
+    |> HtmlEntities.decode()
     |> Formatter.truncate(max_length)
   end