diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-08-29 22:01:37 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-08-30 22:04:17 +0300 |
| commit | d8098d142a0e8412eabdf5fe63705c25bcb1be34 (patch) | |
| tree | 5ecc2f3653282914fc40cbec0d938382b645926f /lib/pleroma/web/common_api/utils.ex | |
| parent | 5c90b7073332ac333a5db9dfc82744cee03843fa (diff) | |
| download | pleroma-d8098d142a0e8412eabdf5fe63705c25bcb1be34.tar.gz | |
added Emoji.Formatter
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 9686e6491..d6907f707 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -9,6 +9,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do alias Pleroma.Activity alias Pleroma.Config alias Pleroma.Conversation.Participation + alias Pleroma.Emoji alias Pleroma.Formatter alias Pleroma.Object alias Pleroma.Plugs.AuthenticationPlug @@ -184,7 +185,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do "name" => option, "type" => "Note", "replies" => %{"type" => "Collection", "totalItems" => 0} - }, Map.merge(emoji, Formatter.get_emoji_map(option))} + }, Map.merge(emoji, Emoji.Formatter.get_emoji_map(option))} end) case expires_in do @@ -434,7 +435,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do end def emoji_from_profile(%{info: _info} = user) do - (Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name)) + (Emoji.Formatter.get_emoji(user.bio) ++ Emoji.Formatter.get_emoji(user.name)) |> Enum.map(fn {shortcode, url, _, _, _} -> %{ "type" => "Emoji", |