Talon/chat_grid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add z item management menu with transfer and yes/no confirmation

Browse Source
This commit is contained in:
Jage9
2026-02-28 05:11:49 -05:00
parent 8a2b95ce68
commit b0fa040d33
14 changed files with 476 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/app/models.py
View File

@@ -132,6 +132,12 @@ class ItemDeletePacket(BasePacket):
itemId: str
class ItemTransferPacket(BasePacket):
type: Literal["item_transfer"]
itemId: str
targetId: str
class ItemUsePacket(BasePacket):
type: Literal["item_use"]
itemId: str
@@ -186,6 +192,7 @@ ClientPacket = (
| ItemPickupPacket
| ItemDropPacket
| ItemDeletePacket
| ItemTransferPacket
| ItemUsePacket
| ItemSecondaryUsePacket
| ItemPianoNotePacket
@@ -348,7 +355,7 @@ class ItemRemovePacket(BasePacket):
class ItemActionResultPacket(BasePacket):
type: Literal["item_action_result"]
ok: bool
action: Literal["add", "pickup", "drop", "delete", "use", "secondary_use", "update"]
action: Literal["add", "pickup", "drop", "delete", "transfer", "use", "secondary_use", "update"]
message: str
itemId: str | None = None

41
server/app/server.py
View File

@@ -86,6 +86,7 @@ from .models import (
ItemPickupPacket,
ItemRemovePacket,
ItemSecondaryUsePacket,
ItemTransferPacket,
ItemUpdatePacket,
ItemUpsertPacket,
ItemUsePacket,
@@ -1240,7 +1241,7 @@ class SignalingServer:
self,
client: ClientConnection,
ok: bool,
action: Literal["add", "pickup", "drop", "delete", "use", "secondary_use", "update"],
action: Literal["add", "pickup", "drop", "delete", "transfer", "use", "secondary_use", "update"],
message: str,
item_id: str | None = None,
) -> None:
@@ -2443,6 +2444,44 @@ class SignalingServer:
await self._send_item_result(client, True, "delete", f"Deleted {item.title}.", item.id)
return
if isinstance(packet, ItemTransferPacket):
item = self.items.get(packet.itemId)
if not item:
await self._send_item_result(client, False, "transfer", "Item not found.")
return
if item.carrierId:
await self._send_item_result(client, False, "transfer", "Item cannot be transferred while carried.", item.id)
return
if item.x != client.x or item.y != client.y:
await self._send_item_result(client, False, "transfer", "Item is not on your square.", item.id)
return
can_transfer_any = self._client_has_permission(client, "item.transfer.any")
can_transfer_own = self._client_has_permission(client, "item.transfer.own") and self._owns_item(client, item)
if not can_transfer_any and not can_transfer_own:
await self._send_item_result(client, False, "transfer", "Not authorized to transfer this item.", item.id)
return
target = self._get_client_by_id(packet.targetId)
if not target or not target.authenticated or not target.user_id:
await self._send_item_result(client, False, "transfer", "Target user is not available.", item.id)
return
if target.id == client.id:
await self._send_item_result(client, False, "transfer", "Cannot transfer an item to yourself.", item.id)
return
if item.createdBy == target.user_id:
await self._send_item_result(client, False, "transfer", "Item already belongs to that user.", item.id)
return
item.createdBy = target.user_id
item.createdByName = target.username or target.nickname
item.updatedAt = self.item_service.now_ms()
actor_id, actor_name = self._item_updated_actor(client)
item.updatedBy = actor_id
item.updatedByName = actor_name
item.version += 1
await self._broadcast_item(item)
self._request_state_save()
await self._send_item_result(client, True, "transfer", f"Transferred {item.title} to {target.nickname}.", item.id)
return
if isinstance(packet, ItemUsePacket):
if not self._client_has_permission(client, "item.use"):
await self._send_item_result(client, False, "use", "Not authorized to use items.")

6
server/tests/test_models.py
View File

@@ -30,3 +30,9 @@ def test_item_piano_recording_packet_validates() -> None:
assert packet.type == "item_piano_recording"
stop_packet = adapter.validate_python({"type": "item_piano_recording", "itemId": "p1", "action": "stop_record"})
assert stop_packet.type == "item_piano_recording"
def test_item_transfer_packet_validates() -> None:
adapter = TypeAdapter(ClientPacket)
packet = adapter.validate_python({"type": "item_transfer", "itemId": "i1", "targetId": "u2"})
assert packet.type == "item_transfer"

110
server/tests/test_server_message_handling.py
View File

@@ -325,6 +325,116 @@ async def test_item_drop_rejects_out_of_bounds(monkeypatch: pytest.MonkeyPatch)
assert "out of bounds" in send_payloads[-1].message.lower()
@pytest.mark.asyncio
async def test_item_transfer_updates_item_owner(monkeypatch: pytest.MonkeyPatch) -> None:
server = SignalingServer("127.0.0.1", 8765, None, None, grid_size=41)
owner_ws = _fake_ws()
target_ws = _fake_ws()
owner = ClientConnection(
websocket=owner_ws,
id="u1",
nickname="owner",
authenticated=True,
user_id="1",
username="owner_user",
permissions={"item.transfer.own"},
x=5,
y=6,
)
target = ClientConnection(
websocket=target_ws,
id="u2",
nickname="target",
authenticated=True,
user_id="2",
username="target_user",
permissions=set(),
x=10,
y=10,
)
server.clients[owner_ws] = owner
server.clients[target_ws] = target
item = server.item_service.default_item(owner, "dice")
item.x = owner.x
item.y = owner.y
server.item_service.add_item(item)
send_payloads: list[object] = []
broadcasted_items: list[object] = []
async def fake_send(websocket: ServerConnection, packet: object) -> None:
send_payloads.append(packet)
async def fake_broadcast_item(broadcast_item: object) -> None:
broadcasted_items.append(broadcast_item)
monkeypatch.setattr(server, "_send", fake_send)
monkeypatch.setattr(server, "_broadcast_item", fake_broadcast_item)
await server._handle_message(owner, json.dumps({"type": "item_transfer", "itemId": item.id, "targetId": target.id}))
assert item.createdBy == target.user_id
assert item.createdByName == target.username
assert broadcasted_items
assert send_payloads
result = send_payloads[-1]
assert result.type == "item_action_result"
assert result.ok is True
assert result.action == "transfer"
@pytest.mark.asyncio
async def test_item_transfer_rejects_when_not_authorized(monkeypatch: pytest.MonkeyPatch) -> None:
server = SignalingServer("127.0.0.1", 8765, None, None, grid_size=41)
owner_ws = _fake_ws()
target_ws = _fake_ws()
owner = ClientConnection(
websocket=owner_ws,
id="u1",
nickname="owner",
authenticated=True,
user_id="1",
username="owner_user",
permissions={"item.use"},
x=5,
y=6,
)
target = ClientConnection(
websocket=target_ws,
id="u2",
nickname="target",
authenticated=True,
user_id="2",
username="target_user",
permissions=set(),
x=10,
y=10,
)
server.clients[owner_ws] = owner
server.clients[target_ws] = target
item = server.item_service.default_item(owner, "dice")
item.x = owner.x
item.y = owner.y
server.item_service.add_item(item)
send_payloads: list[object] = []
async def fake_send(websocket: ServerConnection, packet: object) -> None:
send_payloads.append(packet)
monkeypatch.setattr(server, "_send", fake_send)
await server._handle_message(owner, json.dumps({"type": "item_transfer", "itemId": item.id, "targetId": target.id}))
assert item.createdBy == owner.user_id
assert send_payloads
result = send_payloads[-1]
assert result.type == "item_action_result"
assert result.ok is False
assert result.action == "transfer"
assert "not authorized" in result.message.lower()
@pytest.mark.asyncio
async def test_broadcast_fanout_is_concurrent(monkeypatch: pytest.MonkeyPatch) -> None:
server = SignalingServer("127.0.0.1", 8765, None, None)