diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-01 17:17:57 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-01 17:17:57 +0700 |
| commit | 3601f03147bd104f6acff64e7c8d5d4d3e1f53a2 (patch) | |
| tree | 9575002d2291587dc3080fdd3b65144d6535bfef /lib/pleroma/formatter.ex | |
| parent | dc39d8d3fb941bad9fe26586c321bb00a0b92fe4 (diff) | |
| download | pleroma-3601f03147bd104f6acff64e7c8d5d4d3e1f53a2.tar.gz | |
Adding tag to emoji ets table
changes in apis
Diffstat (limited to 'lib/pleroma/formatter.ex')
| -rw-r--r-- | lib/pleroma/formatter.ex | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index e3625383b..8ea9dbd38 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -77,9 +77,9 @@ defmodule Pleroma.Formatter do def emojify(text, nil), do: text def emojify(text, emoji, strip \\ false) do - Enum.reduce(emoji, text, fn {emoji, file}, text -> - emoji = HTML.strip_tags(emoji) - file = HTML.strip_tags(file) + Enum.reduce(emoji, text, fn emoji_data, text -> + emoji = HTML.strip_tags(elem(emoji_data, 0)) + file = HTML.strip_tags(elem(emoji_data, 1)) html = if not strip do @@ -101,7 +101,7 @@ defmodule Pleroma.Formatter do def demojify(text, nil), do: text def get_emoji(text) when is_binary(text) do - Enum.filter(Emoji.get_all(), fn {emoji, _} -> String.contains?(text, ":#{emoji}:") end) + Enum.filter(Emoji.get_all(), fn {emoji, _, _} -> String.contains?(text, ":#{emoji}:") end) end def get_emoji(_), do: [] |