mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-22 16:16:34 +00:00
Code Issues Projects Releases Wiki Activity

remove duplicate module

Browse source
This commit is contained in:
Maksim Pechnikov 2020-07-24 08:35:06 +03:00
parent 67ab9a7928
commit 61ef1fca4b
3 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/test.exs
View file

@ -118,6 +118,8 @@ config :pleroma, Pleroma.Uploaders.S3,
streaming_enabled: true, streaming_enabled: true,
public_endpoint: nil public_endpoint: nil
config :tzdata, :autoupdate, :disabled
if File.exists?("./config/test.secret.exs") do if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs" import_config "test.secret.exs"
else else

17
lib/pleroma/config/utils.ex
View file

@ -1,17 +0,0 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Config.Utils do
alias Pleroma.Config
def instance_name, do: Config.get([:instance, :name])
defp instance_notify_email do
Config.get([:instance, :notify_email]) || Config.get([:instance, :email])
end
def sender do
{instance_name(), instance_notify_email()}
end
end

2
lib/pleroma/user/welcome_email.ex
View file

@ -11,7 +11,7 @@ defmodule Pleroma.User.WelcomeEmail do
alias Pleroma.Emails alias Pleroma.Emails
alias Pleroma.User alias Pleroma.User
import Pleroma.Config.Utils, only: [instance_name: 0] import Pleroma.Config.Helpers, only: [instance_name: 0]
@spec enabled?() :: boolean() @spec enabled?() :: boolean()
def enabled?, do: Config.get([:welcome, :email, :enabled], false) def enabled?, do: Config.get([:welcome, :email, :enabled], false)