Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

use ISUPPORT QUIET when available

Browse source
This commit is contained in:
jesopo 2020-01-22 11:21:22 +00:00
parent 1c5d67f836
commit b6f10049f9
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/channel_op.py
View file

@ -183,13 +183,15 @@ class Module(ModuleManager.BaseModule):
event["target"].send_topic(event["target"].topic + event["args"]) event["target"].send_topic(event["target"].topic + event["args"])
def _quiet_method(self, server): def _quiet_method(self, server):
if server.quiet:
return server.quiet
quiet_method = server.get_setting("quiet-method", "qmode").lower() quiet_method = server.get_setting("quiet-method", "qmode").lower()
if quiet_method in QUIET_METHODS: if quiet_method in QUIET_METHODS:
mode, prefix, list, start = QUIET_METHODS[quiet_method] return QUIET_METHODS[quiet_method]
return mode, prefix
elif mute_method == "none": elif mute_method == "none":
return None, None return None
else: else:
raise ValueError("Unknown mute-method '%s'" % mute_method) raise ValueError("Unknown mute-method '%s'" % mute_method)
@ -226,10 +228,12 @@ class Module(ModuleManager.BaseModule):
if not event["target"].has_user(target_user): if not event["target"].has_user(target_user):
raise utils.EventError("No such user") raise utils.EventError("No such user")
mode, prefix = self._quiet_method(event["server"]) quiet_method = self._quiet_method(event["server"])
if mode == None: if quiet_method == None:
raise utils.EventError("This network doesn't support quiets") raise utils.EventError("This network doesn't support quiets")
mode, prefix, _, _ = quiet_method
mask = self._get_hostmask(event["target"], target_user) mask = self._get_hostmask(event["target"], target_user)
mask = "%s%s" % (prefix, mask) mask = "%s%s" % (prefix, mask)