chansres = curs.fetchall()
curs.close()
self.chans = [self.parent.newchannel(self, row['chname']) for row in chansres]
+ else:
+ self.chans = []
self.conn = BotConnection(self, bind, server, port)
self.msgqueue = deque()
self.slowmsgqueue = deque()
self.makemsgtimer()
+ self.msgtimer.start()
def __del__(self):
curs = self.parent.db.cursor()
'433': self._got433, #nick in use
'JOIN': self._gotjoin,
'PART': self._gotpart,
+ 'KICK': self._gotkick,
'QUIT': self._gotquit,
'NICK': self._gotnick,
'MODE': self._gotmode,
user = self.parent.user(nick, justjoined=True)
chan.userjoin(user)
user.join(chan)
- def _gotpart(self, pieces):
- nick = pieces[0].split('!')[0][1:]
- chan = self.parent.channel(pieces[2])
-
+ def _clientLeft(self, nick, chan):
if nick != self.nick:
gone = self.parent.user(nick).part(chan)
chan.userpart(self.parent.user(nick))
if gone:
self.parent.user(nick).quit()
del self.parent.users[nick.lower()]
+ def _gotpart(self, pieces):
+ nick = pieces[0].split('!')[0][1:]
+ chan = self.parent.channel(pieces[2])
+ self._clientLeft(nick, chan)
+ def _gotkick(self, pieces):
+ nick = pieces[3]
+ chan = self.parent.channel(pieces[2])
+ self._clientLeft(nick, chan)
def _gotquit(self, pieces):
nick = pieces[0].split('!')[0][1:]
if nick != self.nick:
def __debug_cbexception(self, source, *args, **kwargs):
if int(self.parent.cfg.get('debug', 'cbexc', default=0)) == 1:
- self.conn.send("PRIVMSG %s :%09.3f ^C4^B!!!^B^C CBEXC %s" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, source))
+ self.conn.send("PRIVMSG %s :%09.3f \ 34\1f!!! CBEXC\1f\ 3 %s" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, source))
__import__('traceback').print_exc()
self.log('!', "CBEXC %s %r %r" % (source, args, kwargs))
# print "%09.3f %s [!] CBEXC %s %r %r" % (time.time() % 100000, self.nick, source, args, kwargs)
def parsemsg(self, user, target, msg):
chan = None
+ chanparam = None # was the channel specified as part of the command?
if len(msg) == 0:
return
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[0] == '#':
- chan = self.parent.channel(chanword)
- if chan is not None: #if chan is still none, there's no bot on "chanword", and chanword is used as a parameter.
- pieces.pop(1)
-
- else: # message was sent to a channel
+ if len(pieces) > 1:
+ chanword = pieces[1]
+ if chanword[0] == '#':
+ chanparam = self.parent.channel(chanword)
+
+ if target != self.nick: # message was sent to a channel
chan = self.parent.channel(target)
try:
if msg[0] == '*': # message may be addressed to bot by "*BOTNICK" trigger?
return # "message" is empty
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:
+ chan = chanparam
+ pieces.pop(1)
if chan is None and callback.needchan:
+ rancmd = True
self.msg(user, "You need to specify a channel for that command.")
elif user.glevel >= callback.reqglevel and (not callback.needchan or chan.levelof(user.auth) >= callback.reqclevel):
+ rancmd = True
try:
cbret = callback(self, user, chan, target, *pieces[1:])
except NotImplementedError:
curs.execute("UPDATE bots SET connected = 0")
curs.close()
raise e
+ else:
+ rancmd = True
+ self.msg(user, "I don't know that command.")
+ if not rancmd:
+ 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:
- self.conn.send("PRIVMSG %s :%09.3f \ 34\ 2!!!\ 2\ 3 NOMSG %r, %r" % (self.parent.cfg.get('debug', 'owner'), time.time() % 100000, target, msg))
+ self.conn.send("PRIVMSG %s :%09.3f \ 34\1f!!! NOMSG\1f\ 3 %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 target is None or msg is None:
- return self.__debug_nomsg(target, msg)
-
- self.msgqueue.append((target, msg))
- if not self.msgtimer.is_alive():
- self.msgtimer.start()
+ cmd = self._formatmsg(target, msg)
+ 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
def slowmsg(self, target, msg):
- if target is None or msg is None:
- return self.__debug_nomsg(target, msg)
-
- self.slowmsgqueue.append((target, msg))
- if not self.msgtimer.is_alive():
- self.msgtimer.start()
+ cmd = self._formatmsg(target, msg)
+ 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
def fastmsg(self, target, msg):
+ self.conn.send(self._formatmsg(target, msg))
+ self.conn.exceeded = True
+
+ def _formatmsg(self, target, msg):
if target is None or msg is None:
return self.__debug_nomsg(target, msg)
if target[0] == '#': command = "PRIVMSG %s :%s" % (target, msg)
else: command = "NOTICE %s :%s" % (target, msg)
- self.conn.send(command)
+ return command
def _popmsg(self):
self.makemsgtimer()
+ self.conn.bytessent -= self.conn.recvq/3
+ if self.conn.bytessent < 0: self.conn.bytessent = 0
+ self.conn.exceeded = False
try:
- self.fastmsg(*self.msgqueue.popleft())
- self.msgtimer.start()
+ 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:
- self.fastmsg(*self.slowmsgqueue.popleft())
- self.msgtimer.start()
+ 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(2, self._popmsg)
+ self.msgtimer = threading.Timer(3, self._popmsg)
self.msgtimer.daemon = True
def join(self, chan):
self.state = 0 # 0=disconnected, 1=registering, 2=connected
+ self.bytessent = 0
+ self.recvq = 500
+ self.exceeded = False
+
def connect(self):
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.socket.bind((self.bind, 0))
def send(self, line):
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)
def _write(self, line):
projects / erebus.git / blobdiff