bunch of changes to help with development (no nginx) and new installs

.gitignore

@@ -2,5 +2,6 @@ node_modules/
 backup.sh
 configs/*.json
 static/*
+gulp/res/js/socket.io.js
 gulp/dist/
 tmp/

db/accounts.js

@@ -7,6 +7,8 @@ const Mongo = require(__dirname+'/db.js')
 
 module.exports = {
 
+	db,
+
 	count: (usernames) => {
 		return db.countDocuments({
 			'_id': {
@@ -22,7 +24,6 @@ module.exports = {
 	insertOne: async (username, password, authLevel) => {
 		// hash the password
 		const passwordHash = await bcrypt.hash(password, 12);
-
 		//add to db
 		return db.insertOne({
 			'_id': username,

db/files.js

@@ -56,10 +56,18 @@ module.exports = {
 			}
 		]).toArray().then(res => {
 			const stats = res[0];
-			return {
-				count: stats.count,
-				totalSize: stats.size,
-				totalSizeString: formatSize(stats.size)
+			if (stats) {
+				return {
+					count: stats.count,
+					totalSize: stats.size,
+					totalSizeString: formatSize(stats.size)
+				}
+			} else {
+				return {
+					count: 0,
+					totalSize: 0,
+					totalSizeString: '0B'
+				}
 			}
 		});
 	},

db/modlogs.js

@@ -5,6 +5,8 @@ const Mongo = require(__dirname+'/db.js')
 
 module.exports = {
 
+	db,
+
 	getDates: (board) => {
 		return db.aggregate([
             {

db/news.js

@@ -6,6 +6,8 @@ const Mongo = require(__dirname+'/db.js')
 
 module.exports = {
 
+	db,
+
 	find: () => {
 		return db.find({}).sort({
 			'_id': -1

db/ratelimits.js

@@ -31,7 +31,7 @@ module.exports = {
 	},
 
 	deleteAll: () => {
-		return ratelimit.deleteMany({});
+		return db.deleteMany({});
 	},
 
 }

db/stats.js

@@ -6,6 +6,8 @@ const Mongo = require(__dirname+'/db.js')
 
 module.exports = {
 
+	db,
+
 	updateOne: (board, ip, thread) => {
 		return db.updateOne({
 			'board': board,

gulpfile.js

@@ -34,14 +34,7 @@ async function wipe() {
 	const Mongo = require(__dirname+'/db/db.js');
 	await Mongo.connect();
 	const { Boards, Posts, Captchas, Ratelimits,
-			Accounts, Files, Stats, Modlogs, Bans } = require(__dirname+'/db/')
-		, Posts = require(__dirname+'/db/posts.js')
-		, Bans = require(__dirname+'/db/bans.js')
-		, Captchas = require(__dirname+'/db/captchas.js')
-		, Ratelimits = require(__dirname+'/db/ratelimits.js')
-		, Accounts = require(__dirname+'/db/accounts.js')
-		, Files = require(__dirname+'/db/files.js')
-		, Stats = require(__dirname+'/db/stats.js');
+		Accounts, Files, Stats, Modlogs, Bans } = require(__dirname+'/db/');
 
 	//wipe db shit
 	await Promise.all([
@@ -157,7 +150,7 @@ function scripts() {
 		.pipe(gulp.dest(paths.scripts.dest));
 }
 
-const build = gulp.parallel(css, scripts, images, deletehtml, custompages);
+const build = gulp.parallel(css, scripts, images, gulp.series(deletehtml, custompages));
 const reset = gulp.series(wipe, build)
 const html = gulp.series(deletehtml, custompages)
 

helpers/sessionrefresh.js

@@ -6,10 +6,14 @@ module.exports = async (req, res, next) => {
 	if (req.session && req.session.authenticated === true) {
 		// keeping session updated incase user updated on global manage
 		const account = await Accounts.findOne(req.session.user.username);
-		req.session.user = {
-			'username': account._id,
-			'authLevel': account.authLevel
-		};
+		if (!account) {
+			req.session.destroy();
+		} else {
+			req.session.user = {
+				'username': account._id,
+				'authLevel': account.authLevel
+			};
+		}
 	}
 	next();
 }