From 5d6310e5a472decaf3b491bb990b9bd880db3866 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Sat, 28 Dec 2024 11:50:40 +0300
Subject: [PATCH 01/12] Feat: started menu command and admin field

---
 .dockerignore                  |  1 +
 main.py                        |  4 ++--
 nwxraybot/bot.py               |  6 ++++--
 nwxraybot/handlers/__init__.py |  1 +
 nwxraybot/handlers/menu.py     | 18 ++++++++++++++++++
 nwxraybot/meta/router.py       | 12 +++++-------
 nwxraybot/models/user.py       |  4 +---
 run.sh                         |  7 -------
 8 files changed, 32 insertions(+), 21 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 nwxraybot/handlers/menu.py
 delete mode 100644 run.sh

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..bee8a64
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/main.py b/main.py
index 8c2a805..0178396 100644
--- a/main.py
+++ b/main.py
@@ -5,7 +5,7 @@ from sys import exit
 import uvloop
 
 from nwxraybot import NwXrayBot, Settings
-from nwxraybot.handlers import HelloHandler
+from nwxraybot.handlers import *
 from nwxraybot.models import User
 
 if __name__ == "__main__":
@@ -21,5 +21,5 @@ if __name__ == "__main__":
 
     # Start bot
     bot = NwXrayBot(config.bot_token.get_secret_value())
-    bot.include_routers(HelloHandler(bot)())
+    bot.include_routers(HelloHandler(bot), MenuHandler(bot))
     uvloop.run(bot.start(skip_updates=True))
diff --git a/nwxraybot/bot.py b/nwxraybot/bot.py
index 6d558fa..173b319 100644
--- a/nwxraybot/bot.py
+++ b/nwxraybot/bot.py
@@ -1,14 +1,16 @@
 from aiogram import Bot, Dispatcher, Router
 
+from .meta import Handler
+
 
 class NwXrayBot:
     def __init__(self, token: str) -> None:
         self.bot = Bot(token=token)
         self.dp = Dispatcher()
 
-    def include_routers(self, *routers: Router):
+    def include_routers(self, *routers: Handler):
         for router in routers:
-            self.dp.include_router(router)
+            self.dp.include_router(router())
 
     async def start(self, skip_updates: bool = False) -> None:
         await self.dp.start_polling(self.bot, skip_updates=skip_updates)
diff --git a/nwxraybot/handlers/__init__.py b/nwxraybot/handlers/__init__.py
index a03cc0c..9a127c1 100644
--- a/nwxraybot/handlers/__init__.py
+++ b/nwxraybot/handlers/__init__.py
@@ -1 +1,2 @@
 from nwxraybot.handlers.hello import HelloHandler
+from nwxraybot.handlers.menu import MenuHandler
diff --git a/nwxraybot/handlers/menu.py b/nwxraybot/handlers/menu.py
new file mode 100644
index 0000000..660881c
--- /dev/null
+++ b/nwxraybot/handlers/menu.py
@@ -0,0 +1,18 @@
+from aiogram import types
+from aiogram.enums import ParseMode
+
+from nwxraybot.meta import Handler
+from nwxraybot.models import User
+
+
+class MenuHandler(Handler):
+    def __init__(self, bot) -> None:
+        super().__init__(bot)
+
+        @self.router.message()
+        async def menu(message: types.Message) -> None:
+            user: User = User.select().where(User.id == message.from_user.id).first()
+            if user:
+                await message.reply(f"Ваша ссылка:\n```{user.url}```", parse_mode=ParseMode.MARKDOWN_V2)
+            else:
+                await message.reply("Пользователь не найден, обратитесь к админу!")
diff --git a/nwxraybot/meta/router.py b/nwxraybot/meta/router.py
index 9220bcd..c66f282 100644
--- a/nwxraybot/meta/router.py
+++ b/nwxraybot/meta/router.py
@@ -1,15 +1,13 @@
-from aiogram import Router
-
-from nwxraybot import NwXrayBot
+from aiogram import Bot, Router
 
 
 class Handler:
-    bot: NwXrayBot
+    bot: Bot
     router: Router
 
-    def __init__(self, bot: NwXrayBot) -> None:
-        assert isinstance(bot, NwXrayBot)
-        self.bot = bot
+    def __init__(self, bot) -> None:
+        assert isinstance(bot.bot, Bot)
+        self.bot = bot.bot
         self.router = Router()
 
     def __call__(self) -> Router:
diff --git a/nwxraybot/models/user.py b/nwxraybot/models/user.py
index 67c1f5e..70d2eb1 100644
--- a/nwxraybot/models/user.py
+++ b/nwxraybot/models/user.py
@@ -12,9 +12,7 @@ class User(Model):
     name = CharField()
     url = CharField()
     time = DateTimeField(null=True)
+    admin = BooleanField(default=False)
 
     class Meta:
         database = db
-
-
-User.create_table()
diff --git a/run.sh b/run.sh
deleted file mode 100644
index 75bd83f..0000000
--- a/run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-export $(grep -E -v '^#' .env | xargs)
-
-docker stack deploy -c docker-compose.yml nwxraybot
\ No newline at end of file

From e73bc6569b9947c3147a910a7fc59a69e44204e0 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Thu, 2 Jan 2025 22:00:44 +0300
Subject: [PATCH 02/12] Feat: removed unnecessary bot

---
 main.py                    |  3 +--
 nwxraybot/handlers/menu.py |  4 ++--
 nwxraybot/meta/router.py   | 11 +++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/main.py b/main.py
index 0178396..3f0bca9 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from sys import exit
 
@@ -21,5 +20,5 @@ if __name__ == "__main__":
 
     # Start bot
     bot = NwXrayBot(config.bot_token.get_secret_value())
-    bot.include_routers(HelloHandler(bot), MenuHandler(bot))
+    bot.include_routers(HelloHandler(), MenuHandler())
     uvloop.run(bot.start(skip_updates=True))
diff --git a/nwxraybot/handlers/menu.py b/nwxraybot/handlers/menu.py
index 660881c..a261978 100644
--- a/nwxraybot/handlers/menu.py
+++ b/nwxraybot/handlers/menu.py
@@ -6,8 +6,8 @@ from nwxraybot.models import User
 
 
 class MenuHandler(Handler):
-    def __init__(self, bot) -> None:
-        super().__init__(bot)
+    def __init__(self) -> None:
+        super().__init__()
 
         @self.router.message()
         async def menu(message: types.Message) -> None:
diff --git a/nwxraybot/meta/router.py b/nwxraybot/meta/router.py
index c66f282..9646d7a 100644
--- a/nwxraybot/meta/router.py
+++ b/nwxraybot/meta/router.py
@@ -1,13 +1,16 @@
+from typing import Optional
+
 from aiogram import Bot, Router
 
 
 class Handler:
-    bot: Bot
+    bot: Optional[Bot]
     router: Router
 
-    def __init__(self, bot) -> None:
-        assert isinstance(bot.bot, Bot)
-        self.bot = bot.bot
+    def __init__(self, bot: Optional[Bot] = None) -> None:
+        if bot:
+            assert isinstance(bot.bot, Optional[Bot])
+            self.bot = bot.bot
         self.router = Router()
 
     def __call__(self) -> Router:

From 7093f7452d2c5104eef789c96d44fc188817d256 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Thu, 2 Jan 2025 22:01:05 +0300
Subject: [PATCH 03/12] Feat: added user middleware

---
 nwxraybot/bot.py                  |  3 +++
 nwxraybot/middlewares/__init__.py |  1 +
 nwxraybot/middlewares/user.py     | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 nwxraybot/middlewares/__init__.py
 create mode 100644 nwxraybot/middlewares/user.py

diff --git a/nwxraybot/bot.py b/nwxraybot/bot.py
index 173b319..8fcc426 100644
--- a/nwxraybot/bot.py
+++ b/nwxraybot/bot.py
@@ -1,5 +1,7 @@
 from aiogram import Bot, Dispatcher, Router
 
+from nwxraybot.middlewares import UserMiddleware
+
 from .meta import Handler
 
 
@@ -7,6 +9,7 @@ class NwXrayBot:
     def __init__(self, token: str) -> None:
         self.bot = Bot(token=token)
         self.dp = Dispatcher()
+        self.dp.message.middleware(UserMiddleware())
 
     def include_routers(self, *routers: Handler):
         for router in routers:
diff --git a/nwxraybot/middlewares/__init__.py b/nwxraybot/middlewares/__init__.py
new file mode 100644
index 0000000..beb9792
--- /dev/null
+++ b/nwxraybot/middlewares/__init__.py
@@ -0,0 +1 @@
+from nwxraybot.middlewares.user import UserMiddleware
diff --git a/nwxraybot/middlewares/user.py b/nwxraybot/middlewares/user.py
new file mode 100644
index 0000000..f6e39e7
--- /dev/null
+++ b/nwxraybot/middlewares/user.py
@@ -0,0 +1,22 @@
+from typing import Any, Awaitable, Callable, Dict, Optional
+
+from aiogram import BaseMiddleware
+from aiogram.enums import ChatType
+from aiogram.types import Message
+
+from nwxraybot.models import User
+
+
+class UserMiddleware(BaseMiddleware):
+    def __init__(self) -> None:
+        pass
+
+    async def __call__(self, handler: Callable[[Message, Dict[str, Any]], Awaitable[Any]], event: Message, data: Dict[str, Any]) -> Any:
+        if event.chat.type != ChatType.PRIVATE:
+            return None
+        user: Optional[User] = User.select().where(
+            User.id == event.from_user.id).first()
+        if user is None:
+            await event.answer("Вы не зарегистрированы в системе, обратитесь к админам за доступом!")
+            return None
+        return await handler(event, data)

From 34308f2cace1743937e284a1934a6d756b3b47f1 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Thu, 2 Jan 2025 22:01:29 +0300
Subject: [PATCH 04/12] Feat: started main user interface

---
 nwxraybot/handlers/hello.py | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/nwxraybot/handlers/hello.py b/nwxraybot/handlers/hello.py
index fcf9a4f..05c29bc 100644
--- a/nwxraybot/handlers/hello.py
+++ b/nwxraybot/handlers/hello.py
@@ -1,13 +1,33 @@
-from aiogram import types
+import json
+from datetime import datetime
+
+from aiogram import F, types
+from aiogram.enums import ParseMode
 from aiogram.filters import Command
+from aiogram.types import (CallbackQuery, InlineKeyboardButton,
+                           InlineKeyboardMarkup)
 
 from nwxraybot.meta import Handler
+from nwxraybot.models import User
 
 
 class HelloHandler(Handler):
-    def __init__(self, bot) -> None:
-        super().__init__(bot)
+    def __non_admin_main_menu(self):
+        markup = [[
+            InlineKeyboardButton(text="Обновить данные",
+                                 callback_data='update')
+        ]]
+        return InlineKeyboardMarkup(
+            inline_keyboard=markup
+        )
+
+    def __init__(self) -> None:
+        super().__init__()
 
         @self.router.message(Command("start"))
         async def hello(message: types.Message):
-            await message.reply("Приветствуем в боте NwXray! Здесь вы сможете получить информацию о своем подключении к NwXray")
+            await message.reply("Приветствуем в боте NwXray! Здесь вы сможете получить информацию о своем подключении к NwXray", reply_markup=self.__non_admin_main_menu())
+
+        @self.router.callback_query(F.data == 'update')
+        async def update_data(callback: CallbackQuery):
+            await callback.message.delete()

From 3962c57dde4cda75e036c84a6efa021bcd229208 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Sun, 5 Jan 2025 20:44:51 +0300
Subject: [PATCH 05/12] Feat: add user command

---
 main.py                           |  2 +-
 nwxraybot/__init__.py             |  1 +
 nwxraybot/bot.py                  |  2 ++
 nwxraybot/handlers/__init__.py    |  1 +
 nwxraybot/handlers/admin.py       | 37 +++++++++++++++++++++++++++++++
 nwxraybot/handlers/hello.py       | 25 ++++++++++++++++-----
 nwxraybot/handlers/menu.py        |  3 ++-
 nwxraybot/middlewares/__init__.py |  1 +
 nwxraybot/middlewares/admin.py    | 19 ++++++++++++++++
 nwxraybot/middlewares/user.py     |  4 +++-
 nwxraybot/models/user.py          |  2 ++
 nwxraybot/utils.py                | 22 ++++++++++++++++++
 12 files changed, 111 insertions(+), 8 deletions(-)
 create mode 100644 nwxraybot/handlers/admin.py
 create mode 100644 nwxraybot/middlewares/admin.py
 create mode 100644 nwxraybot/utils.py

diff --git a/main.py b/main.py
index 3f0bca9..41445a5 100644
--- a/main.py
+++ b/main.py
@@ -20,5 +20,5 @@ if __name__ == "__main__":
 
     # Start bot
     bot = NwXrayBot(config.bot_token.get_secret_value())
-    bot.include_routers(HelloHandler(), MenuHandler())
+    bot.include_routers(HelloHandler(), MenuHandler(), AdminHandler())
     uvloop.run(bot.start(skip_updates=True))
diff --git a/nwxraybot/__init__.py b/nwxraybot/__init__.py
index 667fdf5..4621279 100644
--- a/nwxraybot/__init__.py
+++ b/nwxraybot/__init__.py
@@ -1,2 +1,3 @@
 from nwxraybot.bot import NwXrayBot
 from nwxraybot.config import Settings
+from nwxraybot.utils import get_code, get_subscription_info
diff --git a/nwxraybot/bot.py b/nwxraybot/bot.py
index 8fcc426..b24ae5d 100644
--- a/nwxraybot/bot.py
+++ b/nwxraybot/bot.py
@@ -1,4 +1,5 @@
 from aiogram import Bot, Dispatcher, Router
+from aiogram.utils.callback_answer import CallbackAnswerMiddleware
 
 from nwxraybot.middlewares import UserMiddleware
 
@@ -10,6 +11,7 @@ class NwXrayBot:
         self.bot = Bot(token=token)
         self.dp = Dispatcher()
         self.dp.message.middleware(UserMiddleware())
+        self.dp.message.middleware(CallbackAnswerMiddleware())
 
     def include_routers(self, *routers: Handler):
         for router in routers:
diff --git a/nwxraybot/handlers/__init__.py b/nwxraybot/handlers/__init__.py
index 9a127c1..0dde1e6 100644
--- a/nwxraybot/handlers/__init__.py
+++ b/nwxraybot/handlers/__init__.py
@@ -1,2 +1,3 @@
+from nwxraybot.handlers.admin import AdminHandler
 from nwxraybot.handlers.hello import HelloHandler
 from nwxraybot.handlers.menu import MenuHandler
diff --git a/nwxraybot/handlers/admin.py b/nwxraybot/handlers/admin.py
new file mode 100644
index 0000000..70ab2a7
--- /dev/null
+++ b/nwxraybot/handlers/admin.py
@@ -0,0 +1,37 @@
+import re
+from datetime import datetime
+
+from aiogram.enums import ParseMode
+from aiogram.filters import Command
+from aiogram.types import Message
+
+from nwxraybot import get_code
+from nwxraybot.meta import Handler
+from nwxraybot.middlewares import AdminMiddleware
+from nwxraybot.models import User
+
+
+class AdminHandler(Handler):
+    def __init__(self) -> None:
+        super().__init__()
+
+        self.router.message.middleware(AdminMiddleware())
+
+        @self.router.message(Command('adduser'))
+        async def add_user(message: Message):
+            mask = r"^(?P<name>[a-zA-Z0-9]+)\s(?P<url>[^\s]+)($|\s(?P<date>[0-9]{2}\.[0-9]{2}\.[0-9]{4})\s(?P<time>[0-9]{2}\:[0-9]{2})$)"
+            text = message.text.replace('/adduser ', '')
+            match = re.match(mask, text)
+            if match is None:
+                await message.reply('Вы ввели пользователя в неверном формате. Вводите в формате:\n``` /adduser name vless://....  01.01.1970 00:00```', parse_mode=ParseMode.MARKDOWN)
+                return
+            user_dict = match.groupdict()
+            date = None
+            if user_dict['date']:
+                date = datetime.strptime(f"{user_dict['date']} {
+                                         user_dict['time']}", "%d.%m.%Y %H:%M")
+            code = get_code()
+            new_user = User(
+                name=user_dict['name'], url=user_dict['url'], time=date, code=code)
+            new_user.save()
+            await message.answer(f'Пользователь создан. Вот его ссылка для доступа:\n`https://t.me/nwproxybot?start={code}`', parse_mode=ParseMode.MARKDOWN)
diff --git a/nwxraybot/handlers/hello.py b/nwxraybot/handlers/hello.py
index 05c29bc..cb94a2e 100644
--- a/nwxraybot/handlers/hello.py
+++ b/nwxraybot/handlers/hello.py
@@ -1,5 +1,4 @@
-import json
-from datetime import datetime
+from typing import Optional
 
 from aiogram import F, types
 from aiogram.enums import ParseMode
@@ -7,6 +6,7 @@ from aiogram.filters import Command
 from aiogram.types import (CallbackQuery, InlineKeyboardButton,
                            InlineKeyboardMarkup)
 
+from nwxraybot import get_subscription_info
 from nwxraybot.meta import Handler
 from nwxraybot.models import User
 
@@ -14,7 +14,7 @@ from nwxraybot.models import User
 class HelloHandler(Handler):
     def __non_admin_main_menu(self):
         markup = [[
-            InlineKeyboardButton(text="Обновить данные",
+            InlineKeyboardButton(text="Обновить данные🔄",
                                  callback_data='update')
         ]]
         return InlineKeyboardMarkup(
@@ -26,8 +26,23 @@ class HelloHandler(Handler):
 
         @self.router.message(Command("start"))
         async def hello(message: types.Message):
-            await message.reply("Приветствуем в боте NwXray! Здесь вы сможете получить информацию о своем подключении к NwXray", reply_markup=self.__non_admin_main_menu())
+            data = message.text.split()
+            if len(data) == 2:
+                code = data[1]
+                query = User.update(telegram_id=None).where(
+                    User.telegram_id == message.from_user.id)
+                query.execute()
+                user: Optional[User] = User.select().where(
+                    User.code == code).first()
+                if user is None:
+                    await message.answer('Пользователь не найден, обратитесь к администратору за ссылкой!')
+                    return
+                user.telegram_id = message.from_user.id
+                user.save()
+            await message.answer(f"Приветствуем в боте NwXray! Здесь вы сможете получить информацию о своем подключении к NwXray.\n\n{get_subscription_info(message.from_user.id)}",
+                                 reply_markup=self.__non_admin_main_menu(), parse_mode=ParseMode.MARKDOWN)
 
         @self.router.callback_query(F.data == 'update')
         async def update_data(callback: CallbackQuery):
-            await callback.message.delete()
+            await callback.message.edit_text(get_subscription_info(callback.from_user.id),
+                                             reply_markup=self.__non_admin_main_menu(), parse_mode=ParseMode.MARKDOWN)
diff --git a/nwxraybot/handlers/menu.py b/nwxraybot/handlers/menu.py
index a261978..b680261 100644
--- a/nwxraybot/handlers/menu.py
+++ b/nwxraybot/handlers/menu.py
@@ -1,5 +1,6 @@
 from aiogram import types
 from aiogram.enums import ParseMode
+from aiogram.filters import Command
 
 from nwxraybot.meta import Handler
 from nwxraybot.models import User
@@ -9,7 +10,7 @@ class MenuHandler(Handler):
     def __init__(self) -> None:
         super().__init__()
 
-        @self.router.message()
+        @self.router.message(Command('menu'))
         async def menu(message: types.Message) -> None:
             user: User = User.select().where(User.id == message.from_user.id).first()
             if user:
diff --git a/nwxraybot/middlewares/__init__.py b/nwxraybot/middlewares/__init__.py
index beb9792..0d5c139 100644
--- a/nwxraybot/middlewares/__init__.py
+++ b/nwxraybot/middlewares/__init__.py
@@ -1 +1,2 @@
+from nwxraybot.middlewares.admin import AdminMiddleware
 from nwxraybot.middlewares.user import UserMiddleware
diff --git a/nwxraybot/middlewares/admin.py b/nwxraybot/middlewares/admin.py
new file mode 100644
index 0000000..bd7a66c
--- /dev/null
+++ b/nwxraybot/middlewares/admin.py
@@ -0,0 +1,19 @@
+from typing import Any, Awaitable, Callable, Dict, Optional
+
+from aiogram import BaseMiddleware
+from aiogram.types import Message
+
+from nwxraybot.models import User
+
+
+class AdminMiddleware(BaseMiddleware):
+    def __init__(self) -> None:
+        pass
+
+    async def __call__(self, handler: Callable[[Message, Dict[str, Any]], Awaitable[Any]], event: Message, data: Dict[str, Any]) -> Any:
+        user: User = User.select().where(
+            User.telegram_id == event.from_user.id).first()
+        if user is None or not user.admin:
+            await event.reply('Вы не обладаете правами администратора для доступа к данной команде.')
+            return None
+        return await handler(event, data)
diff --git a/nwxraybot/middlewares/user.py b/nwxraybot/middlewares/user.py
index f6e39e7..fefb11b 100644
--- a/nwxraybot/middlewares/user.py
+++ b/nwxraybot/middlewares/user.py
@@ -14,8 +14,10 @@ class UserMiddleware(BaseMiddleware):
     async def __call__(self, handler: Callable[[Message, Dict[str, Any]], Awaitable[Any]], event: Message, data: Dict[str, Any]) -> Any:
         if event.chat.type != ChatType.PRIVATE:
             return None
+        if event.text.startswith('/start'):
+            return await handler(event, data)
         user: Optional[User] = User.select().where(
-            User.id == event.from_user.id).first()
+            User.telegram_id == event.from_user.id).first()
         if user is None:
             await event.answer("Вы не зарегистрированы в системе, обратитесь к админам за доступом!")
             return None
diff --git a/nwxraybot/models/user.py b/nwxraybot/models/user.py
index 70d2eb1..cc1df2d 100644
--- a/nwxraybot/models/user.py
+++ b/nwxraybot/models/user.py
@@ -13,6 +13,8 @@ class User(Model):
     url = CharField()
     time = DateTimeField(null=True)
     admin = BooleanField(default=False)
+    telegram_id = CharField(null=True)
+    code = CharField()
 
     class Meta:
         database = db
diff --git a/nwxraybot/utils.py b/nwxraybot/utils.py
new file mode 100644
index 0000000..6bc4a5d
--- /dev/null
+++ b/nwxraybot/utils.py
@@ -0,0 +1,22 @@
+import logging
+from datetime import datetime
+from secrets import token_urlsafe
+from typing import Optional
+
+from nwxraybot.models import User
+
+
+def get_subscription_info(telegram_id: str) -> str:
+    user: User = User.select().where(User.telegram_id == telegram_id).first()
+    if user is None:
+        logging.error("[get_subscription_info]: User is not found")
+        return "Ошибка\!"
+    date: Optional[datetime] = user.time
+    date_str = "" if date is None else f'До: {
+        date.strftime("%d.%m.%Y %H:%M")} МСК\n'
+    res = f"Информация о подписке:\n{date_str}Ссылка: `{user.url}`"
+    return res
+
+
+def get_code(length: int = 10) -> str:
+    return token_urlsafe(length)[:length]

From 9f98d9502eea4a8caeee901e45663ac40c6f4f24 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Sun, 5 Jan 2025 20:58:25 +0300
Subject: [PATCH 06/12] Feat: update user command

---
 nwxraybot/handlers/admin.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nwxraybot/handlers/admin.py b/nwxraybot/handlers/admin.py
index 70ab2a7..6041b43 100644
--- a/nwxraybot/handlers/admin.py
+++ b/nwxraybot/handlers/admin.py
@@ -23,7 +23,7 @@ class AdminHandler(Handler):
             text = message.text.replace('/adduser ', '')
             match = re.match(mask, text)
             if match is None:
-                await message.reply('Вы ввели пользователя в неверном формате. Вводите в формате:\n``` /adduser name vless://....  01.01.1970 00:00```', parse_mode=ParseMode.MARKDOWN)
+                await message.reply('Вы ввели команду в неверном формате. Вводите в формате:\n``` /adduser name vless://....  01.01.1970 00:00```', parse_mode=ParseMode.MARKDOWN)
                 return
             user_dict = match.groupdict()
             date = None
@@ -35,3 +35,19 @@ class AdminHandler(Handler):
                 name=user_dict['name'], url=user_dict['url'], time=date, code=code)
             new_user.save()
             await message.answer(f'Пользователь создан. Вот его ссылка для доступа:\n`https://t.me/nwproxybot?start={code}`', parse_mode=ParseMode.MARKDOWN)
+
+        @self.router.message(Command('updateuser'))
+        async def update_user(message: Message):
+            mask = r"^(?P<name>[a-zA-Z0-9]+)\s(?P<date>[0-9]{2}\.[0-9]{2}\.[0-9]{4})\s(?P<time>[0-9]{2}\:[0-9]{2})$"
+            text = message.text.replace('/updateuser ', '')
+            match = re.match(mask, text)
+            if match is None:
+                await message.reply('Вы ввели команду в неверном формате. Вводите в формате:\n``` /updateuser name 01.01.1970 00:00```', parse_mode=ParseMode.MARKDOWN)
+                return
+            user_dict = match.groupdict()
+            date = datetime.strptime(f"{user_dict['date']} {
+                user_dict['time']}", "%d.%m.%Y %H:%M")
+            query = User.update(time=date).where(
+                User.name == user_dict['name'])
+            query.execute()
+            await message.answer('Информация о пользователе обновлена.')

From af837b54be6f516ca483b6c27258a75509b67201 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Sun, 5 Jan 2025 21:02:00 +0300
Subject: [PATCH 07/12] Feat: disabled menu command

---
 nwxraybot/handlers/menu.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nwxraybot/handlers/menu.py b/nwxraybot/handlers/menu.py
index b680261..365512a 100644
--- a/nwxraybot/handlers/menu.py
+++ b/nwxraybot/handlers/menu.py
@@ -10,7 +10,8 @@ class MenuHandler(Handler):
     def __init__(self) -> None:
         super().__init__()
 
-        @self.router.message(Command('menu'))
+        # TODO: Temporary disabled
+        # @self.router.message(Command('menu'))
         async def menu(message: types.Message) -> None:
             user: User = User.select().where(User.id == message.from_user.id).first()
             if user:

From 9ee8e43fb428af66c53989e4604da3f15c93e2f3 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Mon, 13 Jan 2025 11:49:59 +0300
Subject: [PATCH 08/12] Feat: fixed start command

---
 docker-compose.yml          | 2 +-
 nwxraybot/handlers/admin.py | 2 +-
 nwxraybot/handlers/hello.py | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6ccb38e..a3f241e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_DB: ${POSTGRES_DB:-postgres}
     ports:
-      - 5432
+      - "127.0.0.1:${POSTGRES_PORT}:5432"
     healthcheck:
       test: ["CMD", "pg_isready"]
       interval: 10s
diff --git a/nwxraybot/handlers/admin.py b/nwxraybot/handlers/admin.py
index 6041b43..5de4838 100644
--- a/nwxraybot/handlers/admin.py
+++ b/nwxraybot/handlers/admin.py
@@ -19,7 +19,7 @@ class AdminHandler(Handler):
 
         @self.router.message(Command('adduser'))
         async def add_user(message: Message):
-            mask = r"^(?P<name>[a-zA-Z0-9]+)\s(?P<url>[^\s]+)($|\s(?P<date>[0-9]{2}\.[0-9]{2}\.[0-9]{4})\s(?P<time>[0-9]{2}\:[0-9]{2})$)"
+            mask = r"^(?P<name>[a-zA-Z0-9]+)\s(?P<url>vless://[^\s]+)($|\s(?P<date>[0-9]{2}\.[0-9]{2}\.[0-9]{4})\s(?P<time>[0-9]{2}\:[0-9]{2})$)"
             text = message.text.replace('/adduser ', '')
             match = re.match(mask, text)
             if match is None:
diff --git a/nwxraybot/handlers/hello.py b/nwxraybot/handlers/hello.py
index cb94a2e..506a1d1 100644
--- a/nwxraybot/handlers/hello.py
+++ b/nwxraybot/handlers/hello.py
@@ -27,18 +27,24 @@ class HelloHandler(Handler):
         @self.router.message(Command("start"))
         async def hello(message: types.Message):
             data = message.text.split()
+            user: Optional[User] = None
             if len(data) == 2:
                 code = data[1]
                 query = User.update(telegram_id=None).where(
                     User.telegram_id == message.from_user.id)
                 query.execute()
-                user: Optional[User] = User.select().where(
+                user = User.select().where(
                     User.code == code).first()
                 if user is None:
                     await message.answer('Пользователь не найден, обратитесь к администратору за ссылкой!')
                     return
                 user.telegram_id = message.from_user.id
+                user.code = ''
                 user.save()
+            user = User.select().where(User.telegram_id == message.from_user.id).first()
+            if user is None:
+                await message.answer('Пользователь не найден, обратитесь к администратору за ссылкой!')
+                return
             await message.answer(f"Приветствуем в боте NwXray! Здесь вы сможете получить информацию о своем подключении к NwXray.\n\n{get_subscription_info(message.from_user.id)}",
                                  reply_markup=self.__non_admin_main_menu(), parse_mode=ParseMode.MARKDOWN)
 

From b5a893e5aa7e18cd46d935aabe1d844bb7206af3 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Mon, 13 Jan 2025 15:18:48 +0300
Subject: [PATCH 09/12] Feat: some fixes

---
 main.py                     |  8 ++++-
 nwxraybot/handlers/hello.py |  9 ++++--
 nwxraybot/utils.py          |  2 +-
 poetry.lock                 | 59 +++++++++++++++++++++++++++++++++++--
 pyproject.toml              |  1 +
 5 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index 41445a5..876de98 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,4 @@
+import asyncio
 import logging
 from sys import exit
 
@@ -18,7 +19,12 @@ if __name__ == "__main__":
 
     User.create_table()
 
+    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+    loop = uvloop.new_event_loop()
+    asyncio.set_event_loop(loop)
+
     # Start bot
     bot = NwXrayBot(config.bot_token.get_secret_value())
     bot.include_routers(HelloHandler(), MenuHandler(), AdminHandler())
-    uvloop.run(bot.start(skip_updates=True))
+
+    asyncio.run(bot.start(skip_updates=True))
diff --git a/nwxraybot/handlers/hello.py b/nwxraybot/handlers/hello.py
index 506a1d1..4e41b0b 100644
--- a/nwxraybot/handlers/hello.py
+++ b/nwxraybot/handlers/hello.py
@@ -50,5 +50,10 @@ class HelloHandler(Handler):
 
         @self.router.callback_query(F.data == 'update')
         async def update_data(callback: CallbackQuery):
-            await callback.message.edit_text(get_subscription_info(callback.from_user.id),
-                                             reply_markup=self.__non_admin_main_menu(), parse_mode=ParseMode.MARKDOWN)
+            text = get_subscription_info(callback.from_user.id)
+            try:
+                await callback.message.edit_text(get_subscription_info(callback.from_user.id),
+                                                 reply_markup=self.__non_admin_main_menu(), parse_mode=ParseMode.MARKDOWN)
+            except:
+                await callback.answer('Обновлений нет', show_alert=True)
+                return
diff --git a/nwxraybot/utils.py b/nwxraybot/utils.py
index 6bc4a5d..35a9c42 100644
--- a/nwxraybot/utils.py
+++ b/nwxraybot/utils.py
@@ -10,7 +10,7 @@ def get_subscription_info(telegram_id: str) -> str:
     user: User = User.select().where(User.telegram_id == telegram_id).first()
     if user is None:
         logging.error("[get_subscription_info]: User is not found")
-        return "Ошибка\!"
+        return "Ошибка!"
     date: Optional[datetime] = user.time
     date_str = "" if date is None else f'До: {
         date.strftime("%d.%m.%Y %H:%M")} МСК\n'
diff --git a/poetry.lock b/poetry.lock
index 40127c9..2ed186f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand.
 
 [[package]]
 name = "aiofiles"
@@ -185,6 +185,33 @@ files = [
     {file = "ansicon-1.89.0.tar.gz", hash = "sha256:e4d039def5768a47e4afec8e89e83ec3ae5a26bf00ad851f914d1240b444d2b1"},
 ]
 
+[[package]]
+name = "apscheduler"
+version = "3.11.0"
+description = "In-process task scheduler with Cron-like capabilities"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "APScheduler-3.11.0-py3-none-any.whl", hash = "sha256:fc134ca32e50f5eadcc4938e3a4545ab19131435e851abb40b34d63d5141c6da"},
+    {file = "apscheduler-3.11.0.tar.gz", hash = "sha256:4c622d250b0955a65d5d0eb91c33e6d43fd879834bf541e0a18661ae60460133"},
+]
+
+[package.dependencies]
+tzlocal = ">=3.0"
+
+[package.extras]
+doc = ["packaging", "sphinx", "sphinx-rtd-theme (>=1.3.0)"]
+etcd = ["etcd3", "protobuf (<=3.21.0)"]
+gevent = ["gevent"]
+mongodb = ["pymongo (>=3.0)"]
+redis = ["redis (>=3.0)"]
+rethinkdb = ["rethinkdb (>=2.4.0)"]
+sqlalchemy = ["sqlalchemy (>=1.4)"]
+test = ["APScheduler[etcd,mongodb,redis,rethinkdb,sqlalchemy,tornado,zookeeper]", "PySide6", "anyio (>=4.5.2)", "gevent", "pytest", "pytz", "twisted"]
+tornado = ["tornado (>=4.3)"]
+twisted = ["twisted"]
+zookeeper = ["kazoo"]
+
 [[package]]
 name = "attrs"
 version = "24.3.0"
@@ -882,6 +909,34 @@ files = [
     {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"},
 ]
 
+[[package]]
+name = "tzdata"
+version = "2024.2"
+description = "Provider of IANA time zone data"
+optional = false
+python-versions = ">=2"
+files = [
+    {file = "tzdata-2024.2-py2.py3-none-any.whl", hash = "sha256:a48093786cdcde33cad18c2555e8532f34422074448fbc874186f0abd79565cd"},
+    {file = "tzdata-2024.2.tar.gz", hash = "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc"},
+]
+
+[[package]]
+name = "tzlocal"
+version = "5.2"
+description = "tzinfo object for the local timezone"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "tzlocal-5.2-py3-none-any.whl", hash = "sha256:49816ef2fe65ea8ac19d19aa7a1ae0551c834303d5014c6d5a62e4cbda8047b8"},
+    {file = "tzlocal-5.2.tar.gz", hash = "sha256:8d399205578f1a9342816409cc1e46a93ebd5755e39ea2d85334bea911bf0e6e"},
+]
+
+[package.dependencies]
+tzdata = {version = "*", markers = "platform_system == \"Windows\""}
+
+[package.extras]
+devenv = ["check-manifest", "pytest (>=4.3)", "pytest-cov", "pytest-mock (>=3.3)", "zest.releaser"]
+
 [[package]]
 name = "uvloop"
 version = "0.21.0"
@@ -1085,4 +1140,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.13"
-content-hash = "9b455b4a27b4038063fad5d023c0d2af06d7277a9b7ee02cc2d366e458f195b4"
+content-hash = "57654abddded59b21f10fc936a3f75bf5897bc0fd9ebcc81da38a5699d7ca90a"
diff --git a/pyproject.toml b/pyproject.toml
index c50a0dc..72ec579 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,6 +14,7 @@ peewee = "^3.17.8"
 uvloop = "^0.21.0"
 jurigged = "^0.6.0"
 psycopg2-binary = "^2.9.10"
+apscheduler = "^3.11.0"
 
 
 [build-system]

From 7d50cf95cff09d0642539eac60f5a0688f0ab671 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Mon, 13 Jan 2025 15:50:45 +0300
Subject: [PATCH 10/12] Feat: started working on the sub notification

---
 main.py                             |  6 +++++-
 nwxraybot/bot.py                    |  2 ++
 nwxraybot/notifiers/__init__.py     |  1 +
 nwxraybot/notifiers/subscription.py | 28 ++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 nwxraybot/notifiers/__init__.py
 create mode 100644 nwxraybot/notifiers/subscription.py

diff --git a/main.py b/main.py
index 876de98..779875b 100644
--- a/main.py
+++ b/main.py
@@ -8,6 +8,10 @@ from nwxraybot import NwXrayBot, Settings
 from nwxraybot.handlers import *
 from nwxraybot.models import User
 
+
+async def main(bot: NwXrayBot, skip_updates: bool = True) -> None:
+    await asyncio.create_task(bot.start())
+
 if __name__ == "__main__":
     config = Settings()  # Load config from .env
     logging.basicConfig(level=logging.DEBUG if config.debug else logging.INFO)
@@ -27,4 +31,4 @@ if __name__ == "__main__":
     bot = NwXrayBot(config.bot_token.get_secret_value())
     bot.include_routers(HelloHandler(), MenuHandler(), AdminHandler())
 
-    asyncio.run(bot.start(skip_updates=True))
+    asyncio.run(main(bot))
diff --git a/nwxraybot/bot.py b/nwxraybot/bot.py
index b24ae5d..ff4d5e2 100644
--- a/nwxraybot/bot.py
+++ b/nwxraybot/bot.py
@@ -2,6 +2,7 @@ from aiogram import Bot, Dispatcher, Router
 from aiogram.utils.callback_answer import CallbackAnswerMiddleware
 
 from nwxraybot.middlewares import UserMiddleware
+from nwxraybot.notifiers import setup_subscription_notifier
 
 from .meta import Handler
 
@@ -12,6 +13,7 @@ class NwXrayBot:
         self.dp = Dispatcher()
         self.dp.message.middleware(UserMiddleware())
         self.dp.message.middleware(CallbackAnswerMiddleware())
+        setup_subscription_notifier(self.bot)
 
     def include_routers(self, *routers: Handler):
         for router in routers:
diff --git a/nwxraybot/notifiers/__init__.py b/nwxraybot/notifiers/__init__.py
new file mode 100644
index 0000000..db8e999
--- /dev/null
+++ b/nwxraybot/notifiers/__init__.py
@@ -0,0 +1 @@
+from nwxraybot.notifiers.subscription import setup_subscription_notifier
diff --git a/nwxraybot/notifiers/subscription.py b/nwxraybot/notifiers/subscription.py
new file mode 100644
index 0000000..1bdc326
--- /dev/null
+++ b/nwxraybot/notifiers/subscription.py
@@ -0,0 +1,28 @@
+import asyncio
+import datetime
+import logging
+
+from aiogram import Bot
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+
+from nwxraybot.models import User
+
+
+# TODO: This shit is not working
+async def send_subscription_notification(bot: Bot, telegram_id: int) -> None:
+    logging.debug(f"Sending subscription notification to {telegram_id}")
+
+
+async def check_subscription_status(bot: Bot):
+    logging.debug('Running notifier task')
+    await asyncio.sleep(1)
+    for user in User.select():
+        if user.telegram_id != '':
+            await bot.send_message(user.telegram_id, 'Your subscription is active')
+
+
+def setup_subscription_notifier(bot: Bot) -> None:
+    scheduler = AsyncIOScheduler(event_loop=asyncio.get_event_loop())
+    scheduler.add_job(check_subscription_status,
+                      'interval', seconds=10, args=[bot])
+    scheduler.start()

From 0d1dd4362d098acaaa119cef208f630a1f842ff2 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Thu, 16 Jan 2025 16:51:26 +0300
Subject: [PATCH 11/12] Feat: fixed notifications

---
 main.py                             |  7 +------
 nwxraybot/notifiers/subscription.py | 31 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/main.py b/main.py
index 779875b..c445e37 100644
--- a/main.py
+++ b/main.py
@@ -8,10 +8,6 @@ from nwxraybot import NwXrayBot, Settings
 from nwxraybot.handlers import *
 from nwxraybot.models import User
 
-
-async def main(bot: NwXrayBot, skip_updates: bool = True) -> None:
-    await asyncio.create_task(bot.start())
-
 if __name__ == "__main__":
     config = Settings()  # Load config from .env
     logging.basicConfig(level=logging.DEBUG if config.debug else logging.INFO)
@@ -30,5 +26,4 @@ if __name__ == "__main__":
     # Start bot
     bot = NwXrayBot(config.bot_token.get_secret_value())
     bot.include_routers(HelloHandler(), MenuHandler(), AdminHandler())
-
-    asyncio.run(main(bot))
+    loop.run_until_complete(bot.start(skip_updates=True))
diff --git a/nwxraybot/notifiers/subscription.py b/nwxraybot/notifiers/subscription.py
index 1bdc326..01d3950 100644
--- a/nwxraybot/notifiers/subscription.py
+++ b/nwxraybot/notifiers/subscription.py
@@ -1,6 +1,5 @@
 import asyncio
 import datetime
-import logging
 
 from aiogram import Bot
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
@@ -8,21 +7,29 @@ from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from nwxraybot.models import User
 
 
-# TODO: This shit is not working
-async def send_subscription_notification(bot: Bot, telegram_id: int) -> None:
-    logging.debug(f"Sending subscription notification to {telegram_id}")
-
-
 async def check_subscription_status(bot: Bot):
-    logging.debug('Running notifier task')
-    await asyncio.sleep(1)
-    for user in User.select():
-        if user.telegram_id != '':
-            await bot.send_message(user.telegram_id, 'Your subscription is active')
+
+    # Check users subscription status
+    now_time = datetime.datetime.now()
+    for user in User.select().where((User.time > now_time) & ((User.time - now_time <= datetime.timedelta(days=7))) & (User.telegram_id != '')):
+        text = ""
+        delta = user.time - now_time
+        print(delta)
+        if delta.days <= 1:
+            text = "Скоро истекает срок действия вашей подписки. Не теряйте доступ к NwaifuVPN — продлите подписку прямо сейчас!"
+        elif delta.days <= 3:
+            text = "До окончания вашей подписки осталось менее 3-х дней. Продлите, чтобы избежать отключения."
+        else:
+            text = "Ваша подписка заканчивается через менее чем 7 дней. Продлите её, чтобы избежать отключения."
+        await bot.send_message(user.telegram_id, text)
+
+    # Check non-paying users
+    for user in User.select().where((User.time < now_time) & (now_time - User.time < datetime.timedelta(days=1)) & (User.telegram_id != '')):
+        await bot.send_message(user.telegram_id, "Ваша подписка истекла. Чтобы восстановить доступ к NwaifuVPN, продлите подписку уже сегодня")
 
 
 def setup_subscription_notifier(bot: Bot) -> None:
     scheduler = AsyncIOScheduler(event_loop=asyncio.get_event_loop())
     scheduler.add_job(check_subscription_status,
-                      'interval', seconds=10, args=[bot])
+                      'cron', hour=10, minute=0, args=[bot])
     scheduler.start()

From 926774424e7ce3aaaa0fc96a5c22f61896b15316 Mon Sep 17 00:00:00 2001
From: Sergey Elpashev <elpashevs@bk.ru>
Date: Fri, 17 Jan 2025 13:19:13 +0300
Subject: [PATCH 12/12] Feat: added notifier

---
 main.py                       |  2 +-
 nwxraybot/fsm/__init__.py     |  1 +
 nwxraybot/fsm/broadcast.py    |  6 ++++
 nwxraybot/handlers/admin.py   | 56 +++++++++++++++++++++++++++++++++--
 nwxraybot/meta/router.py      |  4 +--
 nwxraybot/middlewares/user.py |  2 +-
 6 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 nwxraybot/fsm/__init__.py
 create mode 100644 nwxraybot/fsm/broadcast.py

diff --git a/main.py b/main.py
index c445e37..9c81504 100644
--- a/main.py
+++ b/main.py
@@ -25,5 +25,5 @@ if __name__ == "__main__":
 
     # Start bot
     bot = NwXrayBot(config.bot_token.get_secret_value())
-    bot.include_routers(HelloHandler(), MenuHandler(), AdminHandler())
+    bot.include_routers(HelloHandler(), MenuHandler(), AdminHandler(bot.bot))
     loop.run_until_complete(bot.start(skip_updates=True))
diff --git a/nwxraybot/fsm/__init__.py b/nwxraybot/fsm/__init__.py
new file mode 100644
index 0000000..dca75b7
--- /dev/null
+++ b/nwxraybot/fsm/__init__.py
@@ -0,0 +1 @@
+from nwxraybot.fsm.broadcast import BroadcastStates
diff --git a/nwxraybot/fsm/broadcast.py b/nwxraybot/fsm/broadcast.py
new file mode 100644
index 0000000..70a7aca
--- /dev/null
+++ b/nwxraybot/fsm/broadcast.py
@@ -0,0 +1,6 @@
+from aiogram.fsm.state import State, StatesGroup
+
+
+class BroadcastStates(StatesGroup):
+    waiting_for_message = State()
+    confirming_message = State()
diff --git a/nwxraybot/handlers/admin.py b/nwxraybot/handlers/admin.py
index 5de4838..09f603b 100644
--- a/nwxraybot/handlers/admin.py
+++ b/nwxraybot/handlers/admin.py
@@ -1,19 +1,26 @@
+import asyncio
+import logging
 import re
 from datetime import datetime
+from typing import Optional
 
+from aiogram import Bot, F
 from aiogram.enums import ParseMode
 from aiogram.filters import Command
-from aiogram.types import Message
+from aiogram.fsm.context import FSMContext
+from aiogram.types import (CallbackQuery, InlineKeyboardButton,
+                           InlineKeyboardMarkup, Message)
 
 from nwxraybot import get_code
+from nwxraybot.fsm import BroadcastStates
 from nwxraybot.meta import Handler
 from nwxraybot.middlewares import AdminMiddleware
 from nwxraybot.models import User
 
 
 class AdminHandler(Handler):
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, bot: Optional[Bot] = None) -> None:
+        super().__init__(bot)
 
         self.router.message.middleware(AdminMiddleware())
 
@@ -51,3 +58,46 @@ class AdminHandler(Handler):
                 User.name == user_dict['name'])
             query.execute()
             await message.answer('Информация о пользователе обновлена.')
+
+        @self.router.message(Command('broadcast'))
+        async def start_broadcast(message: Message, state: FSMContext):
+            await message.answer('Отправьте для рассылки')
+            await state.set_state(BroadcastStates.waiting_for_message)
+
+        @self.router.message(BroadcastStates.waiting_for_message)
+        async def broadcast_message(message: Message, state: FSMContext):
+            if message.media_group_id is not None:
+                await state.clear()
+                await message.answer('Пожалуйста, не отправляйте сообщение с несколькими изображениями.')
+                return
+            await state.set_state(BroadcastStates.confirming_message)
+            keyboard = InlineKeyboardMarkup(inline_keyboard=[
+                [InlineKeyboardButton(
+                    text="Подтвердить", callback_data='confirm_broadcast')],
+                [InlineKeyboardButton(
+                    text="Отменить", callback_data='cancel_broadcast')]
+            ])
+            await state.update_data(message_id=message.message_id)
+            await message.answer("Подтвердите отправку сообщения", reply_markup=keyboard)
+
+        @self.router.callback_query(F.data == 'confirm_broadcast', BroadcastStates.confirming_message)
+        async def confirm_broadcast(callback: CallbackQuery, state: FSMContext):
+            await callback.answer()
+            data = await state.get_data()
+            message_id = data.get('message_id')
+            users = User.select().where((User.telegram_id != None))
+            semaphore = asyncio.Semaphore(10)
+            for user in users:
+                async with semaphore:
+                    try:
+                        await self.bot.copy_message(user.telegram_id, callback.from_user.id, message_id)
+                    except Exception as e:
+                        logging.error(f"Error while broadcasting message to user {
+                            user.telegram_id}: {e}")
+            await state.clear()
+
+        @self.router.callback_query(F.data == 'cancel_broadcast', BroadcastStates.confirming_message)
+        async def cancel_broadcast(callback: CallbackQuery, state: FSMContext):
+            await callback.answer()
+            await state.clear()
+            await callback.message.answer('Рассылка отменена.')
diff --git a/nwxraybot/meta/router.py b/nwxraybot/meta/router.py
index 9646d7a..3095540 100644
--- a/nwxraybot/meta/router.py
+++ b/nwxraybot/meta/router.py
@@ -9,8 +9,8 @@ class Handler:
 
     def __init__(self, bot: Optional[Bot] = None) -> None:
         if bot:
-            assert isinstance(bot.bot, Optional[Bot])
-            self.bot = bot.bot
+            assert isinstance(bot, Bot)
+            self.bot = bot
         self.router = Router()
 
     def __call__(self) -> Router:
diff --git a/nwxraybot/middlewares/user.py b/nwxraybot/middlewares/user.py
index fefb11b..3ab15c9 100644
--- a/nwxraybot/middlewares/user.py
+++ b/nwxraybot/middlewares/user.py
@@ -14,7 +14,7 @@ class UserMiddleware(BaseMiddleware):
     async def __call__(self, handler: Callable[[Message, Dict[str, Any]], Awaitable[Any]], event: Message, data: Dict[str, Any]) -> Any:
         if event.chat.type != ChatType.PRIVATE:
             return None
-        if event.text.startswith('/start'):
+        if event.text and event.text.startswith('/start'):
             return await handler(event, data)
         user: Optional[User] = User.select().where(
             User.telegram_id == event.from_user.id).first()