diff options
| author |  jesopo | 2019-05-09 10:36:33 +0100 |
|---|---|---|
| committer | jesopo | 2019-05-09 10:36:33 +0100 |
| commit | f7eae1a978143ffc2f613ba3899ab5a12b282da7 (patch) | |
| tree | 65cfe41d3db50ea70bbfb0e2ced9f70b589f138f | |
| parent | Catch UserNotFoundException in var `e` (diff) | |
| signature | ||
Tokenize IRC data as soon as it comes out of IRCServer
| -rw-r--r-- | modules/line_handler/__init__.py | 9 | ||||
| -rw-r--r-- | src/IRCServer.py | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/line_handler/__init__.py b/modules/line_handler/__init__.py index 144e6102..42a830f7 100644 --- a/modules/line_handler/__init__.py +++ b/modules/line_handler/__init__.py @@ -24,12 +24,11 @@ class Module(ModuleManager.BaseModule): @utils.hook("raw.received") def handle_raw(self, event): - line = utils.irc.parse_line(event["line"]) - if "batch" in line.tags and line.tags["batch"] in event[ - "server"].batches: - server.batches[tag["batch"]].lines.append(line) + if ("batch" in event["line"].tags and + event["line"].tags["batch"] in event["server"].batches): + server.batches[tag["batch"]].lines.append(event["line"]) else: - self._handle(event["server"], line) + self._handle(event["server"], event["line"]) @utils.hook("raw.send") def handle_send(self, event): diff --git a/src/IRCServer.py b/src/IRCServer.py index 98e8580e..1a556ee5 100644 --- a/src/IRCServer.py +++ b/src/IRCServer.py @@ -207,7 +207,8 @@ class Server(IRCObject.Object): return self.bot.log.debug("%s (raw recv) | %s", [str(self), line]) - self.events.on("raw.received").call_unsafe(server=self, line=line) + self.events.on("raw.received").call_unsafe(server=self, + line=utils.irc.parse_line(line)) self.check_users() def check_users(self): for user in self.new_users: |