diff options
| author |  jesopo | 2018-11-14 22:07:01 +0000 |
|---|---|---|
| committer | jesopo | 2018-11-14 22:07:01 +0000 |
| commit | 957b881dbd599bbf462ee07c141a42995964ae63 (patch) | |
| tree | 8dc65cef4b630e3ea3fbcab2474dc841275a8b1d /modules/line_handler.py | |
| parent | Better parsing of CTCP messages, support raw.send.privmsg/raw.send.notice in (diff) | |
| signature | ||
`if is_channel` should be `if channel`, `buffer.add_notice` doesn't take an
`action` param and `elif` can't go after `else`!
Diffstat (limited to 'modules/line_handler.py')
| -rw-r--r-- | modules/line_handler.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/line_handler.py b/modules/line_handler.py index f8fa50f6..994893ea 100644 --- a/modules/line_handler.py +++ b/modules/line_handler.py @@ -429,7 +429,7 @@ class Module(ModuleManager.BaseModule): "server": event["server"], "tags": event["tags"], "action": action} - if is_channel: + if channel: self._event(event, "message.channel", user=user, channel=channel, **kwargs) channel.buffer.add_message(user_nickname, message, action, @@ -460,7 +460,7 @@ class Module(ModuleManager.BaseModule): self._event(event, "server-notice", message=message, message_split=message_split, server=event["server"]) - else: + elif "prefix" in event: user = None user_nickname = None if "prefix" in event: @@ -473,13 +473,13 @@ class Module(ModuleManager.BaseModule): channel = event["server"].channels.get(target) self._event(event, "notice.channel", user=user, channel=channel, **kwargs) - channel.buffer.add_notice(user_nickname, message, False, - event["tags"], user==None) + channel.buffer.add_notice(user_nickname, message, event["tags"], + user==None) elif event["server"].is_own_nickname(target): self._event(event, "notice.private", user=user, **kwargs) - user.buffer.add_notice(user.nickname, message, False, - event["tags"], False) - elif not "prefix" in event: + user.buffer.add_notice(user.nickname, message, event["tags"], + False) + else: # a notice we've sent to a user user = event["server"].get_user(target) user.buffer.add_message(None, message, action, event["tags"], True) |