Don't pass around full server details more than we have to.

1 files changed, 5 insertions, 3 deletions

diff --git a/IRCBot.py b/IRCBot.py
index 14a70fcf..536e01ee 100644
--- a/IRCBot.py
+++ b/IRCBot.py
@@ -24,9 +24,11 @@ class Bot(object):
         self._events.on("timer.reconnect").hook(self.reconnect)
         self._events.on("boot.done").hook(self.setup_timers)
 
-    def add_server(self, id, alias, hostname, port, password, ipv4, tls,
-            nickname, username, realname, connect=False):
-        new_server = IRCServer.Server(self, self._events, id, alias,
+    def add_server(self, server_id, connect=True):
+        (_, alias, hostname, port, password, ipv4, tls, nickname,
+            username, realname) = self.database.servers.get(server_id)
+
+        new_server = IRCServer.Server(self, self._events, server_id, alias,
             hostname, port, password, ipv4, tls, nickname, username,
             realname)
         if not new_server.get_setting("connect", True):