more conversions

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

2 files changed, 8 insertions, 9 deletions

diff --git a/passiveactions/rootcheck.py b/passiveactions/rootcheck.py
index c5cc7a7..0abe183 100644
--- a/passiveactions/rootcheck.py
+++ b/passiveactions/rootcheck.py
@@ -5,12 +5,11 @@ class rootcheck:
 
     def getAction(self, data, users):
         try:
-            user = data[1:data.index('!')]
-            input = data.split()
-            if 'JOIN' in input[1]:
-                if 'root' in input[0]:
-                    cmd = "PRIVMSG " + input[2][1:] + " :" + user +": Root?!?!?!!??!"
-                    cmd += "\r\nKICK " + input[2][1:] + " " + user + " :Root + irc = kick"
+            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"
                     return cmd
         except:
             return False
diff --git a/passiveactions/spy.py b/passiveactions/spy.py
index c1fc1f6..9f815a0 100644
--- a/passiveactions/spy.py
+++ b/passiveactions/spy.py
@@ -10,14 +10,14 @@ class spy:
 
     def getAction(self, data, users):
         try:
-            user = data[1:data.index('!')]
+            user = data.getUsername()
             if user in spyusers:
                 if user in data:
                     input = data.split()
                     words = ""
-                    for word in input[3:]:
+                    for word in data.prefix.split(' ')[1:]:
                         words += ' ' + word
-                    return 'PRIVMSG ' + spymaster + ' :' + user + ' in ' + input[2] + ' said "' + words[2:] + '"'
+                    return 'PRIVMSG ' + spymaster + ' :' + user + ' in ' + data.prefix.split(' ')[0] + ' said "' + words[2:] + '"'
         except:
             return False