From 85f746528311857899c305cc623baeec2f99fccf Mon Sep 17 00:00:00 2001
From: Interitio <cona@thewisewolf.dev>
Date: Wed, 3 Sep 2025 20:16:56 +1000
Subject: [PATCH] fix: Incorrect redirect_url from behind proxy.

Override the redirect URI calculator for AiohttpAdapter.
Required due to changes in Twitchio v3.1
---
 src/bot.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/bot.py b/src/bot.py
index ca898e5..7cedf98 100644
--- a/src/bot.py
+++ b/src/bot.py
@@ -4,7 +4,7 @@ import websockets
 
 from twitchio.web import AiohttpAdapter
 
-from meta import Bot, conf, setup_main_logger, args
+from meta import Bot, conf, setup_main_logger, args, sockets
 from data import Database
 
 from modules import twitch_setup
@@ -12,11 +12,16 @@ from modules import twitch_setup
 logger = logging.getLogger(__name__)
 
 
+class ProxyAiohttpAdapter(AiohttpAdapter):
+    def _find_redirect(self, request):
+        return self.redirect_url
+
+
 async def main():
     db = Database(conf.data['args'])
 
     async with db.open():
-        adapter = AiohttpAdapter(
+        adapter = ProxyAiohttpAdapter(
             host=conf.bot.get('wshost', None),
             port=conf.bot.getint('wsport', None),
             domain=conf.bot.get('wsdomain', None),
@@ -30,10 +35,11 @@ async def main():
             setup=twitch_setup,
         )
 
-        try:
-            await bot.start()
-        finally:
-            await bot.close()
+        async with websockets.serve(sockets.root_handler, '', conf.wserver.getint('port')):
+            try:
+                await bot.start()
+            finally:
+                await bot.close()
 
 
 def _main():