summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLain Soykaf <lain@lain.com>2023-12-12 19:35:19 +0400
committerLain Soykaf <lain@lain.com>2023-12-12 19:35:19 +0400
commitcca6c20eb6acd0f510054d1a1050d12ea2a32482 (patch)
treedcdacdec964f040d3d53d0f8e8e36918372e87de /lib
parenta989b793de5790987e1a6a82a7da37be673b11f8 (diff)
downloadpleroma-cca6c20eb6acd0f510054d1a1050d12ea2a32482.tar.gz
pleroma-cca6c20eb6acd0f510054d1a1050d12ea2a32482.zip
Revert "EmailTest: use config mock"
This reverts commit dca41cc4a37999a6971b70ef5e0996e528b79bf5.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/emails/mailer.ex3
-rw-r--r--lib/pleroma/user.ex3
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/emails/mailer.ex b/lib/pleroma/emails/mailer.ex
index 02c148e9f..101442130 100644
--- a/lib/pleroma/emails/mailer.ex
+++ b/lib/pleroma/emails/mailer.ex
@@ -14,10 +14,9 @@ defmodule Pleroma.Emails.Mailer do
@otp_app :pleroma
@mailer_config [otp: :pleroma]
- @config_impl Application.compile_env(:pleroma, [__MODULE__, :config_impl], Pleroma.Config)
@spec enabled?() :: boolean()
- def enabled?, do: @config_impl.get([__MODULE__, :enabled])
+ def enabled?, do: Pleroma.Config.get([__MODULE__, :enabled])
@doc "add email to queue"
def deliver_async(email, config \\ []) do
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index f939687eb..0706f5607 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -86,7 +86,6 @@ defmodule Pleroma.User do
]
@cachex Pleroma.Config.get([:cachex, :provider], Cachex)
- @config_impl Application.compile_env(:pleroma, [__MODULE__, :config_impl], Pleroma.Config)
schema "users" do
field(:bio, :string, default: "")
@@ -1001,7 +1000,7 @@ defmodule Pleroma.User do
@spec maybe_send_confirmation_email(User.t()) :: {:ok, :enqueued | :noop}
def maybe_send_confirmation_email(%User{is_confirmed: false, email: email} = user)
when is_binary(email) do
- if @config_impl.get([:instance, :account_activation_required]) do
+ if Config.get([:instance, :account_activation_required]) do
send_confirmation_email(user)
{:ok, :enqueued}
else