Update app.py

app.py

@@ -1,11 +1,15 @@
-import telebot
-from telebot import types
-from flask import Flask, request, jsonify, render_template_string
-import threading
+import asyncio
 import json
-from datetime import datetime
 import os
+from datetime import datetime
+from aiogram import Bot, Dispatcher, types, F
+from aiogram.filters import Command
+from aiogram.fsm.context import FSMContext
+from aiogram.fsm.state import State, StatesGroup
+from aiogram.utils.keyboard import ReplyKeyboardBuilder, InlineKeyboardBuilder
+from flask import Flask, request, jsonify, render_template_string
 import logging
+import threading
 
 # Настройка логирования
 logging.basicConfig(level=logging.INFO)
@@ -13,7 +17,8 @@ logger = logging.getLogger(__name__)
 
 # Инициализация бота и Flask
 BOT_TOKEN = '7734802681:AAGKHGG8O9uNk64JWTHH5yqXzvSxCcoLUdA'
-bot = telebot.TeleBot(BOT_TOKEN)
+bot = Bot(token=BOT_TOKEN)
+dp = Dispatcher()
 app = Flask(__name__)
 
 # Путь для хранения данных (товары и заказы)
@@ -39,60 +44,45 @@ def save_data(data):
 
 data = load_data()
 
-# Обработчики для бота (пользовательская часть)
-@bot.message_handler(commands=['start'])
-def send_welcome(message):
-    markup = types.ReplyKeyboardMarkup(resize_keyboard=True)
-    btn1 = types.KeyboardButton("📋 Меню")
-    btn2 = types.KeyboardButton("🛒 Корзина")
-    btn3 = types.KeyboardButton("📦 Заказы")
-    markup.add(btn1, btn2, btn3)
-    bot.reply_to(message, "Привет! Я твой бот-магазин. Выбери действие:", reply_markup=markup)
+# Состояния для FSM (Finite State Machine)
+class CartStates(StatesGroup):
+    waiting_for_product = State()
+    waiting_for_quantity = State()
+
+# Клавиатуры
+def get_main_keyboard():
+    builder = ReplyKeyboardBuilder()
+    builder.button(text="📋 Меню")
+    builder.button(text="🛒 Корзина")
+    builder.button(text="📦 Заказы")
+    builder.adjust(2)
+    return builder.as_markup(resize_keyboard=True)
+
+def get_product_keyboard(product_id):
+    builder = InlineKeyboardBuilder()
+    builder.button(text="Добавить в корзину", callback_data=f"add_{product_id}")
+    return builder.as_markup()
 
-@bot.message_handler(content_types=['text'])
-def func(message):
-    if message.text == "📋 Меню":
-        show_products(message)
-    elif message.text == "🛒 Корзина":
-        show_cart(message)
-    elif message.text == "📦 Заказы":
-        show_orders(message)
+# Обработчики для бота
+@dp.message(Command("start"))
+async def cmd_start(message: types.Message):
+    await message.answer("Привет! Я твой бот-магазин. Выбери действие:", reply_markup=get_main_keyboard())
 
-def show_products(message):
+@dp.message(F.text == "📋 Меню")
+async def show_products(message: types.Message):
     if not data['products']:
-        bot.reply_to(message, "Нет доступных товаров.")
+        await message.answer("Нет доступных товаров.")
         return
     for product in data['products']:
-        bot.reply_to(message, f"🏷 {product['name']} - {product['price']} руб.\nОписание: {product['description']}\n/id: {product['id']}",
-                     reply_markup=get_product_keyboard(product['id']))
-
-def get_product_keyboard(product_id):
-    markup = types.InlineKeyboardMarkup()
-    btn_add = types.InlineKeyboardButton("Добавить в корзину", callback_data=f"add_{product_id}")
-    markup.add(btn_add)
-    return markup
-
-@bot.callback_query_handler(func=lambda call: call.data.startswith('add_'))
-def callback_handler(call):
-    product_id = int(call.data.split('_')[1])
-    product = next((p for p in data['products'] if p['id'] == product_id), None)
-    if product:
-        user_id = call.from_user.id
-        cart = next((o for o in data['orders'] if o['user_id'] == user_id and not o['completed']), None)
-        if not cart:
-            cart = {'user_id': user_id, 'items': [], 'completed': False, 'date': datetime.now().isoformat()}
-            data['orders'].append(cart)
-        cart['items'].append({'product_id': product_id, 'quantity': 1})
-        save_data(data)
-        bot.answer_callback_query(call.id, "Товар добавлен в корзину!")
-    else:
-        bot.answer_callback_query(call.id, "Товар не найден.")
+        await message.answer(f"🏷 {product['name']} - {product['price']} руб.\nОписание: {product['description']}\n/id: {product['id']}",
+                            reply_markup=get_product_keyboard(product['id']))
 
-def show_cart(message):
+@dp.message(F.text == "🛒 Корзина")
+async def show_cart(message: types.Message):
     user_id = message.from_user.id
     cart = next((o for o in data['orders'] if o['user_id'] == user_id and not o['completed']), None)
     if not cart or not cart['items']:
-        bot.reply_to(message, "Ваша корзина пуста.")
+        await message.answer("Ваша корзина пуста.")
         return
     total = 0
     response = "Ваша корзина:\n"
@@ -101,28 +91,44 @@ def show_cart(message):
         response += f"🏷 {product['name']} - {product['price']} руб. x {item['quantity']}\n"
         total += product['price'] * item['quantity']
     response += f"\nИтого: {total} руб."
-    markup = types.InlineKeyboardMarkup()
-    btn_complete = types.InlineKeyboardButton("Оформить заказ", callback_data=f"complete_{user_id}")
-    markup.add(btn_complete)
-    bot.reply_to(message, response, reply_markup=markup)
+    builder = InlineKeyboardBuilder()
+    builder.button(text="Оформить заказ", callback_data=f"complete_{user_id}")
+    await message.answer(response, reply_markup=builder.as_markup())
+
+@dp.callback_query(F.data.startswith("add_"))
+async def add_to_cart(callback_query: types.CallbackQuery):
+    product_id = int(callback_query.data.split('_')[1])
+    product = next((p for p in data['products'] if p['id'] == product_id), None)
+    if product:
+        user_id = callback_query.from_user.id
+        cart = next((o for o in data['orders'] if o['user_id'] == user_id and not o['completed']), None)
+        if not cart:
+            cart = {'user_id': user_id, 'items': [], 'completed': False, 'date': datetime.now().isoformat()}
+            data['orders'].append(cart)
+        cart['items'].append({'product_id': product_id, 'quantity': 1})
+        save_data(data)
+        await bot.answer_callback_query(callback_query.id, "Товар добавлен в корзину!")
+    else:
+        await bot.answer_callback_query(callback_query.id, "Товар не найден.")
 
-@bot.callback_query_handler(func=lambda call: call.data.startswith('complete_'))
-def complete_order(call):
-    user_id = int(call.data.split('_')[1])
+@dp.callback_query(F.data.startswith("complete_"))
+async def complete_order(callback_query: types.CallbackQuery):
+    user_id = int(callback_query.data.split('_')[1])
     cart = next((o for o in data['orders'] if o['user_id'] == user_id and not o['completed']), None)
     if cart:
         cart['completed'] = True
         save_data(data)
-        bot.answer_callback_query(call.id, "Заказ успешно оформлен!")
-        bot.send_message(user_id, "Спасибо за заказ! Мы скоро свяжемся с вами.")
+        await bot.answer_callback_query(callback_query.id, "Заказ успешно оформлен!")
+        await bot.send_message(user_id, "Спасибо за заказ! Мы скоро свяжемся с вами.")
     else:
-        bot.answer_callback_query(call.id, "Корзина пуста или заказ уже оформлен.")
+        await bot.answer_callback_query(callback_query.id, "Корзина пуста или заказ уже оформлен.")
 
-def show_orders(message):
+@dp.message(F.text == "📦 Заказы")
+async def show_orders(message: types.Message):
     user_id = message.from_user.id
     user_orders = [o for o in data['orders'] if o['user_id'] == user_id and o['completed']]
     if not user_orders:
-        bot.reply_to(message, "У вас нет оформленных заказов.")
+        await message.answer("У вас нет оформленных заказов.")
         return
     for order in user_orders:
         response = "Ваш заказ:\n"
@@ -132,7 +138,7 @@ def show_orders(message):
             response += f"🏷 {product['name']} - {product['price']} руб. x {item['quantity']}\n"
             total += product['price'] * item['quantity']
         response += f"\nИтого: {total} руб.\nДата: {order['date']}"
-        bot.reply_to(message, response)
+        await message.answer(response)
 
 # Админ-панель (Flask) с HTML, CSS и JavaScript в строке
 admin_html = """
@@ -236,9 +242,12 @@ def delete_product(product_id):
         return jsonify({'status': 'error', 'message': str(e)}), 500
 
 # Запуск бота и Flask в разных потоках
+async def on_startup(_):
+    logger.info("Бот запущен!")
+
 def run_bot():
     try:
-        bot.polling(none_stop=True)
+        asyncio.run(dp.start_polling(bot, on_startup=on_startup))
     except Exception as e:
         logger.error(f"Ошибка в боте: {e}")