pleroma

commit: 1d0e130cb3f37f611ec8242d99c12f693e328112
parent 7f82f18664f73a320f82d0430966b4f673391fbe
Author: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date:   Sun, 16 Aug 2020 20:28:31 +0300

fixes after rebase

Diffstat:
M
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
1
-
M
lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
2
+-
M
lib/pleroma/web/plugs/admin_secret_authentication_plug.ex
4
++--

3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@ -26,7 +26,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
   alias Pleroma.Web.MastodonAPI.StatusView
   alias Pleroma.Web.OAuth.OAuthController
   alias Pleroma.Web.OAuth.OAuthView
-  alias Pleroma.Web.OAuth.Token
   alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
   alias Pleroma.Web.Plugs.OAuthScopesPlug
   alias Pleroma.Web.Plugs.RateLimiter
diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
@@ -24,7 +24,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
 
   @skip_plugs [
     Pleroma.Web.Plugs.OAuthScopesPlug,
-    Pleroma.Web.Plugs.ExpectPublicOrAuthenticatedCheckPlug
+    Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
   ]
   plug(:skip_plug, @skip_plugs when action in [:index, :archive, :show])
 
diff --git a/lib/pleroma/web/plugs/admin_secret_authentication_plug.ex b/lib/pleroma/web/plugs/admin_secret_authentication_plug.ex
@@ -5,9 +5,9 @@
 defmodule Pleroma.Web.Plugs.AdminSecretAuthenticationPlug do
   import Plug.Conn
 
-  alias Pleroma.Plugs.OAuthScopesPlug
-  alias Pleroma.Plugs.RateLimiter
   alias Pleroma.User
+  alias Pleroma.Web.Plugs.OAuthScopesPlug
+  alias Pleroma.Web.Plugs.RateLimiter
 
   def init(options) do
     options