diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-08-16 20:28:31 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-10-13 16:44:02 +0300 |
| commit | 1d0e130cb3f37f611ec8242d99c12f693e328112 (patch) | |
| tree | 9953114ab310b0609a4f4fa60d267f3b3cdfcaa1 /lib | |
| parent | 7f82f18664f73a320f82d0430966b4f673391fbe (diff) | |
| download | pleroma-1d0e130cb3f37f611ec8242d99c12f693e328112.tar.gz | |
fixes after rebase
Diffstat (limited to 'lib')
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 index f3b6b3571..4f9696d52 100644 --- 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 index 81ba69017..a9accc5af 100644 --- 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 index 9c7454443..d7d4e4092 100644 --- 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 |