else:
timerbase = threading.Timer
stringbase = str
+
class MyTimer(timerbase):
def __init__(self, *args, **kwargs):
timerbase.__init__(self, *args, **kwargs)
self.authname = authname
self.authpass = authpass
- curs = self.parent.query("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.permnick,))
if curs:
chansres = curs.fetchall()
curs.close()
self.msgqueue = deque()
self.slowmsgqueue = deque()
- self.makemsgtimer()
- self.msgtimer.start()
+ self._makemsgtimer()
+ self._msgtimer.start()
def __del__(self):
try:
- curs = self.parent.query("UPDATE bots SET connected = 0 WHERE nick = %s", (self.nick,))
+ curs = self.parent.query("UPDATE bots SET connected = 0 WHERE nick = %s", (self.permnick,))
curs.close()
except: pass
self.parent.log(self.nick, *args, **kwargs)
def connect(self):
+ self.log('!', "Connecting")
if self.conn.connect():
self.parent.newfd(self, self.conn.socket.fileno())
def _gotRegistered(self, pieces):
self.conn.registered(True)
- curs = self.parent.query("UPDATE bots SET connected = 1 WHERE nick = %s", (self.nick,))
+ curs = self.parent.query("UPDATE bots SET connected = 1 WHERE nick = %s", (self.permnick,))
if curs: curs.close()
self.conn.send("MODE %s +x" % (pieces[2]))
def _gotnick(self, pieces):
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)
+ if oldnick == self.nick:
+ self.nick = newnick
+ else:
+ 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)
def _gotmode(self, pieces):
source = pieces[0].split('!')[0][1:]
chan = pieces[2]
for callback in self.parent.getchanhook(target.lower()):
try:
cbret = callback(self, user, chan, *pieces)
- except NotImplementedError:
- self.msg(user, "Command not implemented.")
+ if isinstance(cbret, stringbase):
+ self.reply(target, user, cbret)
except:
self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
self.__debug_cbexception("chanhook", user=user, target=target, msg=msg)
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.")
+ if isinstance(cbret, stringbase):
+ self.reply(target, user, cbret)
except Exception:
self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
self.__debug_cbexception("hook", user=user, target=target, msg=msg)
def reply(self, chan, user, msg):
- if chan is not None:
+ if chan is not None and (isinstance(chan, self.parent.Channel) or (isinstance(chan, stringbase) and chan[0] == "#")):
self.msg(chan, "%s: %s" % (user, msg))
else:
self.msg(user, msg)
return command
def _popmsg(self):
- self.makemsgtimer()
+ self._makemsgtimer()
self.conn.bytessent -= self.conn.recvq/3
if self.conn.bytessent < 0: self.conn.bytessent = 0
- self.conn.exceeded = False
+ self.conn.exceeded = True
+ cmd = None
try:
cmd = self.msgqueue.popleft()
- if not self.conn.exceeded and self.conn.bytessent+len(cmd) < self.conn.recvq:
- self.conn.send(cmd)
- self.conn.exceeded = True
- else: raise IndexError
except IndexError:
try:
cmd = self.slowmsgqueue.popleft()
- if not self.conn.exceeded and self.conn.bytessent+len(cmd) < self.conn.recvq:
- self.conn.send(cmd)
- self.conn.exceeded = True
except IndexError:
pass
- self.msgtimer.start()
- def makemsgtimer(self):
- self.msgtimer = threading.Timer(3, self._popmsg)
- self.msgtimer.daemon = True
+ if cmd is not None:
+ if self.conn.bytessent+len(cmd) > self.conn.recvq: # If it's too long
+ if len(cmd) > self.conn.recvq: # Is the command itself somehow over max length???
+ self._msgtimer.start()
+ raise ValueError('Somehow a command that was too long made it into the message queue. Uhoh!', cmd)
+ # Discard the message.
+ self.msgqueue.appendleft(cmd) # Phew, we've just sent too much recently. Put it (back) on the (primary) queue.
+ else:
+ self.conn.send(cmd)
+
+ self._msgtimer.start()
+
+ def _makemsgtimer(self):
+ self._msgtimer = MyTimer(3, self._popmsg)
def join(self, chan):
self.conn.send("JOIN %s" % (chan))
class BotConnection(object):
def __init__(self, parent, bind, server, port):
self.parent = parent
- self.buffer = bytearray(8192)
+ self.buffer = bytearray()
self.socket = None
self.bind = bind
self.bytessent = 0
self.recvq = 500
self.exceeded = False
+ self._nowrite = False
def connect(self):
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
return self.state == 2
def send(self, line):
- if self.parent.parent.cfg.getboolean('debug', 'io'):
- self.parent.log('O', line)
- self.bytessent += len(line)
- try:
- self._write(line)
- except socket.error as e:
- self.parent._goterror(repr(e))
+ if not self._nowrite:
+ if self.parent.parent.cfg.getboolean('debug', 'io'):
+ self.parent.log('O', line)
+ self.bytessent += len(line)
+ try:
+ self._write(line)
+ except socket.error as e:
+ self._nowrite = True
+ self.parent._goterror(repr(e))
+ else:
+ if self.parent.parent.cfg.getboolean('debug', 'io'):
+ self.parent.log('X', line)
def _write(self, line):
self.socket.sendall(line.encode('utf-8', 'backslashreplace')+b"\r\n")