]> jfr.im git - erebus.git/blobdiff - bot.py
trivia - show streak breaker, fix streak calc
[erebus.git] / bot.py
diff --git a/bot.py b/bot.py
index 883472448f039b1c17d381ba6749657c670445a3..416934b2caf5b0b1218e897d6a5c49d056a2b5b3 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# vim: fileencoding=utf-8
 
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
@@ -8,11 +9,21 @@ from collections import deque
 
 MAXLEN = 400 # arbitrary max length of a command generated by Bot.msg functions
 
-class MyTimer(threading._Timer):
+if sys.version_info.major < 3:
+       timerbase = threading._Timer
+       stringbase = basestring
+else:
+       timerbase = threading.Timer
+       stringbase = str
+class MyTimer(timerbase):
        def __init__(self, *args, **kwargs):
-               threading._Timer.__init__(self, *args, **kwargs)
+               timerbase.__init__(self, *args, **kwargs)
                self.daemon = True
 
+if sys.version_info.major < 3:
+       stringbase = basestring
+else:
+       stringbase = str
 
 #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')}
 class Bot(object):
@@ -51,9 +62,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)
@@ -82,6 +93,7 @@ class Bot(object):
                        'ERROR': self._goterror,
                }
                one = { #things to look for after source
+                       'NOTICE': self._gotconnected,
                        '001': self._got001,
                        '376': self._gotRegistered,
                        '422': self._gotRegistered,
@@ -117,8 +129,11 @@ class Bot(object):
                self.conn.send("PONG %s" % (pieces[1]))
                self._checknick()
        def _goterror(self, pieces):
+               # TODO: better handling, just reconnect that single bot
                try:
                        self.quit("Error detected: %s" % ' '.join(pieces))
+               except: pass
+               try:
                        curs = self.parent.query("UPDATE bots SET connected = 0")
                        curs.close()
                except: pass
@@ -181,7 +196,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):
@@ -265,10 +280,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")
@@ -276,13 +287,21 @@ 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 len(pieces) == 0:
+                       return
+
                if target != self.nick: # message was sent to a channel
                        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
-                                               triggerused = True
+                               if pieces[0][:-1].lower() == self.nick.lower() and (pieces[0][-1] == ":" or pieces[0][-1] == ","):
+                                       pieces.pop(0) # command actually starts with next word
+                                       if len(pieces) == 0: # is there still anything left?
+                                               return
+                                       msg = ' '.join(pieces)
+                                       triggerused = True
                        except IndexError:
                                return # "message" is empty
 
@@ -319,6 +338,10 @@ class Bot(object):
                                        rancmd = True
                                        try:
                                                cbret = callback(self, user, chan, target, *pieces[1:])
+                                               if cbret is NotImplemented:
+                                                       raise NotImplementedError
+                                               elif isinstance(cbret, stringbase):
+                                                       self.reply(chan, user, cbret)
                                        except NotImplementedError:
                                                self.msg(user, "Command not implemented.")
                                        except Exception:
@@ -343,10 +366,21 @@ class Bot(object):
 #                      print "%09.3f %s [!] %s" % (time.time() % 100000, self.nick, "!!! NOMSG")
                        __import__('traceback').print_stack()
 
-       def msg(self, target, msg):
+
+       def reply(self, chan, user, msg):
+               if chan is not None:
+                       self.msg(chan, "%s: %s" % (user, msg))
+               else:
+                       self.msg(user, msg)
+
+       def msg(self, target, msg, truncate=False):
                if self.parent.cfg.getboolean('erebus', 'nofakelag'): return self.fastmsg(target, msg)
                cmd = self._formatmsg(target, msg)
-               if len(cmd) > MAXLEN: return False
+               if len(cmd) > MAXLEN:
+                       if not truncate:
+                               return False
+                       else:
+                               cmd = cmd[:MAXLEN]
                if self.conn.exceeded or self.conn.bytessent+len(cmd) >= self.conn.recvq:
                        self.msgqueue.append(cmd)
                else:
@@ -354,10 +388,14 @@ class Bot(object):
                self.conn.exceeded = True
                return True
 
-       def slowmsg(self, target, msg):
+       def slowmsg(self, target, msg, truncate=False):
                if self.parent.cfg.getboolean('erebus', 'nofakelag'): return self.fastmsg(target, msg)
                cmd = self._formatmsg(target, msg)
-               if len(cmd) > MAXLEN: return False
+               if len(cmd) > MAXLEN:
+                       if not truncate:
+                               return False
+                       else:
+                               cmd = cmd[:MAXLEN]
                if self.conn.exceeded or self.conn.bytessent+len(cmd) >= self.conn.recvq:
                        self.slowmsgqueue.append(cmd)
                else:
@@ -365,9 +403,13 @@ class Bot(object):
                self.conn.exceeded = True
                return True
 
-       def fastmsg(self, target, msg):
+       def fastmsg(self, target, msg, truncate=False):
                cmd = self._formatmsg(target, msg)
-               if len(cmd) > MAXLEN: return False
+               if len(cmd) > MAXLEN:
+                       if not truncate:
+                               return False
+                       else:
+                               cmd = cmd[:MAXLEN]
                self.conn.send(cmd)
                self.conn.exceeded = True
                return True
@@ -424,7 +466,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
@@ -454,24 +496,24 @@ class BotConnection(object):
                return self.state == 2
 
        def send(self, line):
-               if self.parent.cfg.getboolean('debug', 'io'):
+               if self.parent.parent.cfg.getboolean('debug', 'io'):
                        self.parent.log('O', line)
-#              print "%09.3f %s [O] %s" % (time.time() % 100000, self.parent.nick, line)
                self.bytessent += len(line)
-               self._write(line)
+               try:
+                       self._write(line)
+               except socket.error as e:
+                       self.parent._goterror(repr(e))
 
        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