diff options
Diffstat (limited to 'modules/admin.py')
| -rw-r--r-- | modules/admin.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/modules/admin.py b/modules/admin.py index 2ca50843..1a732a7c 100644 --- a/modules/admin.py +++ b/modules/admin.py @@ -45,10 +45,13 @@ class Module(ModuleManager.BaseModule): def _id_from_alias(self, alias): return self.bot.database.servers.get_by_alias(alias) def _server_from_alias(self, alias): + id, server = self._both_from_alias(alias) + return server + def _both_from_alias(self, alias): id = self._id_from_alias(alias) if id == None: raise utils.EventError("Unknown server alias") - return self.bot.get_server_by_id(id) + return id, self.bot.get_server_by_id(id) @utils.hook("received.command.reconnect") def reconnect(self, event): @@ -95,10 +98,11 @@ class Module(ModuleManager.BaseModule): :permission: disconnect """ server = event["server"] + id = -1 alias = str(event["server"]) if event["args"]: alias = event["args_split"][0] - server = self._server_from_alias(alias) + id, server = self._both_from_alias(alias) if not server == None: alias = str(server) @@ -168,8 +172,8 @@ class Module(ModuleManager.BaseModule): @utils.kwarg("permission", "editserver") def edit_server(self, event): alias = event["args_split"][0] - server = self.bot.get_server_by_alias(alias) - if server == None: + server_id = self._id_from_alias(alias) + if server_id == None: raise utils.EventError("Unknown server '%s'" % alias) option = event["args_split"][1].lower() @@ -196,5 +200,5 @@ class Module(ModuleManager.BaseModule): else: raise utils.EventError("Unknown option '%s'" % option) - self.bot.database.servers.edit(server.id, option, value_parsed) + self.bot.database.servers.edit(server_id, option, value_parsed) event["stdout"].write("Set %s for %s" % (option, alias)) |