From c1560a367d1b4a14e4aed938894f8d2a9b914c7b Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Tue, 28 Jan 2020 15:40:18 +0100
Subject: [PATCH] 404 site views folder fix

---
 modules/main/main.js       |  4 ++--
 modules/qmining/qmining.js |  2 --
 modules/sio/sio.js         |  4 ++--
 modules/stuff/stuff.js     |  4 ++--
 server.js                  | 29 ++---------------------------
 5 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/modules/main/main.js b/modules/main/main.js
index 1ef78dc..b3653d2 100644
--- a/modules/main/main.js
+++ b/modules/main/main.js
@@ -58,11 +58,11 @@ app.get('/', function (req, res) {
 })
 
 app.get('*', function (req, res) {
-  res.status(404).render('shared/404')
+  res.status(404).render('404')
 })
 
 app.post('*', function (req, res) {
-  res.status(404).render('shared/404')
+  res.status(404).render('404')
 })
 
 exports.app = app
diff --git a/modules/qmining/qmining.js b/modules/qmining/qmining.js
index 51ad305..eb02409 100644
--- a/modules/qmining/qmining.js
+++ b/modules/qmining/qmining.js
@@ -289,7 +289,6 @@ app.post('/isAdding', function (req, res) {
 })
 
 app.get('/q', function (req, res) {
-  logger.LogReq(req)
   if (Object.keys(req.query).length === 0) {
     res.json({
       message: `ask something! ?q=[question]&subj=[subject]&data=[question data]. 'subj' is optimal for faster result`,
@@ -366,7 +365,6 @@ app.get('/infos', function (req, res) {
   if (req.query.motd) {
     result.motd = motd
   }
-  logger.LogReq(req)
   res.json(result)
 })
 
diff --git a/modules/sio/sio.js b/modules/sio/sio.js
index 5ae80c9..75c7baa 100644
--- a/modules/sio/sio.js
+++ b/modules/sio/sio.js
@@ -87,11 +87,11 @@ app.route('/fosuploader').post(function (req, res, next) {
   })
 })
 app.get('*', function (req, res) {
-  res.status(404).render('shared/404')
+  res.status(404).render('404')
 })
 
 app.post('*', function (req, res) {
-  res.status(404).render('shared/404')
+  res.status(404).render('404')
 })
 
 exports.app = app
diff --git a/modules/stuff/stuff.js b/modules/stuff/stuff.js
index 07976d7..6ee5f67 100644
--- a/modules/stuff/stuff.js
+++ b/modules/stuff/stuff.js
@@ -197,11 +197,11 @@ app.get('/*', function (req, res) {
 // -----------------------------------------------------------------------------------------------
 
 app.get('*', function (req, res) {
-  res.status(404).render('shared/404')
+  res.status(404).render('404')
 })
 
 app.post('*', function (req, res) {
-  res.status(404).render('shared/404')
+  res.status(404).render('404')
 })
 
 exports.app = app
diff --git a/server.js b/server.js
index 654d0fb..9b50137 100755
--- a/server.js
+++ b/server.js
@@ -31,37 +31,12 @@ const http = require('http')
 const https = require('https')
 
 const extraModulesFile = './extraModules.json'
+const modulesFile = './modules.json'
 
 const loggableKeywords = [
   'user.js'
 ]
-let modules = {
-  qmining: {
-    path: './modules/qmining/qmining.js',
-    name: 'qmining',
-    urls: [ 'qmining.frylabs.net', 'localhost' ]
-  },
-  main: {
-    path: './modules/main/main.js',
-    name: 'main',
-    urls: [ 'frylabs.net', 'www.frylabs.net' ]
-  },
-  sio: {
-    path: './modules/sio/sio.js',
-    name: 'sio',
-    urls: [ 'sio.frylabs.net' ]
-  },
-  stuff: {
-    path: './modules/stuff/stuff.js',
-    name: 'stuff',
-    urls: [ 'stuff.frylabs.net' ]
-  },
-  old: {
-    path: './modules/old/old.js',
-    name: 'old',
-    urls: [ 'qmining.tk', 'www.qmining.tk' ]
-  }
-}
+let modules = JSON.parse(utils.ReadFile(modulesFile))
 
 try {
   if (utils.FileExists(extraModulesFile)) {