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

Support account-wide item transfer targets and fix delete confirm exit

Browse Source
This commit is contained in:
Jage9
2026-02-28 20:24:37 -05:00
parent 9fe9c6da4d
commit daab7bb759
9 changed files with 308 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/app/auth_service.py
View File

@@ -241,6 +241,18 @@ class AuthService:
return permission_key in self.get_user_permissions(user_id)
def get_username_by_id(self, user_id: str) -> str | None:
"""Return username for one numeric user id, or None when not found."""
try:
user_id_value = int(user_id)
except (TypeError, ValueError):
return None
row = self._db_fetchone("SELECT username FROM users WHERE id = ?", (user_id_value,))
if row is None:
return None
return str(row["username"])
def list_roles_with_counts(self) -> list[dict[str, object]]:
"""Return all roles with permission sets and assigned-user counts."""

21
server/app/models.py
View File

@@ -140,7 +140,13 @@ class ItemDeletePacket(BasePacket):
class ItemTransferPacket(BasePacket):
type: Literal["item_transfer"]
itemId: str
targetId: str
targetId: str | None = None
targetUserId: str | None = None
class ItemTransferTargetsPacket(BasePacket):
type: Literal["item_transfer_targets"]
itemId: str
class ItemUsePacket(BasePacket):
@@ -199,6 +205,7 @@ ClientPacket = (
| ItemDropPacket
| ItemDeletePacket
| ItemTransferPacket
| ItemTransferTargetsPacket
| ItemUsePacket
| ItemSecondaryUsePacket
| ItemPianoNotePacket
@@ -367,6 +374,18 @@ class ItemActionResultPacket(BasePacket):
itemId: str | None = None
class ItemTransferTargetSummary(BaseModel):
userId: str
username: str
online: bool
class ItemTransferTargetsResultPacket(BasePacket):
type: Literal["item_transfer_targets"]
itemId: str
targets: list[ItemTransferTargetSummary]
class ItemUseSoundPacket(BasePacket):
type: Literal["item_use_sound"]
itemId: str

76
server/app/server.py
View File

@@ -88,6 +88,8 @@ from .models import (
ItemRemovePacket,
ItemSecondaryUsePacket,
ItemTransferPacket,
ItemTransferTargetsPacket,
ItemTransferTargetsResultPacket,
ItemUpdatePacket,
ItemUpsertPacket,
ItemUsePacket,
@@ -2486,6 +2488,47 @@ class SignalingServer:
await self._send_item_result(client, True, "delete", f"You deleted {item_text}.", item.id)
return
if isinstance(packet, ItemTransferTargetsPacket):
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
users = self.auth_service.list_users_for_admin()
connected_user_ids = {
other.user_id
for other in self.clients.values()
if other.authenticated and other.user_id
}
targets = [
{
"userId": str(entry["id"]),
"username": str(entry["username"]),
"online": str(entry.get("id")) in connected_user_ids,
}
for entry in users
if str(entry.get("status")) == "active" and str(entry["id"]) != item.createdBy
]
await self._send(
client.websocket,
ItemTransferTargetsResultPacket(
type="item_transfer_targets",
itemId=item.id,
targets=targets,
),
)
return
if isinstance(packet, ItemTransferPacket):
item = self.items.get(packet.itemId)
if not item:
@@ -2502,15 +2545,34 @@ class SignalingServer:
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:
target_user_id = str(packet.targetUserId or "").strip()
if not target_user_id and packet.targetId:
target = self._get_client_by_id(packet.targetId)
if target and target.authenticated and target.user_id:
target_user_id = target.user_id
if not target_user_id:
await self._send_item_result(client, False, "transfer", "Target user is not available.", item.id)
return
if item.createdBy == target.user_id:
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
target = next(
(
other
for other in self.clients.values()
if other.authenticated and other.user_id == target_user_id
),
None,
)
target_username = (
target.username
if target and target.username
else target.nickname
if target
else self.auth_service.get_username_by_id(target_user_id) or target_user_id
)
item.createdBy = target_user_id
item.createdByName = target_username
item.updatedAt = self.item_service.now_ms()
actor_id, actor_name = self._item_updated_actor(client)
item.updatedBy = actor_id
@@ -2522,7 +2584,7 @@ class SignalingServer:
await self._broadcast(
BroadcastChatMessagePacket(
type="chat_message",
message=f"{client.nickname} transferred {item_text} to {target.nickname}.",
message=f"{client.nickname} transferred {item_text} to {target_username}.",
system=True,
),
exclude=client.websocket,
@@ -2531,7 +2593,7 @@ class SignalingServer:
client,
True,
"transfer",
f"You transferred {item_text} to {target.nickname}.",
f"You transferred {item_text} to {target_username}.",
item.id,
)
return

130
server/tests/test_server_message_handling.py
View File

@@ -2,6 +2,7 @@ from __future__ import annotations
import asyncio
import json
from pathlib import Path
from time import monotonic
from typing import cast
import uuid
@@ -449,6 +450,135 @@ async def test_item_transfer_allows_self_target_for_transfer_any(monkeypatch: py
assert result.action == "transfer"
@pytest.mark.asyncio
async def test_item_transfer_accepts_offline_target_user_id(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
server = SignalingServer("127.0.0.1", 8765, None, None, auth_db_path=tmp_path / "auth.db", grid_size=41)
owner_session = server.auth_service.register("owner_test", "password99")
actor_session = server.auth_service.register("actor_test", "password99")
offline_session = server.auth_service.register("offline_test", "password99")
owner_ws = _fake_ws()
actor_ws = _fake_ws()
owner = ClientConnection(
websocket=owner_ws,
id="u1",
nickname="owner",
authenticated=True,
user_id=owner_session.user.id,
username=owner_session.user.username,
permissions=set(),
x=5,
y=6,
)
actor = ClientConnection(
websocket=actor_ws,
id="u3",
nickname="actor",
authenticated=True,
user_id=actor_session.user.id,
username=actor_session.user.username,
permissions={"item.transfer.any"},
x=5,
y=6,
)
server.clients[owner_ws] = owner
server.clients[actor_ws] = actor
item = server.item_service.default_item(owner, "dice")
item.x = actor.x
item.y = actor.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(
actor,
json.dumps({"type": "item_transfer", "itemId": item.id, "targetUserId": offline_session.user.id}),
)
assert item.createdBy == offline_session.user.id
assert item.createdByName == offline_session.user.username
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_targets_lists_online_and_offline(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
server = SignalingServer("127.0.0.1", 8765, None, None, auth_db_path=tmp_path / "auth.db", grid_size=41)
owner_session = server.auth_service.register("owner_menu", "password99")
actor_session = server.auth_service.register("actor_menu", "password99")
online_session = server.auth_service.register("online_menu", "password99")
offline_session = server.auth_service.register("offline_menu", "password99")
owner_ws = _fake_ws()
actor_ws = _fake_ws()
online_ws = _fake_ws()
owner = ClientConnection(
websocket=owner_ws,
id="u1",
nickname="owner",
authenticated=True,
user_id=owner_session.user.id,
username=owner_session.user.username,
permissions=set(),
x=5,
y=6,
)
actor = ClientConnection(
websocket=actor_ws,
id="u3",
nickname="actor",
authenticated=True,
user_id=actor_session.user.id,
username=actor_session.user.username,
permissions={"item.transfer.any"},
x=5,
y=6,
)
online = ClientConnection(
websocket=online_ws,
id="u4",
nickname="online",
authenticated=True,
user_id=online_session.user.id,
username=online_session.user.username,
permissions=set(),
x=10,
y=10,
)
server.clients[owner_ws] = owner
server.clients[actor_ws] = actor
server.clients[online_ws] = online
item = server.item_service.default_item(owner, "dice")
item.x = actor.x
item.y = actor.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(actor, json.dumps({"type": "item_transfer_targets", "itemId": item.id}))
assert send_payloads
result = send_payloads[-1]
assert result.type == "item_transfer_targets"
usernames = {entry.username for entry in result.targets}
assert owner_session.user.username not in usernames
assert online_session.user.username in usernames
assert offline_session.user.username in usernames
by_username = {entry.username: entry for entry in result.targets}
assert by_username[online_session.user.username].online is True
assert by_username[offline_session.user.username].online is False
@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)