diff options
| -rw-r--r-- | lib/pleroma/formatter.ex | 4 | ||||
| -rw-r--r-- | test/formatter_test.exs | 10 |
2 files changed, 13 insertions, 1 deletions
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 diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 8453b72ac..273eefb8a 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -214,4 +214,14 @@ defmodule Pleroma.FormatterTest do assert Formatter.get_emoji(text) == [{"moominmamma", "/finmoji/128px/moominmamma-128.png"}] end + + test "it returns a nice empty result when no emojis are present" do + text = "I love moominamma" + assert Formatter.get_emoji(text) == [] + end + + test "it doesn't die when text is absent" do + text = nil + assert Formatter.get_emoji(text) == [] + end end |