diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/admin.py | 28 | ||||
| -rw-r--r-- | modules/channel_op.py | 2 | ||||
| -rw-r--r-- | modules/github/__init__.py | 2 | ||||
| -rw-r--r-- | modules/in.py | 2 | ||||
| -rw-r--r-- | modules/stats.py | 4 |
5 files changed, 17 insertions, 21 deletions
diff --git a/modules/admin.py b/modules/admin.py index c9096e54..8d72a12b 100644 --- a/modules/admin.py +++ b/modules/admin.py @@ -52,15 +52,12 @@ class Module(ModuleManager.BaseModule): :usage: <server id> :permission: connect """ - id = event["args_split"][0] - if not id.isdigit(): - raise utils.EventError("Please provide a numeric server ID") + alias = event["args"] + id = self.bot.database.servers.get_by_alias(alias) + if id == None: + raise utils.EventError("Unknown server alias") - id = int(id) - if not self.bot.database.servers.get(id): - raise utils.EventError("Unknown server ID") - - existing_server = self.bot.get_server(id) + existing_server = self.bot.get_server_by_id(id) if existing_server: raise utils.EventError("Already connected to %s" % str( existing_server)) @@ -77,14 +74,13 @@ class Module(ModuleManager.BaseModule): """ id = event["server"].id if event["args"]: - id = event["args_split"][0] - if not id.isdigit(): - raise utils.EventError("Please provide a numeric server ID") - - id = int(id) - if not self.bot.database.servers.get(id): - raise utils.EventError("Unknown server ID") - server = self.bot.get_server(id) + print("alias") + alias = event["args"] + id = self.bot.database.servers.get_by_alias(alias) + if id == None: + raise utils.EventError("Unknown server alias") + print(id) + server = self.bot.get_server_by_id(id) server.disconnect() self.bot.disconnect(server) diff --git a/modules/channel_op.py b/modules/channel_op.py index 066cee4c..2f0a0620 100644 --- a/modules/channel_op.py +++ b/modules/channel_op.py @@ -21,7 +21,7 @@ class Module(ModuleManager.BaseModule): @utils.hook("timer.unban") def _timer_unban(self, event): - server = self.bot.get_server(event["server_id"]) + server = self.bot.get_server_by_id(event["server_id"]) if event["channel_name"] in server.channels: channel = server.channels.get(event["channel_name"]) channel.send_unban(event["hostmask"]) diff --git a/modules/github/__init__.py b/modules/github/__init__.py index a143ff7c..ff85b8f8 100644 --- a/modules/github/__init__.py +++ b/modules/github/__init__.py @@ -340,7 +340,7 @@ class Module(ModuleManager.BaseModule): if found_hook: repo_hooked = True - server = self.bot.get_server(server_id) + server = self.bot.get_server_by_id(server_id) if server and channel_name in server.channels: if (branch and found_hook["branches"] and diff --git a/modules/in.py b/modules/in.py index 890dc680..f1eda122 100644 --- a/modules/in.py +++ b/modules/in.py @@ -31,7 +31,7 @@ class Module(ModuleManager.BaseModule): @utils.hook("timer.in") def timer_due(self, event): - server = self.bot.get_server(event["server_id"]) + server = self.bot.get_server_by_id(event["server_id"]) if server: message = "%s: this is your reminder: %s" % ( event["nickname"], event["message"]) diff --git a/modules/stats.py b/modules/stats.py index 742574f4..6b19f061 100644 --- a/modules/stats.py +++ b/modules/stats.py @@ -73,7 +73,7 @@ class Module(ModuleManager.BaseModule): return None server_id = int(server_id) - server = self.bot.get_server(server_id) + server = self.bot.get_server_by_id(server_id) if not server: return None return self._server_stats(server) @@ -99,7 +99,7 @@ class Module(ModuleManager.BaseModule): return None server_id = int(server_id) - server = self.bot.get_server(server_id) + server = self.bot.get_server_by_id(server_id) if not server: return None channels = {} |