0
0
mirror of https://gitflic.ru/project/maks1ms/ocab.git synced 2025-03-13 22:03:50 +03:00

фикс для новых пользователей

This commit is contained in:
Maxim Slipenko 2024-07-14 14:56:16 +03:00
parent 4be5d6fa02
commit 36dbab06d3
2 changed files with 14 additions and 19 deletions

View File

@ -25,11 +25,6 @@ bot_modules = [
FSLoader(f"{paths.modules_standard}/message_processing"), FSLoader(f"{paths.modules_standard}/message_processing"),
] ]
# import logging
# logger = logging.getLogger('peewee')
# logger.addHandler(logging.StreamHandler())
# logger.setLevel(logging.DEBUG)
async def main(): async def main():
bot = None bot = None

View File

@ -1,7 +1,7 @@
from typing import Any, Awaitable, Callable, Dict from typing import Any, Awaitable, Callable, Dict
from aiogram import BaseMiddleware 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 ( from ocab_core.modules_system.public_api import (
get_module, get_module,
@ -36,19 +36,19 @@ class OuterMiddleware(BaseMiddleware):
data: Dict[str, Any], data: Dict[str, Any],
): ):
if not isinstance(event, Message): # if not isinstance(event, Message):
return await handler(event, data) # return await handler(event, data)
#
user = db_api.get_user(event.from_user.id) # user = db_api.get_user(event.from_user.id)
#
if user is None: # if user is None:
return # return
#
roles = Roles() # roles = Roles()
role_name = await roles.get_role_name(role_id=user.user_role) # role_name = await roles.get_role_name(role_id=user.user_role)
#
if role_name not in commands: # if role_name not in commands:
return await handler(event, data) # return await handler(event, data)
# bot_commands = [] # bot_commands = []