From 4183875ff85fa6a0ff7065235840fc1230707380 Mon Sep 17 00:00:00 2001
From: Sergey Bahmatov <getoutaway@gmail.com>
Date: Fri, 28 Mar 2025 20:10:12 +0500
Subject: [PATCH] fix routes

---
 pomodoro_bot/bot.py          |  5 +++--
 pomodoro_bot/main.py         |  4 ++--
 pomodoro_bot/time_magager.py | 15 ++++++---------
 pomodoro_bot/user_manager.py |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pomodoro_bot/bot.py b/pomodoro_bot/bot.py
index 4e8a7af..2cf86b6 100644
--- a/pomodoro_bot/bot.py
+++ b/pomodoro_bot/bot.py
@@ -2,14 +2,15 @@ from aiogram import Bot, Dispatcher, types
 from aiogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton
 from aiogram.utils import executor
 from aiogram.dispatcher.filters import Text
-from pomodoro_bot.user_manager import user_manager
-from pomodoro_bot.timer_manager import timer_manager
+from .user_manager import user_manager
+from .timer_manager import TimerManager
 import os
 
 API_TOKEN = os.getenv("BOT_TOKEN")
 
 bot = Bot(token=API_TOKEN)
 dp = Dispatcher(bot)
+timer_manager = TimerManager(bot)
 
 menu_kb = InlineKeyboardMarkup(row_width=2)
 menu_kb.add(
diff --git a/pomodoro_bot/main.py b/pomodoro_bot/main.py
index 9e21f4b..b7de797 100644
--- a/pomodoro_bot/main.py
+++ b/pomodoro_bot/main.py
@@ -1,6 +1,6 @@
 import asyncio
-from pomodoro_bot.bot import run_bot
-from pomodoro_bot.redis_client import init_redis
+from .bot import run_bot
+from .redis_client import init_redis
 
 if __name__ == '__main__':
     asyncio.run(init_redis())
diff --git a/pomodoro_bot/time_magager.py b/pomodoro_bot/time_magager.py
index 3c70bae..29b2ae2 100644
--- a/pomodoro_bot/time_magager.py
+++ b/pomodoro_bot/time_magager.py
@@ -1,13 +1,10 @@
 import asyncio
-from pomodoro_bot.user_manager import user_manager
-from pomodoro_bot.models import UserState
-from aiogram import Bot
-import os
-
-bot = Bot(token=os.getenv("BOT_TOKEN"))
+from .user_manager import user_manager
+from .models import UserState
 
 class TimerManager:
-    def __init__(self):
+    def __init__(self, bot):
+        self.bot = bot
         self.tasks = {}
 
     async def start_timer(self, user_id, duration, chat_id, label):
@@ -17,7 +14,7 @@ class TimerManager:
             await asyncio.sleep(duration)
             if label == 'Pomodoro':
                 await user_manager.increment_pomodoros(user_id)
-            await bot.send_message(chat_id, f"⏰ {label} завершён!")
+            await self.bot.send_message(chat_id, f"⏰ {label} завершён!")
 
         task = asyncio.create_task(timer())
         user = user_manager.get_user(user_id)
@@ -31,4 +28,4 @@ class TimerManager:
             user.task.cancel()
             user.task = None
             user.current_timer = None
-        self.tasks.pop(user_id, None)
\ No newline at end of file
+        self.tasks.pop(user_id, None)
diff --git a/pomodoro_bot/user_manager.py b/pomodoro_bot/user_manager.py
index 52a1696..802b8e3 100644
--- a/pomodoro_bot/user_manager.py
+++ b/pomodoro_bot/user_manager.py
@@ -1,5 +1,5 @@
-from pomodoro_bot.models import UserState
-from pomodoro_bot.redis_client import r as redis
+from .models import UserState
+from .redis_client import r as redis
 
 class UserManager:
     def __init__(self):