From 36dbab06d37024ea452962f1483b9f9a6390cebd Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Sun, 14 Jul 2024 14:56:16 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ocab_core/main.py | 5 ---- .../standard/command_helper/main.py | 28 +++++++++---------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/ocab_core/main.py b/src/ocab_core/main.py index ce311fd..e92c9ab 100644 --- a/src/ocab_core/main.py +++ b/src/ocab_core/main.py @@ -25,11 +25,6 @@ bot_modules = [ FSLoader(f"{paths.modules_standard}/message_processing"), ] -# import logging -# logger = logging.getLogger('peewee') -# logger.addHandler(logging.StreamHandler()) -# logger.setLevel(logging.DEBUG) - async def main(): bot = None diff --git a/src/ocab_modules/standard/command_helper/main.py b/src/ocab_modules/standard/command_helper/main.py index 190d102..1032eca 100644 --- a/src/ocab_modules/standard/command_helper/main.py +++ b/src/ocab_modules/standard/command_helper/main.py @@ -1,7 +1,7 @@ from typing import Any, Awaitable, Callable, Dict from aiogram import BaseMiddleware -from aiogram.types import BotCommand, Message, TelegramObject +from aiogram.types import BotCommand, TelegramObject from ocab_core.modules_system.public_api import ( get_module, @@ -36,19 +36,19 @@ class OuterMiddleware(BaseMiddleware): data: Dict[str, Any], ): - if not isinstance(event, Message): - return await handler(event, data) - - user = db_api.get_user(event.from_user.id) - - if user is None: - return - - roles = Roles() - role_name = await roles.get_role_name(role_id=user.user_role) - - if role_name not in commands: - return await handler(event, data) + # if not isinstance(event, Message): + # return await handler(event, data) + # + # user = db_api.get_user(event.from_user.id) + # + # if user is None: + # return + # + # roles = Roles() + # role_name = await roles.get_role_name(role_id=user.user_role) + # + # if role_name not in commands: + # return await handler(event, data) # bot_commands = []