summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/config/utils.ex17
-rw-r--r--lib/pleroma/user/welcome_email.ex2
2 files changed, 1 insertions, 18 deletions
diff --git a/lib/pleroma/config/utils.ex b/lib/pleroma/config/utils.ex
deleted file mode 100644
index f1afbb42f..000000000
--- a/lib/pleroma/config/utils.ex
+++ /dev/null
@@ -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
diff --git a/lib/pleroma/user/welcome_email.ex b/lib/pleroma/user/welcome_email.ex
index 91a9591dd..5322000d4 100644
--- a/lib/pleroma/user/welcome_email.ex
+++ b/lib/pleroma/user/welcome_email.ex
@@ -11,7 +11,7 @@ defmodule Pleroma.User.WelcomeEmail do
alias Pleroma.Emails
alias Pleroma.User
- import Pleroma.Config.Utils, only: [instance_name: 0]
+ import Pleroma.Config.Helpers, only: [instance_name: 0]
@spec enabled?() :: boolean()
def enabled?, do: Config.get([:welcome, :email, :enabled], false)