Renovate the module system and implement adding and resuming pool instances using the new relay/alias/network system

core/bot.py

@@ -95,44 +95,27 @@ class IRCBot(IRCClient):
             error("Network with all numbers: %s" % name)
         self.buffer = ""
         self.name = name
-        instance = main.pool[name]
+        inst = main.pool[name]
+        alias = main.alias[inst["alias"]]
+        relay = main.relay[inst["relay"]]
+        network = main.network[inst["network"]]
 
-        self.nickname = instance["nickname"]
-        self.realname = instance["realname"]
-        self.username = instance["username"]
-        self.userinfo = instance["userinfo"]
-        self.fingerReply = instance["finger"]
-        self.versionName = instance["version"]
+        self.nickname = alias["nick"]
+        self.realname = alias["realname"]
+        self.username = inst["alias"]+"/"+inst["network"]
+        self.password = relay["password"]
+        self.userinfo = None
+        self.fingerReply = None
+        self.versionName = None
         self.versionNum = None
         self.versionEnv = None
-        self.sourceURL = instance["source"]
-        self.autojoin = instance["autojoin"]
+        self.sourceURL = None
 
         self._who = {}
         self._getWho = {}
 
         self._names = {}
 
-        self.authtype = instance["authtype"]
-        if self.authtype == "ns":
-            self.authpass = instance["password"]
-            self.authentity = instance["authentity"]
-        else:
-            self.password = instance["password"]
-
-    def refresh(self):
-        instance = main.pool[self.name]
-        if not instance["nickname"] == self.nickname:
-            self.nickname = instance["nickname"]
-            self.setNick(self.nickname)
-
-        self.userinfo = instance["userinfo"]
-        self.fingerReply = instance["finger"]
-        self.versionName = instance["version"]
-        self.versionNum = None
-        self.versionEnv = None
-        self.sourceURL = instance["source"]
-
     def parsen(self, user):
         step = user.split("!")
         nick = step[0]
@@ -350,10 +333,6 @@ class IRCBot(IRCClient):
         log("signed on: %s" % self.name)
         if main.config["Notifications"]["Connection"]:
             keyword.sendMaster("SIGNON: %s" % self.name)
-        if self.authtype == "ns":
-            self.msg(self.authentity, "IDENTIFY %s" % self.nspass)
-        for i in self.autojoin:
-            self.join(i)
         count.event(self.net, "signedon")
 
     def joined(self, channel):
@@ -454,7 +433,6 @@ class IRCBotFactory(ReconnectingClientFactory):
     def __init__(self, name, relay=None, relayCommands=None, user=None, stage2=None):
         if not name == None:
             self.name = name
-            self.instance = main.pool[name]
             self.net = "".join([x for x in self.name if not x in digits])
         else:
             self.name = "Relay to "+relay