From 2f5a232c4ed17c0f4d62b72410384e85b07fd6cc Mon Sep 17 00:00:00 2001 From: jesopo Date: Mon, 11 Feb 2019 22:15:12 +0000 Subject: Hold on to tags and type for BATCHes --- modules/line_handler.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'modules/line_handler.py') diff --git a/modules/line_handler.py b/modules/line_handler.py index bac0245b..8b1dbf90 100644 --- a/modules/line_handler.py +++ b/modules/line_handler.py @@ -8,6 +8,7 @@ CAPABILITIES = {"multi-prefix", "chghost", "invite-notify", "account-tag", "account-notify", "extended-join", "away-notify", "userhost-in-names", "draft/message-tags-0.2", "draft/message-tags-0.3", "server-time", "cap-notify", "batch", "draft/labeled-response", "draft/rename"} +LABELED_BATCH = ["draft/labeled-response", "labeled-response"] class Direction(enum.Enum): SEND = 0 @@ -38,7 +39,7 @@ class Module(ModuleManager.BaseModule): line = utils.irc.parse_line(event["line"]) if "batch" in line.tags and line.tags["batch"] in event[ "server"].batches: - server.batches[tag["batch"]].append(line) + server.batches[tag["batch"]].lines.append(line) else: self._handle(event["server"], line) @@ -554,12 +555,15 @@ class Module(ModuleManager.BaseModule): def batch(self, event): identifier = event["args"][0] modifier, identifier = identifier[0], identifier[1:] + batch_type = event["args"][1] + if modifier == "+": - event["server"].batches[identifier] = [] + event["server"].batches[identifier] = utils.irc.IRCBatch(identifier, + batch_type, event["tags"]) else: - lines = event["server"].batches[identifier] + batch = event["server"].batches[identifier] del event["server"].batches[identifier] - for line in lines: + for line in batch.lines: self._handle(line) # IRCv3 CHGHOST, a user's username and/or hostname has changed -- cgit v1.3.1-10-gc9f91