Move Twitch adapter configuration.

example-config/bot.conf

@@ -4,9 +4,15 @@ bot_id =
 
 ALSO_READ = config/secrets.conf
 
-wshost = localhost
+[TWTICH]
-wsport = 4343
+host =
-wsdomain = localhost:4343
+port =
+domain =
+redirect_path =
+oauth_path =
+evenstub_path =
+
+webhooks =
 
 [LOGGING]
 general_log = 

example-config/secrets.conf

@@ -1,7 +1,10 @@
-[CROCBOT]
+[BOT]
 client_id = 
 client_secret = 
 
+[TWITCH]
+eventsub_secret =
+
 [DATA]
 args =
 appid =

src/bot.py

@@ -13,6 +13,10 @@ logger = logging.getLogger(__name__)
 
 
 class ProxyAiohttpAdapter(AiohttpAdapter):
+    """
+    Overrides the computed AiohttpAdapter redirect_url
+    to always use provided domain.
+    """
     def _find_redirect(self, request):
         return self.redirect_url
 
@@ -21,18 +25,26 @@ async def main():
     db = Database(conf.data['args'])
 
     async with db.open():
-        adapter = ProxyAiohttpAdapter(
+        adapter_keys = (
-            host=conf.bot.get('wshost', None),
+            'host', 'domain', 'port',
-            port=conf.bot.getint('wsport', None),
+            'redirect_path', 'oauth_path', 'eventsub_path',
-            domain=conf.bot.get('wsdomain', None),
+            'eventsub_secret',
-            eventsub_secret=conf.bot.get('eventsub_secret', None)
         )
+        adapter_args = {}
+        for key in adapter_keys:
+            value = conf.twitch.get(key, '').strip()
+            if value:
+                if key == 'port':
+                    value = int(value)
+                adapter_args[key] = value
+        adapter = ProxyAiohttpAdapter(**adapter_args)
 
         bot = Bot(
             config=conf,
             dbconn=db,
             adapter=adapter,
             setup=twitch_setup,
+            using_webhooks=conf.twitch.getboolean('webhooks', False)
         )
 
         async with websockets.serve(sockets.root_handler, '', conf.wserver.getint('port')):

src/meta/bot.py

@@ -29,10 +29,7 @@ class Bot(commands.Bot):
         super().__init__(*args, **kwargs)
 
         # Whether we should do eventsub via webhooks or websockets
-        if config.bot.get('eventsub_secret', None):
+        self.using_webhooks = kwargs.get('using_webhooks', False)
-            self.using_webhooks = True
-        else:
-            self.using_webhooks = False
 
         self.config = config
         self.dbconn = dbconn