diff options
| author | lain <lain@soykaf.club> | 2020-10-23 13:25:41 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-10-23 13:25:41 +0200 |
| commit | 682f0aa2597bec4ef80691daddae1d87ddeeae0a (patch) | |
| tree | c8ae5efb603e6b226ed3b5d39efb3912b63d17b9 /lib/pleroma/web/pleroma_api/controllers/account_controller.ex | |
| parent | 346a59aee68d71af5d7ab6cfb9ff89008a032f2b (diff) | |
| parent | 096e4518adf176c3f9cee0e38319340249083a48 (diff) | |
| download | pleroma-682f0aa2597bec4ef80691daddae1d87ddeeae0a.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2061-chat-deletion
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/account_controller.ex')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/account_controller.ex | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex index 563edded7..30cf83567 100644 --- a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex @@ -8,16 +8,21 @@ defmodule Pleroma.Web.PleromaAPI.AccountController do import Pleroma.Web.ControllerHelper, only: [json_response: 3, add_link_headers: 2, assign_account_by_id: 2] - alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug - alias Pleroma.Plugs.OAuthScopesPlug - alias Pleroma.Plugs.RateLimiter alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.MastodonAPI.StatusView + alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug + alias Pleroma.Web.Plugs.OAuthScopesPlug + alias Pleroma.Web.Plugs.RateLimiter require Pleroma.Constants plug( + Majic.Plug, + [pool: Pleroma.MajicPool] when action in [:update_avatar, :update_background, :update_banner] + ) + + plug( OpenApiSpex.Plug.PutApiSpec, [module: Pleroma.Web.ApiSpec] when action == :confirmation_resend ) |