4 files changed, 27 insertions, 13 deletions

diff --git a/conf/users.py b/conf/users.py
index 174380c..3ef926d 100644
--- a/conf/users.py
+++ b/conf/users.py
@@ -3,3 +3,4 @@ user.append('ashcrow')
 user.append('beav')
 user.append('wes')
 user.append('com4')
+user.append('jason_')
diff --git a/passiveactions/autoop.py b/passiveactions/autoop.py
index 45ae9e4..5724df5 100644
--- a/passiveactions/autoop.py
+++ b/passiveactions/autoop.py
@@ -5,11 +5,13 @@ class autoop:
 
     def getAction(self, data, users):
         try:
-            input = data.split()
-            if 'JOIN' in input[1]:
-                user = data[1:data.index('!')]
+            if data.command == 'JOIN':
+                user = data.prefix[0:data.prefix.index('!')]
                 if user in users:
                     print "autoop"
-                    return 'MODE ' + input[2][1:] + ' +o ' + user
+
+                    if data.params[0] == ':':
+                        data.params = data.params[1:]
+                    return 'MODE ' + data.params + ' +o ' + user
         except:
             return False
diff --git a/warmachine.py b/warmachine.py
index 769e7b6..ed4fcda 100644
--- a/warmachine.py
+++ b/warmachine.py
@@ -89,13 +89,22 @@ class irc:
             for line in data.split('\r\n'):
                 obj_data = parser.ircparse(line)
                 #pass to action handlers here...
+                print "!" + obj_data.prefix + "~" + obj_data.command + "~" + obj_data.params
+                try:
+                    for key in passiveactions.keys():
+                        pa = passiveactions[key].getAction(obj_data, user)
+                        if pa:
+                            self.send(pa)
+                except Exception,e:
+                    print "Action failed"
+                    print e
 
             # Passive Actions
             try:
-                for key in passiveactions.keys():
-                    pa = passiveactions[key].getAction(data, user)
-                    if pa:
-                        self.send(pa)
+            #    for key in passiveactions.keys():
+            #        pa = passiveactions[key].getAction(data, user)
+            #        if pa:
+            #            self.send(pa)
             # Direct Actions
                 if data.find(self.nick + ':') != -1:
                     curuser = data[1:data.index('!')]
@@ -115,7 +124,7 @@ class irc:
 
 
 if __name__ == '__main__':
-    i = irc('localhost', 'warmachine', 'omgident')
+    i = irc('irc.servercentral.net', 'warmachine', 'omgident')
     i.connect()
     i.join('#zzq')
     i.MainLoop()
diff --git a/wmd/parser.py b/wmd/parser.py
index a413594..99173be 100644
--- a/wmd/parser.py
+++ b/wmd/parser.py
@@ -28,13 +28,15 @@ class ircparse(object):
             pass
 
         # Command comes 2nd (Or first if the prefix is missing) 
-        self.command = data.split(' ')[1]
+        if len(data.split(' ')) > 1:
+            self.command = data.split(' ')[1]
 
         # Finally we reconstruct the parameters. We'll let the plugins figure out
         # what they mean since they could potentially be very different.
-        for param in data.split(' ')[2:]:
-            self.params += param + " "
-        self.params.strip()
+        if len(data.split(' ')) > 2:
+            for param in data.split(' ')[2:]:
+                self.params += param + " "
+            self.params.strip()
 
 class configparse(object):
     def __init__(self, filename):