refactor(bot-builders): adapt to new ResponsesRouter and add language middleware

anonflow/bot/builders/middleware.py → anonflow/bot/builders/middlewares.py

@@ -3,20 +3,21 @@ from typing import Tuple
 from aiogram.types import ChatIdUnion
 
 from anonflow.services import (
-    MessageRouter,
     ModeratorService,
+    ResponsesRouter,
     UserService
 )
 
-from anonflow.bot.middleware import (
+from anonflow.bot.middlewares import (
     BannedMiddleware,
+    LanguageMiddleware,
     NotRegisteredMiddleware,
     SubscriptionMiddleware,
     ThrottlingMiddleware
 )
 
 def build(
-    message_router: MessageRouter,
+    responses_router: ResponsesRouter,
     user_service: UserService,
     moderator_service: ModeratorService,
 
@@ -29,9 +30,15 @@ def build(
 ):
     middlewares = []
 
+    middlewares.append(
+        LanguageMiddleware(
+            user_service=user_service
+        )
+    )
+
     middlewares.append(
         BannedMiddleware(
-            message_router=message_router,
+            responses_port=responses_router,
             moderator_service=moderator_service
         )
     )
@@ -39,14 +46,14 @@ def build(
     if subscription_requirement:
         middlewares.append(
             SubscriptionMiddleware(
-                channel_ids=subscription_channel_ids,
-                message_router=message_router
+                responses_port=responses_router,
+                channel_ids=subscription_channel_ids
             )
         )
 
     middlewares.append(
         NotRegisteredMiddleware(
-            message_router=message_router,
+            responses_port=responses_router,
             user_service=user_service
         )
     )
@@ -54,7 +61,7 @@ def build(
     if throttling:
         middlewares.append(
             ThrottlingMiddleware(
-                message_router=message_router,
+                responses_port=responses_router,
                 delay=throttling_delay,
                 allowed_chat_ids=throttling_allowed_chat_ids
             )

anonflow/bot/builders/routers.py

@@ -1,11 +1,10 @@
 from aiogram import Router
 
 from anonflow.config import Config
-from anonflow.moderation import ModerationExecutor
-from anonflow.services import MessageRouter, ModeratorService, UserService
+from anonflow.moderation import ModerationService
+from anonflow.services import ModeratorService, ResponsesRouter, UserService
 
 from anonflow.bot.routers import (
-    InfoRouter,
     MediaRouter,
     StartRouter,
     TextRouter
@@ -13,28 +12,27 @@ from anonflow.bot.routers import (
 
 def build(
     config: Config,
-    message_router: MessageRouter,
+    responses_router: ResponsesRouter,
     user_service: UserService,
     moderator_service: ModeratorService,
-    moderation_executor: ModerationExecutor,
+    moderation_service: ModerationService,
 ) -> Router:
     main_router = Router()
 
     routers = [
         StartRouter(
-            message_router=message_router,
+            responses_port=responses_router,
             user_service=user_service
         ),
-        InfoRouter(message_router=message_router),
         TextRouter(
-            message_router=message_router,
-            forwarding_types=config.forwarding.types,
-            moderation_executor=moderation_executor
+            responses_port=responses_router,
+            moderation_service=moderation_service,
+            forwarding_types=config.forwarding.types
         ),
         MediaRouter(
-            message_router=message_router,
+            responses_port=responses_router,
+            moderation_service=moderation_service,
             forwarding_types=config.forwarding.types,
-            moderation_executor=moderation_executor
         ),
     ]