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

dont try to !connect to a variable that doesnt exist

Browse source
This commit is contained in:
jesopo 2019-10-03 05:15:30 +01:00
parent 4a7bc17528
commit 54e4cd4e74
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/admin.py
View file

@ -42,8 +42,10 @@ class Module(ModuleManager.BaseModule):
event["stderr"].write("No channel provided") event["stderr"].write("No channel provided")
event["server"].send_part(target) event["server"].send_part(target)
def _from_alias(self, alias): def _id_from_alias(self, alias):
id = self.bot.database.servers.get_by_alias(alias) return self.bot.database.servers.get_by_alias(alias)
def _server_from_alias(self, 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 self.bot.get_server_by_id(id)
@ -58,7 +60,7 @@ class Module(ModuleManager.BaseModule):
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._from_alias(alias) server = self._server_from_alias(alias)
if server: if server:
line = server.send_quit("Reconnecting") line = server.send_quit("Reconnecting")
@ -76,12 +78,12 @@ class Module(ModuleManager.BaseModule):
:usage: <server id> :usage: <server id>
:permission: connect :permission: connect
""" """
server = self._from_alias(event["args"]) server = self._server_from_alias(event["args"])
if server: if server:
raise utils.EventError("Already connected to %s" % str( raise utils.EventError("Already connected to %s" % str(
existing_server)) existing_server))
server = self.bot.add_server(id) server = self.bot.add_server(self._id_from_alias(alias))
event["stdout"].write("Connecting to %s" % str(server)) event["stdout"].write("Connecting to %s" % str(server))
@utils.hook("received.command.disconnect") @utils.hook("received.command.disconnect")
@ -95,7 +97,7 @@ class Module(ModuleManager.BaseModule):
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._from_alias(alias) server = self._server_from_alias(alias)
if not server == None: if not server == None:
alias = str(server) alias = str(server)