From 5b965657bba6c7de3d1f29033969b4658021fd89 Mon Sep 17 00:00:00 2001 From: Luke Slater Date: Tue, 22 Jan 2013 12:21:14 +0100 Subject: [PATCH 1/2] second part of the regexen can be empty --- modules/regex/regex.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/regex/regex.js b/modules/regex/regex.js index 42182aa..0444950 100644 --- a/modules/regex/regex.js +++ b/modules/regex/regex.js @@ -3,7 +3,7 @@ var _ = require('underscore')._; var regex = function(dbot) { this.last = {}; this.listener = function(event) { - var q = event.message.valMatch(/^([\d\w\s]*)?:? ?s\/(.+)\/(.+)\/([ig]*)?$/, 5); + var q = event.message.valMatch(/^([\d\w\s]*)?:? ?s\/(.+)\/(.+)?\/([ig]*)?$/, 5); if(q) { var flags = q[4], toMatch = new RegExp(q[2], flags), From 6e08b184f67168d44ea135f38e51b7f0dc566a50 Mon Sep 17 00:00:00 2001 From: Luke Slater Date: Tue, 22 Jan 2013 12:22:55 +0100 Subject: [PATCH 2/2] replaceWith empty if no q[3] --- modules/regex/regex.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/regex/regex.js b/modules/regex/regex.js index 0444950..48b8e21 100644 --- a/modules/regex/regex.js +++ b/modules/regex/regex.js @@ -10,6 +10,8 @@ var regex = function(dbot) { replaceWith = q[3], last, replacement; + + if(!replaceWith) replaceWith = ""; if(q[1] != null) { var user = q[1];