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

Include self in transfer targets and exclude item owner

Browse Source
This commit is contained in:
Jage9
2026-02-28 20:13:39 -05:00
parent c1cf100898
commit 83b7e1f9ce
7 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/public/version.js
View File

@@ -1,5 +1,5 @@
// Maintainer-controlled web client version.
// Format: YYYY.MM.DD Rn (example: 2026.02.20 R2)
window.CHGRID_WEB_VERSION = "2026.03.01 R320";
window.CHGRID_WEB_VERSION = "2026.03.01 R321";
// Optional display timezone for timestamps. Falls back to America/Detroit if unset/invalid.
window.CHGRID_TIME_ZONE = "America/Detroit";

35
client/src/main.ts
View File

@@ -1060,12 +1060,18 @@ function itemManagementOptionsFor(item: WorldItem): ItemManagementOption[] {
if (canManageDeleteItem(item)) {
options.push({ action: 'delete', label: 'Delete item' });
}
if (canManageTransferItem(item) && state.peers.size > 0) {
if (canManageTransferItem(item) && (state.player.id !== null || state.peers.size > 0)) {
options.push({ action: 'transfer', label: 'Transfer item' });
}
return options;
}
/** Resolves transfer-target label for either local player id or a remote peer id. */
function transferTargetLabel(userPeerId: string): string {
if (userPeerId === state.player.id) return state.player.nickname || 'Unknown user';
return state.peers.get(userPeerId)?.nickname ?? 'Unknown user';
}
/** Opens item-management options for one selected item. */
function beginItemManagement(item: WorldItem): void {
const options = itemManagementOptionsFor(item);
@@ -2894,12 +2900,21 @@ function handleItemManageOptionsModeInput(code: string, key: string): void {
});
return;
}
const targetIds = Array.from(state.peers.values())
.map((peer) => peer.id)
.filter((peerId) => peerId !== state.player.id && state.peers.has(peerId))
const ownerUserId = item.createdBy.trim();
const targetIds = [
...(state.player.id ? [state.player.id] : []),
...Array.from(state.peers.values()).map((peer) => peer.id),
]
.filter((peerId, index, arr) => arr.indexOf(peerId) === index)
.filter((peerId) => {
if (!ownerUserId) return true;
if (peerId === state.player.id) return authUserId !== ownerUserId;
const peer = state.peers.get(peerId);
return (peer?.userId ?? '') !== ownerUserId;
})
.sort((a, b) => {
const left = state.peers.get(a)?.nickname ?? '';
const right = state.peers.get(b)?.nickname ?? '';
const left = transferTargetLabel(a);
const right = transferTargetLabel(b);
return left.localeCompare(right, undefined, { sensitivity: 'base' });
});
if (targetIds.length === 0) {
@@ -2910,7 +2925,7 @@ function handleItemManageOptionsModeInput(code: string, key: string): void {
itemManagementTargetUserIds = targetIds;
itemManagementTargetUserIndex = 0;
state.mode = 'itemManageTransferUser';
const firstLabel = state.peers.get(itemManagementTargetUserIds[0])?.nickname ?? 'Unknown user';
const firstLabel = transferTargetLabel(itemManagementTargetUserIds[0]);
updateStatus(firstLabel);
audio.sfxUiBlip();
return;
@@ -2930,11 +2945,11 @@ function handleItemManageTransferUserModeInput(code: string, key: string): void
return;
}
const control = handleListControlKey(code, key, itemManagementTargetUserIds, itemManagementTargetUserIndex, (userId) => {
return state.peers.get(userId)?.nickname ?? 'Unknown user';
return transferTargetLabel(userId);
});
if (control.type === 'move') {
itemManagementTargetUserIndex = control.index;
const label = state.peers.get(itemManagementTargetUserIds[itemManagementTargetUserIndex])?.nickname ?? 'Unknown user';
const label = transferTargetLabel(itemManagementTargetUserIds[itemManagementTargetUserIndex]);
updateStatus(label);
audio.sfxUiBlip();
return;
@@ -2947,7 +2962,7 @@ function handleItemManageTransferUserModeInput(code: string, key: string): void
audio.sfxUiCancel();
return;
}
const targetLabel = state.peers.get(targetId)?.nickname ?? 'Unknown user';
const targetLabel = transferTargetLabel(targetId);
openItemManagementConfirm({
itemId: item.id,
action: 'transfer',

12
client/src/network/messageHandlers.ts
View File

@@ -154,11 +154,12 @@ export function createOnMessageHandler(deps: MessageHandlerDeps): (message: Inco
if (!deps.isPeerNegotiationReady()) {
deps.enqueuePendingSignal(message);
if (!deps.state.peers.has(message.senderId)) {
deps.state.peers.set(message.senderId, {
id: message.senderId,
nickname: deps.sanitizeName(message.senderNickname || 'user...') || 'user...',
x: Number.isFinite(message.x) ? message.x : 20,
y: Number.isFinite(message.y) ? message.y : 20,
deps.state.peers.set(message.senderId, {
id: message.senderId,
userId: null,
nickname: deps.sanitizeName(message.senderNickname || 'user...') || 'user...',
x: Number.isFinite(message.x) ? message.x : 20,
y: Number.isFinite(message.y) ? message.y : 20,
});
}
break;
@@ -167,6 +168,7 @@ export function createOnMessageHandler(deps: MessageHandlerDeps): (message: Inco
if (!deps.state.peers.has(peer.id)) {
deps.state.peers.set(peer.id, {
id: peer.id,
userId: null,
nickname: deps.sanitizeName(peer.nickname) || 'user...',
x: peer.x,
y: peer.y,

2
client/src/network/protocol.ts
View File

@@ -24,6 +24,7 @@ export const welcomeMessageSchema = z.object({
id: z.string(),
player: z.object({
id: z.string(),
userId: z.string().nullable().optional(),
nickname: z.string(),
x: z.number().int(),
y: z.number().int(),
@@ -31,6 +32,7 @@ export const welcomeMessageSchema = z.object({
users: z.array(
z.object({
id: z.string(),
userId: z.string().nullable().optional(),
nickname: z.string(),
x: z.number().int(),
y: z.number().int(),

1
client/src/state/gameState.ts
View File

@@ -62,6 +62,7 @@ export type Player = {
export type PeerState = {
id: string;
userId?: string | null;
nickname: string;
x: number;
y: number;