Merge branch 'master' into discord-enhancements

server/database.js

@@ -1,9 +1,8 @@
 const fs = require("fs");
 const { sleep } = require("../src/util");
 const { R } = require("redbean-node");
-const {
-    setSetting, setting,
-} = require("./util-server");
+const { setSetting, setting } = require("./util-server");
+const knex = require("knex");
 
 class Database {
 
@@ -12,6 +11,24 @@ class Database {
     static latestVersion = 5;
     static noReject = true;
 
+    static connect() {
+        const Dialect = require("knex/lib/dialects/sqlite3/index.js");
+        Dialect.prototype._driver = () => require("@louislam/sqlite3");
+
+        R.setup(knex({
+            client: Dialect,
+            connection: {
+                filename: Database.path,
+            },
+            useNullAsDefault: true,
+            pool: {
+                min: 1,
+                max: 1,
+                idleTimeoutMillis: 30000,
+            }
+        }));
+    }
+
     static async patch() {
         let version = parseInt(await setting("database_version"));
 

server/server.js

@@ -649,9 +649,7 @@ async function initDatabase() {
     }
 
     console.log("Connecting to Database")
-    R.setup("sqlite", {
-        filename: Database.path,
-    });
+    Database.connect();
     console.log("Connected")
 
     // Patch the database