X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/a5ceff24fb154445c41b179825a329d80df974e8..c889fbb1f64a7eac7de813eb24326139c58c7b18:/bot.py

diff --git a/bot.py b/bot.py
index fa6e7c2..b65a5ae 100644
--- a/bot.py
+++ b/bot.py
@@ -3,18 +3,19 @@
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
 
-#TODO: error checking
-
 import socket, sys
 
 #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')}
 class Bot(object):
-	def __init__(self, parent, nick, user, bind, server, port, realname):
+	def __init__(self, parent, nick, user, bind, authname, authpass, server, port, realname):
 		self.parent = parent
 		self.nick = nick
 		self.user = user
 		self.realname = realname
 
+		self.authname = authname
+		self.authpass = authpass
+
 		curs = self.parent.db.cursor()
 		if curs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,)):
 			chansres = curs.fetchall()
@@ -43,6 +44,9 @@ class Bot(object):
 
 		if pieces[1] == "001":
 			self.conn.registered(True)
+			self.conn.send("MODE %s +x" % (pieces[2]))
+			if self.authname is not None and self.authpass is not None:
+				self.conn.send("AUTH %s %s" % (self.authname, self.authpass))
 			for c in self.chans:
 				self.join(c.name)
 
@@ -67,7 +71,7 @@ class Bot(object):
 			chan = self.parent.channel(pieces[2])
 
 			if nick == self.nick:
-				self.conn.send("WHO %s %%ant,1" % (chan))
+				self.conn.send("WHO %s c%%ant,1" % (chan))
 			else:
 				user = self.parent.user(nick, justjoined=True)
 				chan.userjoin(user)
@@ -76,7 +80,7 @@ class Bot(object):
 		elif pieces[1] == "PART":
 			nick = pieces[0].split('!')[0][1:]
 			chan = self.parent.channel(pieces[2])
-			
+
 			if nick != self.nick:
 				self.parent.user(nick).part(chan)
 				chan.userpart(self.parent.user(nick))
@@ -87,10 +91,18 @@ class Bot(object):
 				self.parent.user(nick).quit()
 				del self.parent.users[nick.lower()]
 
-		elif pieces[1] == "MODE": #TODO
+		elif pieces[1] == "NICK":
+			oldnick = pieces[0].split('!')[0][1:]
+			newnick = pieces[2][1:]
+			if newnick.lower() != oldnick.lower():
+				self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()]
+				del self.parent.users[oldnick.lower()]
+			self.parent.users[newnick.lower()].nickchange(newnick)
+
+		elif pieces[1] == "MODE": #TODO parse for ops/voices (at least)
 			pass
 
-	
+
 	def parsemsg(self, user, target, msg):
 		chan = None
 		if len(msg) == 0:
@@ -101,6 +113,11 @@ class Bot(object):
 		pieces = msg.split()
 
 		if target == self.nick:
+			if msg[0] == "\001": #ctcp
+				msg = msg.strip("\001")
+				if msg == "VERSION":
+					self.msg(user, "\001VERSION Erebus v%d.%d - http://github.com/zonidjan/erebus" % (self.parent.APIVERSION, self.parent.RELEASE))
+				return
 			if len(pieces) > 1:
 				chanword = pieces[1]
 				if chanword[0] == '#':
@@ -109,7 +126,7 @@ class Bot(object):
 						pieces.pop(1)
 
 		else: # message was sent to a channel
-			chan = self.parent.channel(target) #TODO check if bot's on channel --- in Erebus.channel() maybe?
+			chan = self.parent.channel(target)
 			try:
 				if msg[0] == '*': # message may be addressed to bot by "*BOTNICK" trigger?
 					if pieces[0][1:].lower() == self.nick.lower():
@@ -121,11 +138,9 @@ class Bot(object):
 							cbret = callback(self, user, chan, *pieces)
 							if cbret is NotImplemented:
 								self.msg(user, "Command not implemented.")
-						return
-					else:
-						return # not to bot, don't process!
+					return # not to bot, don't process!
 			except IndexError:
-				return # Fix if you feel like it /BiohZn
+				return # "message" is empty
 
 		cmd = pieces[0].lower()
 
@@ -161,8 +176,6 @@ class Bot(object):
 	def __repr__(self): return "<Bot %r>" % (self.nick)
 
 class BotConnection(object):
-	state = 0 # 0=disconnected, 1=registering, 2=connected
-
 	def __init__(self, parent, bind, server, port):
 		self.parent = parent
 		self.buffer = ''
@@ -172,6 +185,8 @@ class BotConnection(object):
 		self.server = server
 		self.port = int(port)
 
+		self.state = 0 # 0=disconnected, 1=registering, 2=connected
+
 	def connect(self):
 		self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		self.socket.bind((self.bind, 0))
@@ -191,17 +206,17 @@ class BotConnection(object):
 	#TODO: rewrite send() to queue
 	def send(self, line):
 		print self.parent.nick, '[O]', str(line)
-		self.write(line)
+		self._write(line)
 
-	def write(self, line):
+	def _write(self, line):
 		self.socket.sendall(line+"\r\n")
 
 	def read(self):
 		self.buffer += self.socket.recv(8192)
 		lines = []
 
-		while '\r\n' in self.buffer:
-			pieces = self.buffer.split('\r\n', 1)
+		while "\r\n" in self.buffer:
+			pieces = self.buffer.split("\r\n", 1)
 			print self.parent.nick, '[I]', pieces[0]
 			lines.append(pieces[0])
 			self.buffer = pieces[1]