Обновление зависимостей и улучшение структуры кода: исправление токена Telegram, добавление логирования, рефакторинг обработчиков команд и настройка Docker.

.env.example

@@ -1,2 +1,2 @@
-TELEGRAM_TOKEN=your_token_here
+TELEGRAM_TOKEN=your_bot_token_here
 VNDB_API_URL=https://api.vndb.org/kana

Dockerfile

@@ -2,9 +2,12 @@ FROM python:3.12-slim
 
 WORKDIR /app
 
+# Установка зависимостей
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-COPY . .
+# Копирование кода
+COPY bot.py .
 
+# Запуск
 CMD ["python", "bot.py"]

bot.py

@@ -1,111 +1,105 @@
 import os
-import asyncio
+import logging
-from aiogram import Bot, Dispatcher, types
+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):
+# Команды /start и /help
-    if not x:
+@dp.message(Command("start", "help"))
-        return "—"
+async def cmd_start(message: types.Message):
-    return str(x)
+    help_text = (
-
+        "🤖 <b>VNDB Bot</b>\n\n"
-
+        "<b>Поиск:</b>\n"
-@dp.message(Command("start"))
+        "/search [name] - поиск новеллы\n"
-async def start(msg: types.Message):
+        "/char [name] - поиск персонажа\n"
-    await msg.answer(
+        "/release [name] - поиск релизов\n\n"
-        "VNDB Bot ready.\n"
+        "<b>Инфо по ID:</b>\n"
-        "Commands:\n"
+        "/vn [id] (напр. v17)\n"
-        "/search <vn>\n"
+        "/char_id [id] (напр. c1)\n"
-        "/vn <id>\n"
+        "/rel_id [id] (напр. r1)"
-        "/char <id>\n"
-        "/release <id>"
     )
+    await message.answer(help_text)
 
-
+# Обработчик поиска VN
-@dp.message(Command("help"))
-async def help(msg: types.Message):
-    await start(msg)
-
-
 @dp.message(Command("search"))
-async def search(msg: types.Message):
+async def search_vn(message: types.Message):
-    query = msg.text.replace("/search", "").strip()
+    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)
+    res = await fetch_vndb("vn", ["search", "=", query], "title, released, rating")
-
+    if not res:
-    if not result:
+        return await message.answer("❌ Ничего не найдено или ошибка API")
-        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])
 
+    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):
+async def details_vn(message: types.Message):
-    vid = msg.text.replace("/vn", "").strip()
+    vn_id = message.extract_args()
-    if not vid:
+    if not vn_id: return await message.answer("Укажите ID. Пример: <code>/vn v11</code>")
-        return await msg.answer("No ID")
 
-    data = await vndb.get_vn(vid)
+    res = await fetch_vndb("vn", ["id", "=", vn_id], "id, title, original, released, rating, votecount")
-    if not data:
+    if not res: return await message.answer("❌ VN не найдена")
-        return await msg.answer("Not found")
 
-    await msg.answer(
+    v = res[0]
-        f"{safe_text(data.get('title'))}\n"
+    text = (
-        f"Original: {safe_text(data.get('original'))}\n"
+        f"📖 <b>{v['title']}</b>\n"
-        f"Released: {safe_text(data.get('released'))}\n"
+        f"Original: {v.get('original', 'N/A')}\n"
-        f"Rating: {safe_text(data.get('rating'))}\n"
+        f"Released: {v.get('released', 'N/A')}\n"
-        f"Votes: {safe_text(data.get('votecount'))}"
+        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):
+async def search_char(message: types.Message):
-    cid = msg.text.replace("/char", "").strip()
+    query = message.extract_args()
-    if not cid:
+    if not query: return await message.answer("Пример: <code>/char Kurisu</code>")
-        return await msg.answer("No ID")
+    
-
+    res = await fetch_vndb("character", ["search", "=", query], "id, name, original")
-    data = await vndb.get_char(cid)
+    if not res: return await message.answer("❌ Персонаж не найден")
-    if not data:
+    
-        return await msg.answer("Not found")
+    out = [f"👤 <b>Персонажи:</b>"]
-
+    for c in res[:10]:
-    await msg.answer(
+        out.append(f"• {c['name']} (<code>{c['id']}</code>)")
-        f"{safe_text(data.get('name'))}\n"
+    await message.answer("\n".join(out))
-        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)
-
 
+# Запуск
 if __name__ == "__main__":
-    asyncio.run(main())
+    if not TOKEN:
+        print("Error: TELEGRAM_TOKEN not set!")
+    else:
+        dp.run_polling(bot)

docker-compose.yml

@@ -1,8 +1,14 @@
-version: "3.9"
+version: '3.8'
 
 services:
   bot:
     build: .
+    container_name: vndb_bot
     restart: always
     env_file:
-      - .env
+      - .env
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"

requirements.txt

@@ -1,2 +1,2 @@
-aiogram==3.6.0
+aiogram==3.10.0
-httpx==0.27.0
+httpx==0.28.1