From 05f5e2237d1464807656f66fa7824a42a047179a Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Mon, 27 Jan 2020 12:51:35 +0100
Subject: [PATCH] Added extra modules loading

---
 server.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/server.js b/server.js
index da68f36..654d0fb 100755
--- a/server.js
+++ b/server.js
@@ -27,10 +27,11 @@ const vhost = require('vhost')
 const logger = require('./utils/logger.js')
 logger.Load()
 const utils = require('./utils/utils.js')
-const fs = require('fs')
 const http = require('http')
 const https = require('https')
 
+const extraModulesFile = './extraModules.json'
+
 const loggableKeywords = [
   'user.js'
 ]
@@ -62,6 +63,19 @@ let modules = {
   }
 }
 
+try {
+  if (utils.FileExists(extraModulesFile)) {
+    const extraModules = JSON.parse(utils.ReadFile(extraModulesFile))
+    modules = {
+      ...extraModules,
+      ...modules
+    }
+  }
+} catch (e) {
+  logger.Log('Failed to read extra modules file')
+  console.log(e)
+}
+
 const app = express()
 
 app.use(function (req, res, next) {
@@ -107,9 +121,9 @@ var certsLoaded = false
 if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFile) && utils.FileExists(
   chainFile)) {
   try {
-    const key = fs.readFileSync(privkeyFile, 'utf8')
-    const cert = fs.readFileSync(fullchainFile, 'utf8')
-    const ca = fs.readFileSync(chainFile, 'utf8')
+    const key = utils.ReadFile(privkeyFile)
+    const cert = utils.ReadFile(fullchainFile)
+    const ca = utils.ReadFile(chainFile)
     var certs = {
       key: key,
       cert: cert,