routine: Update subathon module pointer

data/schema.sql

@@ -4,7 +4,7 @@ CREATE TABLE version_history(
   from_version INTEGER NOT NULL,
   to_version INTEGER NOT NULL,
   author TEXT NOT NULL,
-  _timestamp TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+  _timestamp TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
 INSERT INTO version_history (component, from_version, to_version, author) VALUES ('ROOT', 0, 1, 'Initial Creation');
 

example-config/bot.conf

@@ -1,6 +1,7 @@
 [BOT]
 prefix = ?
 bot_id =
+owner_id =
 
 ALSO_READ = config/secrets.conf
 

example-config/secrets.conf

@@ -1,4 +1,4 @@
-[CROCBOT]
+[BOT]
 client_id = 
 client_secret = 
 

src/bot.py

@@ -12,11 +12,16 @@ from modules import twitch_setup
 logger = logging.getLogger(__name__)
 
 
+class FixedAiohttpAdapter(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 = FixedAiohttpAdapter(
             host=conf.bot.get('wshost', None),
             port=conf.bot.getint('wsport', None),
             domain=conf.bot.get('wsdomain', None),

src/meta/bot.py

@@ -178,17 +178,15 @@ class Bot(commands.Bot):
 
         # Save the token and scopes to data
         # Wrap this in a transaction so if it fails halfway we rollback correctly
-        async with self.dbconn.connection() as conn:
+        # TODO
-            self.dbconn.conn = conn 
+        row = await UserAuth.fetch_or_create(userid, token=token, refresh_token=refresh)
-            async with conn.transaction():
+        if row.token != token or row.refresh_token != refresh:
-                row = await UserAuth.fetch_or_create(userid, token=token, refresh_token=refresh)
+            await row.update(token=token, refresh_token=refresh)
-                if row.token != token or row.refresh_token != refresh:
+        await self.data.user_auth_scopes.delete_where(userid=userid)
-                    await row.update(token=token, refresh_token=refresh)
+        await self.data.user_auth_scopes.insert_many(
-                await self.data.user_auth_scopes.delete_where(userid=userid)
+            ('userid', 'scope'),
-                await self.data.user_auth_scopes.insert_many(
+            *((userid, scope) for scope in new_scopes)
-                    ('userid', 'scope'),
+        )
-                    *((userid, scope) for scope in new_scopes)
-                )
 
         logger.info("Updated auth token for user '%s' with scopes: %s", resp.user_id, ', '.join(new_scopes))
         return resp

src/meta/logger.py

@@ -14,6 +14,7 @@ import aiohttp
 
 from .config import conf
 from utils.ratelimits import Bucket, BucketOverFull, BucketFull
+from utils.lib import utc_now
 
 
 log_logger = logging.getLogger(__name__)
@@ -365,6 +366,8 @@ class WebHookHandler(logging.StreamHandler):
             await self._send(batched)
 
     async def _send(self, message, as_file=False):
+        import discord
+        from discord import File
         try:
             self.bucket.request()
         except BucketOverFull: