From c1cf1008980854dab8be83a297da3d472fd2046e Mon Sep 17 00:00:00 2001 From: Jage9 Date: Sat, 28 Feb 2026 20:09:52 -0500 Subject: [PATCH] Refine confirm menu speech and item action notifications --- client/public/version.js | 2 +- client/src/main.ts | 2 - server/app/server.py | 28 ++++++++- server/tests/test_server_message_handling.py | 66 ++++++++++++++++++++ 4 files changed, 93 insertions(+), 5 deletions(-) diff --git a/client/public/version.js b/client/public/version.js index cacce6e..6c68ddc 100644 --- a/client/public/version.js +++ b/client/public/version.js @@ -1,5 +1,5 @@ // Maintainer-controlled web client version. // Format: YYYY.MM.DD Rn (example: 2026.02.20 R2) -window.CHGRID_WEB_VERSION = "2026.02.28 R319"; +window.CHGRID_WEB_VERSION = "2026.03.01 R320"; // Optional display timezone for timestamps. Falls back to America/Detroit if unset/invalid. window.CHGRID_TIME_ZONE = "America/Detroit"; diff --git a/client/src/main.ts b/client/src/main.ts index 78278af..4a2a50b 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -2973,7 +2973,6 @@ function handleConfirmYesNoModeInput(code: string, key: string): void { const control = handleYesNoMenuInput(code, key, itemManagementConfirmIndex); if (control.type === 'move') { itemManagementConfirmIndex = control.index; - updateStatus(`${itemManagementConfirmContext.prompt} ${YES_NO_OPTIONS[itemManagementConfirmIndex].label}.`); audio.sfxUiBlip(); return; } @@ -3288,7 +3287,6 @@ function handleAdminUserDeleteConfirmModeInput(code: string, key: string): void const control = handleYesNoMenuInput(code, key, adminDeleteConfirmIndex); if (control.type === 'move') { adminDeleteConfirmIndex = control.index; - updateStatus(`Delete account ${adminSelectedUsername}? ${YES_NO_OPTIONS[adminDeleteConfirmIndex].label}.`); audio.sfxUiBlip(); return; } diff --git a/server/app/server.py b/server/app/server.py index 4add5e3..ab1adf7 100644 --- a/server/app/server.py +++ b/server/app/server.py @@ -2474,7 +2474,16 @@ class SignalingServer: self.item_last_use_ms.pop(item.id, None) await self._broadcast(ItemRemovePacket(type="item_remove", itemId=item.id)) self._request_state_save() - await self._send_item_result(client, True, "delete", f"Deleted {item.title}.", item.id) + item_text = f"{item.title} ({self._item_type_label(item)})" + await self._broadcast( + BroadcastChatMessagePacket( + type="chat_message", + message=f"{client.nickname} deleted {item_text}.", + system=True, + ), + exclude=client.websocket, + ) + await self._send_item_result(client, True, "delete", f"You deleted {item_text}.", item.id) return if isinstance(packet, ItemTransferPacket): @@ -2512,7 +2521,22 @@ class SignalingServer: 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) + item_text = f"{item.title} ({self._item_type_label(item)})" + await self._broadcast( + BroadcastChatMessagePacket( + type="chat_message", + message=f"{client.nickname} transferred {item_text} to {target.nickname}.", + system=True, + ), + exclude=client.websocket, + ) + await self._send_item_result( + client, + True, + "transfer", + f"You transferred {item_text} to {target.nickname}.", + item.id, + ) return if isinstance(packet, ItemUsePacket): diff --git a/server/tests/test_server_message_handling.py b/server/tests/test_server_message_handling.py index 527f114..b2d62b4 100644 --- a/server/tests/test_server_message_handling.py +++ b/server/tests/test_server_message_handling.py @@ -361,6 +361,7 @@ async def test_item_transfer_updates_item_owner(monkeypatch: pytest.MonkeyPatch) send_payloads: list[object] = [] broadcasted_items: list[object] = [] + broadcast_payloads: list[object] = [] async def fake_send(websocket: ServerConnection, packet: object) -> None: send_payloads.append(packet) @@ -368,8 +369,12 @@ async def test_item_transfer_updates_item_owner(monkeypatch: pytest.MonkeyPatch) async def fake_broadcast_item(broadcast_item: object) -> None: broadcasted_items.append(broadcast_item) + async def fake_broadcast(packet: object, exclude: ServerConnection | None = None) -> None: + broadcast_payloads.append(packet) + monkeypatch.setattr(server, "_send", fake_send) monkeypatch.setattr(server, "_broadcast_item", fake_broadcast_item) + monkeypatch.setattr(server, "_broadcast", fake_broadcast) await server._handle_message(owner, json.dumps({"type": "item_transfer", "itemId": item.id, "targetId": target.id})) @@ -381,6 +386,67 @@ async def test_item_transfer_updates_item_owner(monkeypatch: pytest.MonkeyPatch) assert result.type == "item_action_result" assert result.ok is True assert result.action == "transfer" + assert "you transferred" in result.message.lower() + assert broadcast_payloads + assert getattr(broadcast_payloads[-1], "type", "") == "chat_message" + assert "owner transferred" in getattr(broadcast_payloads[-1], "message", "").lower() + + +@pytest.mark.asyncio +async def test_item_delete_sends_others_notification(monkeypatch: pytest.MonkeyPatch) -> None: + server = SignalingServer("127.0.0.1", 8765, None, None, grid_size=41) + owner_ws = _fake_ws() + watcher_ws = _fake_ws() + owner = ClientConnection( + websocket=owner_ws, + id="u1", + nickname="owner", + authenticated=True, + user_id="1", + username="owner_user", + permissions={"item.delete.own"}, + x=5, + y=6, + ) + watcher = ClientConnection( + websocket=watcher_ws, + id="u2", + nickname="watcher", + authenticated=True, + user_id="2", + username="watcher_user", + permissions=set(), + x=5, + y=6, + ) + server.clients[owner_ws] = owner + server.clients[watcher_ws] = watcher + 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] = [] + broadcast_payloads: list[object] = [] + + async def fake_send(websocket: ServerConnection, packet: object) -> None: + send_payloads.append(packet) + + async def fake_broadcast(packet: object, exclude: ServerConnection | None = None) -> None: + broadcast_payloads.append(packet) + + monkeypatch.setattr(server, "_send", fake_send) + monkeypatch.setattr(server, "_broadcast", fake_broadcast) + + await server._handle_message(owner, json.dumps({"type": "item_delete", "itemId": item.id})) + + result_packets = [packet for packet in send_payloads if getattr(packet, "type", "") == "item_action_result"] + assert result_packets + assert result_packets[-1].ok is True + assert "you deleted" in result_packets[-1].message.lower() + chat_packets = [packet for packet in broadcast_payloads if getattr(packet, "type", "") == "chat_message"] + assert chat_packets + assert "owner deleted" in getattr(chat_packets[-1], "message", "").lower() @pytest.mark.asyncio