From dc102f258d75493b11735fdd69e25f92be186c1f Mon Sep 17 00:00:00 2001 From: jesopo Date: Wed, 24 Apr 2019 12:07:30 +0100 Subject: Add Database.servers.get_by_alias, move IRCBot.get_server to IRCBot.get_server_by_id, add IRCBot.get_server_by_alias and change !connect/!disconnect to take aliases instead of IDs --- src/IRCBot.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/IRCBot.py') diff --git a/src/IRCBot.py b/src/IRCBot.py index d5beb766..0abfb432 100644 --- a/src/IRCBot.py +++ b/src/IRCBot.py @@ -84,11 +84,17 @@ class Bot(object): del self.other_sockets[sock.fileno()] self.poll.unregister(sock.fileno()) - def get_server(self, id: int) -> typing.Optional[IRCServer.Server]: + def get_server_by_id(self, id: int) -> typing.Optional[IRCServer.Server]: for server in self.servers.values(): if server.id == id: return server return None + def get_server_by_alias(self, alias: str) -> typing.Optional[IRCServer.Server]: + alias_lower = alias.lower() + for server in self.servers.values(): + if server.alias.lower() == alias_lower: + return server + return None def connect(self, server: IRCServer.Server) -> bool: try: @@ -235,7 +241,7 @@ class Bot(object): self._events.on("server.disconnect").call(server=server) self.disconnect(server) - if not self.get_server(server.id): + if not self.get_server_by_id(server.id): reconnect_delay = self.config.get("reconnect-delay", 10) self._timers.add("reconnect", reconnect_delay, server_id=server.id) -- cgit v1.3.1-10-gc9f91