fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-24 10:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nil-bio-emojis' into 'develop'

Browse source 
add nil clause for Formatter.get_emoji/1 to return an empty result

Closes #274

See merge request pleroma/pleroma!315
This commit is contained in:
kaniini 2018-09-03 05:54:11 +00:00
parent 072e965015 4257f784bc
commit 7ca2a2ddea
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/formatter.ex
View file

@ -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

10
test/formatter_test.exs
View file

@ -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