X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/2591a1c8caad59346f49712a3af24080557b6330..b376c8253cf227f11e50157fd10c02b1cd784646:/bot.py

diff --git a/bot.py b/bot.py
index d1eed6c..ed45293 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
 
 
@@ -24,8 +30,8 @@ class Bot(object):
 		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,)):
+		curs = self.parent.query("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,))
+		if curs:
 			chansres = curs.fetchall()
 			curs.close()
 			self.chans = [self.parent.newchannel(self, row['chname']) for row in chansres]
@@ -35,7 +41,7 @@ class Bot(object):
 		self.conn = BotConnection(self, bind, server, port)
 
 		self.lastreceived = time.time() #time we last received a line from the server
-		self.watchdogtimer = MyTimer(self.parent.cfg.get('watchdog', 'interval', default=30), self.watchdog)
+		self.watchdog()
 
 		self.msgqueue = deque()
 		self.slowmsgqueue = deque()
@@ -43,14 +49,15 @@ class Bot(object):
 		self.msgtimer.start()
 
 	def __del__(self):
-		curs = self.parent.db.cursor()
-		curs.execute("UPDATE bots SET connected = 0 WHERE nick = %s", (self.nick,))
-		curs.close()
+		try:
+			curs = self.parent.query("UPDATE bots SET connected = 0 WHERE nick = %s", (self.nick,))
+			curs.close()
+		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(int(self.parent.cfg.get('watchdog', 'interval', default=30)), self.watchdog)
 
 	def log(self, *args, **kwargs):
 		self.parent.log(self.nick, *args, **kwargs)
@@ -68,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
@@ -113,11 +121,11 @@ class Bot(object):
 		self.conn.send("PONG %s" % (pieces[1]))
 		self._checknick()
 	def _goterror(self, pieces):
-		try: self.quit("Error detected: %s" % ' '.join(pieces))
+		try:
+			self.quit("Error detected: %s" % ' '.join(pieces))
+			curs = self.parent.query("UPDATE bots SET connected = 0")
+			curs.close()
 		except: pass
-		curs = self.parent.db.cursor()
-		curs.execute("UPDATE bots SET connected = 0")
-		curs.close()
 		sys.exit(2)
 		os._exit(2)
 	def _got001(self, pieces):
@@ -125,9 +133,8 @@ class Bot(object):
 	def _gotRegistered(self, pieces):
 		self.conn.registered(True)
 
-		curs = self.parent.db.cursor()
-		curs.execute("UPDATE bots SET connected = 1 WHERE nick = %s", (self.nick,))
-		curs.close()
+		curs = self.parent.query("UPDATE bots SET connected = 1 WHERE nick = %s", (self.nick,))
+		if curs: curs.close()
 
 		self.conn.send("MODE %s +x" % (pieces[2]))
 		if self.authname is not None and self.authpass is not None:
@@ -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):
@@ -222,6 +229,8 @@ class Bot(object):
 		self.parent.users[newnick.lower()].nickchange(newnick)
 	def _gotmode(self, pieces):
 		source = pieces[0].split('!')[0][1:]
+		chan = pieces[2]
+		if not chan.startswith("#"): return
 		chan = self.parent.channel(pieces[2])
 		mode = pieces[3]
 		args = pieces[4:]
@@ -246,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))
@@ -270,37 +279,41 @@ class Bot(object):
 				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.startswith('#'):
-				chanparam = self.parent.channel(chanword)
 
 		if target != self.nick: # message was sent to a channel
-			chan = self.parent.channel(target)
 			try:
 				if msg.startswith('*'): # message may be addressed to bot by "*BOTNICK" trigger?
 					if pieces[0][1:].lower() == self.nick.lower():
 						pieces.pop(0) # command actually starts with next word
 						msg = ' '.join(pieces) # command actually starts with next word
-				elif not triggerused:
-					if self.parent.haschanhook(target.lower()):
-						for callback in self.parent.getchanhook(target.lower()):
-							try:
-								cbret = callback(self, user, chan, *pieces)
-							except NotImplementedError:
-								self.msg(user, "Command not implemented.")
-							except:
-								self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
-								self.__debug_cbexception("chanhook", user=user, target=target, msg=msg)
-					return # not to bot, don't process!
+						triggerused = True
 			except IndexError:
 				return # "message" is empty
 
+		if len(pieces) > 1:
+			chanword = pieces[1]
+			if chanword.startswith('#'):
+				chanparam = self.parent.channel(chanword)
+
+		if target != self.nick: # message was sent to a channel
+			chan = self.parent.channel(target)
+			if not triggerused:
+				if self.parent.haschanhook(target.lower()):
+					for callback in self.parent.getchanhook(target.lower()):
+						try:
+							cbret = callback(self, user, chan, *pieces)
+						except NotImplementedError:
+							self.msg(user, "Command not implemented.")
+						except:
+							self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
+							self.__debug_cbexception("chanhook", user=user, target=target, msg=msg)
+				return # not to bot, don't process!
+
 		cmd = pieces[0].lower()
 		rancmd = False
 		if self.parent.hashook(cmd):
 			for callback in self.parent.gethook(cmd):
-				if chanparam is not None and callback.needchan:
+				if chanparam is not None and (callback.needchan or callback.wantchan):
 					chan = chanparam
 					pieces.pop(1)
 				if chan is None and callback.needchan:
@@ -316,9 +329,10 @@ class Bot(object):
 						self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
 						self.__debug_cbexception("hook", user=user, target=target, msg=msg)
 					except SystemExit as e:
-						curs = self.parent.db.cursor()
-						curs.execute("UPDATE bots SET connected = 0")
-						curs.close()
+						try:
+							curs = self.parent.query("UPDATE bots SET connected = 0")
+							curs.close()
+						except: pass
 						raise e
 		else:
 			rancmd = True
@@ -327,31 +341,40 @@ 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")
 			__import__('traceback').print_stack()
 
 	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:
@@ -405,7 +428,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
@@ -435,23 +458,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