From 795f6afbeb91d00141b21930b8c0acb717989218 Mon Sep 17 00:00:00 2001 From: jesopo Date: Thu, 13 Jun 2019 11:53:47 +0100 Subject: Mode mode (and mode arg) parsing to IRCChannel.py, add IRCChannel.mode_str --- modules/line_handler/core.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'modules/line_handler/core.py') diff --git a/modules/line_handler/core.py b/modules/line_handler/core.py index b85a9677..979eaa31 100644 --- a/modules/line_handler/core.py +++ b/modules/line_handler/core.py @@ -80,22 +80,12 @@ def mode(events, event): is_channel = target[0] in event["server"].channel_types if is_channel: channel = event["server"].channels.get(target) + modes = event["args"][1] args = event["args"][2:] - _args = args[:] - modes = RE_MODES.findall(event["args"][1]) - for chunk in modes: - remove = chunk[0] == "-" - for mode in chunk[1:]: - if mode in event["server"].channel_modes: - channel.change_mode(remove, mode) - elif mode in event["server"].prefix_modes and len(args): - channel.change_mode(remove, mode, args.pop(0)) - elif (mode in event["server"].channel_list_modes or - mode in event["server"].channel_paramatered_modes): - args.pop(0) - elif not remove: - args.pop(0) - events.on("received.mode.channel").call(modes=modes, mode_args=_args, + + channel.parse_modes(modes, args[:]) + + events.on("received.mode.channel").call(modes=modes, mode_args=args, channel=channel, server=event["server"], user=user) elif event["server"].is_own_nickname(target): modes = event["args"][1] -- cgit v1.3.1-10-gc9f91