X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/c9db2d7ede0848cf876ee4613d0b4f804b374d88..963f2522b39c57a38f9cc05aa66c9d504162a54d:/bot.py

diff --git a/bot.py b/bot.py
index e5bcebe..c753fe1 100644
--- a/bot.py
+++ b/bot.py
@@ -3,7 +3,8 @@
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
 
-import socket, sys
+import socket, sys, time, threading
+from collections import deque
 
 #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')}
 class Bot(object):
@@ -23,6 +24,11 @@ class Bot(object):
 			self.chans = [self.parent.newchannel(self, row['chname']) for row in chansres]
 
 		self.conn = BotConnection(self, bind, server, port)
+
+		self.msgqueue = deque()
+		self.makemsgtimer()
+
+
 	def connect(self):
 		if self.conn.connect():
 			self.parent.newfd(self, self.conn.socket.fileno())
@@ -80,7 +86,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))
@@ -91,10 +97,22 @@ class Bot(object):
 				self.parent.user(nick).quit()
 				del self.parent.users[nick.lower()]
 
+		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[0] == "ERROR": #TODO handle better
+			sys.exit(2)
+			os._exit(2)
+
 		elif pieces[1] == "MODE": #TODO parse for ops/voices (at least)
 			pass
 
-	
+
 	def parsemsg(self, user, target, msg):
 		chan = None
 		if len(msg) == 0:
@@ -148,12 +166,32 @@ class Bot(object):
 	def msg(self, target, msg):
 		if target is None or msg is None: return
 
-		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')
+		self.msgqueue.append((target,msg))
+		if not self.msgtimer.is_alive():
+			self.msgtimer.start()
+
+	def fastmsg(self, target, msg):
+
+		if isinstance(target, self.parent.User): target = target.nick
+		elif isinstance(target, self.parent.Channel): target = target.name
+		elif not isinstance(target, basestring): raise TypeError('Bot.msg() "target" must be Erebus.User, Erebus.Channel, or string')
+
+		if target[0] == '#': command = "PRIVMSG %s :%s" % (target, msg)
+		else: command = "NOTICE %s :%s" % (target, msg)
+
+		self.conn.send(command)
+
+	def _popmsg(self):
+		self.makemsgtimer()
+
+		try:
+			self.fastmsg(*self.msgqueue.popleft())
+			self.msgtimer.start()
+		except IndexError: pass
+
+	def makemsgtimer(self):
+		self.msgtimer = threading.Timer(2, self._popmsg)
+		self.msgtimer.daemon = True
 
 	def join(self, chan):
 		self.conn.send("JOIN %s" % (chan))
@@ -168,8 +206,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 = ''
@@ -179,6 +215,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))
@@ -197,19 +235,23 @@ class BotConnection(object):
 
 	#TODO: rewrite send() to queue
 	def send(self, line):
-		print self.parent.nick, '[O]', str(line)
-		self.write(line)
+		print "%05.3f %s [O] %s" % (time.time() % 100000, self.parent.nick, line)
+		sys.stdout.flush()
+#		print (time.time() % 1466400000), self.parent.nick, '[O]', str(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)
-			print self.parent.nick, '[I]', pieces[0]
+		while "\r\n" in self.buffer:
+			pieces = self.buffer.split("\r\n", 1)
+			print "%05.3f %s [I] %s" % (time.time() % 100000, self.parent.nick, pieces[0])
+			sys.stdout.flush()
+#			print (time.time() % 1460000000), self.parent.nick, '[I]', pieces[0]
 			lines.append(pieces[0])
 			self.buffer = pieces[1]