Finished user authentication when bot joins channel (WHO #chan %ant,0) and added...

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index a3b16f9938c19e4fcf0951b7af94d97dbaeab246..1737f93debd4914999aadb10ebcd984983a909ae 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -1,5 +1,8 @@
 #!/usr/bin/python
 
+# Erebus IRC bot - Author: John Runyon
+# "Bot" and "BotConnection" classes (handling a specific "arm")
+
 #TODO: error checking
 
 import socket, sys
@@ -9,9 +12,11 @@ class Bot(object):
        def __init__(self, parent, nick, user, bind, server, port, realname, chans):
                self.parent = parent
                self.nick = nick
+               self.user = user
+               self.realname = realname
                self.chans = chans
 
-               self.conn = BotConnection(self, nick, user, bind, server, port, realname)
+               self.conn = BotConnection(self, bind, server, port)
        def connect(self):
                if self.conn.connect():
                        self.parent.newfd(self, self.conn.socket.fileno())
@@ -28,9 +33,9 @@ class Bot(object):
 
                                elif pieces[1] == "001":
                                        self.conn.registered(True)
-
                                        for c in self.chans:
                                                self.join(c)
+
                        else:
                                self.parse(line)
        def parse(self, line):
@@ -46,32 +51,39 @@ class Bot(object):
                elif pieces[0] == "PING":
                        self.conn.send("PONG %s" % (pieces[1]))
 
+               elif pieces[1] == "354": # WHOX
+                       qt = pieces[3]
+                       nick = pieces[4]
+                       auth = pieces[5]
+                       if auth != '0':
+                               self.parent.user(nick).authed(auth)
+
                elif pieces[1] == "JOIN":
                        nick = pieces[0].split('!')[0][1:]
                        user = self.parent.user(nick)
-                       chan = self.parent.channel(pieces[2]) #TODO TODO TODO
+                       chan = self.parent.channel(pieces[2])
+
+                       if nick == self.nick:
+                               self.conn.send("WHO %s %%ant,1" % (chan))
+                       else:
+                               pass #TODO TODO TODO add to common chans!
                        
        def parsemsg(self, user, chan, msg):
-               if msg[0] == '!': #TODO check config for trigger
+               if msg[0] == self.parent.trigger:
                        msg = msg[1:]
-
                else:
                        return
 
                pieces = msg.split()
-               cmd = pieces[0].upper()
+               cmd = pieces[0].lower()
 
-               if cmd == "EVAL":
-                       try: ret = eval(' '.join(pieces[1:]))
-                       except: self.msg(chan, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-                       else: self.msg(chan, "Done: %r" % (ret))
+               if self.parent.hashook(cmd):
+                       callback = self.parent.gethook(cmd)
+                       if user.level >= callback.reqlevel:
+                               callback(self, user, chan, *pieces[1:])
+                               return
 
-               elif cmd == "EXEC":
-                       try: exec ' '.join(pieces[1:])
-                       except: self.msg(chan, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-                       else: self.msg(chan, "Done.")
-
-               #TODO
+               self.msg(user, "No such command, or you don't have access.")
 
        def msg(self, target, msg):
                if isinstance(target, self.parent.User): self.conn.send("NOTICE %s :%s" % (target.nick, msg))
@@ -90,27 +102,27 @@ class Bot(object):
        def quit(self, reason="Shutdown"):
                self.conn.send("QUIT :%s" % (reason))
 
+       def __str__(self): return self.nick
+       def __repr__(self): return "<Bot %r>" % (self.nick)
+
 class BotConnection(object):
        state = 0 # 0=disconnected, 1=registering, 2=connected
 
-       def __init__(self, parent, nick, user, bind, server, port, realname):
+       def __init__(self, parent, bind, server, port):
                self.parent = parent
                self.buffer = ''
                self.socket = None
 
-               self.nick = nick
-               self.user = user
                self.bind = bind
                self.server = server
                self.port = int(port)
-               self.realname = realname
 
        def connect(self):
                self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                self.socket.bind((self.bind, 0))
                self.socket.connect((self.server, self.port))
-               self.send("NICK %s" % (self.nick))
-               self.send("USER %s 0 * :%s" % (self.user, self.realname))
+               self.send("NICK %s" % (self.parent.nick))
+               self.send("USER %s 0 * :%s" % (self.parent.user, self.parent.realname))
                self.state = 1
                return True
 
@@ -120,7 +132,7 @@ class BotConnection(object):
 
        #TODO: rewrite send() to queue
        def send(self, line):
-               print self.nick, '[O]', line
+               print self.parent.nick, '[O]', line
                self.write(line)
 
        def write(self, line):
@@ -136,3 +148,6 @@ class BotConnection(object):
                        self.buffer = pieces[1]
 
                return lines
+
+       def __str__(self): return self.nick
+       def __repr__(self): return "<BotConnection %r (%r)>" % (self.socket.fileno(), self.parent.nick)