rejnronuz/muzovkantv2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixes regarding logging, api and db working; small fixes in all of the cogs; moved all the configurable information to the config.py

Browse Source
This commit is contained in:
perforat
2026-03-09 01:56:07 +05:00
parent 417c5daa60
commit 4ace3b6611
12 changed files with 513 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
cogs/kitty.py
View File

@@ -6,82 +6,83 @@ import logging
logger = logging.getLogger(__name__)
class Kitty(commands.Cog, name="Котики"):
def __init__(self, bot):
self.bot = bot
self.api_key = os.environ.get('CAT_API_KEY')
self.search_url = "https://api.thecatapi.com/v1/images/search"
self.session: aiohttp.ClientSession | None = None
if not self.api_key:
logger.warning("[Kitty] no api key found")
logger.warning("No CAT_API_KEY found, using unauthenticated requests")
async def cog_load(self):
headers = {"Content-Type": "application/json"}
if self.api_key:
headers["x-api-key"] = self.api_key
self.session = aiohttp.ClientSession(headers=headers)
async def cog_unload(self):
if self.session:
await self.session.close()
async def _fetch_random_cat(self):
headers = {"Content-Type": "application/json"}
if self.api_key and self.api_key != "DEMO-API-KEY":
headers["x-api-key"] = self.api_key
else:
headers["x-api-key"] = "DEMO-API-KEY"
params = {
'size': 'med',
'mime_types': 'jpg,png',
'format': 'json',
'has_breeds': 'true',
'order': 'RANDOM',
'limit': 1
'limit': 1,
}
try:
async with aiohttp.ClientSession() as session:
async with session.get(self.search_url, headers=headers, params=params) as response:
if response.status == 200:
data = await response.json()
if data and isinstance(data, list):
logger.info(f"[Kitty] API response received")
return data[0]
else:
logger.error(f"[Kitty] api err: {response.status}")
async with self.session.get(self.search_url, params=params) as response:
if response.status != 200:
error_text = await response.text()
logger.error("API error %s: %s", response.status, error_text)
return None
data = await response.json()
if not data or not isinstance(data, list):
logger.error("Unexpected API response format: %s", data)
return None
return data[0]
try:
error_text = await response.text()
logger.error(f"[Kitty] api error text: {error_text}")
except:
pass
except aiohttp.ClientError as e:
logger.error(f"[Kitty] client error when contacting api: {e}")
logger.error("HTTP client error: %s", e)
except Exception as e:
logger.error(f"[Kitty] err: {e}")
logger.error("Unexpected error fetching cat: %s", e)
return None
@commands.hybrid_command(name="kitty", description="kitty")
async def kitty(self, ctx):
await ctx.defer()
logger.info(f"[Kitty] kitty request from {ctx.author.name} ({ctx.author.id})")
logger.info("Kitty request from %s (%s)", ctx.author.name, ctx.author.id)
cat_data = await self._fetch_random_cat()
if not cat_data:
logger.warning("[Kitty] cat_data = null")
await ctx.send("помоему чет поломалось. меня пингани ||not cat_data||")
return
image_url = cat_data.get('url')
if not image_url:
logger.error("[Kitty] no image url")
await ctx.send("помоему чет поломалось. меня пингани ||no image url||")
return
breeds_info = cat_data.get('breeds')
if breeds_info and len(breeds_info) > 0:
breed = breeds_info[0]
if breed.get('name'):
caption = f"{breed['name']}"
logger.info(f"[Kitty] Breed found: {breed['name']}")
breeds = cat_data.get('breeds')
breed_name = breeds[0].get('name') if breeds else None
if breed_name:
logger.info("Breed found: %s", breed_name)
await ctx.send(f"random kitty of the day\n[{breed_name}]({image_url})")
else:
await ctx.send(f"random kitty of the day\n{image_url}")
logger.info("Successfully sent kitty to %s", ctx.author.name)
await ctx.send(f"random kitty of the day\n[{caption}]({image_url})")
logger.info(f"[Kitty] succesfully send kitty to {ctx.author.name}")
async def setup(bot):
await bot.add_cog(Kitty(bot))