forked from FOSS/AutoShop-Djimbo
refactor: remove Alembic migrations and Discord integration
This commit is contained in:
@@ -5,7 +5,7 @@ from aiogram import Router, Bot, F
|
||||
from aiogram.filters import Command
|
||||
from aiogram.types import CallbackQuery, Message
|
||||
|
||||
from tgbot.data.config import BOT_VERSION, get_text_desc, get_text_warning
|
||||
from tgbot.data.config import BOT_VERSION, get_text_desc
|
||||
from tgbot.database import Purchasesx, Settingsx
|
||||
from tgbot.keyboards.inline_user import user_support_finl
|
||||
from tgbot.keyboards.inline_user_page import *
|
||||
@@ -60,7 +60,7 @@ async def user_available(message: Message, bot: Bot, state: FSM, arSession: ARS)
|
||||
|
||||
|
||||
# Открытие FAQ
|
||||
@router.message(F.text.in_(('❔ FAQ', '/faq')))
|
||||
@router.message(F.text.in_(("❔ FAQ", "/faq")))
|
||||
async def user_faq(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
await state.clear()
|
||||
|
||||
@@ -68,15 +68,7 @@ async def user_faq(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
|
||||
if get_settings.misc_faq == "None":
|
||||
return await message.answer(
|
||||
ded(f"""
|
||||
❔ Текст FAQ не указан. Измените его в настройках бота.
|
||||
|
||||
➖➖➖➖➖➖➖➖➖➖
|
||||
{get_text_desc()}
|
||||
|
||||
➖➖➖➖➖➖➖➖➖➖
|
||||
{get_text_warning()}
|
||||
"""),
|
||||
ded(f"""❔ Текст FAQ не указан."""),
|
||||
disable_web_page_preview=True,
|
||||
)
|
||||
|
||||
@@ -87,7 +79,7 @@ async def user_faq(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
|
||||
|
||||
# Открытие сообщения с ссылкой на поддержку
|
||||
@router.message(F.text.in_(('☎️ Поддержка', '/support')))
|
||||
@router.message(F.text.in_(("☎️ Поддержка", "/support")))
|
||||
async def user_support(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
await state.clear()
|
||||
|
||||
@@ -95,15 +87,7 @@ async def user_support(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
|
||||
if get_settings.misc_support == "None":
|
||||
return await message.answer(
|
||||
ded(f"""
|
||||
☎️ Контакты поддержки не указаны. Измените их в настройках бота.
|
||||
|
||||
➖➖➖➖➖➖➖➖➖➖
|
||||
{get_text_desc()}
|
||||
|
||||
➖➖➖➖➖➖➖➖➖➖
|
||||
{get_text_warning()}
|
||||
"""),
|
||||
ded(f"""☎️ Контакты поддержки не указаны."""),
|
||||
disable_web_page_preview=True,
|
||||
)
|
||||
|
||||
@@ -114,7 +98,7 @@ async def user_support(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
|
||||
|
||||
# Получение версии бота
|
||||
@router.message(Command(commands=['version']))
|
||||
@router.message(Command(commands=["version"]))
|
||||
async def admin_version(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
await state.clear()
|
||||
|
||||
@@ -122,7 +106,7 @@ async def admin_version(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
|
||||
|
||||
# Получение информации о боте
|
||||
@router.message(Command(commands=['dj_desc']))
|
||||
@router.message(Command(commands=["dj_desc"]))
|
||||
async def admin_desc(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
await state.clear()
|
||||
|
||||
@@ -132,7 +116,9 @@ async def admin_desc(message: Message, bot: Bot, state: FSM, arSession: ARS):
|
||||
################################################################################
|
||||
# Переход к профилю
|
||||
@router.callback_query(F.data == "user_profile")
|
||||
async def user_profile_return(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
|
||||
async def user_profile_return(
|
||||
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
|
||||
):
|
||||
await state.clear()
|
||||
|
||||
await del_message(call.message)
|
||||
@@ -176,7 +162,9 @@ async def user_purchases(call: CallbackQuery, bot: Bot, state: FSM, arSession: A
|
||||
|
||||
# Страницы наличия товаров
|
||||
@router.callback_query(F.data.startswith("user_available_swipe:"))
|
||||
async def user_available_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
|
||||
async def user_available_swipe(
|
||||
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
|
||||
):
|
||||
remover = int(call.data.split(":")[1])
|
||||
|
||||
items_available, remover_max, remover_now = await get_items_available(remover)
|
||||
|
||||
Reference in New Issue
Block a user