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

bot.py

@@ -17,15 +17,31 @@ bot = Bot(token=TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
 dp = Dispatcher()
 
 def clean_text(text: str) -> str:
-    """Очистка текста от VNDB-тегов и ограничение длины."""
+    """Очистка текста от тегов VNDB и ограничение длины."""
     if not text: return "No description available."
-    # Убираем [url] и другие теги
     text = re.sub(r'\[url=?.*?\](.*?)\[/url\]', r'\1', text)
     text = re.sub(r'\[/?b\]', '', text)
     text = re.sub(r'\[/?i\]', '', text)
     text = text.replace('"', "'")
     return text[:700] + "..." if len(text) > 700 else text
 
+def safe_list_to_str(data) -> str:
+    """Безопасное преобразование данных в строку через запятую."""
+    if not data: return "N/A"
+    if isinstance(data, list):
+        # Если элементы списка — строки
+        if all(isinstance(x, str) for x in data):
+            return ", ".join([x.upper() for x in data])
+        # Если элементы списка — словари (как в languages у релизов)
+        processed = []
+        for x in data:
+            if isinstance(x, dict):
+                # берем lang или name, что найдется
+                val = x.get('lang') or x.get('name')
+                if val: processed.append(str(val).upper())
+        return ", ".join(processed) if processed else "N/A"
+    return str(data).upper()
+
 async def fetch_vndb(endpoint: str, filters: list, fields: str):
     payload = {"filters": filters, "fields": fields}
     async with httpx.AsyncClient(timeout=15.0) as client:
@@ -46,31 +62,25 @@ async def handle_vn(message: types.Message, command: CommandObject):
     is_id = command.args.startswith('v') and command.args[1:].isdigit()
     filt = ["id", "=", command.args] if is_id else ["search", "=", command.args]
     
+    # Для VN languages — это [string]
     fields = "id, title, alttitle, released, rating, votecount, description, languages, platforms, developers{name}"
     res = await fetch_vndb("vn", filt, fields)
     
     if not res: return await message.answer("❌ Not found.")
-    
-    # Если поиск выдал список, а не конкретный ID
     if len(res) > 1 and not is_id:
         out = ["🔍 <b>Select VN by ID:</b>"]
-        for i in res[:10]:
+        for i in res[:10]: out.append(f"• {i['title']} — <code>{i['id']}</code>")
-            out.append(f"• {i['title']} — <code>{i['id']}</code>")
         return await message.answer("\n".join(out))
 
     v = res[0]
-    langs = ", ".join([l.upper() for l in v.get('languages', [])])
-    plats = ", ".join([p.upper() for p in v.get('platforms', [])])
-    devs = ", ".join([d['name'] for d in v.get('developers', [])])
-    
     text = (
         f"<b>TITLE:</b> {v['title']}\n"
         f"<b>ORIGINAL:</b> {v.get('alttitle') or 'N/A'}\n\n"
         f"<b>RELEASED:</b> {v.get('released', 'N/A')}\n"
-        f"<b>DEVELOPER:</b> {devs or 'N/A'}\n"
+        f"<b>DEVELOPER:</b> {safe_list_to_str(v.get('developers'))}\n"
         f"<b>RATING:</b> {v['rating']/10 if v.get('rating') else 'N/A'} ({v.get('votecount', 0)} votes)\n"
-        f"<b>LANGUAGES:</b> {langs or 'N/A'}\n"
+        f"<b>LANGUAGES:</b> {safe_list_to_str(v.get('languages'))}\n"
-        f"<b>PLATFORMS:</b> {plats or 'N/A'}\n\n"
+        f"<b>PLATFORMS:</b> {safe_list_to_str(v.get('platforms'))}\n\n"
         f"<b>DESCRIPTION:</b>\n<i>{clean_text(v.get('description'))}</i>\n\n"
         f"<b>VNDB LINK:</b> https://vndb.org/{v['id']}"
     )
@@ -87,14 +97,16 @@ async def handle_char(message: types.Message, command: CommandObject):
     res = await fetch_vndb("character", filt, fields)
     
     if not res: return await message.answer("❌ Not found.")
-    
     if len(res) > 1 and not is_id:
         out = ["👤 <b>Select Character by ID:</b>"]
         for i in res[:10]: out.append(f"• {i['name']} — <code>{i['id']}</code>")
         return await message.answer("\n".join(out))
 
     c = res[0]
-    gender = {"m": "MALE", "f": "FEMALE", "both": "BOTH"}.get(c.get('gender'), 'UNKNOWN')
+    # Защита от list в поле gender
+    raw_gender = c.get('gender')
+    if isinstance(raw_gender, list): raw_gender = raw_gender[0] if raw_gender else None
+    gender = {"m": "MALE", "f": "FEMALE", "both": "BOTH"}.get(raw_gender, 'UNKNOWN')
     
     text = (
         f"<b>NAME:</b> {c['name']}\n"
@@ -114,28 +126,25 @@ async def handle_rel(message: types.Message, command: CommandObject):
     is_id = command.args.startswith('r') and command.args[1:].isdigit()
     filt = ["id", "=", command.args] if is_id else ["search", "=", command.args]
     
-    fields = "id, title, alttitle, released, languages, platforms, extlinks{url, label}"
+    # КРИТИЧНО: languages{lang} для релизов
+    fields = "id, title, alttitle, released, languages{lang}, platforms, extlinks{url, label}"
     res = await fetch_vndb("release", filt, fields)
     
     if not res: return await message.answer("❌ Not found.")
-    
     if len(res) > 1 and not is_id:
         out = ["💿 <b>Select Release by ID:</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]
-    langs = ", ".join([l.upper() for l in r.get('languages', [])])
-    plats = ", ".join([p.upper() for p in r.get('platforms', [])])
-    # Ограничиваем ссылки, чтобы не спамить
     links = "\n".join([f"• <a href='{l['url']}'>{l['label']}</a>" for l in r.get('extlinks', [])[:8]])
     
     text = (
         f"<b>RELEASE TITLE:</b> {r['title']}\n"
         f"<b>ORIGINAL:</b> {r.get('alttitle') or 'N/A'}\n\n"
         f"<b>DATE:</b> {r.get('released', 'N/A')}\n"
-        f"<b>LANGUAGES:</b> {langs}\n"
+        f"<b>LANGUAGES:</b> {safe_list_to_str(r.get('languages'))}\n"
-        f"<b>PLATFORMS:</b> {plats}\n\n"
+        f"<b>PLATFORMS:</b> {safe_list_to_str(r.get('platforms'))}\n\n"
         f"<b>LINKS / STORES:</b>\n{links or 'No links available'}\n\n"
         f"<b>VNDB LINK:</b> https://vndb.org/{r['id']}"
     )
@@ -145,13 +154,7 @@ async def handle_rel(message: types.Message, command: CommandObject):
 async def cmd_start(message: types.Message, command: CommandObject):
     if message.text.startswith("/search") and command.args:
         return await handle_vn(message, command)
-    await message.answer(
+    await message.answer("🤖 <b>VNDB Technical Bot</b>\n\n/vn [name/id]\n/char [name/id]\n/release [name/id]")
-        "🤖 <b>VNDB Technical Bot</b>\n\n"
-        "Commands:\n"
-        "/vn [name/id]\n"
-        "/char [name/id]\n"
-        "/release [name/id]"
-    )
 
 if __name__ == "__main__":
     dp.run_polling(bot)