diff --git a/bot.py b/bot.py index da73b0a..14f8e04 100644 --- a/bot.py +++ b/bot.py @@ -443,6 +443,18 @@ class Bot: if msg.channel in srv.moremessages: return srv.moremessages[msg.channel] + elif msg.cmds[0] == "next": + ret = None + if msg.channel == srv.nick: + if msg.sender in srv.moremessages: + ret = srv.moremessages[msg.sender] + else: + if msg.channel in srv.moremessages: + ret = srv.moremessages[msg.channel] + if ret is not None: + ret.pop() + return ret + elif msg.cmds[0] == "dcc": logger.debug("dcctest for %s", msg.sender) srv.send_dcc("Hello %s!" % msg.nick, msg.sender) diff --git a/response.py b/response.py index cd44405..b9c30c0 100644 --- a/response.py +++ b/response.py @@ -100,6 +100,7 @@ class Response: def pop(self): self.messages.pop(0) + self.elt = 0 if isinstance(self.rawtitle, list): self.rawtitle.pop(0) if len(self.rawtitle) <= 0: @@ -136,13 +137,11 @@ class Response: msg += e + ", " self.elt += 1 self.pop() - self.elt = 0 return msg[:len(msg)-2] else: if len(elts) <= 432: self.pop() - self.elt = 0 if self.count is not None: return msg + elts + (self.count % len(self.messages)) else: @@ -164,7 +163,6 @@ class Response: msg += w + " " self.elt += len(w) + 1 self.pop() - self.elt = 0 return msg import hooks