From f627cdc785e94e98a81357a6b7ee92cb1ed73e18 Mon Sep 17 00:00:00 2001 From: Anatoliy Esherkin Date: Thu, 12 Mar 2026 10:50:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=A1,=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE?= =?UTF-8?q?=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BE=D1=82=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B1=D0=B5=D0=BB=D1=8B?= =?UTF-8?q?=D1=85=20=D0=B8=20=D1=87=D1=91=D1=80=D0=BD=D1=8B=D1=85=20=D1=81?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/telegrambot/bot.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/telegrambot/bot.py b/src/telegrambot/bot.py index c89891d..dcc280f 100644 --- a/src/telegrambot/bot.py +++ b/src/telegrambot/bot.py @@ -13,6 +13,7 @@ class TelegramBot: self.enabled = enabled self.db_pool = db_pool self.whitelist_ids = whitelist_ids if whitelist_ids is not None else [] + self.blacklist_ids = blacklist_ids if blacklist_ids is not None else [] self.logger = logging.getLogger(__name__) self.msg_types = Static().BotMessageTypes() @@ -46,11 +47,16 @@ class TelegramBot: async def handle_register(message): tg_id = str(message.from_user.id) - # Проверка ID на наличие в белом списке - if tg_id not in self.whitelist_ids: - await self.bot.send_message(message.chat.id, self.get_bot_message(self.msg_types.ID_NOT_WHITELISTED)) - return - + # Проверка ID на наличие в белом списке и в чёрном списке + if whitelist_enabled: + if tg_id not in self.whitelist_ids: + await self.bot.send_message(message.chat.id, self.get_bot_message(self.msg_types.ID_NOT_WHITELISTED)) + return + elif blacklist_enabled: + if tg_id in self.blacklist_ids: + await self.bot.send_message(message.chat.id, self.get_bot_message(self.msg_types.ID_BLACKLISTED)) + return + async with self.db_pool.acquire() as conn: async with conn.cursor() as cursor: # Проверка на существование @@ -127,4 +133,4 @@ class TelegramBot: chat_id, self.get_bot_message(self.msg_types.INCOMING_CODE).format(phone=phone, code=code) ) except Exception as e: - self.logger.error(f"Ошибка отправки кода в Telegram: {e}") \ No newline at end of file + self.logger.error(f"Ошибка отправки кода в Telegram: {e}")