From 78c77afe886aafe1da1ed0cbd0d760c69ddfbd7a Mon Sep 17 00:00:00 2001 From: Interitio Date: Tue, 15 Sep 2026 19:40:13 +1000 Subject: [PATCH] Customisations for nico. --- .gitmodules | 2 +- src/bot.py | 21 +++++++++++++++++++++ src/botdata.py | 8 +++++--- src/modules/hyperfocus | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index aacc0b6..d71fe7b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://git.thewisewolf.dev/HoloTech/profiles-plugin.git [submodule "src/modules/hyperfocus"] path = src/modules/hyperfocus - url = https://git.thewisewolf.dev/HoloTech/hyperfocus-plugin.git + url = https://git.thewisewolf.dev/LordNico/nicofocus-plugin.git [submodule "src/modules/exec"] path = src/modules/exec url = https://git.thewisewolf.dev/HoloTech/exec-plugin.git diff --git a/src/bot.py b/src/bot.py index 37490f4..d6a2e71 100644 --- a/src/bot.py +++ b/src/bot.py @@ -1,6 +1,7 @@ import asyncio import logging import websockets +from aiohttp import web from twitchio.web import AiohttpAdapter @@ -20,6 +21,26 @@ class ProxyAiohttpAdapter(AiohttpAdapter): def _find_redirect(self, request): return self.redirect_url + async def oauth_callback(self, request: web.Request) -> web.Response: + payload: FetchTokenPayload = await self.fetch_token(request) + + # Change the default success response to no content... + print(payload) + if 200 <= payload.response.status < 300: + return web.Response( + status=200, + text=( + "Successfully added Croccyfocus to your channel! Good luck with your hyperfocused sessions!\n" + "

For further usage and setup information, see the documentation here.

" + ).format( + docs="https://git.thewisewolf.dev/HoloTech/hyperfocus-twitch-bot/wiki/Focus-docs" + ), + content_type="text/html", + ) + + # Return the default error responses... + return payload.response + async def main(): db = Database(conf.data['args']) diff --git a/src/botdata.py b/src/botdata.py index 8287b5f..252be7a 100644 --- a/src/botdata.py +++ b/src/botdata.py @@ -14,6 +14,7 @@ class UserAuth(RowModel): _timestamp TIMESTAMPTZ NOT NULL DEFAULT NOW() ); """ + _schema_ = 'nico' _tablename_ = 'user_auth' _cache_ = {} @@ -36,6 +37,7 @@ class BotChannel(RowModel): _timestamp TIMESTAMPTZ NOT NULL DEFAULT NOW() ); """ + _schema_ = 'nico' _tablename_ = 'bot_channels' _cache_ = {} @@ -73,10 +75,10 @@ class BotData(Registry): bot_channels = BotChannel.table """ - CREATE TABLE user_auth_scopes( - userid TEXT NOT NULL REFERENCES user_auth(userid) ON DELETE CASCADE, + CREATE TABLE nico_user_auth_scopes( + userid TEXT NOT NULL REFERENCES nico.user_auth(userid) ON DELETE CASCADE, scope TEXT NOT NULL ); """ - user_auth_scopes = Table('user_auth_scopes') + user_auth_scopes = Table('user_auth_scopes', schema='nico') diff --git a/src/modules/hyperfocus b/src/modules/hyperfocus index d2050ab..9c834c1 160000 --- a/src/modules/hyperfocus +++ b/src/modules/hyperfocus @@ -1 +1 @@ -Subproject commit d2050ab2dcb591a749bb3e25ad1b705ef6500521 +Subproject commit 9c834c1c4e88f240576591b02d5ae7ddfd379039