commit: 7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14
parent: 072e965015698a3198242aad3ad969a696b8f03e
Author: kaniini <nenolod@gmail.com>
Date: Mon, 3 Sep 2018 05:54:11 +0000
Merge branch 'nil-bio-emojis' into 'develop'
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
Diffstat:
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git 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
@@ -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