#82

shvatka/tgbot/dialogs/starters/game_spy.py

@@ -2,24 +2,34 @@
 from aiogram.filters import Command
 
 from shvatka.tgbot import states
+from shvatka.tgbot.filters.is_org import is_org_on_running_game, is_org
 from shvatka.tgbot.utils.router import register_start_handler
-from shvatka.tgbot.views.commands import SPY_COMMAND, SPY_LEVELS_COMMAND, SPY_KEYS_COMMAND
+from shvatka.tgbot.views.commands import SPY_COMMAND, SPY_LEVELS_COMMAND, SPY_KEYS_COMMAND, START_COMMAND
 
 
 def setup() -> Router:
     router = Router(name=__name__)
     register_start_handler(
         Command(commands=SPY_COMMAND),
+        is_org,
         state=states.OrgSpySG.main,
-        router=router,  # TODO is_org
+        router=router,
+    )
+    register_start_handler(
+        Command(commands=START_COMMAND),
+        is_org_on_running_game,
+        state=states.OrgSpySG.main,
+        router=router,
     )
     register_start_handler(
-        Command(commands=SPY_LEVELS_COMMAND),  # TODO is_org
+        Command(commands=SPY_LEVELS_COMMAND),
+        is_org,
         state=states.OrgSpySG.spy,
         router=router,
     )
     register_start_handler(
-        Command(commands=SPY_KEYS_COMMAND),  # TODO is_org
+        Command(commands=SPY_KEYS_COMMAND),
+        is_org,
         state=states.OrgSpySG.keys,
         router=router,
     )

shvatka/tgbot/filters/is_org.py

@@ -0,0 +1,18 @@
+from aiogram.types import Message
+
+from shvatka.core.models import dto
+from shvatka.core.services.organizers import get_by_player
+from shvatka.infrastructure.db.dao.holder import HolderDao
+
+
+async def is_org_on_running_game(_: Message, player: dto.Player, game: dto.Game, dao: HolderDao):
+    if game is None or not game.is_started():
+        return False
+    return await is_org(_, player=player, game=game, dao=dao)
+
+
+async def is_org(_: Message, player: dto.Player, game: dto.Game, dao: HolderDao):
+    org = await get_by_player(player=player, game=game, dao=dao.organizer)
+    if org is None or org.deleted:
+        return False
+    return {"org": org}

shvatka/tgbot/utils/router.py

@@ -1,4 +1,7 @@
+from typing import Callable
+
 from aiogram import Router, Dispatcher
+from aiogram.dispatcher.event.handler import CallbackType
 from aiogram.filters import Filter
 from aiogram.fsm.state import State
 from aiogram.types import Message
@@ -20,7 +23,7 @@ def disable_router_on_game(router: Router):
 
 
 def register_start_handler(
-    *filters: Filter,
+    *filters: CallbackType,
     state: State,
     router: Router,
     mode: StartMode = StartMode.NORMAL,