Bläddra i källkod

refactor: rename blocked middleware and its result object to banned, update related modules

Librellium 3 veckor sedan
förälder
incheckning
5e6c22c113

+ 2 - 2
anonflow/bot/builders/middleware.py

@@ -9,7 +9,7 @@ from anonflow.services import (
 )
 
 from anonflow.bot.middleware import (
-    BlockedMiddleware,
+    BannedMiddleware,
     NotRegisteredMiddleware,
     SubscriptionMiddleware,
     ThrottlingMiddleware
@@ -30,7 +30,7 @@ def build(
     middlewares = []
 
     middlewares.append(
-        BlockedMiddleware(
+        BannedMiddleware(
             message_router=message_router,
             moderator_service=moderator_service
         )

+ 2 - 2
anonflow/bot/middleware/__init__.py

@@ -1,10 +1,10 @@
-from .blocked import BlockedMiddleware
+from .banned import BannedMiddleware
 from .not_registered import NotRegisteredMiddleware
 from .subscription import SubscriptionMiddleware
 from .throttling import ThrottlingMiddleware
 
 __all__ = [
-    "BlockedMiddleware",
+    "BannedMiddleware",
     "NotRegisteredMiddleware",
     "SubscriptionMiddleware",
     "ThrottlingMiddleware"

+ 3 - 3
anonflow/bot/middleware/blocked.py → anonflow/bot/middleware/banned.py

@@ -2,10 +2,10 @@ from aiogram import BaseMiddleware
 from aiogram.types import Message
 
 from anonflow.services import MessageRouter, ModeratorService
-from anonflow.services.transport.results import UserBlockedResult
+from anonflow.services.transport.results import UserBannedResult
 
 
-class BlockedMiddleware(BaseMiddleware):
+class BannedMiddleware(BaseMiddleware):
     def __init__(self, message_router: MessageRouter, moderator_service: ModeratorService):
         super().__init__()
 
@@ -16,7 +16,7 @@ class BlockedMiddleware(BaseMiddleware):
         message = getattr(event, "message", None)
         if isinstance(message, Message):
             if await self.moderator_service.is_banned(message.chat.id):
-                await self.message_router.dispatch(UserBlockedResult(), message)
+                await self.message_router.dispatch(UserBannedResult(), message)
                 return
 
         return await handler(event, data)

+ 2 - 2
anonflow/services/transport/results.py

@@ -31,7 +31,7 @@ class ModerationStartedResult(Result):
     pass
 
 @dataclass(frozen=True)
-class UserBlockedResult(Result):
+class UserBannedResult(Result):
     pass
 
 @dataclass(frozen=True)
@@ -52,7 +52,7 @@ Results: TypeAlias = Union[
     PostPreparedResult,
     ModerationDecisionResult,
     ModerationStartedResult,
-    UserBlockedResult,
+    UserBannedResult,
     UserSubscriptionRequiredResult,
     UserThrottledResult,
     UserNotRegisteredResult

+ 3 - 3
anonflow/services/transport/router.py

@@ -15,7 +15,7 @@ from .results import (
     ModerationDecisionResult,
     ModerationStartedResult,
     PostPreparedResult,
-    UserBlockedResult,
+    UserBannedResult,
     UserNotRegisteredResult,
     UserSubscriptionRequiredResult,
     UserThrottledResult
@@ -45,7 +45,7 @@ class MessageRouter:
             PostPreparedResult: self._handle_post_prepared,
             ModerationStartedResult: self._handle_moderation_started,
             ModerationDecisionResult: self._handle_moderation_decision,
-            UserBlockedResult: self._handle_user_blocked,
+            UserBannedResult: self._handle_user_banned,
             UserNotRegisteredResult: self._handle_user_not_registered,
             UserSubscriptionRequiredResult: self._handle_user_subscription_required,
             UserThrottledResult: self._handle_user_throttled
@@ -112,7 +112,7 @@ class MessageRouter:
                 _("messages.user.moderation_rejected", message=message)
             )
 
-    async def _handle_user_blocked(self, result: UserBlockedResult, message: Message, _):
+    async def _handle_user_banned(self, result: UserBannedResult, message: Message, _):
         await self.delivery_service.send_text(message.chat.id, _("messages.user.blocked", message))
 
     async def _handle_user_not_registered(self, result: UserNotRegisteredResult, message: Message, _):