!!! spy.py is broken. I'm not exactly sure what it's supposed to do.

rootcheck.py bug fixes.


git-svn-id: svn://svn.zzq.org/warmachine/trunk@9 3ede8657-8418-0410-873f-eb3fb5a66eab

2 files changed, 6 insertions, 4 deletions

diff --git a/passiveactions/rootcheck.py b/passiveactions/rootcheck.py
index 0abe183..2f20fb2 100644
--- a/passiveactions/rootcheck.py
+++ b/passiveactions/rootcheck.py
@@ -8,8 +8,11 @@ class rootcheck:
             user = data.getUsername()
             if 'JOIN' in data.command:
                 if 'root' in data.prefix:
-                    cmd = "PRIVMSG " + data.prefix + " :" + user +": Root?!?!?!!??!"
-                    cmd += "\r\nKICK " + data.prefix + " " + user + " :Root + irc = kick"
+                    if data.params[0] == ':':
+                        data.params = data.params[1:]
+
+                    cmd = "PRIVMSG " + data.params + " :" + user +": Root?!?!?!!??!"
+                    cmd += "\r\nKICK " + data.params + " " + user + " :Root + irc = kick"
                     return cmd
         except:
             return False
diff --git a/passiveactions/spy.py b/passiveactions/spy.py
index 9f815a0..56956ad 100644
--- a/passiveactions/spy.py
+++ b/passiveactions/spy.py
@@ -12,8 +12,7 @@ class spy:
         try:
             user = data.getUsername()
             if user in spyusers:
-                if user in data:
-                    input = data.split()
+                if user in data.params:
                     words = ""
                     for word in data.prefix.split(' ')[1:]:
                         words += ' ' + word