2
0
forked from kodorvan/stcs
This commit is contained in:
algizn97
2025-09-09 10:24:01 +05:00
parent 058ba09c03
commit cf581dc485
11 changed files with 670 additions and 428 deletions

View File

@@ -1,7 +1,7 @@
import logging.config
from aiogram import F, Router
from aiogram.filters import CommandStart
from aiogram.filters import CommandStart, Command
from aiogram.types import Message, CallbackQuery
from aiogram.fsm.context import FSMContext
@@ -23,7 +23,7 @@ logger = logging.getLogger("handlers")
router = Router()
@router.message(Command("start"))
@router.message(CommandStart())
async def start_message(message: Message) -> None:
"""
@@ -37,6 +37,7 @@ async def start_message(message: Message) -> None:
await func.start_message(message)
@router.message(Command("profile"))
@router.message(F.text == "👤 Профиль")
async def profile_message(message: Message) -> None:
"""
@@ -52,6 +53,12 @@ async def profile_message(message: Message) -> None:
if user and balance:
await run_ws_for_user(tg_id, message)
await func.profile_message(message.from_user.username, message)
else:
await rq.save_tg_id_new_user(message.from_user.id)
await func_main_settings.reg_new_user_default_main_settings(message.from_user.id, message)
await func_rmanagement_settings.reg_new_user_default_risk_management_settings(message.from_user.id, message)
await func_condition_settings.reg_new_user_default_condition_settings(message.from_user.id)
await func_additional_settings.reg_new_user_default_additional_settings(message.from_user.id, message)
@router.callback_query(F.data == "clb_start_chatbot_message")
@@ -64,6 +71,8 @@ async def clb_profile_msg(callback: CallbackQuery) -> None:
Args:
callback (CallbackQuery): Полученный колбэк.
"""
tg_id = callback.from_user.id
message = callback.message
user = await rq.check_user(callback.from_user.id)
balance = await get_balance(callback.from_user.id, callback.message)
first_name = callback.from_user.first_name or ""
@@ -71,6 +80,7 @@ async def clb_profile_msg(callback: CallbackQuery) -> None:
username = f"{first_name} {last_name}".strip() or callback.from_user.username or "Пользователь"
if user and balance:
await run_ws_for_user(tg_id, message)
await func.profile_message(callback.from_user.username, callback.message)
else:
await rq.save_tg_id_new_user(callback.from_user.id)
@@ -164,7 +174,7 @@ async def clb_change_additional_message(callback: CallbackQuery) -> None:
# Конкретные настройки каталогов
list_main_settings = ['clb_change_trading_mode',
'clb_change_switch_mode',
'clb_change_switch_state',
'clb_change_margin_type',
'clb_change_size_leverage',
'clb_change_starting_quantity',
@@ -188,7 +198,7 @@ async def clb_main_settings_msg(callback: CallbackQuery, state: FSMContext) -> N
match callback.data:
case 'clb_change_trading_mode':
await func_main_settings.trading_mode_message(callback.message, state)
case 'clb_change_switch_mode':
case 'clb_change_switch_state':
await func_main_settings.switch_mode_enabled_message(callback.message, state)
case 'clb_change_margin_type':
await func_main_settings.margin_type_message(callback.message, state)