From 2200b1dc79b518be944ee5a92c4cc738f98aed4a Mon Sep 17 00:00:00 2001
From: Big Bad Waffle <skichenbrand@gmail.com>
Date: Sun, 3 Mar 2019 21:52:17 +0200
Subject: [PATCH] fixed some sqlite issues

---
 src/server/components/auth.js                      | 6 ++++--
 src/server/components/extensions/socialCommands.js | 3 ++-
 src/server/config/consts.js                        | 6 +-----
 src/server/config/serverConfig.js                  | 2 +-
 src/server/leaderboard/leaderboard.js              | 3 ++-
 src/server/mail/mail.js                            | 6 +++++-
 src/server/security/io.js                          | 4 ++--
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/server/components/auth.js b/src/server/components/auth.js
index b5636a3d..16b4be45 100644
--- a/src/server/components/auth.js
+++ b/src/server/components/auth.js
@@ -106,14 +106,16 @@ module.exports = {
 			key: this.charname,
 			table: 'character',
 			value: simple,
-			clean: true
+			clean: true,
+			serialize: true
 		});
 
 		await io.setAsync({
 			key: this.username,
 			table: 'stash',
 			value: this.obj.stash.serialize(),
-			clean: true
+			clean: true,
+			serialize: true
 		});
 
 		if (callback)
diff --git a/src/server/components/extensions/socialCommands.js b/src/server/components/extensions/socialCommands.js
index 36274fb3..023f764f 100644
--- a/src/server/components/extensions/socialCommands.js
+++ b/src/server/components/extensions/socialCommands.js
@@ -590,7 +590,8 @@ module.exports = {
 		await io.setAsync({
 			key: username,
 			table: 'skins',
-			value: JSON.stringify(skins)
+			value: skins,
+			serialize: true
 		});
 	},
 
diff --git a/src/server/config/consts.js b/src/server/config/consts.js
index fae6247a..fda1f6b5 100644
--- a/src/server/config/consts.js
+++ b/src/server/config/consts.js
@@ -3,9 +3,5 @@ module.exports = {
 	tickTime: 350,
 
 	//The maximum level a player can reach
-	maxLevel: 20,
-
-	//Which DB engine to use
-	// Options: sqlite, rethinkdb
-	db: 'rethinkdb'
+	maxLevel: 20
 };
diff --git a/src/server/config/serverConfig.js b/src/server/config/serverConfig.js
index 7857bc89..16c5d9af 100644
--- a/src/server/config/serverConfig.js
+++ b/src/server/config/serverConfig.js
@@ -7,7 +7,7 @@ module.exports = {
 	//Options: 
 	// sqlite
 	// rethink
-	db: 'rethink',
+	db: 'sqlite',
 	dbHost: 'localhost',
 	dbPort: 28015
 };
diff --git a/src/server/leaderboard/leaderboard.js b/src/server/leaderboard/leaderboard.js
index bd504139..8a35ec26 100644
--- a/src/server/leaderboard/leaderboard.js
+++ b/src/server/leaderboard/leaderboard.js
@@ -56,7 +56,8 @@ module.exports = {
 		});
 
 		this.list = list.map(l => ({
-			name: l.id,
+			//This is a bit of a hack. RethinkDB uses 'id' whereas Sqlite uses 'key'
+			name: l.key || l.id,
 			level: l.value.level,
 			prophecies: l.value.prophecies
 		}));
diff --git a/src/server/mail/mail.js b/src/server/mail/mail.js
index eac3d763..afb6d2f2 100644
--- a/src/server/mail/mail.js
+++ b/src/server/mail/mail.js
@@ -1,7 +1,11 @@
+let serverConfig = require('../config/serverConfig');
+
+const useDb = process.env.db || serverConfig.db;
+
 const moduleMap = {
 	sqlite: 'Sqlite',
 	rethinkdb: 'RethinkDb'
 };
-const modulePath = `./mail${moduleMap[consts.db]}`;
+const modulePath = `./mail${moduleMap[useDb]}`;
 
 module.exports = require(modulePath);
diff --git a/src/server/security/io.js b/src/server/security/io.js
index f616ae1f..a820e391 100644
--- a/src/server/security/io.js
+++ b/src/server/security/io.js
@@ -1,8 +1,8 @@
-let fs = require('fs');
 let util = require('util');
 let serverConfig = require('../config/serverConfig');
 
-if (serverConfig.db === 'rethink') {
+//eslint-disable-next-line no-process-env
+if ((process.env.db || serverConfig.db) === 'rethink') {
 	module.exports = require('./ioRethink');
 	return;
 }