diff options
Diffstat (limited to 'modules/line_handler')
| -rw-r--r-- | modules/line_handler/__init__.py | 20 | ||||
| -rw-r--r-- | modules/line_handler/ircv3.py | 1 |
2 files changed, 8 insertions, 13 deletions
diff --git a/modules/line_handler/__init__.py b/modules/line_handler/__init__.py index 1d4881f9..a1b05426 100644 --- a/modules/line_handler/__init__.py +++ b/modules/line_handler/__init__.py @@ -2,10 +2,6 @@ import enum from src import EventManager, ModuleManager, utils from . import channel, core, ircv3, message, user -LABELED_BATCH = { - "draft/labeled-response": "draft/label" -} - class Module(ModuleManager.BaseModule): def _handle(self, server, line): hooks = self.events.on("raw.received").on(line.command).get_hooks() @@ -186,20 +182,20 @@ class Module(ModuleManager.BaseModule): if modifier == "+": batch_type = event["args"][1] - event["server"].batches[identifier] = utils.irc.IRCRecvBatch( - identifier, batch_type, event["tags"]) + batch = utils.irc.IRCRecvBatch(identifier, batch_type, + event["tags"]) + event["server"].batches[identifier] = batch + + self.events.on("received.batch.start").call(batch=batch, + server=event["server"]) else: batch = event["server"].batches[identifier] del event["server"].batches[identifier] - add_tags = {} - if batch.type in LABELED_BATCH.keys(): - tag_name = LABELED_BATCH[batch.type] - add_tags[tag_name] = batch.tags[tag_name] + self.events.on("received.batch.end").call(batch=batch, + server=event["server"]) for line in batch.lines: - if add_tags: - line.tags.update(add_tags) self._handle(event["server"], line) # IRCv3 CHGHOST, a user's username and/or hostname has changed diff --git a/modules/line_handler/ircv3.py b/modules/line_handler/ircv3.py index 8b6b459d..d9f83b75 100644 --- a/modules/line_handler/ircv3.py +++ b/modules/line_handler/ircv3.py @@ -13,7 +13,6 @@ CAPABILITIES = [ utils.irc.Capability("cap-notify"), utils.irc.Capability("batch"), utils.irc.Capability("echo-message"), - utils.irc.Capability(None, "draft/labeled-response-0.2"), utils.irc.Capability(None, "draft/rename"), utils.irc.Capability(None, "draft/setname") ] |