From 4252a2c2ce6b589fd3c8bc0f5774804abf76d9e3 Mon Sep 17 00:00:00 2001 From: jesopo Date: Fri, 6 Dec 2019 10:40:24 +0000 Subject: [PATCH] _specific_hostmask() should take an already-parsed hostmask --- modules/permissions/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/permissions/__init__.py b/modules/permissions/__init__.py index 3370a799..0559774c 100644 --- a/modules/permissions/__init__.py +++ b/modules/permissions/__init__.py @@ -19,11 +19,11 @@ class Module(ModuleManager.BaseModule): for account, user_hostmasks in event["server"].get_all_user_settings( HOSTMASKS_SETTING): for hostmask in user_hostmasks: - self._add_hostmask(event["server"], hostmask, account) + self._add_hostmask(event["server"], + utils.irc.hostmask_parse(hostmask), account) def _add_hostmask(self, server, hostmask, account): - server._hostmasks[hostmask] = ( - utils.irc.hostmask_parse(hostmask), account) + server._hostmasks[hostmask.original] = (hostmask, account) def _remove_hostmask(self, server, hostmask): if hostmask in server._hostmasks: del server._hostmasks[hostmask] @@ -307,8 +307,9 @@ class Module(ModuleManager.BaseModule): hostmasks.append(hostmask) event["user"].set_setting(HOSTMASKS_SETTING, hostmasks) - self._specific_hostmask(event["server"], hostmask, account) - self._add_hostmask(event["server"], hostmask, account) + hostmask_obj = utils.irc.hostmask_parse(hostmaks) + self._specific_hostmask(event["server"], hostmask_obj, account) + self._add_hostmask(event["server"], hostmask_obj, account) event["stdout"].write("Added %s to your hostmasks" % hostmask) elif subcommand == "remove":