Обновление зависимостей и улучшение структуры кода: исправление токена Telegram, добавление логирования, рефакторинг обработчиков команд и настройка Docker.
This commit is contained in:
170
bot.py
170
bot.py
@@ -1,111 +1,105 @@
|
||||
import os
|
||||
import asyncio
|
||||
from aiogram import Bot, Dispatcher, types
|
||||
import logging
|
||||
import httpx
|
||||
from aiogram import Bot, Dispatcher, types, F
|
||||
from aiogram.filters import Command
|
||||
from vndb import VNDBClient
|
||||
from aiogram.utils.markdown import hbold, hlink
|
||||
|
||||
# Настройки
|
||||
TOKEN = os.getenv("TELEGRAM_TOKEN")
|
||||
API_URL = os.getenv("VNDB_API_URL", "https://api.vndb.org/kana")
|
||||
|
||||
bot = Bot(token=TOKEN)
|
||||
# Логирование
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
bot = Bot(token=TOKEN, parse_mode="HTML")
|
||||
dp = Dispatcher()
|
||||
vndb = VNDBClient(os.getenv("VNDB_API_URL"))
|
||||
|
||||
# Хелпер для запросов к VNDB
|
||||
async def fetch_vndb(endpoint: str, filters: list, fields: str):
|
||||
payload = {"filters": filters, "fields": fields}
|
||||
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||
try:
|
||||
response = await client.post(f"{API_URL}/{endpoint}", json=payload)
|
||||
if response.status_code != 200:
|
||||
logger.error(f"VNDB Error {response.status_code}: {response.text}")
|
||||
return None
|
||||
return response.json().get("results", [])
|
||||
except Exception as e:
|
||||
logger.error(f"Connection error: {e}")
|
||||
return None
|
||||
|
||||
def safe_text(x):
|
||||
if not x:
|
||||
return "—"
|
||||
return str(x)
|
||||
|
||||
|
||||
@dp.message(Command("start"))
|
||||
async def start(msg: types.Message):
|
||||
await msg.answer(
|
||||
"VNDB Bot ready.\n"
|
||||
"Commands:\n"
|
||||
"/search <vn>\n"
|
||||
"/vn <id>\n"
|
||||
"/char <id>\n"
|
||||
"/release <id>"
|
||||
# Команды /start и /help
|
||||
@dp.message(Command("start", "help"))
|
||||
async def cmd_start(message: types.Message):
|
||||
help_text = (
|
||||
"🤖 <b>VNDB Bot</b>\n\n"
|
||||
"<b>Поиск:</b>\n"
|
||||
"/search [name] - поиск новеллы\n"
|
||||
"/char [name] - поиск персонажа\n"
|
||||
"/release [name] - поиск релизов\n\n"
|
||||
"<b>Инфо по ID:</b>\n"
|
||||
"/vn [id] (напр. v17)\n"
|
||||
"/char_id [id] (напр. c1)\n"
|
||||
"/rel_id [id] (напр. r1)"
|
||||
)
|
||||
await message.answer(help_text)
|
||||
|
||||
|
||||
@dp.message(Command("help"))
|
||||
async def help(msg: types.Message):
|
||||
await start(msg)
|
||||
|
||||
|
||||
# Обработчик поиска VN
|
||||
@dp.message(Command("search"))
|
||||
async def search(msg: types.Message):
|
||||
query = msg.text.replace("/search", "").strip()
|
||||
async def search_vn(message: types.Message):
|
||||
query = message.extract_args()
|
||||
if not query:
|
||||
return await msg.answer("Empty query")
|
||||
return await message.answer("Введите название для поиска. Пример: <code>/search Steins;Gate</code>")
|
||||
|
||||
result = await vndb.search_vn(query)
|
||||
|
||||
if not result:
|
||||
return await msg.answer("Not found")
|
||||
|
||||
text = "\n\n".join(
|
||||
f"{i['id']} — {i.get('title') or i.get('name')}"
|
||||
for i in result
|
||||
)
|
||||
await msg.answer(text[:4000])
|
||||
res = await fetch_vndb("vn", ["search", "=", query], "title, released, rating")
|
||||
if not res:
|
||||
return await message.answer("❌ Ничего не найдено или ошибка API")
|
||||
|
||||
out = [f"🔍 <b>Результаты поиска:</b>"]
|
||||
for item in res[:10]:
|
||||
rating = f"⭐ {item['rating']/10}" if item.get('rating') else "No rating"
|
||||
out.append(f"• {item['title']} (ID: <code>{item['id']}</code>) | {rating}")
|
||||
|
||||
await message.answer("\n".join(out))
|
||||
|
||||
# Обработчик деталей VN
|
||||
@dp.message(Command("vn"))
|
||||
async def vn(msg: types.Message):
|
||||
vid = msg.text.replace("/vn", "").strip()
|
||||
if not vid:
|
||||
return await msg.answer("No ID")
|
||||
async def details_vn(message: types.Message):
|
||||
vn_id = message.extract_args()
|
||||
if not vn_id: return await message.answer("Укажите ID. Пример: <code>/vn v11</code>")
|
||||
|
||||
data = await vndb.get_vn(vid)
|
||||
if not data:
|
||||
return await msg.answer("Not found")
|
||||
res = await fetch_vndb("vn", ["id", "=", vn_id], "id, title, original, released, rating, votecount")
|
||||
if not res: return await message.answer("❌ VN не найдена")
|
||||
|
||||
await msg.answer(
|
||||
f"{safe_text(data.get('title'))}\n"
|
||||
f"Original: {safe_text(data.get('original'))}\n"
|
||||
f"Released: {safe_text(data.get('released'))}\n"
|
||||
f"Rating: {safe_text(data.get('rating'))}\n"
|
||||
f"Votes: {safe_text(data.get('votecount'))}"
|
||||
v = res[0]
|
||||
text = (
|
||||
f"📖 <b>{v['title']}</b>\n"
|
||||
f"Original: {v.get('original', 'N/A')}\n"
|
||||
f"Released: {v.get('released', 'N/A')}\n"
|
||||
f"Rating: {v.get('rating', 'N/A') if v.get('rating') else 'N/A'} ({v.get('votecount', 0)} votes)\n"
|
||||
f"Link: https://vndb.org/{v['id']}"
|
||||
)
|
||||
await message.answer(text)
|
||||
|
||||
|
||||
# Обработчик персонажей
|
||||
@dp.message(Command("char"))
|
||||
async def char(msg: types.Message):
|
||||
cid = msg.text.replace("/char", "").strip()
|
||||
if not cid:
|
||||
return await msg.answer("No ID")
|
||||
|
||||
data = await vndb.get_char(cid)
|
||||
if not data:
|
||||
return await msg.answer("Not found")
|
||||
|
||||
await msg.answer(
|
||||
f"{safe_text(data.get('name'))}\n"
|
||||
f"Original: {safe_text(data.get('original'))}"
|
||||
)
|
||||
|
||||
|
||||
@dp.message(Command("release"))
|
||||
async def release(msg: types.Message):
|
||||
rid = msg.text.replace("/release", "").strip()
|
||||
if not rid:
|
||||
return await msg.answer("No ID")
|
||||
|
||||
data = await vndb.get_release(rid)
|
||||
if not data:
|
||||
return await msg.answer("Not found")
|
||||
|
||||
await msg.answer(
|
||||
f"{safe_text(data.get('title'))}\n"
|
||||
f"Released: {safe_text(data.get('released'))}"
|
||||
)
|
||||
|
||||
|
||||
async def main():
|
||||
await dp.start_polling(bot)
|
||||
|
||||
async def search_char(message: types.Message):
|
||||
query = message.extract_args()
|
||||
if not query: return await message.answer("Пример: <code>/char Kurisu</code>")
|
||||
|
||||
res = await fetch_vndb("character", ["search", "=", query], "id, name, original")
|
||||
if not res: return await message.answer("❌ Персонаж не найден")
|
||||
|
||||
out = [f"👤 <b>Персонажи:</b>"]
|
||||
for c in res[:10]:
|
||||
out.append(f"• {c['name']} (<code>{c['id']}</code>)")
|
||||
await message.answer("\n".join(out))
|
||||
|
||||
# Запуск
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(main())
|
||||
if not TOKEN:
|
||||
print("Error: TELEGRAM_TOKEN not set!")
|
||||
else:
|
||||
dp.run_polling(bot)
|
||||
Reference in New Issue
Block a user