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

we need both id and server for !disconnect

Browse source
This commit is contained in:
jesopo 2019-10-10 18:02:55 +01:00
parent dd94f3a918
commit a5eca53f0a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/admin.py
View file

@ -45,10 +45,13 @@ class Module(ModuleManager.BaseModule):
def _id_from_alias(self, alias): def _id_from_alias(self, alias):
return self.bot.database.servers.get_by_alias(alias) return self.bot.database.servers.get_by_alias(alias)
def _server_from_alias(self, 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) id = self._id_from_alias(alias)
if id == None: if id == None:
raise utils.EventError("Unknown server alias") 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") @utils.hook("received.command.reconnect")
def reconnect(self, event): def reconnect(self, event):
@ -95,10 +98,11 @@ class Module(ModuleManager.BaseModule):
:permission: disconnect :permission: disconnect
""" """
server = event["server"] server = event["server"]
id = -1
alias = str(event["server"]) alias = str(event["server"])
if event["args"]: if event["args"]:
alias = event["args_split"][0] alias = event["args_split"][0]
server = self._server_from_alias(alias) id, server = self._both_from_alias(alias)
if not server == None: if not server == None:
alias = str(server) alias = str(server)