X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/fa93b93394adc45f4b3bd1694c960df127cfc4da..79519d5abd251267436256b6cc41f36872f39dbe:/modules/subtext.py

diff --git a/modules/subtext.py b/modules/subtext.py
index bef2ac1..ca23ec7 100644
--- a/modules/subtext.py
+++ b/modules/subtext.py
@@ -1,6 +1,7 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # module for 's/regex/replacement/' style correction
-# see for usage examples: https://github.com/zonidjan/erebus/commit/d7e9802778477f1faa26a03078cb1b3c018a5e5c
+# warning: arbitrary regex's are generally capable of various DoS attacks on CPU/memory usage. use with caution.
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
@@ -21,7 +22,7 @@ modstop = lib.modstop
 # module code
 import re
 from collections import namedtuple
-re_findsub = re.compile(r"s(.)(?P<search>[^\1]+)\1(?P<replace>[^\1]+)\1(?P<global>g)?;?")
+re_findsub = re.compile(r"""s([/'";:!@#$%^&-_=`~])(?P<search>.+?)\1(?P<replace>.*?)(?:\1(?P<global>g)?|$)""")
 Line = namedtuple('Line', ['sender', 'msg'])
 lastline = {}
 @lib.hooknum("PRIVMSG")
@@ -29,19 +30,18 @@ def privmsg_hook(bot, line):
 	pieces = line.split(None, 3)
 	fromnick = pieces[0][1:].split('!')[0]
 	chan = pieces[2]
+	if chan[0] != "#": return
 	msg = pieces[3][1:]
+
 	mo = re_findsub.match(msg)
 	if mo:
-		print lastline[chan]
-		print mo.groupdict()
 		if mo.group('global') is not None:
 			count = 0 # unlimited
 		else:
 			count = 1 # only first
 		try:
 			newline = re.sub(mo.group('search'), mo.group('replace'), lastline[chan].msg, count)
-		except Exception as e: print e; return # ignore it if it doesn't work
-		print newline
+		except Exception as e: return # ignore it if it doesn't work
 		if newline != lastline[chan].msg:
 			if lastline[chan].sender == fromnick:
 				bot.msg(chan, "<%s> %s" % (lastline[chan].sender, newline))