X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=2b4c3c2aa561374c6fff3afdf0c819f5eb1f31bb;hb=045953225e04862c914b51808907cc86b11fcaf4;hp=93cd12fa69132d920900fadef4ff329bc737a0ae;hpb=6aa65b68b82c8ad7f6246dc5ccf1ac7673ce3e22;p=akkoma

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 93cd12fa6..2b4c3c2aa 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -154,13 +154,16 @@ defmodule Pleroma.Formatter do
           MediaProxy.url(file)
         }' />"
       )
+      |> HtmlSanitizeEx.basic_html()
     end)
   end
 
-  def get_emoji(text) do
+  def get_emoji(text) when is_binary(text) do
     Enum.filter(@emoji, fn {emoji, _} -> String.contains?(text, ":#{emoji}:") end)
   end
 
+  def get_emoji(_), do: []
+
   def get_custom_emoji() do
     @emoji
   end
@@ -188,11 +191,7 @@ defmodule Pleroma.Formatter do
   ]
 
   # TODO: make it use something other than @link_regex
-  def html_escape(text, "text/html") do
-    HtmlSanitizeEx.basic_html(text)
-  end
-
-  def html_escape(text, "text/plain") do
+  def html_escape(text) do
     Regex.split(@link_regex, text, include_captures: true)
     |> Enum.map_every(2, fn chunk ->
       {:safe, part} = Phoenix.HTML.html_escape(chunk)