From 61ef1fca4bdefc1281d2ffaac8af43d0fcdb6ee4 Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Fri, 24 Jul 2020 08:35:06 +0300
Subject: [PATCH] remove duplicate module
---
config/test.exs | 2 ++
lib/pleroma/config/utils.ex | 17 -----------------
lib/pleroma/user/welcome_email.ex | 2 +-
3 files changed, 3 insertions(+), 18 deletions(-)
delete mode 100644 lib/pleroma/config/utils.ex
diff --git a/config/test.exs b/config/test.exs
index abcf793e5..db0655e73 100644
--- 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
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)