rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Fix error on invalid regex for /clean

Browse source
This commit is contained in:
Calvin Montgomery 2018-01-17 21:54:43 -08:00
parent 326e67893c
commit 8399eab33f
3 changed files with 69 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/channel/playlist.js
View file

@ -1218,6 +1218,12 @@ PlaylistModule.prototype.clean = function (test) {
* == Command Handlers ==
*/
/*
* TODO: investigate how many people are relying on regex
* capabilities for /clean. Might be user friendlier to
* replace it with a glob matcher (or at least remove the
* -flags)
*/
function generateTargetRegex(target) {
const flagsre = /^(-[img]+\s+)/i
var m = target.match(flagsre);
@ -1242,7 +1248,15 @@ PlaylistModule.prototype.handleClean = function (user, msg, meta) {
"/cleantitle <title>"
});
}
var target = generateTargetRegex(args.join(" "));
var target;
try {
target = generateTargetRegex(args.join(" "));
} catch (error) {
user.socket.emit("errorMsg", {
msg: `Invalid target: ${args.join(" ")}`
});
return;
}
this.channel.logger.log("[playlist] " + user.getName() + " used " + cmd +
" with target regex: " + target);