fully migrated from old settings system

- now using mysql instead of a json file
- uses the same database as the dashboard ("mysql" property in 
config.json)

Author: ShadowLp174

commands/join.js

@@ -12,7 +12,7 @@ function joinChannel(message, cid, cb=()=>{}, ecb=()=>{}) {
     return message.reply(this.em("Already joined <#" + cid + ">.", message), false);
   }
   this.channels.push(cid);
-  const settings = this.settingsMgr.getServer(message.channel.serverId);
+  const settings = this.getSettings(message);
   const pOff = this.freed.shift() || ++this.currPort; // reuse old ports
   const p = new RevoltPlayer(this.config.token, {
     voice: this.revoice,

index.js

@@ -36,11 +36,11 @@ class Remix {
     this.observedUsers = new Map();
     this.observedReactions = new Map();
 
-    this.settingsMgr = new SettingsManager();
-    this.settingsMgr.loadDefaultsSync("./storage/defaults.json");
+    /*this.settingsMgr = new SettingsManager();
+    this.settingsMgr.loadDefaultsSync("./storage/defaults.json");*/
     // updated settings manager based on a mysql database:
     // TODO: add self-hosting instr
-    this.rSettingsMgr = new RemoteSettingsManager(this.config.mysql, "./storage/defaults.json");
+    this.settingsMgr = new RemoteSettingsManager(this.config.mysql, "./storage/defaults.json");
 
     this.uploader = new Uploader(this.client);
 
@@ -553,7 +553,7 @@ class Remix {
   }
   getSettings(message) {
     const serverId = message.channel.serverId;
-    return this.rSettingsMgr.getServer(serverId);
+    return this.settingsMgr.getServer(serverId);
   }
   observeUser(id, channel, cb) {
     this.observedUsers.set(id + ";" + channel, cb);

settings/Settings.js

@@ -55,6 +55,16 @@ class ServerSettings { // TODO: switch to better db system
   }
 }
 
+
+/**
+ * Creates a server settings manager. Stores everything in a JSON file.
+ * To save the current configs you have to call .saveAsync()
+ * Deprecated for obvious reasons. Use RemoteSettingsManager instead.
+ *
+ * @class SettingsManager
+ *
+ * @deprecated
+ */
 class SettingsManager {
   guilds = new Map();
   storagePath = "./storage/settings.json";
@@ -203,11 +213,11 @@ class RemoteSettingsManager { // mysql based manager
     });
   }
   async remoteUpdate(server, key) {
-    const r = await this.query("UPDATE settings SET 'data' = JSON_SET('data', $." + key + ", '" + server.data[key] + "')")
+    const r = await this.query("UPDATE settings SET data = JSON_SET(data, '$." + key + "', '" + server.data[key] + "') WHERE id='" + server.id + "'")
     if (r.error) console.error("settings update error; ", r.error);
   }
   async remoteSave(server) {
-    const r = await this.query("UPDATE settings SET 'data' = '" + JSON.stringify(server.data) + "' WHERE id='" + server.id + "'");
+    const r = await this.query("UPDATE settings SET data = '" + JSON.stringify(server.data) + "' WHERE id='" + server.id + "'");
     if (r.error) console.error("settings server save error; ", r.error);
   }