5 files changed, 65 insertions, 37 deletions

diff --git a/settings.py b/settings.py
index 947b5bb..6591f19 100644
--- a/settings.py
+++ b/settings.py
@@ -4,6 +4,9 @@
 # choose the nickname for you bot.
 NICKNAME = 'warmachine'
 
+# (optional) Only for servers that have nickserv.
+NICKSERV_PASSWORD =''
+
 SERVER = 'irc.freenode.org'
 PORT = 6667
 IDENT = 'warmachine'
@@ -12,7 +15,11 @@ CHANNELS = ('#warmachine-dev',)
 
 ADMINS = ('com4',)
 
+ACTIONS = (
+    'wmd.actions.nickserv.IdentWithNickserv',
+)
+
 try:
-    from local_settings.py import *
+    from local_settings import *
 except ImportError:
     pass
\ No newline at end of file
diff --git a/wmd/actions/__init__.py b/wmd/actions/__init__.py
new file mode 100644
index 0000000..03cde4c
--- /dev/null
+++ b/wmd/actions/__init__.py
@@ -0,0 +1,2 @@
+class Action(object):
+    pass
\ No newline at end of file
diff --git a/wmd/actions/nickserv.py b/wmd/actions/nickserv.py
new file mode 100644
index 0000000..fa91d5b
--- /dev/null
+++ b/wmd/actions/nickserv.py
@@ -0,0 +1,21 @@
+from wmd.actions import Action
+
+import settings
+
+class IdentWithNickserv(Action):
+    def __init__(self):
+        self.logged_in = False
+
+    def recv_msg(self, irc, obj_data):
+        username = obj_data.get_username()
+        msg = obj_data.params
+        if username and username.lower() == 'nickserv':
+
+            if 'identify' in msg.lower()\
+            and not self.logged_in:
+                msg = 'identify %s' % (settings.NICKSERV_PASSWORD)
+                print "%s: Logging in..." % self.__class__.__name__
+                irc.privmsg(username, msg)
+                self.logged_in = True
+            elif 'are now identified' in msg.lower():
+                print "%s: Logged in." % (self.__class__.__name__)
\ No newline at end of file
diff --git a/wmd/irc.py b/wmd/irc.py
index 98e8245..558712d 100644
--- a/wmd/irc.py
+++ b/wmd/irc.py
@@ -1,7 +1,5 @@
 import socket
 
-from actions.ActionMap import *
-from passiveactions.PassiveActionMap import *
 from wmd import parser
 
 import settings
@@ -16,12 +14,9 @@ class IRC(object):
         self.nick = nick
         self.name = name
         self.port = port
+        self.actions = []
 
-    def locaActions(self):
-        """
-        Loads the actions internally.
-        """
-        pass
+        self.load_actions()
 
     def connect(self):
         """
@@ -37,7 +32,7 @@ class IRC(object):
         """
         Joins a channel
         """
-        self.send('JOIN ' + chan)
+        self.rawsend('JOIN ' + chan)
 
     def log(self, string):
         """
@@ -45,12 +40,34 @@ class IRC(object):
         """
         print 'log: ' + string
 
-    def send(self, command):
+    def privmsg(self, dest, msg):
+        """
+        send a privmsg to dest
+        """
+        self.rawsend('PRIVMSG %s :%s' % (dest, msg))
+
+    def rawsend(self, command):
         """
         Sends commands straight to the irc server.
         """
         self.irc.send(command + '\r\n')
 
+    def load_actions(self):
+        """
+        Loads the actions internally.
+        """
+        for action in settings.ACTIONS:
+            self.load_action(action)
+
+    def load_action(self, path):
+        """
+        Loads the provided action
+        """
+        module_name, class_name = path.rsplit('.', 1)
+        module = __import__(module_name, globals(), locals(), [class_name], -1)
+        classz = getattr(module, class_name)
+        self.actions.insert(0, classz())
+
     def __call__(self, *args, **kwargs):
         """
         Main Event Loop that parses generic commands
@@ -66,26 +83,13 @@ class IRC(object):
                 data = data + self.irc.recv(4096)
 
             for line in data.split('\r\n'):
-                obj_data = parser.ircparse(line)
+                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)
-
-                    if obj_data.params.find(self.nick + ':') > -1 or obj_data.params.find(':!') > -1:
-                        curuser = obj_data.getUsername()
-                        if curuser not in user:
-                            continue
-                        for key in actions.keys():
-                            if obj_data.params.find(key) > -1:
-                                self.send(actions[key].getAction(obj_data))
-
-                except Exception,e:
-                    print "Action failed"
-                    print e
+                for action in self.actions:
+                    retval = action.recv_msg(self, obj_data)
+                    if retval:
+                        self.rawsend(retval)
\ No newline at end of file
diff --git a/wmd/parser.py b/wmd/parser.py
index cf88f75..24b965c 100644
--- a/wmd/parser.py
+++ b/wmd/parser.py
@@ -1,4 +1,4 @@
-class ircparse(object):
+class IRCParse(object):
     #http://www.irchelp.org/irchelp/rfc/rfc.html
 
     def __init__(self, data):
@@ -11,7 +11,7 @@ class ircparse(object):
         if data != '':
             self._process_data(data)
 
-    def getUsername(self):
+    def get_username(self):
         # Usernames are from 0 to the !... extract it out of we can.
         if self.prefix.find('!') > -1:
             return self.prefix[0:self.prefix.index('!')]
@@ -44,10 +44,4 @@ class ircparse(object):
         if len(data.split(' ')) > (start_at + 1):
             for param in data.split(' ')[(start_at+1):]:
                 self.params += param + " "
-            self.params.strip()
-
-class configparse(object):
-    def __init__(self, filename):
-        self.filename = filename
-
-
+            self.params.strip()
\ No newline at end of file