Улучшение обработки команд: рефакторинг функций для поиска, улучшение сообщений об ошибках и упрощение логики обработки аргументов

bot.py

@@ -6,17 +6,13 @@ from aiogram.filters import Command, CommandObject
 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, 
-    default=DefaultBotProperties(parse_mode=ParseMode.HTML)
-)
+bot = Bot(token=TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
 dp = Dispatcher()
 
 async def fetch_vndb(endpoint: str, filters: list, fields: str):
@@ -26,7 +22,7 @@ async def fetch_vndb(endpoint: str, filters: list, fields: str):
             response = await client.post(f"{API_URL}/{endpoint}", json=payload)
             if response.status_code == 200:
                 return response.json().get("results", [])
-            logger.error(f"VNDB API Error {response.status_code}: {response.text}")
+            logger.error(f"VNDB Error {response.status_code} on {endpoint}: {response.text}")
             return None
         except Exception as e:
             logger.error(f"Request failed: {e}")
@@ -34,103 +30,82 @@ async def fetch_vndb(endpoint: str, filters: list, fields: str):
 
 @dp.message(Command("start", "help"))
 async def cmd_help(message: types.Message):
-    help_text = (
+    await message.answer(
         "🤖 <b>VNDB Bot</b>\n\n"
-        "<b>Поиск:</b>\n"
-        "/search &lt;name&gt;\n"
-        "/char &lt;name&gt;\n"
-        "/release &lt;name&gt;\n\n"
-        "<b>Инфо по ID:</b>\n"
-        "/vn &lt;id&gt; (v17)\n"
-        "/char_id &lt;id&gt; (c1)\n"
-        "/rel_id &lt;id&gt; (r1)"
+        "• /vn &lt;id или название&gt;\n"
+        "• /char &lt;id или название&gt;\n"
+        "• /release &lt;id или название&gt;"
     )
-    await message.answer(help_text)
-
-# --- SEARCH HANDLERS ---
-
-@dp.message(Command("search"))
-async def search_vn(message: types.Message, command: CommandObject):
-    if not command.args: 
-        return await message.answer("Пример: <code>/search Steins;Gate</code>")
-    
-    res = await fetch_vndb("vn", ["search", "=", command.args], "title")
-    if not res: return await message.answer("❌ Ничего не найдено.")
-    
-    out = ["🔍 <b>VN Results:</b>"]
-    for i in res[:10]:
-        out.append(f"• {i['title']} (<code>{i['id']}</code>)")
-    await message.answer("\n".join(out))
-
-@dp.message(Command("char"))
-async def search_char(message: types.Message, command: CommandObject):
-    if not command.args: 
-        return await message.answer("Пример: <code>/char Kurisu</code>")
-    
-    res = await fetch_vndb("character", ["search", "=", command.args], "name")
-    if not res: return await message.answer("❌ Персонаж не найден.")
-    
-    out = ["👤 <b>Characters:</b>"]
-    for i in res[:10]:
-        out.append(f"• {i['name']} (<code>{i['id']}</code>)")
-    await message.answer("\n".join(out))
-
-@dp.message(Command("release"))
-async def search_release(message: types.Message, command: CommandObject):
-    if not command.args: 
-        return await message.answer("Пример: <code>/release Chaos;Head</code>")
-    
-    res = await fetch_vndb("release", ["search", "=", command.args], "title")
-    if not res: return await message.answer("❌ Релиз не найден.")
-    
-    out = ["💿 <b>Releases:</b>"]
-    for i in res[:10]:
-        out.append(f"• {i['title']} (<code>{i['id']}</code>)")
-    await message.answer("\n".join(out))
-
-# --- DETAIL HANDLERS ---
 
 @dp.message(Command("vn"))
-async def detail_vn(message: types.Message, command: CommandObject):
-    if not command.args: return await message.answer("Введите ID (v17)")
+async def handle_vn(message: types.Message, command: CommandObject):
+    if not command.args: return await message.answer("Введите название или ID (v17)")
     
-    res = await fetch_vndb("vn", ["id", "=", command.args], "id, title, original, released, rating, votecount")
-    if not res: return await message.answer("❌ VN не найдена.")
+    # Если это ID (начинается с 'v' + цифры)
+    if command.args.startswith('v') and command.args[1:].isdigit():
+        filt = ["id", "=", command.args]
+    else:
+        filt = ["search", "=", command.args]
+
+    # Важно: для VN используем alttitle вместо original
+    res = await fetch_vndb("vn", filt, "id, title, alttitle, released, rating, votecount")
     
+    if not res: return await message.answer("❌ Ничего не найдено.")
+    
+    if len(res) > 1 and not command.args.startswith('v'):
+        out = ["🔍 <b>Результаты поиска:</b>"]
+        for i in res[:10]:
+            out.append(f"• {i['title']} (<code>{i['id']}</code>)")
+        return await message.answer("\n".join(out))
+
     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"Original: {v.get('alttitle', '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, command: CommandObject):
-    if not command.args: return await message.answer("Введите ID (c1)")
+@dp.message(Command("char"))
+async def handle_char(message: types.Message, command: CommandObject):
+    if not command.args: return await message.answer("Введите имя или ID (c1)")
     
-    res = await fetch_vndb("character", ["id", "=", command.args], "id, name, original")
-    if not res: return await message.answer("❌ Персонаж не найден.")
+    filt = ["id", "=", command.args] if command.args.startswith('c') and command.args[1:].isdigit() else ["search", "=", command.args]
     
-    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)
+    # Для персонажей original работает
+    res = await fetch_vndb("character", filt, "id, name, original")
+    if not res: return await message.answer("❌ Не найдено.")
+    
+    if len(res) > 1 and not command.args.startswith('c'):
+        out = ["👤 <b>Персонажи:</b>"]
+        for i in res[:10]: out.append(f"• {i['name']} (<code>{i['id']}</code>)")
+        return await message.answer("\n".join(out))
 
-@dp.message(Command("rel_id"))
-async def detail_rel(message: types.Message, command: CommandObject):
-    if not command.args: return await message.answer("Введите ID (r1)")
+    c = res[0]
+    await message.answer(f"👤 <b>{c['name']}</b>\nOriginal: {c.get('original', 'N/A')}\nhttps://vndb.org/{c['id']}")
+
+@dp.message(Command("release"))
+async def handle_rel(message: types.Message, command: CommandObject):
+    if not command.args: return await message.answer("Введите название или ID (r1)")
     
-    res = await fetch_vndb("release", ["id", "=", command.args], "id, title, released")
-    if not res: return await message.answer("❌ Релиз не найден.")
+    filt = ["id", "=", command.args] if command.args.startswith('r') and command.args[1:].isdigit() else ["search", "=", command.args]
     
+    res = await fetch_vndb("release", filt, "id, title, alttitle, released")
+    if not res: return await message.answer("❌ Не найдено.")
+    
+    if len(res) > 1 and not command.args.startswith('r'):
+        out = ["💿 <b>Релизы:</b>"]
+        for i in res[:10]: out.append(f"• {i['title']} (<code>{i['id']}</code>)")
+        return await message.answer("\n".join(out))
+
     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)
+    await message.answer(f"💿 <b>{r['title']}</b>\nReleased: {r.get('released', 'N/A')}\nhttps://vndb.org/{r['id']}")
+
+# Прямые команды поиска (алиасы для удобства)
+@dp.message(Command("search"))
+async def search_alias(message: types.Message, command: CommandObject):
+    await handle_vn(message, command)
 
 if __name__ == "__main__":
     dp.run_polling(bot)