11 files changed, 51 insertions, 49 deletions

diff --git a/actions/coin.py b/actions/coin.py
index 05dfbda..36392af 100644
--- a/actions/coin.py
+++ b/actions/coin.py
@@ -13,5 +13,5 @@ class coin:
            thecoin = "The coin lands on HEAD."
         else:
            thecoin = "The coin lands on TAILS."
-        input = data.split(' ')
-        return 'PRIVMSG ' + input[4] + ' :' + thecoin
+        channel = data.params[0:data.params.index(' ')]
+        return 'PRIVMSG ' + channel + ' :' + thecoin
diff --git a/actions/deop.py b/actions/deop.py
index d9c61eb..38d54ca 100644
--- a/actions/deop.py
+++ b/actions/deop.py
@@ -4,5 +4,6 @@ class deop:
         self = []
 
     def getAction(self, data):
-        input = data.split(' ')
-        return 'MODE ' + input[5] + ' -o ' + input[6]
+        channel = data.params[0:data.params.index(' ')]
+        user = data.params.split(' ')[3]
+        return 'MODE ' + channel + ' -o ' + user
diff --git a/actions/devoice.py b/actions/devoice.py
index 9539634..e820466 100644
--- a/actions/devoice.py
+++ b/actions/devoice.py
@@ -4,5 +4,6 @@ class devoice:
         self = []
 
     def getAction(self, data):
-        input = data.split(' ')
-        return 'MODE ' + input[5] + ' -v ' + input[6]
+        channel = data.params[0:data.params.index(' ')]
+        user = data.params.split(' ')[3]
+        return 'MODE ' + channel + ' -v ' + user
diff --git a/actions/join.py b/actions/join.py
index 7a36947..44246be 100644
--- a/actions/join.py
+++ b/actions/join.py
@@ -4,4 +4,5 @@ class join:
         self = []
 
     def getAction(self, data):
-        return 'JOIN ' + data[data.index('join')+5:]
+        channel = data.params.split(' ')[3]
+        return 'JOIN ' + channel
diff --git a/actions/kick.py b/actions/kick.py
index 86416fa..0725ef5 100644
--- a/actions/kick.py
+++ b/actions/kick.py
@@ -4,6 +4,7 @@ class kick:
         self = []
 
     def getAction(self, data):
-        input = data.split(' ')
-        return 'KICK ' + input[5] + ' ' + input[6]
+        channel = data.params[0:data.params.index(' ')]
+        user = data.params.split(' ')[3]
+        return 'KICK ' + channel + ' ' + user
 
diff --git a/actions/op.py b/actions/op.py
index 60102c4..9c9df6c 100644
--- a/actions/op.py
+++ b/actions/op.py
@@ -4,5 +4,6 @@ class op:
         self = []
 
     def getAction(self, data):
-        input = data.split(' ')
-        return 'MODE ' + input[5] + ' +o ' + input[6]
+        channel = data.params[0:data.params.index(' ')]
+        user = data.params.split(' ')[3]
+        return 'MODE ' + channel + ' +o ' + user
diff --git a/actions/part.py b/actions/part.py
index f55e63f..508a44a 100644
--- a/actions/part.py
+++ b/actions/part.py
@@ -4,4 +4,5 @@ class part:
         self = []
 
     def getAction(self, data):
-        return 'PART ' + data[data.index('part')+5:]
+        channel = data.params.split(' ')[3]
+        return 'PART ' + channel
diff --git a/actions/say.py b/actions/say.py
index 7c7273f..1d2a916 100644
--- a/actions/say.py
+++ b/actions/say.py
@@ -4,8 +4,12 @@ class say:
        self = []
 
     def getAction(self, data):
-        input = data.split(' ')
-        words = ""
-        for word in input[6:]:
-            words += ' ' + word
-        return 'PRIVMSG ' + input[5] + ' :' + words[1:]
+        channel = data.params.split(' ')[3]
+        words = data.params.split(' ')[4:]
+
+
+        say = "" 
+        for word in words:
+            say += word + " "
+
+        return 'PRIVMSG ' + channel + ' :' + say
diff --git a/actions/settopic.py b/actions/settopic.py
index 8fa574a..91ecc6c 100644
--- a/actions/settopic.py
+++ b/actions/settopic.py
@@ -4,8 +4,12 @@ class settopic:
         self = []
 
     def getAction(self, data):
-        input = data.split(' ')
-        words = ""
-        for word in input[6:]:
-            words += ' ' + word
-        return 'TOPIC ' + input[5] + ' :' + words[1:]
+        channel = data.params.split(' ')[3]
+        words = data.params.split(' ')[4:]
+
+
+        say = "" 
+        for word in words:
+            say += word + " "
+
+        return 'TOPIC ' + channel + ' :' + say
diff --git a/actions/voice.py b/actions/voice.py
index fe42d05..ea72d4f 100644
--- a/actions/voice.py
+++ b/actions/voice.py
@@ -4,5 +4,6 @@ class voice:
         self = []
 
     def getAction(self, data):
-        input = data.split(' ')
-        return 'MODE ' + input[5] + ' +v ' + input[6]
+        channel = data.params[0:data.params.index(' ')]
+        user = data.params.split(' ')[3]
+        return 'MODE ' + channel + ' +v ' + user
diff --git a/warmachine.py b/warmachine.py
index 426904f..c9a03eb 100644
--- a/warmachine.py
+++ b/warmachine.py
@@ -89,40 +89,27 @@ class irc:
             for line in data.split('\r\n'):
                 obj_data = parser.ircparse(line)
                 #pass to action handlers here...
+                if (obj_data.prefix == '') and (obj_data.command == '') and (obj_data.params == ''):
+                    continue
+
                 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)
-            # Direct Actions
-                if data.find(self.nick + ':') != -1:
-                    curuser = data[1:data.index('!')]
-                    if curuser in user:
-                        input = data.split()
-                        print "$$ " + input
+                    if obj_data.params.find(self.nick + ':') > -1:
+                        curuser = obj_data.getUsername()
+                        if curuser not in user:
+                            continue
                         for key in actions.keys():
-                            if data.find(key) != -1:
-                                self.send(actions[key].getAction(data))
-                                break
-                    else:
-                        input = data.split()
-                        self.send('PRIVMSG ' + input[2] + ' :' + curuser +
-                            ': stop bothering me jerk.')
-            except Exception,e:
-                print "Action failed"
-                print e
+                            if obj_data.params.find(key) > -1:
+                                self.send(actions[key].getAction(obj_data))
 
+                except Exception,e:
+                    print "Action failed"
+                    print e
 
 if __name__ == '__main__':
     i = irc('irc.inter.net.il', 'warmachine', 'omgident')