Update

tgbot/middlewares/__init__.py

@@ -1,8 +1,8 @@
 # - *- coding: utf- 8 - *-
 from aiogram import Dispatcher
 
-from tgbot.middlewares.exists_user import ExistsUserMiddleware
-from tgbot.middlewares.throttling import ThrottlingMiddleware
+from tgbot.middlewares.middleware_user import ExistsUserMiddleware
+from tgbot.middlewares.middleware_throttling import ThrottlingMiddleware
 
 
 # Регистрация всех миддлварей

tgbot/middlewares/middleware_throttling.py

@@ -21,6 +21,9 @@ class ThrottlingMiddleware(BaseMiddleware):
         if get_flag(data, "rate") is not None:
             self.default_rate = get_flag(data, "rate")
 
+        if self.default_rate == 0:
+            return await handler(event, data)
+
         if this_user.id not in self.users:
             self.users[this_user.id] = {
                 'last_throttled': int(time.time()),

tgbot/middlewares/middleware_user.py

@@ -1,7 +1,7 @@
 # - *- coding: utf- 8 - *-
 from aiogram import BaseMiddleware
 
-from tgbot.services.api_sqlite import get_userx, add_userx, update_userx
+from tgbot.database.db_users import Userx
 from tgbot.utils.const_functions import clear_html
 
 
@@ -11,7 +11,7 @@ class ExistsUserMiddleware(BaseMiddleware):
         this_user = data.get("event_from_user")
 
         if not this_user.is_bot:
-            get_user = get_userx(user_id=this_user.id)
+            get_user = Userx.get(user_id=this_user.id)
 
             user_id = this_user.id
             user_login = this_user.username
@@ -29,20 +29,20 @@ class ExistsUserMiddleware(BaseMiddleware):
             if len(user_surname) >= 1: user_fullname += f" {user_surname}"
 
             if get_user is None:
-                add_userx(user_id, user_login.lower(), user_name, user_surname, user_fullname)
+                Userx.add(user_id, user_login.lower(), user_name, user_surname, user_fullname)
             else:
-                if user_name != get_user['user_name']:
-                    update_userx(get_user['user_id'], user_name=user_name)
+                if user_name != get_user.user_name:
+                    Userx.update(get_user.user_id, user_name=user_name)
 
-                if user_surname != get_user['user_surname']:
-                    update_userx(get_user['user_id'], user_surname=user_surname)
+                if user_surname != get_user.user_surname:
+                    Userx.update(get_user.user_id, user_surname=user_surname)
 
-                if user_fullname != get_user['user_fullname']:
-                    update_userx(get_user['user_id'], user_fullname=user_fullname)
+                if user_fullname != get_user.user_fullname:
+                    Userx.update(get_user.user_id, user_fullname=user_fullname)
 
-                if user_login.lower() != get_user['user_login']:
-                    update_userx(get_user['user_id'], user_login=user_login.lower())
+                if user_login.lower() != get_user.user_login:
+                    Userx.update(get_user.user_id, user_login=user_login.lower())
 
-            data['my_user'] = get_userx(user_id=user_id)
+            data['User'] = Userx.get(user_id=user_id)
 
         return await handler(event, data)