From c1963b28099dfb89cc8d080719ac2c12a885df30 Mon Sep 17 00:00:00 2001
From: Pitu <7425261+Pitu@users.noreply.github.com>
Date: Tue, 3 Oct 2017 19:48:26 -0300
Subject: Changed how domains are handled

---
 lolisafe.js | 74 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

(limited to 'lolisafe.js')

diff --git a/lolisafe.js b/lolisafe.js
index 0255b0e..a9c7f45 100644
--- a/lolisafe.js
+++ b/lolisafe.js
@@ -1,55 +1,57 @@
-const config = require('./config.js')
-const api = require('./routes/api.js')
-const album = require('./routes/album.js')
-const express = require('express')
-const helmet = require('helmet')
-const bodyParser = require('body-parser')
-const RateLimit = require('express-rate-limit')
-const db = require('knex')(config.database)
-const fs = require('fs')
-const exphbs  = require('express-handlebars')
-const safe = express()
+const config = require('./config.js');
+const api = require('./routes/api.js');
+const album = require('./routes/album.js');
+const express = require('express');
+const helmet = require('helmet');
+const bodyParser = require('body-parser');
+const RateLimit = require('express-rate-limit');
+const db = require('knex')(config.database);
+const fs = require('fs');
+const exphbs = require('express-handlebars');
+const safe = express();
 
 require('./database/db.js')(db)
 
-fs.existsSync('./pages/custom' ) || fs.mkdirSync('./pages/custom')
-fs.existsSync('./' + config.logsFolder) || fs.mkdirSync('./' + config.logsFolder)
-fs.existsSync('./' + config.uploads.folder) || fs.mkdirSync('./' + config.uploads.folder)
-fs.existsSync('./' + config.uploads.folder + '/thumbs') || fs.mkdirSync('./' + config.uploads.folder + '/thumbs')
+fs.existsSync('./pages/custom' ) || fs.mkdirSync('./pages/custom');
+fs.existsSync('./' + config.logsFolder) || fs.mkdirSync('./' + config.logsFolder);
+fs.existsSync('./' + config.uploads.folder) || fs.mkdirSync('./' + config.uploads.folder);
+fs.existsSync('./' + config.uploads.folder + '/thumbs') || fs.mkdirSync('./' + config.uploads.folder + '/thumbs');
 
-safe.use(helmet())
-safe.set('trust proxy', 1)
+safe.use(helmet());
+safe.set('trust proxy', 1);
 
-safe.engine('handlebars', exphbs({defaultLayout: 'main'}))
-safe.set('view engine', 'handlebars')
-safe.enable('view cache')
+safe.engine('handlebars', exphbs({ defaultLayout: 'main' }));
+safe.set('view engine', 'handlebars');
+safe.enable('view cache');
 
-let limiter = new RateLimit({ windowMs: 5000, max: 2 })
-safe.use('/api/login/', limiter)
-safe.use('/api/register/', limiter)
+let limiter = new RateLimit({ windowMs: 5000, max: 2 });
+safe.use('/api/login/', limiter);
+safe.use('/api/register/', limiter);
 
-safe.use(bodyParser.urlencoded({ extended: true }))
-safe.use(bodyParser.json())
+safe.use(bodyParser.urlencoded({ extended: true }));
+safe.use(bodyParser.json());
 
-safe.use('/', express.static('./uploads'))
-safe.use('/', express.static('./public'))
-safe.use('/', album)
-safe.use('/api', api)
+if (config.serveFilesWithNode) {
+	safe.use('/', express.static('./uploads'));
+}
 
+safe.use('/', express.static('./public'));
+safe.use('/', album);
+safe.use('/api', api);
 
 for (let page of config.pages) {
-	let root = './pages/'
+	let root = './pages/';
 	if (fs.existsSync(`./pages/custom/${page}.html`)) {
-		root = './pages/custom/'
+		root = './pages/custom/';
 	}
 	if (page === 'home') {
-		safe.get('/', (req, res, next) => res.sendFile(`${page}.html`, { root: root }))
+		safe.get('/', (req, res, next) => res.sendFile(`${page}.html`, { root: root }));
 	} else {
-		safe.get(`/${page}`, (req, res, next) => res.sendFile(`${page}.html`, { root: root }))
+		safe.get(`/${page}`, (req, res, next) => res.sendFile(`${page}.html`, { root: root }));
 	}
 }
 
-safe.use((req, res, next) => res.status(404).sendFile('404.html', { root: './pages/error/' }))
-safe.use((req, res, next) => res.status(500).sendFile('500.html', { root: './pages/error/' }))
+safe.use((req, res, next) => res.status(404).sendFile('404.html', { root: './pages/error/' }));
+safe.use((req, res, next) => res.status(500).sendFile('500.html', { root: './pages/error/' }));
 
-safe.listen(config.port, () => console.log(`loli-safe started on port ${config.port}`))
+safe.listen(config.port, () => console.log(`loli-safe started on port ${config.port}`));
-- 
cgit v1.2.3