logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: ebd6dd7c53db0799c2a6fc0d5602eced9541033e
parent 61c609884cc9fb24049da24159d2e3d2025026a3
Author: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date:   Wed, 24 Jun 2020 09:02:27 +0300

UserEnabledPlug module name

Diffstat:

Mlib/pleroma/web/plugs/user_enabled_plug.ex2+-
Mlib/pleroma/web/router.ex4++--
Mtest/pleroma/web/plugs/user_enabled_plug_test.exs2+-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/plugs/user_enabled_plug.ex b/lib/pleroma/web/plugs/user_enabled_plug.ex @@ -2,7 +2,7 @@ # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Plugs.UserEnabledPlug do +defmodule Pleroma.Web.Plugs.UserEnabledPlug do import Plug.Conn alias Pleroma.User diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex @@ -13,7 +13,7 @@ defmodule Pleroma.Web.Router do pipeline :oauth do plug(:fetch_session) plug(Pleroma.Plugs.OAuthPlug) - plug(Pleroma.Plugs.UserEnabledPlug) + plug(Pleroma.Web.Plugs.UserEnabledPlug) end pipeline :expect_authentication do @@ -34,7 +34,7 @@ defmodule Pleroma.Web.Router do end pipeline :after_auth do - plug(Pleroma.Plugs.UserEnabledPlug) + plug(Pleroma.Web.Plugs.UserEnabledPlug) plug(Pleroma.Plugs.SetUserSessionIdPlug) plug(Pleroma.Plugs.EnsureUserKeyPlug) end diff --git a/test/pleroma/web/plugs/user_enabled_plug_test.exs b/test/pleroma/web/plugs/user_enabled_plug_test.exs @@ -5,7 +5,7 @@ defmodule Pleroma.Web.Plugs.UserEnabledPlugTest do use Pleroma.Web.ConnCase, async: true - alias Pleroma.Plugs.UserEnabledPlug + alias Pleroma.Web.Plugs.UserEnabledPlug import Pleroma.Factory setup do: clear_config([:instance, :account_activation_required])