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

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 9be54e863..2b4c3c2aa 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -158,10 +158,12 @@ defmodule Pleroma.Formatter do
     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