Merge pull request #24 from librellium/refactor/dedicated-bot-builders

Refactor/dedicated bot builders

anonflow/app.py

@@ -7,8 +7,8 @@ from aiogram.client.bot import DefaultBotProperties
 from aiogram.fsm.storage.memory import MemoryStorage
 
 from anonflow import __version_str__
-from anonflow.bot.middleware import build as build_middleware
-from anonflow.bot.routers import build as build_routers
+from anonflow.bot.builders.middleware import build as build_middleware
+from anonflow.bot.builders.routers import build as build_routers
 from anonflow.config import Config
 from anonflow.database import (
     BanRepository,

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

@@ -8,10 +8,12 @@ from anonflow.services import (
     UserService
 )
 
-from .blocked import BlockedMiddleware
-from .not_registered import NotRegisteredMiddleware
-from .subscription import SubscriptionMiddleware
-from .throttling import ThrottlingMiddleware
+from anonflow.bot.middleware import (
+    BlockedMiddleware,
+    NotRegisteredMiddleware,
+    SubscriptionMiddleware,
+    ThrottlingMiddleware
+)
 
 def build(
     message_router: MessageRouter,

anonflow/bot/routers/build.py → anonflow/bot/builders/routers.py

@@ -4,10 +4,12 @@ from anonflow.config import Config
 from anonflow.moderation import ModerationExecutor
 from anonflow.services import MessageRouter
 
-from .info import InfoRouter
-from .media import MediaRouter
-from .start import StartRouter
-from .text import TextRouter
+from anonflow.bot.routers import (
+    InfoRouter,
+    MediaRouter,
+    StartRouter,
+    TextRouter
+)
 
 def build(
     config: Config,

anonflow/bot/middleware/__init__.py

@@ -1,3 +1,11 @@
-from .build import build
+from .blocked import BlockedMiddleware
+from .not_registered import NotRegisteredMiddleware
+from .subscription import SubscriptionMiddleware
+from .throttling import ThrottlingMiddleware
 
-__all__ = ["build"]
+__all__ = [
+    "BlockedMiddleware",
+    "NotRegisteredMiddleware",
+    "SubscriptionMiddleware",
+    "ThrottlingMiddleware"
+]

anonflow/bot/routers/__init__.py

@@ -1,3 +1,11 @@
-from .build import build
+from .info import InfoRouter
+from .media import MediaRouter
+from .start import StartRouter
+from .text import TextRouter
 
-__all__ = ["build"]
+__all__ = [
+    "InfoRouter",
+    "MediaRouter",
+    "StartRouter",
+    "TextRouter"
+]