diff --git a/bot.py b/bot.py
index c85b35f..6f8ecce 100644
--- a/bot.py
+++ b/bot.py
@@ -2,6 +2,7 @@ import os
import logging
import re
import httpx
+import random
from aiogram import Bot, Dispatcher, types
from aiogram.filters import Command, CommandObject
from aiogram.client.default import DefaultBotProperties
@@ -18,12 +19,14 @@ dp = Dispatcher()
# --- UTILS ---
-def clean_text(text: str) -> str:
+def clean_text(text: str, limit: int = 900) -> str:
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)
- return text[:600] + "..." if len(text) > 600 else text
+ # Удаляем все теги [b], [i], [url] и т.д.
+ text = re.sub(r'\[.*?\]', '', text)
+ text = text.replace('"', "'")
+ if len(text) > limit:
+ return text[:limit].rsplit(' ', 1)[0] + "..."
+ return text
def safe_list_to_str(data) -> str:
if not data: return "N/A"
@@ -32,24 +35,14 @@ def safe_list_to_str(data) -> str:
for x in data:
if isinstance(x, str): processed.append(x.upper())
elif isinstance(x, dict):
- val = x.get('lang') or x.get('name')
+ # Ищем любое человекочитаемое поле
+ val = x.get('lang') or x.get('name') or x.get('title') or x.get('label')
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 def fetch_vndb(endpoint: str, filters: list, fields: str, sort: str = "id", results: int = 10):
+ payload = {"filters": filters, "fields": fields, "sort": sort, "results": results}
async with httpx.AsyncClient(timeout=15.0) as client:
try:
response = await client.post(f"{API_URL}/{endpoint}", json=payload)
@@ -58,9 +51,25 @@ 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"Connection error: {e}")
+ logger.error(f"Error: {e}")
return None
+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:
+ await message.answer(text)
+
+def find_exact_match(results, query, attr):
+ """Ищет 100% совпадение по имени/названию в результатах."""
+ for item in results:
+ if item.get(attr, "").lower() == query.lower():
+ return item
+ return None
+
# --- HANDLERS ---
@dp.message(Command("vn"))
@@ -69,28 +78,34 @@ 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]
+ fields = "id, title, alttitle, released, rating, votecount, description, languages, platforms, developers{name}, image{url}, relations{title, id, relation}"
- # 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 = [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
-
+ # Логика умного поиска
+ target = res[0]
+ if not is_id and len(res) > 1:
+ exact = find_exact_match(res, command.args, 'title')
+ if exact:
+ target = exact
+ else:
+ out = [f"• {i['title']} — {i['id']}" for i in res[:10]]
+ return await message.answer("🔍 Select VN:\n" + "\n".join(out))
+
+ img = target.get('image', {}).get('url') if target.get('image') else None
+ rel_str = "\n".join([f"• {r['title']} ({r['id']}) - {r['relation']}" for r in target.get('relations', [])[:3]])
+
text = (
- f"TITLE: {v['title']}\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: https://vndb.org/{v['id']}"
+ f"TITLE: {target['title']}\n"
+ f"ORIGINAL: {target.get('alttitle') or 'N/A'}\n"
+ f"DEVELOPER: {safe_list_to_str(target.get('developers'))}\n"
+ f"RATING: {target['rating']/10 if target.get('rating') else 'N/A'} ({target.get('votecount', 0)} votes)\n"
+ f"LANGS: {safe_list_to_str(target.get('languages'))}\n"
+ f"PLATFORMS: {safe_list_to_str(target.get('platforms'))}\n\n"
+ f"RELATIONS:\n{rel_str or 'None'}\n\n"
+ f"DESC:\n{clean_text(target.get('description'), 450)}\n\n"
+ f"VNDB: https://vndb.org/{target['id']}"
)
await send_result(message, text, img)
@@ -100,67 +115,86 @@ async def handle_char(message: types.Message, command: CommandObject):
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, 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 = [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]
- img = c.get('image', {}).get('url') if c.get('image') else None
- raw_gender = c.get('gender')
+ target = res[0]
+ if not is_id and len(res) > 1:
+ exact = find_exact_match(res, command.args, 'name')
+ if exact: target = exact
+ else:
+ out = [f"• {i['name']} — {i['id']}" for i in res[:10]]
+ return await message.answer("👤 Select Character:\n" + "\n".join(out))
+
+ img = target.get('image', {}).get('url') if target.get('image') else None
+ raw_gender = target.get('gender')
if isinstance(raw_gender, list): raw_gender = raw_gender[0] if raw_gender else None
-
+
text = (
- f"NAME: {c['name']}\n"
- f"ORIGINAL: {c.get('original') or 'N/A'}\n"
+ f"NAME: {target['name']}\n"
+ f"ORIGINAL: {target.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: https://vndb.org/{c['id']}"
+ f"AGE: {target.get('age') or 'N/A'} | BLOOD: {target.get('blood_type') or 'N/A'}\n\n"
+ f"DESCRIPTION:\n{clean_text(target.get('description'), 800)}\n\n"
+ f"VNDB: https://vndb.org/{target['id']}"
)
await send_result(message, text, img)
@dp.message(Command("release"))
-async def handle_rel(message: types.Message, command: CommandObject):
+async def handle_release(message: types.Message, command: CommandObject):
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]
-
- # 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 = [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]
- # Берем первое изображение из списка images
- img_list = r.get('images', [])
+ target = res[0]
+ if not is_id and len(res) > 1:
+ exact = find_exact_match(res, command.args, 'title')
+ if exact: target = exact
+ else:
+ out = [f"• {i['title']} — {i['id']}" for i in res[:10]]
+ return await message.answer("💿 Select Release:\n" + "\n".join(out))
+
+ img_list = target.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]])
-
+ links = "\n".join([f"• {l['label']}" for l in target.get('extlinks', [])[:8]])
+
text = (
- 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"STORES:\n{links or 'N/A'}\n\n"
- f"VNDB: https://vndb.org/{r['id']}"
+ f"RELEASE: {target['title']}\n"
+ f"ORIGINAL: {target.get('alttitle') or 'N/A'}\n\n"
+ f"DATE: {target.get('released', 'N/A')}\n"
+ f"LANGS: {safe_list_to_str(target.get('languages'))}\n"
+ f"PLATFORMS: {safe_list_to_str(target.get('platforms'))}\n\n"
+ f"LINKS / STORES:\n{links or 'N/A'}\n\n"
+ f"VNDB: https://vndb.org/{target['id']}"
)
await send_result(message, text, img)
-@dp.message(Command("start", "help"))
+@dp.message(Command("random"))
+async def handle_random(message: types.Message):
+ res = await fetch_vndb("vn", ["rating", ">=", 80], "id, title, image{url}, rating, description", sort="votecount", results=100)
+ if not res: return await message.answer("❌ API error")
+ v = random.choice(res)
+ text = f"🎲 RANDOM VN\n\n{v['title']}\nRating: {v['rating']/10} ⭐\n\n{clean_text(v.get('description'), 400)}\n\nhttps://vndb.org/{v['id']}"
+ await send_result(message, text, v.get('image', {}).get('url'))
+
+@dp.message(Command("top"))
+async def handle_top(message: types.Message):
+ res = await fetch_vndb("vn", ["votecount", ">", 2000], "id, title, rating", sort="rating", results=10)
+ out = ["🏆 TOP 10 VISUAL NOVELS"]
+ for i, v in enumerate(res, 1):
+ out.append(f"{i}. {v['title']} — {v['rating']/10}")
+ await message.answer("\n".join(out))
+
+@dp.message(Command("start", "help", "search"))
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]")
+ await message.answer("🤖 VNDB Professional\n/vn, /char, /release, /random, /top")
if __name__ == "__main__":
dp.run_polling(bot)
\ No newline at end of file