help - if nofakelag, showcommands should send the list instead of URL

[erebus.git] / modules / subtext.py

diff --git a/modules/subtext.py b/modules/subtext.py
index 278fe92e114597e8c4d44397d69b693b20dae8d5..88a2368e5747dc37f705f9938e10338f5587db86 100644 (file)
--- a/modules/subtext.py
+++ b/modules/subtext.py
@@ -23,7 +23,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")