From 2457f6da009b19e7b0df22352a251b6995430b12 Mon Sep 17 00:00:00 2001 From: Fletcher Boyd Date: Wed, 4 Sep 2013 18:56:58 +0800 Subject: [PATCH 1/2] So apparently you do need inp. --- plugins/core_ctcp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/core_ctcp.py b/plugins/core_ctcp.py index 7312adf..523a4e4 100755 --- a/plugins/core_ctcp.py +++ b/plugins/core_ctcp.py @@ -4,15 +4,15 @@ from util import hook # CTCP responses @hook.regex(r'^\x01VERSION\x01$') -def ctcp_version(notice=None): +def ctcp_version(inp, notice=None): notice('\x01VERSION: CloudBot - http://git.io/cloudbotirc') @hook.regex(r'^\x01PING\x01$') -def ctcp_ping(notice=None): +def ctcp_ping(inp, notice=None): notice('\x01PING: PONG') @hook.regex(r'^\x01TIME\x01$') -def ctcp_time(notice=None): +def ctcp_time(inp, notice=None): notice('\x01TIME: The time is: %s' % time.strftime("%r", time.localtime())) From 7c6453be1ee0e8399599fbee884d01458f96fabe Mon Sep 17 00:00:00 2001 From: Fletcher Boyd Date: Wed, 4 Sep 2013 19:05:39 +0800 Subject: [PATCH 2/2] Fixed flawed logic in word construction. --- plugins/admin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/admin.py b/plugins/admin.py index 70b73ac..851e642 100755 --- a/plugins/admin.py +++ b/plugins/admin.py @@ -187,10 +187,11 @@ def say(inp, conn=None, chan=None): If [channel] is blank the bot will say the in the channel the command was used in.""" inp = inp.split(" ") - message = " ".join(inp[1:]) if inp[0][0] == "#": + message = " ".join(inp[1:]) out = "PRIVMSG %s :%s" % (inp[0], message) else: + message = " ".join(inp[0:]) out = "PRIVMSG %s :%s" % (chan, message) conn.send(out)