Merge remote-tracking branch 'origin/dev'

configs/nginx.example

@@ -111,7 +111,7 @@ server {
 	}
 
 	# Files (image, video, audio, other)
-	location ~* \.(png|jpg|jpeg|gif|apng|webp|jfif|pjpeg|mkv|mp4|webm|mov|svg|mp3|ogg|wav|opus)$ {
+	location ~* \.(png|jpg|jpeg|bmp|gif|apng|webp|jfif|pjpeg|mkv|mp4|webm|mov|svg|mp3|ogg|wav|opus)$ {
 		access_log off;
 		expires max;
 		root /path/to/jschan/static;

configs/nginx_no_https.example

@@ -111,7 +111,7 @@ server {
 	}
 
 	# Files (image, video, audio, other)
-	location ~* \.(png|jpg|jpeg|gif|apng|webp|pjpeg|jfif|mkv|mp4|webm|mov|svg|mp3|ogg|wav|opus)$ {
+	location ~* \.(png|jpg|jpeg|bmp|gif|apng|webp|pjpeg|jfif|mkv|mp4|webm|mov|svg|mp3|ogg|wav|opus)$ {
 		access_log off;
 		expires max;
 		root /path/to/jschan/static;

db/db.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { MongoClient, ObjectId, Int32 } = require('mongodb')
+	, { migrateVersion } = require(__dirname+'/../package.json')
 	, configs = require(__dirname+'/../configs/main.js');
 
 module.exports = {
@@ -15,6 +16,18 @@ module.exports = {
 		});
 	},
 
+	checkVersion: async() => {
+		const currentVersion = await module.exports.client
+			.db('jschan')
+			.collection('version')
+			.findOne({ '_id': 'version' })
+			.then(res => res.version);
+		if (currentVersion < migrateVersion) {
+			console.error('Your migration version is out-of-date. Run `gulp migrate` to update.');
+			process.exit(1);
+		}
+	},
+
 	ObjectId,
 
 	NumberInt: Int32,

gulpfile.js

@@ -14,7 +14,7 @@ const gulp = require('gulp')
 	, del = require('del')
 	, pug = require('pug')
 	, gulppug = require('gulp-pug')
-	, migrateVersion = require(__dirname+'/package.json').migrateVersion
+	, { migrateVersion } = require(__dirname+'/package.json')
 	, paths = {
 		styles: {
 			src: 'gulp/res/css/**/*.css',

models/forms/editpost.js

@@ -147,7 +147,7 @@ todo: handle some more situations
 		user: req.session.user.username,
 		ip: {
 			single: res.locals.ip.single,
-			raw: ras.locals.ip.raw,
+			raw: res.locals.ip.raw,
 		}
 	});
 

schedules/index.js

@@ -13,6 +13,7 @@ const timeUtils = require(__dirname+'/../helpers/timeutils.js')
 
 	debugLogs && console.log('CONNECTING TO MONGODB');
 	await Mongo.connect();
+	await Mongo.checkVersion();
 	debugLogs && console.log('STARTING SCHEDULES');
 
 	//update board stats and homepage

server.js

@@ -32,6 +32,7 @@ const express = require('express')
 	// connect to mongodb
 	debugLogs && console.log('CONNECTING TO MONGODB');
 	await Mongo.connect();
+	await Mongo.checkVersion();
 
 	// connect to redis
 	debugLogs && console.log('CONNECTING TO REDIS');

worker.js

@@ -11,6 +11,7 @@ const { debugLogs } = require(__dirname+'/configs/main.js')
 
 	debugLogs && console.log('CONNECTING TO MONGODB');
 	await Mongo.connect();
+	await Mongo.checkVersion();
 
 	const tasks = require(__dirname+'/helpers/tasks.js')
 		, { queue } = require(__dirname+'/queue.js')