Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions handlers/player/inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

class InventoryRequest(BaseModel):
target_type: TargetType
target_id: int
campaign_id: int | None = None
target_id: int | UUID
campaign_id: int | UUID | None = None

@classmethod
@field_validator("target_type", mode="before")
Expand Down
15 changes: 15 additions & 0 deletions handlers/player/other_games_character.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from db.models import Campaign, Character, Participation, User
from services.character_data import character_preview_getter
from states.inventory_view import InventoryView, TargetType
from states.other_games_campaign import OtherGamesCampaign
from states.other_games_character import OtherGamesCharacter

Expand Down Expand Up @@ -37,11 +38,25 @@ async def on_campaign_info(c: CallbackQuery, b: Button, m: DialogManager):
)


async def on_inventory(c: CallbackQuery, b: Button, m: DialogManager):
character = await Character.get(id=m.start_data["character_id"]).prefetch_related("campaign")
campaign: Campaign = character.campaign
await m.start(
InventoryView.view,
data={
"target_type": TargetType.CHARACTER,
"target_id": m.start_data["character_id"],
"campaign_id": campaign.id,
},
)


router.include_router(
Dialog(
Window(
DynamicMedia("avatar", when="avatar"),
Format("{character_data_preview}", when="character_data_preview"),
Button(Const("Посмотреть инвентарь"), id="inventory", on_click=on_inventory),
Button(Const("Информация о кампании"), id="campaign_info", on_click=on_campaign_info),
Cancel(Const("Назад")),
getter=character_data_getter,
Expand Down