From 2457f6da009b19e7b0df22352a251b6995430b12 Mon Sep 17 00:00:00 2001
From: Fletcher Boyd <me@fletcherjamesboyd.com>
Date: Wed, 4 Sep 2013 18:56:58 +0800
Subject: [PATCH 1/3] 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 <me@fletcherjamesboyd.com>
Date: Wed, 4 Sep 2013 19:05:39 +0800
Subject: [PATCH 2/3] 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 <message> 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)
 

From 99b14bac59f0a7a7142fd2230e70b6817c6ff682 Mon Sep 17 00:00:00 2001
From: Luke Rogers <lukeroge@gmail.com>
Date: Wed, 4 Sep 2013 23:06:44 +1200
Subject: [PATCH 3/3] Updated CONTRIBUTORS. You are all great!

---
 CONTRIBUTORS | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9f8a2a3..8810f2f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3,14 +3,21 @@ Thanks to everyone who has contributed to CloudBot! Come in IRC and ping me if I
 Luke Rogers (lukeroge)
 Neersighted
 blha303
-KsaRedFx
-urbels
 cybojenix
+KsaRedFx
+nathanblaney
+thenoodle68
+nasonfish
+urbels
+puffrfish
+Sepero
+TheFiZi
+mikeleigh
 Spudstabber
 frozenMC
 frdmn
-puffrfish
-nasonfish
+
+
 
 We are using code from the following projects:
 ./plugins/mlia.py - https://github.com/infinitylabs/UguuBot