diff options
| author |  jesopo | 2019-11-27 12:06:57 +0000 |
|---|---|---|
| committer | jesopo | 2019-11-27 12:06:57 +0000 |
| commit | 9972125b24c9917f74cabfafa780617b439acfa0 (patch) | |
| tree | 59a139885e398bdc04043b695f39c71b4bc5e98e /modules | |
| parent | Merge branch 'master' into develop (diff) | |
| signature | ||
remove IRCBuffer.skip_next (not used), pass buffer lines on message events
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/commands/__init__.py | 9 | ||||
| -rw-r--r-- | modules/line_handler/message.py | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/modules/commands/__init__.py b/modules/commands/__init__.py index 71013c38..5a750a9b 100644 --- a/modules/commands/__init__.py +++ b/modules/commands/__init__.py @@ -315,7 +315,8 @@ class Module(ModuleManager.BaseModule): self.command(event["server"], event["channel"], event["target_str"], True, event["user"], command, args_split, event["line"], hook, - command_prefix=command_prefix) + command_prefix=command_prefix, + buffer_line=event["buffer_line"]) else: self.events.on("unknown.command").call(server=event["server"], target=event["channel"], user=event["user"], @@ -336,7 +337,8 @@ class Module(ModuleManager.BaseModule): event["target_str"], True, event["user"], command, "", event["line"], hook, match=match, message=event["message"], command_prefix="", - action=event["action"]) + action=event["action"], + buffer_line=event["buffer_line"]) if res: break @@ -365,7 +367,8 @@ class Module(ModuleManager.BaseModule): if hook: self.command(event["server"], event["user"], event["user"].nickname, False, event["user"], command, - args_split, event["line"], hook, command_prefix="") + args_split, event["line"], hook, command_prefix="", + buffer_line=event["buffer_line"]) else: self.events.on("unknown.command").call(server=event["server"], target=event["user"], user=event["user"], command=command, diff --git a/modules/line_handler/message.py b/modules/line_handler/message.py index f0053866..ae16a1f6 100644 --- a/modules/line_handler/message.py +++ b/modules/line_handler/message.py @@ -91,17 +91,20 @@ def message(events, event): hook = events.on(direction).on(event_type).on(context) if is_channel: - hook.call(channel=target_obj, **kwargs) + buffer_line = None if message: - target_obj.buffer.add_message(user.nickname, message, action, - event["line"].tags, from_self) + buffer_line = target_obj.buffer.add_message(user.nickname, message, + action, event["line"].tags, from_self) + hook.call(channel=target_obj, buffer_line=buffer_line, **kwargs) else: - hook.call(**kwargs) buffer_obj = target_obj if not from_self: buffer_obj = user + buffer_line = None if message: - buffer_obj.buffer.add_message(user.nickname, message, action, - event["line"].tags, from_self) + buffer_line = buffer_obj.buffer.add_message(user.nickname, message, + action, event["line"].tags, from_self) + + hook.call(buffer_line=buffer_line, **kwargs) |