diff --git a/bot.py b/bot.py index 38afd34..c85b35f 100644 --- a/bot.py +++ b/bot.py @@ -16,32 +16,38 @@ logger = logging.getLogger(__name__) bot = Bot(token=TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML)) dp = Dispatcher() +# --- UTILS --- + def clean_text(text: str) -> str: - """Очистка текста от тегов VNDB и ограничение длины.""" if not text: return "No description available." 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 + return text[:600] + "..." if len(text) > 600 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, что найдется + if isinstance(x, str): processed.append(x.upper()) + elif isinstance(x, dict): 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 send_result(message: types.Message, text: str, image_url: str = None): + """Отправляет фото с описанием или просто текст, если фото нет.""" + try: + if image_url: + await message.answer_photo(photo=image_url, caption=text[:1024]) + else: + await message.answer(text) + except Exception as e: + logger.warning(f"Failed to send photo: {e}. Falling back to text.") + await message.answer(text) + async def fetch_vndb(endpoint: str, filters: list, fields: str): payload = {"filters": filters, "fields": fields} async with httpx.AsyncClient(timeout=15.0) as client: @@ -55,106 +61,106 @@ async def fetch_vndb(endpoint: str, filters: list, fields: str): logger.error(f"Connection error: {e}") return None +# --- HANDLERS --- + @dp.message(Command("vn")) async def handle_vn(message: types.Message, command: CommandObject): - if not command.args: return await message.answer("Example: /vn Steins Gate") + if not command.args: return await message.answer("Usage: /vn ") 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}" + # image{url} - правильный синтаксис для Kana API + fields = "id, title, alttitle, released, rating, votecount, description, languages, platforms, developers{name}, image{url}" res = await fetch_vndb("vn", filt, fields) if not res: return await message.answer("❌ Not found.") if len(res) > 1 and not is_id: - out = ["🔍 Select VN by ID:"] - for i in res[:10]: out.append(f"• {i['title']} — {i['id']}") - return await message.answer("\n".join(out)) + out = [f"• {i['title']} — {i['id']}" for i in res[:10]] + return await message.answer("🔍 Select VN by ID:\n" + "\n".join(out)) v = res[0] + img = v.get('image', {}).get('url') if v.get('image') else None + text = ( f"TITLE: {v['title']}\n" - f"ORIGINAL: {v.get('alttitle') or 'N/A'}\n\n" - f"RELEASED: {v.get('released', 'N/A')}\n" + f"ORIGINAL: {v.get('alttitle') or 'N/A'}\n" f"DEVELOPER: {safe_list_to_str(v.get('developers'))}\n" f"RATING: {v['rating']/10 if v.get('rating') else 'N/A'} ({v.get('votecount', 0)} votes)\n" f"LANGUAGES: {safe_list_to_str(v.get('languages'))}\n" f"PLATFORMS: {safe_list_to_str(v.get('platforms'))}\n\n" f"DESCRIPTION:\n{clean_text(v.get('description'))}\n\n" - f"VNDB LINK: https://vndb.org/{v['id']}" + f"VNDB: https://vndb.org/{v['id']}" ) - await message.answer(text) + await send_result(message, text, img) @dp.message(Command("char")) async def handle_char(message: types.Message, command: CommandObject): - if not command.args: return await message.answer("Example: /char Kurisu") + if not command.args: return await message.answer("Usage: /char ") is_id = command.args.startswith('c') and command.args[1:].isdigit() filt = ["id", "=", command.args] if is_id else ["search", "=", command.args] - fields = "id, name, original, description, gender, age, blood_type" + fields = "id, name, original, description, gender, age, blood_type, image{url}" 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 = ["👤 Select Character by ID:"] - for i in res[:10]: out.append(f"• {i['name']} — {i['id']}") - return await message.answer("\n".join(out)) + out = [f"• {i['name']} — {i['id']}" for i in res[:10]] + return await message.answer("👤 Select Character by ID:\n" + "\n".join(out)) c = res[0] - # Защита от list в поле gender + img = c.get('image', {}).get('url') if c.get('image') else None 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"NAME: {c['name']}\n" - f"ORIGINAL: {c.get('original') or 'N/A'}\n\n" - f"GENDER: {gender}\n" - f"AGE: {c.get('age') or 'UNKNOWN'}\n" - f"BLOOD TYPE: {c.get('blood_type') or 'N/A'}\n\n" + f"ORIGINAL: {c.get('original') or 'N/A'}\n" + f"GENDER: {str(raw_gender).upper()}\n" + f"AGE: {c.get('age') or 'N/A'}\n\n" f"DESCRIPTION:\n{clean_text(c.get('description'))}\n\n" - f"VNDB LINK: https://vndb.org/{c['id']}" + f"VNDB: https://vndb.org/{c['id']}" ) - await message.answer(text) + await send_result(message, text, img) @dp.message(Command("release")) async def handle_rel(message: types.Message, command: CommandObject): - if not command.args: return await message.answer("Example: /release Steins Gate") + if not command.args: return await message.answer("Usage: /release ") is_id = command.args.startswith('r') and command.args[1:].isdigit() filt = ["id", "=", command.args] if is_id else ["search", "=", command.args] - # КРИТИЧНО: languages{lang} для релизов - fields = "id, title, alttitle, released, languages{lang}, platforms, extlinks{url, label}" + # images{url} для релизов (это список) + fields = "id, title, alttitle, released, languages{lang}, platforms, extlinks{url, label}, images{url}" 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 = ["💿 Select Release by ID:"] - for i in res[:10]: out.append(f"• {i['title']} — {i['id']}") - return await message.answer("\n".join(out)) + out = [f"• {i['title']} — {i['id']}" for i in res[:10]] + return await message.answer("💿 Select Release by ID:\n" + "\n".join(out)) r = res[0] - links = "\n".join([f"• {l['label']}" for l in r.get('extlinks', [])[:8]]) + # Берем первое изображение из списка images + img_list = r.get('images', []) + img = img_list[0].get('url') if img_list else None + + links = "\n".join([f"• {l['label']}" for l in r.get('extlinks', [])[:5]]) text = ( - f"RELEASE TITLE: {r['title']}\n" - f"ORIGINAL: {r.get('alttitle') or 'N/A'}\n\n" + f"RELEASE: {r['title']}\n" + f"ORIGINAL: {r.get('alttitle') or 'N/A'}\n" f"DATE: {r.get('released', 'N/A')}\n" f"LANGUAGES: {safe_list_to_str(r.get('languages'))}\n" f"PLATFORMS: {safe_list_to_str(r.get('platforms'))}\n\n" - f"LINKS / STORES:\n{links or 'No links available'}\n\n" - f"VNDB LINK: https://vndb.org/{r['id']}" + f"STORES:\n{links or 'N/A'}\n\n" + f"VNDB: https://vndb.org/{r['id']}" ) - await message.answer(text, disable_web_page_preview=True) + await send_result(message, text, img) -@dp.message(Command("start", "help", "search")) -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("🤖 VNDB Technical Bot\n\n/vn [name/id]\n/char [name/id]\n/release [name/id]") +@dp.message(Command("start", "help")) +async def cmd_start(message: types.Message): + await message.answer("🤖 VNDB Bot with Posters\n\n/vn [name/id]\n/char [name/id]\n/release [name/id]") if __name__ == "__main__": dp.run_polling(bot) \ No newline at end of file