trivia - show streak breaker, fix streak calc

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 610c6cda694cd7d8d9eaae0ed4c3ff080240ceb1..416934b2caf5b0b1218e897d6a5c49d056a2b5b3 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -11,13 +11,19 @@ MAXLEN = 400 # arbitrary max length of a command generated by Bot.msg functions
 
 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):
                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):
@@ -87,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,
@@ -122,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
@@ -281,19 +291,20 @@ class Bot(object):
                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
 
-               if len(pieces) == 0:
-                       return
-
                if len(pieces) > 1:
                        chanword = pieces[1]
                        if chanword.startswith('#'):
@@ -329,6 +340,8 @@ class Bot(object):
                                                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:
@@ -353,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:
@@ -364,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:
@@ -375,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
@@ -467,7 +499,10 @@ class BotConnection(object):
                if self.parent.parent.cfg.getboolean('debug', 'io'):
                        self.parent.log('O', 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.encode('utf-8', 'backslashreplace')+b"\r\n")