diff options
| -rw-r--r-- | lib/pleroma/formatter.ex | 12 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 4afc73bf4..66ca92f27 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -110,14 +110,10 @@ defmodule Pleroma.Formatter do @emoji @finmoji_with_filenames ++ @emoji_from_file - def emojify(text, additional \\ nil) do - all_emoji = if additional do - Map.to_list(additional) ++ @emoji - else - @emoji - end - - Enum.reduce(all_emoji, text, fn ({emoji, file}, text) -> + def emojify(text, emoji \\ @emoji) + def emojify(text, nil), do: text + def emojify(text, emoji) do + Enum.reduce(emoji, text, fn ({emoji, file}, text) -> emoji = HtmlSanitizeEx.strip_tags(emoji) file = HtmlSanitizeEx.strip_tags(file) String.replace(text, ":#{emoji}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{MediaProxy.url(file)}' />") diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index 5199cef8e..73ae3422b 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -145,7 +145,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do content end - html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"]) + html = HtmlSanitizeEx.basic_html(content) + |> Formatter.emojify(object["emoji"]) %{ "id" => activity.id, diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index 76b8cb14b..ae5be60ce 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -37,7 +37,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do content end - html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"]) + html = HtmlSanitizeEx.basic_html(content) + |> Formatter.emojify(object["emoji"]) %{ "id" => activity.id, |