Merge remote-tracking branch 'upstream/develop' into registration-workflow

[akkoma] / lib / pleroma / web / twitter_api / controller.ex

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/controller.ex
similarity index 96%
rename from lib/pleroma/web/twitter_api/twitter_api_controller.ex
rename to lib/pleroma/web/twitter_api/controller.ex
index b126064729ec9aa6c96886f84320a9f55a580f80..16f43863ce6a959bf8dd12c5a8c9c3bc8d71695d 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/controller.ex
@@ -6,10 +6,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
 
   alias Pleroma.Notification
-  alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
-  alias Pleroma.Plugs.OAuthScopesPlug
   alias Pleroma.User
   alias Pleroma.Web.OAuth.Token
+  alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
+  alias Pleroma.Web.Plugs.OAuthScopesPlug
   alias Pleroma.Web.TwitterAPI.TokenView
 
   require Logger