refactor(anonflow): adapt to new transport module location

anonflow/app.py

@@ -7,8 +7,14 @@ from aiogram.client.bot import DefaultBotProperties
 from aiogram.fsm.storage.memory import MemoryStorage
 
 from anonflow import __version_str__
-from anonflow.bot.builders.middlewares import build as build_middlewares
-from anonflow.bot.builders.routers import build as build_routers
+from anonflow.bot.builders import (
+    build_middlewares,
+    build_routers
+)
+from anonflow.bot.transport import (
+    DeliveryService,
+    ResponsesRouter
+)
 from anonflow.config import Config
 from anonflow.database import (
     BanRepository,
@@ -23,9 +29,7 @@ from anonflow.moderation import (
     RuleManager
 )
 from anonflow.services import (
-    DeliveryService,
     ModeratorService,
-    ResponsesRouter,
     UserService
 )
 from anonflow.translator import Translator
@@ -174,14 +178,10 @@ class Application:
             self, "_dispatcher", "_config", "_responses_router", "_user_service", "_moderator_service"
         ) as (dispatcher, config, responses_router, user_service, moderator_service):
             middlewares = build_middlewares(
+                config=config,
                 responses_router=responses_router,
                 user_service=user_service,
-                moderator_service=moderator_service,
-                subscription_requirement=config.behavior.subscription_requirement.enabled,
-                subscription_channel_ids=config.behavior.subscription_requirement.channel_ids,
-                throttling=config.behavior.throttling.enabled,
-                throttling_delay=config.behavior.throttling.delay,
-                throttling_allowed_chat_ids=config.forwarding.moderation_chat_ids
+                moderator_service=moderator_service
             )
 
             for middleware in middlewares:

anonflow/bot/routers/media.py

@@ -12,12 +12,12 @@ from aiogram.types import Message
 from anonflow.config.models import ForwardingType
 from anonflow.interfaces import PostResponsesPort
 from anonflow.moderation import ModerationService
-from anonflow.services.transport.content import (
+from anonflow.bot.transport.content import (
     ContentGroup,
     ContentMediaItem,
     MediaType
 )
-from anonflow.services.transport.types import RequestContext
+from anonflow.bot.transport.types import RequestContext
 
 
 class MediaRouter(Router):

anonflow/bot/routers/start.py

@@ -4,7 +4,7 @@ from aiogram.types import Message
 
 from anonflow.services import UserService
 from anonflow.interfaces import UserResponsesPort
-from anonflow.services.transport.types import RequestContext
+from anonflow.bot.transport.types import RequestContext
 
 
 class StartRouter(Router):

anonflow/bot/routers/text.py

@@ -7,8 +7,8 @@ from aiogram.types import Message
 from anonflow.config.models import ForwardingType
 from anonflow.interfaces import PostResponsesPort
 from anonflow.moderation import ModerationService
-from anonflow.services.transport.content import ContentTextItem
-from anonflow.services.transport.types import RequestContext
+from anonflow.bot.transport.content import ContentTextItem
+from anonflow.bot.transport.types import RequestContext
 
 
 class TextRouter(Router):

anonflow/interfaces/post.py

@@ -1,10 +1,10 @@
 from typing import Protocol, Union
 
-from anonflow.services.transport.content import (
+from anonflow.bot.transport.content import (
     ContentGroup,
     ContentItem
 )
-from anonflow.services.transport.types import RequestContext
+from anonflow.bot.transport.types import RequestContext
 
 
 class PostResponsesPort(Protocol):

anonflow/interfaces/user.py

@@ -1,6 +1,6 @@
 from typing import Protocol
 
-from anonflow.services.transport.types import RequestContext
+from anonflow.bot.transport.types import RequestContext
 
 
 class UserResponsesPort(Protocol):

anonflow/moderation/service.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from anonflow.interfaces import PostResponsesPort
-from anonflow.services.transport.types import RequestContext
+from anonflow.bot.transport.types import RequestContext
 
 from .events import ModerationDecisionEvent, ModerationStartedEvent
 from .executor import ModerationExecutor

anonflow/services/__init__.py

@@ -1,10 +1,7 @@
 from .moderator import ModeratorService
-from .transport import DeliveryService, ResponsesRouter
 from .user import UserService
 
 __all__ = [
     "ModeratorService",
-    "DeliveryService",
-    "ResponsesRouter",
     "UserService",
 ]