Merge pull request CloudBotIRC#95 from linuxdaemon/gonzobot+correction-fix

Cleanup of correction.py

Author: edwardslabs

plugins/correction.py

@@ -1,10 +1,10 @@
 import re
 
 from cloudbot import hook
-
 from cloudbot.util.formatting import ireplace
 
-correction_re = re.compile(r"^[sS]/(.*/.*(?:/[igx]{,4})?)\S*$")
+correction_re = re.compile(r"^[sS]/(?:(.*?)(?<!\\)/(.*?)(?:(?<!\\)/([igx]{,4}))?)\s*$")
+unescape_re = re.compile(r'\\(.)')
 
 
 @hook.regex(correction_re)
@@ -14,34 +14,36 @@ def correction(match, conn, nick, chan, message):
     :type conn: cloudbot.client.Client
     :type chan: str
     """
-    groups = [b.replace("\/", "/") for b in re.split(r"(?<!\\)/", match.groups()[0])]
+    groups = [unescape_re.sub(r"\1", group or "") for group in match.groups()]
     find = groups[0]
     replace = groups[1]
     if find == replace:
         return "really dude? you want me to replace {} with {}?".format(find, replace)
-    
-    if not find.strip(): # Replacing empty or entirely whitespace strings is spammy
+
+    if not find.strip():  # Replacing empty or entirely whitespace strings is spammy
         return "really dude? you want me to replace nothing with {}?".format(replace)
 
-    for item in conn.history[chan].__reversed__():
-        name, timestamp, msg = item
+    for name, timestamp, msg in reversed(conn.history[chan]):
         if correction_re.match(msg):
             # don't correct corrections, it gets really confusing
             continue
 
         if find.lower() in msg.lower():
-            if "\x01ACTION" in msg:
-                msg = msg.replace("\x01ACTION", "").replace("\x01", "")
-                mod_msg = ireplace(msg, find, "\x02" + replace + "\x02")
-                message("Correction, * {} {}".format(name, mod_msg))
+            find_esc = re.escape(find)
+            replace_esc = re.escape(replace)
+            if msg.startswith('\x01ACTION'):
+                mod_msg = msg[7:].strip(' \x01')
+                fmt = "* {} {}"
             else:
-                mod_msg = ireplace(msg, find, "\x02" + replace + "\x02")
-                message("Correction, <{}> {}".format(name, mod_msg))
+                mod_msg = msg
+                fmt = "<{}> {}"
+
+            mod_msg = ireplace(mod_msg, find_esc, "\x02" + replace_esc + "\x02")
 
-            msg = ireplace(msg, find, replace)
+            message("Correction, {}".format(fmt.format(name, mod_msg)))
+
+            msg = ireplace(msg, find_esc, replace_esc)
             if nick.lower() == name.lower():
                 conn.history[chan].append((name, timestamp, msg))
-            return
-        else:
-            continue
-    # return("No matches for \"\x02{}\x02\" in recent messages from \x02{}\x02. You can only correct your own messages.".format(find, nick))
+
+            break