Merge branch 'mastodon-emoji-endpoint' into 'develop'

Add mastodon API endpoint for custom emoji.

See merge request pleroma/pleroma!8

4 files changed, 15 insertions, 2 deletions

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 7ccd7e7bb..27e2adc16 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -125,6 +125,5 @@ defmodule Pleroma.Formatter 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 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController 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 514320fd6..b43235d8d 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -91,6 +91,7 @@ defmodule Pleroma.Web.Router 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 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
   end
 
   def emoji(conn, _params) do
-    json conn, Formatter.get_custom_emoji()
+    json conn, Enum.into(Formatter.get_custom_emoji(), %{})
   end
 end