King-of-the-all-Cookies/ayako
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
King-of-the-all-Cookies
2026-05-01 18:34:13 +03:00
parent c3afb260f0
commit c3b62e61d3
1 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
bot.py
View File

@@ -16,17 +16,15 @@ 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() dp = Dispatcher()
# Словари для красоты
LANG_FLAGS = {"en": "🇺🇸", "ja": "🇯🇵", "ru": "🇷🇺", "zh": "🇨🇳", "ko": "🇰🇷", "fr": "🇫🇷", "de": "🇩🇪"}
PLATFORM_ICONS = {"win": "🖥️", "swi": "🎮", "ps4": "🟦", "and": "📱", "ios": "🍏"}
def clean_text(text: str) -> str: def clean_text(text: str) -> str:
"""Очистка описаний от специфических тегов VNDB [url], [b] и т.д.""" """Очистка текста от VNDB-тегов и ограничение длины."""
if not text: return "No description available." if not text: return "No description available."
# Убираем [url] и другие теги
text = re.sub(r'\[url=?.*?\](.*?)\[/url\]', r'\1', text) text = re.sub(r'\[url=?.*?\](.*?)\[/url\]', r'\1', text)
text = text.replace("[b]", "<b>").replace("[/b]", "</b>") text = re.sub(r'\[/?b\]', '', text)
text = text.replace("[i]", "<i>").replace("[/i]", "</i>") text = re.sub(r'\[/?i\]', '', text)
return text[:600] + "..." if len(text) > 600 else text text = text.replace('"', "'")
return text[:700] + "..." if len(text) > 700 else text
async def fetch_vndb(endpoint: str, filters: list, fields: str): async def fetch_vndb(endpoint: str, filters: list, fields: str):
payload = {"filters": filters, "fields": fields} 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}") logger.error(f"VNDB Error {response.status_code}: {response.text}")
return None return None
except Exception as e: except Exception as e:
logger.error(f"Request failed: {e}") logger.error(f"Connection error: {e}")
return None return None
@dp.message(Command("vn")) @dp.message(Command("vn"))
async def handle_vn(message: types.Message, command: CommandObject): async def handle_vn(message: types.Message, command: CommandObject):
if not command.args: return await message.answer("Usage: /vn <name/id>") 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}" fields = "id, title, alttitle, released, rating, votecount, description, languages, platforms, developers{name}"
res = await fetch_vndb("vn", filt, fields) res = await fetch_vndb("vn", filt, fields)
if not res: return await message.answer("❌ Not found.") if not res: return await message.answer("❌ Not found.")
if len(res) > 1 and not command.args.startswith('v'): # Если поиск выдал список, а не конкретный ID
out = ["🔍 <b>Multiple results:</b>"] if len(res) > 1 and not is_id:
for i in res[:10]: out.append(f"• {i['title']} (<code>{i['id']}</code>)") out = ["🔍 <b>Select VN by ID:</b>"]
for i in res[:10]:
out.append(f"• {i['title']} — <code>{i['id']}</code>")
return await message.answer("\n".join(out)) return await message.answer("\n".join(out))
v = res[0] v = res[0]
langs = " ".join([LANG_FLAGS.get(l, l.upper()) for l in v.get('languages', [])]) langs = ", ".join([l.upper() for l in v.get('languages', [])])
plats = " ".join([PLATFORM_ICONS.get(p, p.upper()) for p in v.get('platforms', [])]) plats = ", ".join([p.upper() for p in v.get('platforms', [])])
devs = ", ".join([d['name'] for d in v.get('developers', [])]) devs = ", ".join([d['name'] for d in v.get('developers', [])])
text = ( text = (
f"📖 <b>{v['title']}</b>\n" f"<b>TITLE:</b> {v['title']}\n"
f"<i>{v.get('alttitle', '')}</i>\n\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>RELEASED:</b> {v.get('released', 'N/A')}\n"
f"⭐ <b>Rating:</b> {v['rating']/10 if v.get('rating') else 'N/A'} ({v.get('votecount', 0)} votes)\n" f"<b>DEVELOPER:</b> {devs or 'N/A'}\n"
f"🏢 <b>Developer:</b> {devs or 'N/A'}\n" f"<b>RATING:</b> {v['rating']/10 if v.get('rating') else 'N/A'} ({v.get('votecount', 0)} votes)\n"
f"🌍 <b>Langs:</b> {langs}\n" f"<b>LANGUAGES:</b> {langs or 'N/A'}\n"
f"🎮 <b>Platforms:</b> {plats}\n\n" f"<b>PLATFORMS:</b> {plats or 'N/A'}\n\n"
f"📝 <b>Description:</b>\n{clean_text(v.get('description'))}\n\n" f"<b>DESCRIPTION:</b>\n<i>{clean_text(v.get('description'))}</i>\n\n"
f"🔗 https://vndb.org/{v['id']}" f"<b>VNDB LINK:</b> https://vndb.org/{v['id']}"
) )
await message.answer(text) await message.answer(text)
@dp.message(Command("char")) @dp.message(Command("char"))
async def handle_char(message: types.Message, command: CommandObject): async def handle_char(message: types.Message, command: CommandObject):
if not command.args: return await message.answer("Usage: /char <name/id>") 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" fields = "id, name, original, description, gender, age, blood_type"
res = await fetch_vndb("character", filt, fields) res = await fetch_vndb("character", filt, fields)
if not res: return await message.answer("❌ Not found.") if not res: return await message.answer("❌ Not found.")
if len(res) > 1 and not command.args.startswith('c'): if len(res) > 1 and not is_id:
out = ["👤 <b>Multiple results:</b>"] out = ["👤 <b>Select Character by ID:</b>"]
for i in res[:10]: out.append(f"• {i['name']} (<code>{i['id']}</code>)") for i in res[:10]: out.append(f"• {i['name']} — <code>{i['id']}</code>")
return await message.answer("\n".join(out)) return await message.answer("\n".join(out))
c = res[0] 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 = ( text = (
f"👤 <b>{c['name']}</b> ({c.get('original', '')})\n\n" f"<b>NAME:</b> {c['name']}\n"
f"⚧ <b>Gender:</b> {gender}\n" f"<b>ORIGINAL:</b> {c.get('original') or 'N/A'}\n\n"
f"🎂 <b>Age:</b> {c.get('age') or 'Unknown'}\n" f"<b>GENDER:</b> {gender}\n"
f"🩸 <b>Blood Type:</b> {c.get('blood_type') or 'N/A'}\n\n" f"<b>AGE:</b> {c.get('age') or 'UNKNOWN'}\n"
f"📝 <b>Description:</b>\n{clean_text(c.get('description'))}\n\n" f"<b>BLOOD TYPE:</b> {c.get('blood_type') or 'N/A'}\n\n"
f"🔗 https://vndb.org/{c['id']}" f"<b>DESCRIPTION:</b>\n<i>{clean_text(c.get('description'))}</i>\n\n"
f"<b>VNDB LINK:</b> https://vndb.org/{c['id']}"
) )
await message.answer(text) await message.answer(text)
@dp.message(Command("release")) @dp.message(Command("release"))
async def handle_rel(message: types.Message, command: CommandObject): async def handle_rel(message: types.Message, command: CommandObject):
if not command.args: return await message.answer("Usage: /release <name/id>") 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}" fields = "id, title, alttitle, released, languages, platforms, extlinks{url, label}"
res = await fetch_vndb("release", filt, fields) res = await fetch_vndb("release", filt, fields)
if not res: return await message.answer("❌ Not found.") if not res: return await message.answer("❌ Not found.")
if len(res) > 1 and not command.args.startswith('r'): if len(res) > 1 and not is_id:
out = ["💿 <b>Multiple results:</b>"] out = ["💿 <b>Select Release by ID:</b>"]
for i in res[:10]: out.append(f"• {i['title']} (<code>{i['id']}</code>)") for i in res[:10]: out.append(f"• {i['title']} — <code>{i['id']}</code>")
return await message.answer("\n".join(out)) return await message.answer("\n".join(out))
r = res[0] r = res[0]
links = "\n".join([f"🔗 <a href='{l['url']}'>{l['label']}</a>" 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"• <a href='{l['url']}'>{l['label']}</a>" for l in r.get('extlinks', [])[:8]])
text = ( text = (
f"💿 <b>{r['title']}</b>\n" f"<b>RELEASE TITLE:</b> {r['title']}\n"
f"<i>{r.get('alttitle', '')}</i>\n\n" f"<b>ORIGINAL:</b> {r.get('alttitle') or 'N/A'}\n\n"
f"🗓 <b>Released:</b> {r.get('released', 'N/A')}\n" f"<b>DATE:</b> {r.get('released', 'N/A')}\n"
f"🌍 <b>Langs:</b> {' '.join([LANG_FLAGS.get(l, l.upper()) for l in r.get('languages', [])])}\n\n" f"<b>LANGUAGES:</b> {langs}\n"
f"<b>Links & Stores:</b>\n{links or 'No links available'}\n\n" f"<b>PLATFORMS:</b> {plats}\n\n"
f"🔗 https://vndb.org/{r['id']}" f"<b>LINKS / STORES:</b>\n{links or 'No links available'}\n\n"
f"<b>VNDB LINK:</b> https://vndb.org/{r['id']}"
) )
await message.answer(text, disable_web_page_preview=True) 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): async def cmd_start(message: types.Message, command: CommandObject):
if message.text.startswith("/search") and command.args: if message.text.startswith("/search") and command.args:
return await handle_vn(message, command) return await handle_vn(message, command)
await message.answer("🤖 <b>VNDB Bot</b>\n/vn [id/name]\n/char [id/name]\n/release [id/name]") await message.answer(
"🤖 <b>VNDB Technical Bot</b>\n\n"
"Commands:\n"
"/vn [name/id]\n"
"/char [name/id]\n"
"/release [name/id]"
)
if __name__ == "__main__": if __name__ == "__main__":
dp.run_polling(bot) dp.run_polling(bot)