diff --git a/bot.py b/bot.py
index 3420454..0718324 100644
--- a/bot.py
+++ b/bot.py
@@ -16,17 +16,15 @@ logger = logging.getLogger(__name__)
bot = Bot(token=TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
dp = Dispatcher()
-# Словари для красоты
-LANG_FLAGS = {"en": "🇺🇸", "ja": "🇯🇵", "ru": "🇷🇺", "zh": "🇨🇳", "ko": "🇰🇷", "fr": "🇫🇷", "de": "🇩🇪"}
-PLATFORM_ICONS = {"win": "🖥️", "swi": "🎮", "ps4": "🟦", "and": "📱", "ios": "🍏"}
-
def clean_text(text: str) -> str:
- """Очистка описаний от специфических тегов VNDB [url], [b] и т.д."""
+ """Очистка текста от VNDB-тегов и ограничение длины."""
if not text: return "No description available."
+ # Убираем [url] и другие теги
text = re.sub(r'\[url=?.*?\](.*?)\[/url\]', r'\1', text)
- text = text.replace("[b]", "").replace("[/b]", "")
- text = text.replace("[i]", "").replace("[/i]", "")
- return text[:600] + "..." if len(text) > 600 else 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
async def fetch_vndb(endpoint: str, filters: list, fields: str):
payload = {"filters": filters, "fields": fields}
@@ -38,96 +36,108 @@ async def fetch_vndb(endpoint: str, filters: list, fields: str):
logger.error(f"VNDB Error {response.status_code}: {response.text}")
return None
except Exception as e:
- logger.error(f"Request failed: {e}")
+ logger.error(f"Connection error: {e}")
return None
@dp.message(Command("vn"))
async def handle_vn(message: types.Message, command: CommandObject):
- if not command.args: return await message.answer("Usage: /vn ")
+ if not command.args: return await message.answer("Example: /vn Steins Gate")
+
+ is_id = command.args.startswith('v') and command.args[1:].isdigit()
+ filt = ["id", "=", command.args] if is_id else ["search", "=", command.args]
- filt = ["id", "=", command.args] if command.args.startswith('v') and command.args[1:].isdigit() else ["search", "=", command.args]
- # Запрашиваем расширенные поля
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.")
- if len(res) > 1 and not command.args.startswith('v'):
- out = ["🔍 Multiple results:"]
- for i in res[:10]: out.append(f"• {i['title']} ({i['id']})")
+ # Если поиск выдал список, а не конкретный ID
+ 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))
v = res[0]
- langs = " ".join([LANG_FLAGS.get(l, l.upper()) for l in v.get('languages', [])])
- plats = " ".join([PLATFORM_ICONS.get(p, p.upper()) for p in v.get('platforms', [])])
+ 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"📖 {v['title']}\n"
- f"{v.get('alttitle', '')}\n\n"
- f"🗓 Released: {v.get('released', 'N/A')}\n"
- f"⭐ Rating: {v['rating']/10 if v.get('rating') else 'N/A'} ({v.get('votecount', 0)} votes)\n"
- f"🏢 Developer: {devs or 'N/A'}\n"
- f"🌍 Langs: {langs}\n"
- f"🎮 Platforms: {plats}\n\n"
- f"📝 Description:\n{clean_text(v.get('description'))}\n\n"
- f"🔗 https://vndb.org/{v['id']}"
+ f"TITLE: {v['title']}\n"
+ f"ORIGINAL: {v.get('alttitle') or 'N/A'}\n\n"
+ f"RELEASED: {v.get('released', 'N/A')}\n"
+ f"DEVELOPER: {devs or 'N/A'}\n"
+ f"RATING: {v['rating']/10 if v.get('rating') else 'N/A'} ({v.get('votecount', 0)} votes)\n"
+ f"LANGUAGES: {langs or 'N/A'}\n"
+ f"PLATFORMS: {plats or 'N/A'}\n\n"
+ f"DESCRIPTION:\n{clean_text(v.get('description'))}\n\n"
+ f"VNDB LINK: https://vndb.org/{v['id']}"
)
await message.answer(text)
@dp.message(Command("char"))
async def handle_char(message: types.Message, command: CommandObject):
- if not command.args: return await message.answer("Usage: /char ")
+ if not command.args: return await message.answer("Example: /char Kurisu")
+
+ is_id = command.args.startswith('c') and command.args[1:].isdigit()
+ filt = ["id", "=", command.args] if is_id else ["search", "=", command.args]
- filt = ["id", "=", command.args] if command.args.startswith('c') and command.args[1:].isdigit() else ["search", "=", command.args]
fields = "id, name, original, description, gender, age, blood_type"
res = await fetch_vndb("character", filt, fields)
if not res: return await message.answer("❌ Not found.")
- if len(res) > 1 and not command.args.startswith('c'):
- out = ["👤 Multiple results:"]
- for i in res[:10]: out.append(f"• {i['name']} ({i['id']})")
+ 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))
c = res[0]
- gender = {"m": "Male ♂️", "f": "Female ♀️", "both": "Both 🚻"}.get(c.get('gender'), 'Unknown')
+ gender = {"m": "MALE", "f": "FEMALE", "both": "BOTH"}.get(c.get('gender'), 'UNKNOWN')
text = (
- f"👤 {c['name']} ({c.get('original', '')})\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"📝 Description:\n{clean_text(c.get('description'))}\n\n"
- f"🔗 https://vndb.org/{c['id']}"
+ 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"DESCRIPTION:\n{clean_text(c.get('description'))}\n\n"
+ f"VNDB LINK: https://vndb.org/{c['id']}"
)
await message.answer(text)
@dp.message(Command("release"))
async def handle_rel(message: types.Message, command: CommandObject):
- if not command.args: return await message.answer("Usage: /release ")
+ if not command.args: return await message.answer("Example: /release Steins Gate")
+
+ is_id = command.args.startswith('r') and command.args[1:].isdigit()
+ filt = ["id", "=", command.args] if is_id else ["search", "=", command.args]
- filt = ["id", "=", command.args] if command.args.startswith('r') and command.args[1:].isdigit() else ["search", "=", command.args]
fields = "id, title, alttitle, released, languages, 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 command.args.startswith('r'):
- out = ["💿 Multiple results:"]
- for i in res[:10]: out.append(f"• {i['title']} ({i['id']})")
+ 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))
r = res[0]
- links = "\n".join([f"🔗 {l['label']}" for l in r.get('extlinks', [])[:5]])
+ langs = ", ".join([l.upper() for l in r.get('languages', [])])
+ plats = ", ".join([p.upper() for p in r.get('platforms', [])])
+ # Ограничиваем ссылки, чтобы не спамить
+ links = "\n".join([f"• {l['label']}" for l in r.get('extlinks', [])[:8]])
text = (
- f"💿 {r['title']}\n"
- f"{r.get('alttitle', '')}\n\n"
- f"🗓 Released: {r.get('released', 'N/A')}\n"
- f"🌍 Langs: {' '.join([LANG_FLAGS.get(l, l.upper()) for l in r.get('languages', [])])}\n\n"
- f"Links & Stores:\n{links or 'No links available'}\n\n"
- f"🔗 https://vndb.org/{r['id']}"
+ f"RELEASE TITLE: {r['title']}\n"
+ f"ORIGINAL: {r.get('alttitle') or 'N/A'}\n\n"
+ f"DATE: {r.get('released', 'N/A')}\n"
+ f"LANGUAGES: {langs}\n"
+ f"PLATFORMS: {plats}\n\n"
+ f"LINKS / STORES:\n{links or 'No links available'}\n\n"
+ f"VNDB LINK: https://vndb.org/{r['id']}"
)
await message.answer(text, disable_web_page_preview=True)
@@ -135,7 +145,13 @@ 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("🤖 VNDB Bot\n/vn [id/name]\n/char [id/name]\n/release [id/name]")
+ await message.answer(
+ "🤖 VNDB Technical Bot\n\n"
+ "Commands:\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