diff --git a/.gitignore b/.gitignore index 338434d5b..c7db0d2de 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ target/ # Cloudbot persist/ +logs/ config.json *.db *.log diff --git a/cloudbot/hook.py b/cloudbot/hook.py index 02a1d9cf6..ca85984c5 100644 --- a/cloudbot/hook.py +++ b/cloudbot/hook.py @@ -297,4 +297,5 @@ def _on_start_hook(func): return lambda func: _on_start_hook(func) +# this is temporary, to ease transition onload = on_start \ No newline at end of file diff --git a/plugins/correction.py b/plugins/correction.py index e6bb784b6..4c633031c 100644 --- a/plugins/correction.py +++ b/plugins/correction.py @@ -34,7 +34,7 @@ def correction(match, conn, chan, message): mod_msg = find_re.sub("\x02" + replacement + "\x02", msg, count=int("g" not in flags)) message("Correction, {}".format(("<{}> " if not is_action else "* {}").format(nick) + mod_msg)) # append to end of history file - msg = find_re.sub(replacement, msg, count=int("g not" in flags)) + msg = find_re.sub(replacement, msg, count=int("g" not in flags)) conn.history[chan].append((nick, timestamp, msg)) return else: diff --git a/plugins/utility.py b/plugins/utility.py index a5412b24b..af7debdc9 100644 --- a/plugins/utility.py +++ b/plugins/utility.py @@ -215,7 +215,7 @@ def derpify(text): "WHAT THE": "WT", "WHAT": "WUT", "ARE": "R", "WHY": "Y", "BE RIGHT BACK": "BRB", "BECAUSE": "B/C", "OH MY GOD": "OMG", "O": "OH", "THE": pick_the, "TOO": "2", "TO": "2", "BE": "B", "CK": "K", "ING": "NG", "PLEASE": "PLS", "SEE YOU": "CYA", "SEE YA": "CYA", "SCHOOL": "SKOOL", "AM": "M", - "AM GOING TO": "IAM GOING TO", + "AM GOING TO": "IAM GOING TO", "THAT": "DAT", "ICK": "IK", "LIKE": "LIEK", "HELP": "HALP", "KE": "EK", "E": pick_e, "!": pick_ex, "?": pick_qt} output = translate(string, rules) + " " + pick_end