X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/b25d436812b01503103b6eb8a6ea806b5b4d5bdf..db57d97fa2dfc4138cca73d43a72debb4fc2e49c:/bot.py

diff --git a/bot.py b/bot.py
index f82f143..a3b16f9 100644
--- a/bot.py
+++ b/bot.py
@@ -2,7 +2,7 @@
 
 #TODO: error checking
 
-import socket
+import socket, sys
 
 #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')}
 class Bot(object):
@@ -13,18 +13,82 @@ class Bot(object):
 
 		self.conn = BotConnection(self, nick, user, bind, server, port, realname)
 	def connect(self):
-		self.conn.connect()
+		if self.conn.connect():
+			self.parent.newfd(self, self.conn.socket.fileno())
+
 	def getdata(self):
 		for line in self.conn.read():
-			self.parse(line)
+			print self.nick, '[I]', line
+
+			if not self.conn.registered():
+				pieces = line.split()
+
+				if pieces[0] == "PING":
+					self.conn.send("PONG %s" % (pieces[1]))
+
+				elif pieces[1] == "001":
+					self.conn.registered(True)
+
+					for c in self.chans:
+						self.join(c)
+			else:
+				self.parse(line)
 	def parse(self, line):
 		pieces = line.split()
-		if not self.conn.registered():
-			if pieces[0] == "PING":
-				self.conn.send("PONG %s" % (pieces[1]))
-			elif pieces[1] == "001":
-				self.conn.registered(True)
-				print "!!!REGISTERED!!!"
+
+		if pieces[1] == "PRIVMSG":
+			nick = pieces[0].split('!')[0][1:]
+			user = self.parent.user(nick)
+			chan = self.parent.channel(pieces[2])
+			msg = ' '.join(pieces[3:])[1:]
+			self.parsemsg(user, chan, msg)
+
+		elif pieces[0] == "PING":
+			self.conn.send("PONG %s" % (pieces[1]))
+
+		elif pieces[1] == "JOIN":
+			nick = pieces[0].split('!')[0][1:]
+			user = self.parent.user(nick)
+			chan = self.parent.channel(pieces[2]) #TODO TODO TODO
+			
+	def parsemsg(self, user, chan, msg):
+		if msg[0] == '!': #TODO check config for trigger
+			msg = msg[1:]
+
+		else:
+			return
+
+		pieces = msg.split()
+		cmd = pieces[0].upper()
+
+		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))
+
+		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
+
+	def msg(self, target, msg):
+		if isinstance(target, self.parent.User): self.conn.send("NOTICE %s :%s" % (target.nick, msg))
+		elif isinstance(target, self.parent.Channel): self.conn.send("PRIVMSG %s :%s" % (target.name, msg))
+		elif isinstance(target, basestring):
+			if target[0] == '#': self.conn.send("PRIVMSG %s :%s" % (target, msg))
+			else: self.conn.send("NOTICE %s :%s" % (target, msg))
+		else: raise TypeError('Bot.msg() "target" must be Erebus.User, Erebus.Channel, or string')
+
+	def join(self, chan):
+		self.conn.send("JOIN %s" % (chan))
+
+	def part(self, chan):
+		self.conn.send("PART %s" % (chan))
+
+	def quit(self, reason="Shutdown"):
+		self.conn.send("QUIT :%s" % (reason))
 
 class BotConnection(object):
 	state = 0 # 0=disconnected, 1=registering, 2=connected
@@ -48,29 +112,27 @@ class BotConnection(object):
 		self.send("NICK %s" % (self.nick))
 		self.send("USER %s 0 * :%s" % (self.user, self.realname))
 		self.state = 1
+		return True
 
 	def registered(self, done=False):
 		if done: self.state = 2
 		return self.state == 2
 
-	def fileno(self):
-		if self.socket is not None:
-			return self.socket.fileno()
-		else:
-			return None
-
 	#TODO: rewrite send() to queue
 	def send(self, line):
+		print self.nick, '[O]', line
 		self.write(line)
+
 	def write(self, line):
-		print self.nick, '[O]', 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)
-			print self.nick, '[I]', pieces[0]
 			lines.append(pieces[0])
 			self.buffer = pieces[1]
+
 		return lines