From 05ee2a0f391e3c11fd6a8c1fcbdaa71c9fa66367 Mon Sep 17 00:00:00 2001 From: PangeaCake Date: Tue, 13 Jan 2015 19:11:07 -0800 Subject: [PATCH 1/4] Erm.. was that a type? line 37 "g not" in flags vs "g" not in flags --- plugins/correction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From aa57bc51b06be872fd290f3f4eb639c7ff139470 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 15 Jan 2015 11:42:43 +1300 Subject: [PATCH 2/4] Add /log to .gitignore to avoid any more nasty accidents --- .gitignore | 1 + cloudbot/hook.py | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 338434d5b..e6d6d817f 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ target/ # Cloudbot persist/ +log/ 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 From 3d8430fb312f63192386f5c115a16b38c7eeb63c Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 15 Jan 2015 11:46:18 +1300 Subject: [PATCH 3/4] =?UTF-8?q?=E0=B2=A0=5F=E0=B2=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e6d6d817f..c7db0d2de 100644 --- a/.gitignore +++ b/.gitignore @@ -52,7 +52,7 @@ target/ # Cloudbot persist/ -log/ +logs/ config.json *.db *.log From c0a2184c145b2911d1f1777cb1ab23bb40dd5087 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Thu, 15 Jan 2015 15:18:16 +1300 Subject: [PATCH 4/4] Update utility.py --- plugins/utility.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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