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

diff --git a/bot.py b/bot.py
index fa6e7c2..e5bcebe 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)
@@ -87,7 +91,7 @@ class Bot(object):
 				self.parent.user(nick).quit()
 				del self.parent.users[nick.lower()]
 
-		elif pieces[1] == "MODE": #TODO
+		elif pieces[1] == "MODE": #TODO parse for ops/voices (at least)
 			pass
 
 	
@@ -101,6 +105,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 +118,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 +130,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()