X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/2729abc8b76cb87b3f981f5dd245c76284ae2711..adbee2daa637e03213cda1f13f263d1a49e994a2:/bot.py

diff --git a/bot.py b/bot.py
index f0be0b5..e86fdbd 100644
--- a/bot.py
+++ b/bot.py
@@ -6,9 +6,15 @@
 import socket, sys, time, threading, os, random
 from collections import deque
 
-class MyTimer(threading._Timer):
+MAXLEN = 400 # arbitrary max length of a command generated by Bot.msg functions
+
+if sys.version_info.major < 3:
+	timerbase = threading._Timer
+else:
+	timerbase = threading.Timer
+class MyTimer(timerbase):
 	def __init__(self, *args, **kwargs):
-		threading._Timer.__init__(self, *args, **kwargs)
+		timerbase.__init__(self, *args, **kwargs)
 		self.daemon = True
 
 
@@ -49,9 +55,9 @@ class Bot(object):
 		except: pass
 
 	def watchdog(self):
-		if time.time() > self.parent.cfg.get('watchdog', 'maxtime', default=300)+self.lastreceived:
+		if time.time() > int(self.parent.cfg.get('watchdog', 'maxtime', default=300))+self.lastreceived:
 			self.parse("ERROR :Fake-error from watchdog timer.")
-		self.watchdogtimer = MyTimer(self.parent.cfg.get('watchdog', 'interval', default=30), self.watchdog)
+		self.watchdogtimer = MyTimer(int(self.parent.cfg.get('watchdog', 'interval', default=30)), self.watchdog)
 
 	def log(self, *args, **kwargs):
 		self.parent.log(self.nick, *args, **kwargs)
@@ -69,7 +75,8 @@ class Bot(object):
 			self.conn.send("NICK %s" % (self.permnick))
 
 	def parse(self, line):
-		self.log('I', line)
+		if self.parent.cfg.getboolean('debug', 'io'):
+			self.log('I', line)
 		pieces = line.split()
 
 		# dispatch dict
@@ -178,7 +185,7 @@ class Bot(object):
 				self.msg(nick, "I tried, but you're not authed!")
 	def _got433(self, pieces):
 		if not self.conn.registered(): #we're trying to connect
-			newnick = "%s%d" % (self.nick, random.randint(111,999))
+			newnick = "%s%d" % (self.nick, random.randint(111, 999))
 			self.conn.send("NICK %s" % (newnick))
 			self.nick = newnick
 	def _gotjoin(self, pieces):
@@ -248,7 +255,7 @@ class Bot(object):
 				pass # don't care about other modes
 
 	def __debug_cbexception(self, source, *args, **kwargs):
-		if int(self.parent.cfg.get('debug', 'cbexc', default=0)) == 1:
+		if self.parent.cfg.getboolean('debug', 'cbexc'):
 			self.conn.send("PRIVMSG %s :%09.3f 4!!! CBEXC %s" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, source))
 			__import__('traceback').print_exc()
 			self.log('!', "CBEXC %s %r %r" % (source, args, kwargs))
@@ -262,10 +269,6 @@ class Bot(object):
 		if len(msg) == 0:
 			return
 
-		triggerused = msg.startswith(self.parent.trigger)
-		if triggerused: msg = msg[len(self.parent.trigger):]
-		pieces = msg.split()
-
 		if target == self.nick:
 			if msg.startswith("\001"): #ctcp
 				msg = msg.strip("\001")
@@ -273,6 +276,10 @@ class Bot(object):
 					self.msg(user, "\001VERSION Erebus v%d.%d - http://github.com/zonidjan/erebus" % (self.parent.APIVERSION, self.parent.RELEASE))
 				return
 
+		triggerused = msg.startswith(self.parent.trigger)
+		if triggerused: msg = msg[len(self.parent.trigger):]
+		pieces = msg.split()
+
 		if target != self.nick: # message was sent to a channel
 			try:
 				if msg.startswith('*'): # message may be addressed to bot by "*BOTNICK" trigger?
@@ -283,6 +290,9 @@ class Bot(object):
 			except IndexError:
 				return # "message" is empty
 
+		if len(pieces) == 0:
+			return
+
 		if len(pieces) > 1:
 			chanword = pieces[1]
 			if chanword.startswith('#'):
@@ -316,6 +326,8 @@ class Bot(object):
 					rancmd = True
 					try:
 						cbret = callback(self, user, chan, target, *pieces[1:])
+						if cbret is NotImplemented:
+							raise NotImplementedError
 					except NotImplementedError:
 						self.msg(user, "Command not implemented.")
 					except Exception:
@@ -334,7 +346,7 @@ class Bot(object):
 			self.msg(user, "You don't have enough access to run that command.")
 
 	def __debug_nomsg(self, target, msg):
-		if int(self.parent.cfg.get('debug', 'nomsg', default=0)) == 1:
+		if self.parent.cfg.getboolean('debug', 'nomsg'):
 			self.conn.send("PRIVMSG %s :%09.3f 4!!! NOMSG %r, %r" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, target, msg))
 			self.log('!', "!!! NOMSG")
 #			print "%09.3f %s [!] %s" % (time.time() % 100000, self.nick, "!!! NOMSG")
@@ -343,24 +355,31 @@ class Bot(object):
 	def msg(self, target, msg):
 		if self.parent.cfg.getboolean('erebus', 'nofakelag'): return self.fastmsg(target, msg)
 		cmd = self._formatmsg(target, msg)
+		if len(cmd) > MAXLEN: return False
 		if self.conn.exceeded or self.conn.bytessent+len(cmd) >= self.conn.recvq:
 			self.msgqueue.append(cmd)
 		else:
 			self.conn.send(cmd)
 		self.conn.exceeded = True
+		return True
 
 	def slowmsg(self, target, msg):
 		if self.parent.cfg.getboolean('erebus', 'nofakelag'): return self.fastmsg(target, msg)
 		cmd = self._formatmsg(target, msg)
+		if len(cmd) > MAXLEN: return False
 		if self.conn.exceeded or self.conn.bytessent+len(cmd) >= self.conn.recvq:
 			self.slowmsgqueue.append(cmd)
 		else:
 			self.conn.send(cmd)
 		self.conn.exceeded = True
+		return True
 
 	def fastmsg(self, target, msg):
-		self.conn.send(self._formatmsg(target, msg))
+		cmd = self._formatmsg(target, msg)
+		if len(cmd) > MAXLEN: return False
+		self.conn.send(cmd)
 		self.conn.exceeded = True
+		return True
 
 	def _formatmsg(self, target, msg):
 		if target is None or msg is None:
@@ -414,7 +433,7 @@ class Bot(object):
 class BotConnection(object):
 	def __init__(self, parent, bind, server, port):
 		self.parent = parent
-		self.buffer = ''
+		self.buffer = bytearray(8192)
 		self.socket = None
 
 		self.bind = bind
@@ -444,23 +463,21 @@ class BotConnection(object):
 		return self.state == 2
 
 	def send(self, line):
-		self.parent.log('O', line)
-#		print "%09.3f %s [O] %s" % (time.time() % 100000, self.parent.nick, line)
+		if self.parent.parent.cfg.getboolean('debug', 'io'):
+			self.parent.log('O', line)
 		self.bytessent += len(line)
 		self._write(line)
 
 	def _write(self, line):
-		self.socket.sendall(line+"\r\n")
+		self.socket.sendall(line.encode('utf-8', 'backslashreplace')+b"\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)
-#			self.parent.log('I', pieces[0]) # replaced by statement in Bot.parse()
-#			print "%09.3f %s [I] %s" % (time.time() % 100000, self.parent.nick, pieces[0])
-			lines.append(pieces[0])
+		while b"\r\n" in self.buffer:
+			pieces = self.buffer.split(b"\r\n", 1)
+			lines.append(pieces[0].decode('utf-8', 'backslashreplace'))
 			self.buffer = pieces[1]
 
 		return lines