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

allow "!config #channel" for channels other than the current one

Browse source
This commit is contained in:
jesopo 2019-09-17 17:56:56 +01:00
parent 441a58125a
commit 770c28da55
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
modules/config.py
View file

@ -49,22 +49,22 @@ class Module(ModuleManager.BaseModule):
if context_desc == "*": if context_desc == "*":
if channel == user: if channel == user:
# we're in PM # we're in PM
return user, "set" return user, "set", None
else: else:
#we're in a channel #we're in a channel
return channel, "channelset" return channel, "channelset", None
if context_desc_lower[0] in server.channel_types: if context_desc_lower[0] in server.channel_types:
return context_desc, "channelset" return context_desc, "channelset", context_desc
elif server.irc_lower(context_desc) == user.nickname_lower: elif server.irc_lower(context_desc) == user.nickname_lower:
return user, "set" return user, "set", None
elif "user".startswith(context_desc_lower): elif "user".startswith(context_desc_lower):
return user, "set" return user, "set", None
elif "channel".startswith(context_desc_lower): elif "channel".startswith(context_desc_lower):
return channel, "channelset" return channel, "channelset", None
elif "server".startswith(context_desc_lower): elif "server".startswith(context_desc_lower):
return server, "serverset" return server, "serverset", None
elif "bot".startswith(context_desc_lower): elif "bot".startswith(context_desc_lower):
return self.bot, "botset" return self.bot, "botset", None
else: else:
raise ValueError() raise ValueError()
@ -86,8 +86,8 @@ class Module(ModuleManager.BaseModule):
channel = event["target"] channel = event["target"]
context = context or "user" context = context or "user"
target, setting_context = self._to_context(event["server"], channel, target, setting_context, _ = self._to_context(event["server"],
event["user"], context) channel, event["user"], context)
export_settings = self._get_export_setting(setting_context) export_settings = self._get_export_setting(setting_context)
setting_info = export_settings.get(require_setting, None) setting_info = export_settings.get(require_setting, None)
@ -153,13 +153,15 @@ class Module(ModuleManager.BaseModule):
value = " ".join(event["args_split"][2:]) value = " ".join(event["args_split"][2:])
try: try:
target, context = self._to_context(event["server"], target, context, name_override = self._to_context(event["server"],
event["target"], event["user"], context_desc) event["target"], event["user"], context_desc)
except ValueError: except ValueError:
raise utils.EventError( raise utils.EventError(
"Unknown context '%s'. Please provide " "Unknown context '%s'. Please provide "
"'user', 'channel', 'server' or 'bot'" % context_desc) "'user', 'channel', 'server' or 'bot'" % context_desc)
name = name_override or name
permission_check = utils.Check("permission", "config") permission_check = utils.Check("permission", "config")
if context == "set": if context == "set":
@ -206,13 +208,18 @@ class Module(ModuleManager.BaseModule):
except ConfigSettingInexistent: except ConfigSettingInexistent:
raise utils.EventError("Setting not set") raise utils.EventError("Setting not set")
for_str = ""
if name_override:
for_str = " for %s" % name_override
if result.result == ConfigResults.Changed: if result.result == ConfigResults.Changed:
event["stdout"].write("Config '%s' set to %s" % event["stdout"].write("Config '%s' %sset to %s" %
(setting, result.data)) (setting, for_str, result.data))
elif result.result == ConfigResults.Retrieved: elif result.result == ConfigResults.Retrieved:
event["stdout"].write("%s: %s" % (setting, result.data)) event["stdout"].write("%s%s: %s" % (setting, for_str,
result.data))
elif result.result == ConfigResults.Removed: elif result.result == ConfigResults.Removed:
event["stdout"].write("Unset setting") event["stdout"].write("Unset setting '%s'%s" %
(setting, for_str))
else: else:
event["stdout"].write("Available config: %s" % event["stdout"].write("Available config: %s" %
", ".join(export_settings.keys())) ", ".join(export_settings.keys()))