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

Store item actor ids with display-name snapshots and nickname carrier display

Browse Source
This commit is contained in:
Jage9
2026-02-27 02:34:58 -05:00
parent 4fcd006856
commit 31ecb8eb5c
6 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/app/item_catalog.py
View File

@@ -85,8 +85,8 @@ GLOBAL_ITEM_PROPERTY_METADATA: dict[str, dict[str, object]] = {
"y": {"valueType": "number", "tooltip": "Item Y coordinate on the grid.", "label": "Y"},
"carrierId": {"valueType": "text", "tooltip": "User id currently carrying this item, or none.", "label": "Carrier"},
"version": {"valueType": "number", "tooltip": "Server-side item version incremented on each update.", "label": "Version"},
"createdBy": {"valueType": "text", "tooltip": "Username that originally created this item.", "label": "Created by"},
"updatedBy": {"valueType": "text", "tooltip": "Username that most recently updated this item.", "label": "Updated by"},
"createdBy": {"valueType": "text", "tooltip": "Display name of the user who originally created this item.", "label": "Created by"},
"updatedBy": {"valueType": "text", "tooltip": "Display name of the user who most recently updated this item.", "label": "Updated by"},
"createdAt": {"valueType": "text", "tooltip": "Creation timestamp for this item.", "label": "Created at"},
"updatedAt": {"valueType": "text", "tooltip": "Last update timestamp for this item.", "label": "Updated at"},
"capabilities": {"valueType": "text", "tooltip": "Supported actions for this item type.", "label": "Capabilities"},

13
server/app/item_service.py
View File

@@ -39,14 +39,18 @@ class ItemService:
item_def = get_item_definition(item_type)
now = self.now_ms()
actor_id = client.user_id or client.id
actor_name = client.username or client.nickname or actor_id
return WorldItem(
id=str(uuid.uuid4()),
type=item_type,
title=item_def.default_title,
x=client.x,
y=client.y,
createdBy=client.username or client.nickname or client.id,
updatedBy=client.username or client.nickname or client.id,
createdBy=actor_id,
createdByName=actor_name,
updatedBy=actor_id,
updatedByName=actor_name,
createdAt=now,
updatedAt=now,
version=1,
@@ -92,6 +96,7 @@ class ItemService:
item.y = client.y
item.updatedAt = self.now_ms()
item.updatedBy = "system"
item.updatedByName = "system"
changed.append(item)
return changed
@@ -117,7 +122,9 @@ class ItemService:
x=persisted.x,
y=persisted.y,
createdBy=persisted.createdBy,
createdByName=persisted.createdByName or persisted.createdBy,
updatedBy=persisted.updatedBy or persisted.createdBy,
updatedByName=persisted.updatedByName or persisted.updatedBy or persisted.createdBy,
createdAt=persisted.createdAt,
updatedAt=persisted.updatedAt,
version=persisted.version,
@@ -171,7 +178,9 @@ class ItemService:
x=item.x,
y=item.y,
createdBy=item.createdBy,
createdByName=item.createdByName,
updatedBy=item.updatedBy,
updatedByName=item.updatedByName,
createdAt=item.createdAt,
updatedAt=item.updatedAt,
version=item.version,

4
server/app/models.py
View File

@@ -243,7 +243,9 @@ class WorldItem(BaseModel):
x: int
y: int
createdBy: str
createdByName: str
updatedBy: str
updatedByName: str
createdAt: int
updatedAt: int
version: int
@@ -263,7 +265,9 @@ class PersistedWorldItem(BaseModel):
x: int
y: int
createdBy: str
createdByName: str | None = None
updatedBy: str | None = None
updatedByName: str | None = None
createdAt: int
updatedAt: int
version: int

50
server/app/server.py
View File

@@ -380,14 +380,18 @@ class SignalingServer:
def _build_item_display_values(self, item: WorldItem) -> dict[str, str]:
"""Build server-authoritative item property display values for readonly/system fields."""
carrier_label = "none"
if item.carrierId:
carrier = self._get_client_by_id(item.carrierId)
carrier_label = carrier.nickname if carrier is not None else item.carrierId
return {
"type": item.type,
"x": str(item.x),
"y": str(item.y),
"carrierId": item.carrierId or "none",
"carrierId": carrier_label,
"version": str(item.version),
"createdBy": item.createdBy,
"updatedBy": item.updatedBy,
"createdBy": item.createdByName or item.createdBy,
"updatedBy": item.updatedByName or item.updatedBy,
"createdAt": self._format_display_timestamp_ms(item.createdAt),
"updatedAt": self._format_display_timestamp_ms(item.updatedAt),
"capabilities": ", ".join(item.capabilities) if item.capabilities else "none",
@@ -401,10 +405,12 @@ class SignalingServer:
return item.model_copy(update={"display": self._build_item_display_values(item)})
@staticmethod
def _item_updated_by_actor(client: ClientConnection) -> str:
"""Resolve display name stored in `updatedBy` for client-initiated item mutations."""
def _item_updated_actor(client: ClientConnection) -> tuple[str, str]:
"""Resolve `(actor_id, actor_name)` used in item update tracking fields."""
return client.username or client.nickname or client.id
actor_id = client.user_id or client.id
actor_name = client.username or client.nickname or actor_id
return actor_id, actor_name
def _get_item_emit_range(self, item: WorldItem) -> int:
"""Return effective emit range for one item with sane bounds."""
@@ -482,6 +488,7 @@ class SignalingServer:
item.params["nowPlaying"] = now_playing
item.updatedAt = self.item_service.now_ms()
item.updatedBy = "system"
item.updatedByName = "system"
item.version += 1
self._request_state_save()
await self._broadcast_item(item)
@@ -822,7 +829,8 @@ class SignalingServer:
item.params.pop("recording", None)
item.params.pop("recordingLengthMs", None)
item.updatedAt = self.item_service.now_ms()
item.updatedBy = owner.username if owner and owner.username else "system"
item.updatedBy = owner.user_id if owner and owner.user_id else "system"
item.updatedByName = owner.username if owner and owner.username else "system"
item.version += 1
self._request_state_save()
await self._broadcast_item(item)
@@ -1520,10 +1528,12 @@ class SignalingServer:
)
carried = self.item_service.find_carried_item(client.id)
if carried:
actor_id, actor_name = self._item_updated_actor(client)
carried.x = client.x
carried.y = client.y
carried.updatedAt = self.item_service.now_ms()
carried.updatedBy = self._item_updated_by_actor(client)
carried.updatedBy = actor_id
carried.updatedByName = actor_name
await self._broadcast_item(carried)
return
@@ -1556,10 +1566,12 @@ class SignalingServer:
)
carried = self.item_service.find_carried_item(client.id)
if carried:
actor_id, actor_name = self._item_updated_actor(client)
carried.x = client.x
carried.y = client.y
carried.updatedAt = self.item_service.now_ms()
carried.updatedBy = self._item_updated_by_actor(client)
carried.updatedBy = actor_id
carried.updatedByName = actor_name
await self._broadcast_item(carried)
await self._broadcast(
BroadcastTeleportCompletePacket(
@@ -1736,7 +1748,9 @@ class SignalingServer:
item.x = client.x
item.y = client.y
item.updatedAt = self.item_service.now_ms()
item.updatedBy = self._item_updated_by_actor(client)
actor_id, actor_name = self._item_updated_actor(client)
item.updatedBy = actor_id
item.updatedByName = actor_name
await self._broadcast_item(item)
self._request_state_save()
await self._send_item_result(client, True, "pickup", f"Picked up {item.title}.", item.id)
@@ -1757,7 +1771,9 @@ class SignalingServer:
item.x = packet.x
item.y = packet.y
item.updatedAt = self.item_service.now_ms()
item.updatedBy = self._item_updated_by_actor(client)
actor_id, actor_name = self._item_updated_actor(client)
item.updatedBy = actor_id
item.updatedByName = actor_name
await self._broadcast_item(item)
self._request_state_save()
await self._send_item_result(client, True, "drop", f"Dropped {item.title}.", item.id)
@@ -1837,7 +1853,9 @@ class SignalingServer:
await self._send_item_result(client, False, "use", str(exc), item.id)
return
item.updatedAt = now_ms
item.updatedBy = self._item_updated_by_actor(client)
actor_id, actor_name = self._item_updated_actor(client)
item.updatedBy = actor_id
item.updatedByName = actor_name
self._request_state_save()
await self._broadcast_item(item)
@@ -1914,7 +1932,9 @@ class SignalingServer:
await self._send_item_result(client, False, "secondary_use", str(exc), item.id)
return
item.updatedAt = self.item_service.now_ms()
item.updatedBy = self._item_updated_by_actor(client)
actor_id, actor_name = self._item_updated_actor(client)
item.updatedBy = actor_id
item.updatedByName = actor_name
item.version += 1
self._request_state_save()
await self._broadcast_item(item)
@@ -2089,7 +2109,9 @@ class SignalingServer:
return
item.params = next_params
item.updatedAt = self.item_service.now_ms()
item.updatedBy = self._item_updated_by_actor(client)
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()