Рефакторинг бота VNDB: обновление инициализации aiogram, улучшение обработки ошибок, добавление новых команд и изменение зависимостей в requirements.txt

bot.py

@@ -1,105 +1,141 @@
 import os
 import logging
 import httpx
-from aiogram import Bot, Dispatcher, types, F
+from aiogram import Bot, Dispatcher, types
 from aiogram.filters import Command
-from aiogram.utils.markdown import hbold, hlink
+from aiogram.client.default import DefaultBotProperties
+from aiogram.enums import ParseMode
 
 # Настройки
 TOKEN = os.getenv("TELEGRAM_TOKEN")
 API_URL = os.getenv("VNDB_API_URL", "https://api.vndb.org/kana")
 
-# Логирование
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-bot = Bot(token=TOKEN, parse_mode="HTML")
+# Исправленная инициализация для aiogram 3.7.0+
+bot = Bot(
+    token=TOKEN, 
+    default=DefaultBotProperties(parse_mode=ParseMode.HTML)
+)
 dp = Dispatcher()
 
-# Хелпер для запросов к VNDB
 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:
             response = await client.post(f"{API_URL}/{endpoint}", json=payload)
-            if response.status_code != 200:
+            if response.status_code == 200:
-                logger.error(f"VNDB Error {response.status_code}: {response.text}")
+                return response.json().get("results", [])
-                return None
+            logger.error(f"VNDB API Error {response.status_code}: {response.text}")
-            return response.json().get("results", [])
+            return None
         except Exception as e:
-            logger.error(f"Connection error: {e}")
+            logger.error(f"Request failed: {e}")
             return None
 
-# Команды /start и /help
 @dp.message(Command("start", "help"))
-async def cmd_start(message: types.Message):
+async def cmd_help(message: types.Message):
     help_text = (
-        "🤖 <b>VNDB Bot</b>\n\n"
+        "🤖 <b>VNDB Bot v2.0</b>\n\n"
         "<b>Поиск:</b>\n"
-        "/search [name] - поиск новеллы\n"
+        "/search &lt;name&gt; — поиск VN\n"
-        "/char [name] - поиск персонажа\n"
+        "/char &lt;name&gt; — поиск персонажа\n"
-        "/release [name] - поиск релизов\n\n"
+        "/release &lt;name&gt; — поиск релиза\n\n"
         "<b>Инфо по ID:</b>\n"
-        "/vn [id] (напр. v17)\n"
+        "/vn &lt;id&gt; (напр. v17)\n"
-        "/char_id [id] (напр. c1)\n"
+        "/char_id &lt;id&gt; (напр. c1)\n"
-        "/rel_id [id] (напр. r1)"
+        "/rel_id &lt;id&gt; (напр. r1)"
     )
     await message.answer(help_text)
 
-# Обработчик поиска VN
+# --- SEARCH HANDLERS ---
+
 @dp.message(Command("search"))
 async def search_vn(message: types.Message):
     query = message.extract_args()
-    if not query:
+    if not query: return await message.answer("Пример: <code>/search Steins;Gate</code>")
-        return await message.answer("Введите название для поиска. Пример: <code>/search Steins;Gate</code>")
-
-    res = await fetch_vndb("vn", ["search", "=", query], "title, released, rating")
-    if not res:
-        return await message.answer("❌ Ничего не найдено или ошибка API")
-
-    out = [f"🔍 <b>Результаты поиска:</b>"]
-    for item in res[:10]:
-        rating = f"⭐ {item['rating']/10}" if item.get('rating') else "No rating"
-        out.append(f"• {item['title']} (ID: <code>{item['id']}</code>) | {rating}")
     
+    res = await fetch_vndb("vn", ["search", "=", query], "title, rating")
+    if not res: return await message.answer("❌ Ничего не найдено.")
+    
+    out = ["🔍 <b>VN Results:</b>"]
+    for i in res[:10]:
+        out.append(f"• {i['title']} (ID: <code>{i['id']}</code>)")
     await message.answer("\n".join(out))
 
-# Обработчик деталей VN
-@dp.message(Command("vn"))
-async def details_vn(message: types.Message):
-    vn_id = message.extract_args()
-    if not vn_id: return await message.answer("Укажите ID. Пример: <code>/vn v11</code>")
-
-    res = await fetch_vndb("vn", ["id", "=", vn_id], "id, title, original, released, rating, votecount")
-    if not res: return await message.answer("❌ VN не найдена")
-
-    v = res[0]
-    text = (
-        f"📖 <b>{v['title']}</b>\n"
-        f"Original: {v.get('original', 'N/A')}\n"
-        f"Released: {v.get('released', 'N/A')}\n"
-        f"Rating: {v.get('rating', 'N/A') if v.get('rating') else 'N/A'} ({v.get('votecount', 0)} votes)\n"
-        f"Link: https://vndb.org/{v['id']}"
-    )
-    await message.answer(text)
-
-# Обработчик персонажей
 @dp.message(Command("char"))
 async def search_char(message: types.Message):
     query = message.extract_args()
     if not query: return await message.answer("Пример: <code>/char Kurisu</code>")
     
-    res = await fetch_vndb("character", ["search", "=", query], "id, name, original")
+    res = await fetch_vndb("character", ["search", "=", query], "name")
-    if not res: return await message.answer("❌ Персонаж не найден")
+    if not res: return await message.answer("❌ Персонаж не найден.")
     
-    out = [f"👤 <b>Персонажи:</b>"]
+    out = ["👤 <b>Characters:</b>"]
-    for c in res[:10]:
+    for i in res[:10]:
-        out.append(f"• {c['name']} (<code>{c['id']}</code>)")
+        out.append(f"• {i['name']} (ID: <code>{i['id']}</code>)")
     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("Пример: <code>/release Chaos;Head</code>")
+    
+    res = await fetch_vndb("release", ["search", "=", query], "title")
+    if not res: return await message.answer("❌ Релиз не найден.")
+    
+    out = ["💿 <b>Releases:</b>"]
+    for i in res[:10]:
+        out.append(f"• {i['title']} (ID: <code>{i['id']}</code>)")
+    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)")
+    
+    res = await fetch_vndb("vn", ["id", "=", vid], "id, title, original, released, rating, votecount")
+    if not res: return await message.answer("❌ VN не найдена.")
+    
+    v = res[0]
+    rating = f"{v['rating']/10} ⭐" if v.get('rating') else "N/A"
+    text = (f"📖 <b>{v['title']}</b>\n"
+            f"Original: {v.get('original', 'N/A')}\n"
+            f"Released: {v.get('released', 'N/A')}\n"
+            f"Rating: {rating} ({v.get('votecount', 0)} votes)\n"
+            f"https://vndb.org/{v['id']}")
+    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)")
+    
+    res = await fetch_vndb("character", ["id", "=", cid], "id, name, original")
+    if not res: return await message.answer("❌ Персонаж не найден.")
+    
+    c = res[0]
+    text = (f"👤 <b>{c['name']}</b>\n"
+            f"Original: {c.get('original', 'N/A')}\n"
+            f"https://vndb.org/{c['id']}")
+    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)")
+    
+    res = await fetch_vndb("release", ["id", "=", rid], "id, title, released")
+    if not res: return await message.answer("❌ Релиз не найден.")
+    
+    r = res[0]
+    text = (f"💿 <b>{r['title']}</b>\n"
+            f"Released: {r.get('released', 'N/A')}\n"
+            f"https://vndb.org/{r['id']}")
+    await message.answer(text)
+
 if __name__ == "__main__":
-    if not TOKEN:
+    dp.run_polling(bot)
-        print("Error: TELEGRAM_TOKEN not set!")
-    else:
-        dp.run_polling(bot)

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   bot:
     build: .

requirements.txt

@@ -1,2 +1,2 @@
-aiogram==3.10.0
+aiogram>=3.10.0
-httpx==0.28.1
+httpx>=0.27.0