1 files changed, 1 insertions, 26 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 73a46bb5e..7a0c37ce9 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -173,32 +173,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
   end
 
   def emoji(conn, _params) do
-    static_dir = Path.join(:code.priv_dir(:pleroma), "static")
-
-    emoji_shortcode_glob =
-      Application.get_env(:pleroma, :emoji, [])
-      |> Keyword.get(:shortcode_glob)
-
-    shortcode_emoji =
-      case emoji_shortcode_glob do
-        nil ->
-          []
-
-        glob ->
-          Path.join(static_dir, glob)
-          |> Path.wildcard()
-          |> Enum.map(fn path ->
-            shortcode = Path.basename(path, ".png")
-            serve_path = Path.join("/", Path.relative_to(path, static_dir))
-            {shortcode, serve_path}
-          end)
-      end
-
-    emoji =
-      Enum.into(Formatter.get_custom_emoji(), shortcode_emoji)
-      |> Enum.into(%{})
-
-    json(conn, emoji)
+    json(conn, Enum.into(Formatter.get_custom_emoji(), %{}))
   end
 
   def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) do