remove duplicate module

diff --git a/config/test.exs b/config/test.exs
index abcf793e5934138b3384d615c6881dfd0429745b..db0655e7377bdcb07f11b840e917b30a4844cd47 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -118,6 +118,8 @@ config :pleroma, Pleroma.Uploaders.S3,
   streaming_enabled: true,
   public_endpoint: nil
 
+config :tzdata, :autoupdate, :disabled
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else

diff --git a/lib/pleroma/config/utils.ex b/lib/pleroma/config/utils.ex
deleted file mode 100644 (file)
index f1afbb4..0000000
--- 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 91a9591ddccd5fef2081f825947bf8b4823a366a..5322000d4f6bd7fe1fd3e9e8c94fcdb39b18b0e5 100644 (file)
--- 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)