diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index f062d9a58..00be839d8 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -125,6 +125,5 @@ def get_emoji(text) do def get_custom_emoji() do @emoji - |> Enum.into %{} end end diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index b1a54a4f1..96cf39f1a 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -61,6 +61,19 @@ def masto_instance(conn, _params) do json(conn, response) end + def custom_emojis(conn, _params) do + mastodon_emoji = Pleroma.Formatter.get_custom_emoji() + |> Enum.map(fn {shortcode, relative_url} -> + url = to_string URI.merge(Web.base_url(), relative_url) + %{ + "shortcode" => shortcode, + "static_url" => url, + "url" => url + } + end) + json conn, mastodon_emoji + end + defp add_link_headers(conn, method, activities) do last = List.last(activities) first = List.first(activities) diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index f96ec7213..b94056cd4 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -91,6 +91,7 @@ def user_fetcher(username) do pipe_through :api get "/instance", MastodonAPIController, :masto_instance post "/apps", MastodonAPIController, :create_app + get "/custom_emojis", MastodonAPIController, :custom_emojis get "/timelines/public", MastodonAPIController, :public_timeline get "/timelines/tag/:tag", MastodonAPIController, :hashtag_timeline diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 792ae2a64..de2abd4d1 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -71,6 +71,6 @@ def version(conn, _params) do end def emoji(conn, _params) do - json conn, Formatter.get_custom_emoji() + json conn, Enum.into(Formatter.get_custom_emoji(), %{}) end end