From: kaniini <nenolod@gmail.com>
Date: Sun, 16 Sep 2018 01:05:09 +0000 (+0000)
Subject: Merge branch 'feature/html-scrub-policy' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c2650f0ffb5938005baf437dfa69bbf05da0cc71;p=akkoma

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

html scrub policy

See merge request pleroma/pleroma!339
---

c2650f0ffb5938005baf437dfa69bbf05da0cc71
diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
index cdae2de7a,f1daa2624..8f6c4b062
--- a/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)
  
      %{