hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "EmailTest: use config mock"

Browse source 
This reverts commit dca41cc4a3.
This commit is contained in:
Lain Soykaf 2023-12-12 19:35:19 +04:00
commit cca6c20eb6
4 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/emails/mailer.ex
View file

@ -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

3
lib/pleroma/user.ex
View file

@ -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