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

find_setting() returns a tuple

Browse source
This commit is contained in:
jesopo 2019-11-20 11:53:26 +00:00
parent 03e4f780a0
commit d63294067b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/aliases.py
View file

@ -26,12 +26,12 @@ class Module(ModuleManager.BaseModule):
def _get_alias(self, server, target, command): def _get_alias(self, server, target, command):
setting = "%s%s" % (SETTING_PREFIX, command) setting = "%s%s" % (SETTING_PREFIX, command)
alias = self.bot.get_setting(setting, command = self.bot.get_setting(setting,
server.get_setting(setting, server.get_setting(setting,
target.get_setting(setting, None))) target.get_setting(setting, None)))
if not alias == None: if not command == None:
alias, _, args = alias.partition(" ") command, _, args = command.partition(" ")
return alias, args return command, args
return None return None
def _get_aliases(self, targets): def _get_aliases(self, targets):
alias_list = [] alias_list = []
@ -39,10 +39,10 @@ class Module(ModuleManager.BaseModule):
alias_list += target.find_settings(prefix=SETTING_PREFIX) alias_list += target.find_settings(prefix=SETTING_PREFIX)
aliases = {} aliases = {}
for alias in alias_list: for alias, command in alias_list:
alias, _, args = alias.partition(" ") alias = alias.replace(SETTING_PREFIX, "", 1)
if not alias in aliases: if not alias in aliases:
aliases[alias] = args or None aliases[alias] = command
return aliases return aliases
@utils.hook("get.command") @utils.hook("get.command")