From df731d467b1e5486aa401212c4737d18d8cc96af Mon Sep 17 00:00:00 2001
From: anthorob <anthonyrobert1997@hotmail.fr>
Date: Tue, 21 Sep 2021 00:41:28 -0400
Subject: [PATCH] Modified settings class

---
 src/main/java/netneutrality/db/DBController.java |  3 ++-
 src/main/java/netneutrality/utils/Settings.java  | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/netneutrality/db/DBController.java b/src/main/java/netneutrality/db/DBController.java
index 7217f7f..6be429e 100644
--- a/src/main/java/netneutrality/db/DBController.java
+++ b/src/main/java/netneutrality/db/DBController.java
@@ -9,6 +9,7 @@ import java.util.concurrent.TimeUnit;
 
 import netneutrality.MusicBot;
 import netneutrality.ThreadManager;
+import netneutrality.utils.Settings;
 import org.jetbrains.annotations.NotNull;
 import org.reflections.Reflections;
 import org.slf4j.Logger;
@@ -26,7 +27,7 @@ public class DBController {
 	private final static HashMap<String, AbstractController> controllers = new HashMap<>();
 
 	private final static Logger logger = LoggerFactory.getLogger(DBController.class);
-	private static final MysqlDatabase database = new MysqlDatabase("netneutrality");
+	private static final MysqlDatabase database = new MysqlDatabase(Settings.getInstance().get("mysql.database", "netneutrality"));
 
 	/**
 	 * @param controller The name of the controller as defined in the {@link AbstractController#getControllerName()}'s method
diff --git a/src/main/java/netneutrality/utils/Settings.java b/src/main/java/netneutrality/utils/Settings.java
index 68c6c30..61cbc10 100644
--- a/src/main/java/netneutrality/utils/Settings.java
+++ b/src/main/java/netneutrality/utils/Settings.java
@@ -4,8 +4,6 @@ import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.entities.User;
 import netneutrality.MusicBot;
-import netneutrality.db.DBController;
-import netneutrality.db.controllers.DBSettings;
 
 import java.io.*;
 import java.util.Properties;
@@ -38,7 +36,15 @@ public class Settings {
 
     public String get(String key) {
         return prop.getProperty(key);
+    }
 
+    public String get(String key, String def) {
+        String property = prop.getProperty(key);
+
+        if (property == null)
+            return def;
+
+        return property;
     }
 
     public final String DATETIMEFORMAT = "yyyy-MM-dd HH:mm:ss";