diff --git a/app/telegram/functions/condition_settings/settings.py b/app/telegram/functions/condition_settings/settings.py
index 79fc57f..6b385d1 100644
--- a/app/telegram/functions/condition_settings/settings.py
+++ b/app/telegram/functions/condition_settings/settings.py
@@ -1,10 +1,19 @@
-import app.telegram.Keyboards.inline_keyboards as inline_markup
+import asyncio
+import logging.config
+import app.telegram.Keyboards.inline_keyboards as inline_markup
from aiogram import Router, F
from aiogram.types import Message, CallbackQuery
from aiogram.fsm.context import FSMContext
import app.telegram.database.requests as rq
from aiogram.fsm.state import State, StatesGroup
+from app.services.Bybit.functions.Futures import trading_cycle
+
+from logger_helper.logger_helper import LOGGING_CONFIG
+
+logging.config.dictConfig(LOGGING_CONFIG)
+logger = logging.getLogger("condition_settings")
+
condition_settings_router = Router()
@@ -47,7 +56,7 @@ async def trigger_message(message, state):
await message.answer(text=text, parse_mode='html', reply_markup=inline_markup.trigger_markup)
-async def timer_message(id,message: Message, state: FSMContext):
+async def timer_message(id, message: Message, state: FSMContext):
await state.set_state(condition_settings.timer)
timer_info = await rq.get_user_timer(id)
@@ -56,8 +65,7 @@ async def timer_message(id,message: Message, state: FSMContext):
return
await message.answer(
- f"Таймер: {timer_info['timer_minutes']} мин\n"
- f"Осталось: {timer_info['remaining_minutes']} мин\n",
+ f"Таймер: {timer_info['timer_minutes']} мин\n",
reply_markup=inline_markup.timer_markup
)
@@ -77,21 +85,15 @@ async def process_timer_input(message: Message, state: FSMContext):
await message.reply("Введите число больше нуля.")
return
- # Сохраняем в базу или память время таймера для пользователя
await rq.update_user_timer(message.from_user.id, minutes)
+ await message.answer(f"Таймер установлен на {minutes} минут.\nНажмите кнопку 'Начать торговлю' для запуска.",
+ reply_markup=inline_markup.start_trading_markup)
- await message.answer(f"Таймер установлен на {minutes} минут.", reply_markup=inline_markup.back_to_main)
await state.clear()
except ValueError:
await message.reply("Пожалуйста, введите корректное число.")
-@condition_settings_router.callback_query(F.data == "clb_stop_timer")
-async def stop_timer_callback(callback: CallbackQuery):
- await rq.update_user_timer(callback.from_user.id, 0) # обнуляем таймер
- await callback.message.answer("Таймер остановлен.", reply_markup=inline_markup.back_to_main)
- await callback.answer()
-
async def filter_volatility_message(message, state):
text = '''Фильтр волатильности
diff --git a/app/telegram/functions/main_settings/settings.py b/app/telegram/functions/main_settings/settings.py
index 8ab3c03..2365967 100644
--- a/app/telegram/functions/main_settings/settings.py
+++ b/app/telegram/functions/main_settings/settings.py
@@ -38,6 +38,7 @@ async def main_settings_message(id, message, state):
- Размер кредитного плеча: х{data['size_leverage']}
- Начальная ставка: {data['starting_quantity']}
- Коэффициент мартингейла: {data['martingale_factor']}
+- Количество ставок в серии: {data['martingale_step']}
- Максимальное количество ставок в серии: {data['maximal_quantity']}
""", parse_mode='html', reply_markup=inline_markup.main_settings_markup)