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
This commit is contained in:
commit
7ca2a2ddea
2 changed files with 13 additions and 1 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue