Refactor client creation

Author: linuxdaemon

cloudbot/bot.py

@@ -13,7 +13,7 @@
 from sqlalchemy.schema import MetaData
 from watchdog.observers import Observer
 
-from cloudbot.client import Client
+from cloudbot.client import Client, CLIENTS
 from cloudbot.clients.irc import IrcClient, irc_clean
 from cloudbot.config import Config
 from cloudbot.event import Event, CommandEvent, RegexEvent, EventType
@@ -150,15 +150,9 @@ def create_connections(self):
             # strip all spaces and capitalization from the connection name
             name = clean_name(config['name'])
             nick = config['nick']
-            server = config['connection']['server']
-            port = config['connection'].get('port', 6667)
-            local_bind = (config['connection'].get('bind_addr', False), config['connection'].get('bind_port', 0))
-            if local_bind[0] is False:
-                local_bind = False
-
-            self.connections[name] = IrcClient(self, name, nick, config=config, channels=config['channels'],
-                                               server=server, port=port, use_ssl=config['connection'].get('ssl', False),
-                                               local_bind=local_bind)
+            _type = config.get("type", "irc")
+
+            self.connections[name] = CLIENTS[_type](self, name, nick, config=config, channels=config['channels'])
             logger.debug("[{}] Created connection.".format(name))
 
     @asyncio.coroutine

cloudbot/clients/irc.py

@@ -14,11 +14,6 @@
 
 logger = logging.getLogger("cloudbot")
 
-irc_prefix_re = re.compile(r":([^ ]*) ([^ ]*) (.*)")
-irc_noprefix_re = re.compile(r"([^ ]*) (.*)")
-irc_netmask_re = re.compile(r"([^!@]*)!([^@]*)@(.*)")
-irc_param_re = re.compile(r"(?:^|(?<= ))(:.*|[^ ]+)")
-
 irc_nick_re = re.compile(r'[A-Za-z0-9^{\}\[\]\-`_|\\]+')
 
 irc_bad_chars = ''.join([chr(x) for x in list(range(0, 1)) + list(range(4, 32)) + list(range(127, 160))])
@@ -61,27 +56,26 @@ class IrcClient(Client):
     :type _ignore_cert_errors: bool
     """
 
-    def __init__(self, bot, name, nick, *, channels=None, config=None,
-                 server, port=6667, use_ssl=False, ignore_cert_errors=True, timeout=300, local_bind=False):
+    def __init__(self, bot, name, nick, *, channels=None, config=None):
         """
         :type bot: cloudbot.bot.CloudBot
         :type name: str
         :type nick: str
         :type channels: list[str]
         :type config: dict[str, unknown]
-        :type server: str
-        :type port: int
-        :type use_ssl: bool
-        :type ignore_cert_errors: bool
-        :type timeout: int
         """
         super().__init__(bot, name, nick, channels=channels, config=config)
 
-        self.use_ssl = use_ssl
-        self._ignore_cert_errors = ignore_cert_errors
-        self._timeout = timeout
-        self.server = server
-        self.port = port
+        self.use_ssl = config['connection'].get('ssl', False)
+        self._ignore_cert_errors = config['connection']['ignore_cert']
+        self._timeout = config['connection']['timeout']
+        self.server = config['connection']['server']
+        self.port = config['connection'].get('port', 6667)
+
+        local_bind = (config['connection'].get('bind_addr', False), config['connection'].get('bind_port', 0))
+        if local_bind[0] is False:
+            local_bind = False
+
         self.local_bind = local_bind
         # create SSL context
         if self.use_ssl:

config.default.json

@@ -2,12 +2,14 @@
     "connections": [
         {
             "name": "esper",
+            "type": "irc",
             "connection": {
                 "server": "irc.esper.net",
                 "port": 6667,
                 "ssl": false,
                 "ignore_cert": true,
-                "password": ""
+                "password": "",
+                "timeout": 300
             },
             "nick": "MyCloudBot",
             "user": "cloudbot",