From 321b2f5d39aabfee766a996c1f099a68bfee470a Mon Sep 17 00:00:00 2001 From: yuki Date: Wed, 8 Oct 2025 02:17:23 -0300 Subject: [PATCH] undo/comment out async catbox library --- .gitmodules | 3 --- bot.py | 6 +++--- catbox_async_uploader | 1 - config-template.toml | 2 -- main.py | 3 +-- 5 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 .gitmodules delete mode 160000 catbox_async_uploader diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9c617de..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "catbox_async_uploader"] - path = catbox_async_uploader - url = https://github.com/IlkoChw/catbox_async_uploader diff --git a/bot.py b/bot.py index 275d331..2a949eb 100644 --- a/bot.py +++ b/bot.py @@ -6,11 +6,11 @@ import pylast import aiosqlite from lastfmcollagegenerator.collage_generator import CollageGenerator -from catbox_async_uploader.catbox_async_uploader.core import CatboxAsyncUploader +# from catbox_async_uploader.catbox_async_uploader.core import CatboxAsyncUploader class Bot(nerimity.Client): """Extended client class for extra functionality.""" - def __init__(self, lastfm_api_key: str, lastfm_api_secret: str, catbox_hash: str, + def __init__(self, lastfm_api_key: str, lastfm_api_secret: str, owner_id: int = None, db_file: str = "database.db", *args, **kwargs): super().__init__(*args, **kwargs) @@ -30,7 +30,7 @@ class Bot(nerimity.Client): ) # initialize catbox client - self.catbox_uploader = CatboxAsyncUploader(userhash=catbox_hash) + # self.catbox_uploader = CatboxAsyncUploader(userhash=catbox_hash) # database self.db = None diff --git a/catbox_async_uploader b/catbox_async_uploader deleted file mode 160000 index 7c9e9a9..0000000 --- a/catbox_async_uploader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7c9e9a9efc833a7f4f7a9641bd81f7ea4881396a diff --git a/config-template.toml b/config-template.toml index db288d0..cdc4798 100644 --- a/config-template.toml +++ b/config-template.toml @@ -2,5 +2,3 @@ token = "NerimityTokenHere" owner_id = 1234567890 api_key = "LastFmApiKeyHere" api_secret = "LastFmApiSecretHere" - -catbox_hash = "CatboxUserHashHere" diff --git a/main.py b/main.py index d42696f..1bfd09b 100644 --- a/main.py +++ b/main.py @@ -11,8 +11,7 @@ bot = bot.Bot( token = config['token'], owner_id = config['owner_id'], lastfm_api_key = config['api_key'], - lastfm_api_secret = config['api_secret'], - catbox_hash = config['catbox_hash'] + lastfm_api_secret = config['api_secret'] ) bot.load_commands("commands")