ref #420 start ban duration editing

controllers/forms/editbans.js

@@ -3,6 +3,7 @@
 const removeBans = require(__dirname+'/../../models/forms/removebans.js')
 	, dynamicResponse = require(__dirname+'/../../helpers/dynamic.js')
 	, denyAppeals = require(__dirname+'/../../models/forms/denybanappeals.js')
+	, editBans = require(__dirname+'/../../models/forms/editbans.js')
 	, paramConverter = require(__dirname+'/../../helpers/paramconverter.js')
 	, { checkSchema, lengthBody, numberBody, minmaxBody, numberBodyVariable,
 		inArrayBody, arrayInBody, existsBody } = require(__dirname+'/../../helpers/schema.js');
@@ -10,6 +11,7 @@ const removeBans = require(__dirname+'/../../models/forms/removebans.js')
 module.exports = {
 
 	paramConverter: paramConverter({
+		timeFields: ['ban_duration'],
 		trimFields: ['option'],
 		allowedArrays: ['checkedbans'],
 		objectIdArrays: ['checkedbans']
@@ -19,7 +21,8 @@ module.exports = {
 
 		const errors = await checkSchema([
 			{ result: lengthBody(req.body.checkedbans, 1), expected: false, error: 'Must select at least one ban' },
-			{ result: inArrayBody(req.body.option, ['unban', 'deny_appeal']), expected: true, error: 'Invalid ban action' },
+			{ result: inArrayBody(req.body.option, ['unban', 'edit', 'deny_appeal']), expected: true, error: 'Invalid ban action' },
+			{ result: req.body.option !== 'edit' || numberBody(req.body.ban_duration, 0), expected: true, error: 'Invalid filter auto ban duration' },
 		]);
 
 		const redirect = req.params.board ? `/${req.params.board}/manage/bans.html` : '/globalmanage/bans.html';
@@ -35,12 +38,21 @@ module.exports = {
 		let amount = 0;
 		let message;
 		try {
-			if (req.body.option === 'unban') {
-				amount = await removeBans(req, res, next);
-				message = `Removed ${amount} bans`;
-			} else {
-				amount = await denyAppeals(req, res, next);
-				message = `Denied ${amount} appeals`;
+			switch(req.body.option) {
+				case 'unban':
+					amount = await removeBans(req, res, next);
+					message = `Removed ${amount} bans`;
+					break;
+				case 'deny_appeal':
+					amount = await denyAppeals(req, res, next);
+					message = `Denied ${amount} appeals`;
+					break;
+				case 'edit': //could do other properties in future
+					amount = await editBans(req, res, next);
+					message = `Edited ${amount} bans`;
+					break;
+				default:
+					throw 'Invalid ban action'; //should never happen anyway
 			}
 		} catch (err) {
 			return next(err);

db/bans.js

@@ -92,6 +92,19 @@ module.exports = {
 		});
 	},
 
+	editDuration: (board, ids, newExpireAt) => {
+		return db.updateMany({
+			'board': board,
+			'_id': {
+				'$in': ids
+			},
+		}, {
+			'$set': {
+				'expireAt': newExpireAt,
+			}
+		});
+	},
+
 	removeMany: (board, ids) => {
 		return db.deleteMany({
 			'board': board,

models/forms/editbans.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const { Bans } = require(__dirname+'/../../db/');
+
+module.exports = async (req, res, next) => {
+
+	//New ban expiry date is current date + ban_duration. Not based on the original ban issue date.
+	const newExpireAt = new Date(Date.now() + req.body.ban_duration);
+	return Bans.editDuration(req.params.board, req.body.checkedbans, newExpireAt).then(result => result.modifiedCount);
+
+}

views/includes/managebanform.pug

@@ -14,5 +14,10 @@ else
 			.label Deny Appeal
 			label.postform-style.ph-5
 				input(type='radio' name='option' value='deny_appeal')
+		.row
+			.label Edit Duration
+			label.postform-style.ph-5.mr-1
+				input(type='radio' name='option' value='edit')
+			input(type='text' name='ban_duration' placeholder='Ban duration e.g. 7d' autocomplete='off')
 	input(type='submit' value='submit')