Move EmojiAPIController from EmojiAPI to PleromaAPI

diff --git a/lib/pleroma/web/emoji_api/emoji_api_controller.ex b/lib/pleroma/web/emoji_api/emoji_api_controller.ex
index 0d4a17c616106f03d761bb672cc748783b487d1d..a83f8af5768ec1037146b9d0e9535245d6fb3c59 100644 (file)
--- a/lib/pleroma/web/emoji_api/emoji_api_controller.ex
+++ b/lib/pleroma/web/emoji_api/emoji_api_controller.ex
@@ -1,4 +1,4 @@
-defmodule Pleroma.Web.EmojiAPI.EmojiAPIController do
+defmodule Pleroma.Web.PleromaAPI.EmojiAPIController do
   use Pleroma.Web, :controller
 
   require Logger

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index bae25c60a011616ee55f34fa40a674d60529dd43..715e4ba68987128d77c4c1c6f8206bf8e5cb7aaf 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -207,7 +207,7 @@ defmodule Pleroma.Web.Router do
     get("/moderation_log", AdminAPIController, :list_log)
   end
 
-  scope "/api/pleroma/emoji", Pleroma.Web.EmojiAPI do
+  scope "/api/pleroma/emoji", Pleroma.Web.PleromaAPI do
     scope [] do
       pipe_through([:admin_api, :oauth_write])
 

diff --git a/test/web/emoji_api_controller_test.exs b/test/web/emoji_api_controller_test.exs
index e92e92f747c6b3ae342c2dc5407ca99a5474466a..38d11cdce66954efb447472b934350953f7e8f1f 100644 (file)
--- a/test/web/emoji_api_controller_test.exs
+++ b/test/web/emoji_api_controller_test.exs
@@ -1,4 +1,4 @@
-defmodule Pleroma.Web.EmojiAPI.EmojiAPIControllerTest do
+defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
   use Pleroma.Web.ConnCase
 
   import Tesla.Mock