diff --git a/bot.py b/bot.py index 8f215ad..79580da 100644 --- a/bot.py +++ b/bot.py @@ -2,7 +2,7 @@ import os import logging import httpx from aiogram import Bot, Dispatcher, types -from aiogram.filters import Command +from aiogram.filters import Command, CommandObject from aiogram.client.default import DefaultBotProperties from aiogram.enums import ParseMode @@ -13,7 +13,6 @@ API_URL = os.getenv("VNDB_API_URL", "https://api.vndb.org/kana") logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) -# Исправленная инициализация для aiogram 3.7.0+ bot = Bot( token=TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML) @@ -21,7 +20,6 @@ bot = Bot( dp = Dispatcher() async def fetch_vndb(endpoint: str, filters: list, fields: str): - """Универсальный и безопасный клиент для VNDB API""" payload = {"filters": filters, "fields": fields} async with httpx.AsyncClient(timeout=10.0) as client: try: @@ -37,67 +35,66 @@ async def fetch_vndb(endpoint: str, filters: list, fields: str): @dp.message(Command("start", "help")) async def cmd_help(message: types.Message): help_text = ( - "🤖 VNDB Bot v2.0\n\n" + "🤖 VNDB Bot\n\n" "Поиск:\n" - "/search <name> — поиск VN\n" - "/char <name> — поиск персонажа\n" - "/release <name> — поиск релиза\n\n" + "/search <name>\n" + "/char <name>\n" + "/release <name>\n\n" "Инфо по ID:\n" - "/vn <id> (напр. v17)\n" - "/char_id <id> (напр. c1)\n" - "/rel_id <id> (напр. r1)" + "/vn <id> (v17)\n" + "/char_id <id> (c1)\n" + "/rel_id <id> (r1)" ) await message.answer(help_text) # --- SEARCH HANDLERS --- @dp.message(Command("search")) -async def search_vn(message: types.Message): - query = message.extract_args() - if not query: return await message.answer("Пример: /search Steins;Gate") +async def search_vn(message: types.Message, command: CommandObject): + if not command.args: + return await message.answer("Пример: /search Steins;Gate") - res = await fetch_vndb("vn", ["search", "=", query], "title, rating") + res = await fetch_vndb("vn", ["search", "=", command.args], "title") if not res: return await message.answer("❌ Ничего не найдено.") out = ["🔍 VN Results:"] for i in res[:10]: - out.append(f"• {i['title']} (ID: {i['id']})") + out.append(f"• {i['title']} ({i['id']})") await message.answer("\n".join(out)) @dp.message(Command("char")) -async def search_char(message: types.Message): - query = message.extract_args() - if not query: return await message.answer("Пример: /char Kurisu") +async def search_char(message: types.Message, command: CommandObject): + if not command.args: + return await message.answer("Пример: /char Kurisu") - res = await fetch_vndb("character", ["search", "=", query], "name") + res = await fetch_vndb("character", ["search", "=", command.args], "name") if not res: return await message.answer("❌ Персонаж не найден.") out = ["👤 Characters:"] for i in res[:10]: - out.append(f"• {i['name']} (ID: {i['id']})") + out.append(f"• {i['name']} ({i['id']})") await message.answer("\n".join(out)) @dp.message(Command("release")) -async def search_release(message: types.Message): - query = message.extract_args() - if not query: return await message.answer("Пример: /release Chaos;Head") +async def search_release(message: types.Message, command: CommandObject): + if not command.args: + return await message.answer("Пример: /release Chaos;Head") - res = await fetch_vndb("release", ["search", "=", query], "title") + res = await fetch_vndb("release", ["search", "=", command.args], "title") if not res: return await message.answer("❌ Релиз не найден.") out = ["💿 Releases:"] for i in res[:10]: - out.append(f"• {i['title']} (ID: {i['id']})") + out.append(f"• {i['title']} ({i['id']})") await message.answer("\n".join(out)) # --- DETAIL HANDLERS --- @dp.message(Command("vn")) -async def detail_vn(message: types.Message): - vid = message.extract_args() - if not vid: return await message.answer("Введите ID (например v17)") +async def detail_vn(message: types.Message, command: CommandObject): + if not command.args: return await message.answer("Введите ID (v17)") - res = await fetch_vndb("vn", ["id", "=", vid], "id, title, original, released, rating, votecount") + res = await fetch_vndb("vn", ["id", "=", command.args], "id, title, original, released, rating, votecount") if not res: return await message.answer("❌ VN не найдена.") v = res[0] @@ -110,11 +107,10 @@ async def detail_vn(message: types.Message): await message.answer(text) @dp.message(Command("char_id")) -async def detail_char(message: types.Message): - cid = message.extract_args() - if not cid: return await message.answer("Введите ID (например c1)") +async def detail_char(message: types.Message, command: CommandObject): + if not command.args: return await message.answer("Введите ID (c1)") - res = await fetch_vndb("character", ["id", "=", cid], "id, name, original") + res = await fetch_vndb("character", ["id", "=", command.args], "id, name, original") if not res: return await message.answer("❌ Персонаж не найден.") c = res[0] @@ -124,11 +120,10 @@ async def detail_char(message: types.Message): await message.answer(text) @dp.message(Command("rel_id")) -async def detail_rel(message: types.Message): - rid = message.extract_args() - if not rid: return await message.answer("Введите ID (например r1)") +async def detail_rel(message: types.Message, command: CommandObject): + if not command.args: return await message.answer("Введите ID (r1)") - res = await fetch_vndb("release", ["id", "=", rid], "id, title, released") + res = await fetch_vndb("release", ["id", "=", command.args], "id, title, released") if not res: return await message.answer("❌ Релиз не найден.") r = res[0]