diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/line_handler/channel.py | 11 | ||||
| -rw-r--r-- | modules/line_handler/message.py | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/modules/line_handler/channel.py b/modules/line_handler/channel.py index c96c7c31..bcfcebcd 100644 --- a/modules/line_handler/channel.py +++ b/modules/line_handler/channel.py @@ -44,9 +44,8 @@ def handle_353(event): if event["server"].has_capability_str("userhost-in-names"): hostmask = utils.irc.parse_hostmask(nickname) nickname = hostmask.nickname - user = event["server"].get_user(hostmask.nickname) - user.username = hostmask.username - user.hostname = hostmask.hostname + user = event["server"].get_user(hostmask.nickname, + username=hostmask.username, hostname=hostmask.hostname) else: user = event["server"].get_user(nickname) user.join_channel(channel) @@ -68,10 +67,10 @@ def join(events, event): account = event["line"].args[1] realname = event["line"].args[2] - user = event["server"].get_user(event["line"].source.nickname) + user = event["server"].get_user(event["line"].source.nickname, + username=event["line"].source.username, + hostname=event["line"].source.hostname) - user.username = event["line"].source.username - user.hostname = event["line"].source.hostname if account: user.identified_account = account user.identified_account_id = event["server"].get_user(account).get_id() diff --git a/modules/line_handler/message.py b/modules/line_handler/message.py index 533420dc..f0053866 100644 --- a/modules/line_handler/message.py +++ b/modules/line_handler/message.py @@ -34,9 +34,9 @@ def message(events, event): if from_self: user = event["server"].get_user(event["server"].nickname) else: - user = event["server"].get_user(event["line"].source.nickname) - user.username = event["line"].source.username - user.hostname = event["line"].source.hostname + user = event["server"].get_user(event["line"].source.nickname, + username=event["line"].source.username, + hostname=event["line"].source.hostname) # strip prefix_symbols from the start of target, for when people use # e.g. 'PRIVMSG +#channel :hi' which would send a message to only |