Merge branch 'feature/html-scrub-policy' into 'develop'

html scrub policy

See merge request pleroma/pleroma!339

diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
index cdae2de7abf9f9b3a73d3313b298a1a55aa155f3,f1daa2624c3e8fb87fda8e2f4102359d6b3c1b74..8f6c4b062795fbde1040e7ac5f0dbf72697c11b2
--- 1/lib/pleroma/web/mastodon_api/views/status_view.ex
--- 2/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@@ -111,13 -112,13 +112,13 @@@ defmodule Pleroma.Web.MastodonAPI.Statu
      emojis =
        (activity.data["object"]["emoji"] || [])
        |> Enum.map(fn {name, url} ->
-         name = HtmlSanitizeEx.strip_tags(name)
+         name = HTML.strip_tags(name)
  
          url =
-           HtmlSanitizeEx.strip_tags(url)
+           HTML.strip_tags(url)
            |> MediaProxy.url()
  
 -        %{shortcode: name, url: url, static_url: url}
 +        %{shortcode: name, url: url, static_url: url, visible_in_picker: false}
        end)
  
      %{