BlueGit

timfa questward

Restrict character names and add admin gift manager.

Names are letters/hyphens only; Questward surname is admin-only. World Editor Gifts credits bank items and queues a John Questward CEO letter.

timfa Tim Falken · pushed by timfa

Authored 2026-09-02 · 2 months ago

Hash
72dc63f7f2cd6a0fc6fecc12fc0148ac410d9270
Parent
33ee6492
16 files changed +1039 −12
client/editor.html +21 −0
@@ -57,6 +57,7 @@
57 57 <button id="open-settings" type="button">World settings</button>
58 58 <button id="open-quests" type="button">Quests</button>
59 59 <button id="open-dialogues" type="button">Dialogues</button>
60 <button id="open-gifts" type="button">Gifts</button>
60 61 <p class="hint">The red border is the chunk you are editing. Paint only inside the border. Hover shows tile config tooltips. Right-click a spawner to edit or remove it. Spawners are editor-only markers (invisible and non-blocking in play). Mouse wheel zooms; Shift+wheel cycles visual states (seasonal outdoor tiles cycle spring/summer/autumn/winter and update Season preview).</p>
61 62 </aside>
62 63 <section id="side-panels">
@@ -133,6 +134,26 @@
133 134 </footer>
134 135 </div>
135 136
137 <div id="gifts-backdrop" hidden></div>
138 <div id="gifts-modal" hidden>
139 <header>
140 <h2>Gifts</h2>
141 <button id="gifts-close" type="button">Close</button>
142 </header>
143 <div class="gifts-layout">
144 <aside class="gifts-search-pane">
145 <label class="gifts-search-label">
146 Search character or account
147 <input id="gifts-search-input" type="search" placeholder="First Last, surname, or username" autocomplete="off">
148 </label>
149 <button id="gifts-search-btn" type="button">Search</button>
150 <div id="gifts-results" class="content-editor-list"></div>
151 <p id="gifts-status" class="hint"></p>
152 </aside>
153 <div id="gifts-detail" class="gifts-detail"></div>
154 </div>
155 </div>
156
136 157 <div id="palette-backdrop" hidden></div>
137 158 <div id="palette-modal" hidden>
138 159 <header>
@@ -57,6 +57,7 @@
57 <button id="open-settings" type="button">World settings</button>
57 <button id="open-settings" type="button">World settings</button>
58 <button id="open-quests" type="button">Quests</button>
58 <button id="open-quests" type="button">Quests</button>
59 <button id="open-dialogues" type="button">Dialogues</button>
59 <button id="open-dialogues" type="button">Dialogues</button>
60 <button id="open-gifts" type="button">Gifts</button>
60 <p class="hint">The red border is the chunk you are editing. Paint only inside the border. Hover shows tile config tooltips. Right-click a spawner to edit or remove it. Spawners are editor-only markers (invisible and non-blocking in play). Mouse wheel zooms; Shift+wheel cycles visual states (seasonal outdoor tiles cycle spring/summer/autumn/winter and update Season preview).</p>
61 <p class="hint">The red border is the chunk you are editing. Paint only inside the border. Hover shows tile config tooltips. Right-click a spawner to edit or remove it. Spawners are editor-only markers (invisible and non-blocking in play). Mouse wheel zooms; Shift+wheel cycles visual states (seasonal outdoor tiles cycle spring/summer/autumn/winter and update Season preview).</p>
61 </aside>
62 </aside>
62 <section id="side-panels">
63 <section id="side-panels">
@@ -133,6 +134,26 @@
133 </footer>
134 </footer>
134 </div>
135 </div>
135
136
137 <div id="gifts-backdrop" hidden></div>
138 <div id="gifts-modal" hidden>
139 <header>
140 <h2>Gifts</h2>
141 <button id="gifts-close" type="button">Close</button>
142 </header>
143 <div class="gifts-layout">
144 <aside class="gifts-search-pane">
145 <label class="gifts-search-label">
146 Search character or account
147 <input id="gifts-search-input" type="search" placeholder="First Last, surname, or username" autocomplete="off">
148 </label>
149 <button id="gifts-search-btn" type="button">Search</button>
150 <div id="gifts-results" class="content-editor-list"></div>
151 <p id="gifts-status" class="hint"></p>
152 </aside>
153 <div id="gifts-detail" class="gifts-detail"></div>
154 </div>
155 </div>
156
136 <div id="palette-backdrop" hidden></div>
157 <div id="palette-backdrop" hidden></div>
137 <div id="palette-modal" hidden>
158 <div id="palette-modal" hidden>
138 <header>
159 <header>
client/index.html +2 −2
@@ -581,8 +581,8 @@
581 581 aria-selected="false">Clothing</button>
582 582 </div>
583 583 <section class="create-pane" data-create-pane="appearance">
584 <label>First name <input id="first-name" required></label>
585 <label>Last name <input id="last-name" required></label>
584 <label>First name <input id="first-name" required maxlength="24" pattern="[A-Za-z-]+" title="Letters A–Z and hyphens only"></label>
585 <label>Last name <input id="last-name" required maxlength="24" pattern="[A-Za-z-]+" title="Letters A–Z and hyphens only"></label>
586 586 <label>Sex
587 587 <select id="sex">
588 588 <option value="male">Male</option>
@@ -581,8 +581,8 @@
581 aria-selected="false">Clothing</button>
581 aria-selected="false">Clothing</button>
582 </div>
582 </div>
583 <section class="create-pane" data-create-pane="appearance">
583 <section class="create-pane" data-create-pane="appearance">
584 <label>First name <input id="first-name" required></label>
584 <label>First name <input id="first-name" required maxlength="24" pattern="[A-Za-z-]+" title="Letters A–Z and hyphens only"></label>
585 <label>Last name <input id="last-name" required></label>
585 <label>Last name <input id="last-name" required maxlength="24" pattern="[A-Za-z-]+" title="Letters A–Z and hyphens only"></label>
586 <label>Sex
586 <label>Sex
587 <select id="sex">
587 <select id="sex">
588 <option value="male">Male</option>
588 <option value="male">Male</option>
client/src/editor/giftsModal.js added +361 −0
@@ -0,0 +1,361 @@
1 import { listAllItemPickerEntries, itemDefinition } from "/shared/definitions/items.js";
2 import {
3 formatGiftLetterBody,
4 QUESTWARD_GIFT_AUTHOR,
5 QUESTWARD_GIFT_ORG
6 } from "/shared/courier/giftLetters.js";
7 import { formatLetterSignature } from "/shared/courier/systemLetters.js";
8
9 export function initGiftsModal ({ socket, MessageType })
10 {
11 const backdrop = document.getElementById("gifts-backdrop");
12 const modal = document.getElementById("gifts-modal");
13 const resultsEl = document.getElementById("gifts-results");
14 const detailEl = document.getElementById("gifts-detail");
15 const statusEl = document.getElementById("gifts-status");
16 const searchInput = document.getElementById("gifts-search-input");
17 const searchBtn = document.getElementById("gifts-search-btn");
18 let open = false;
19 /** @type {any[]} */
20 let characters = [];
21 /** @type {any|null} */
22 let selected = null;
23 /** @type {Array<{ itemId: number, quantity: number, displayName: string }>} */
24 let giftItems = [];
25 let messageText = "";
26 /** @type {null | { resultsEl: HTMLElement, inputEl: HTMLInputElement }} */
27 let itemPickContext = null;
28
29 function show (visible)
30 {
31 open = visible;
32 backdrop.hidden = !visible;
33 modal.hidden = !visible;
34 if (!visible)
35 {
36 closeInlineItemSearch();
37 return;
38 }
39 render();
40 }
41
42 function setStatus (text, isError = false)
43 {
44 if (!statusEl)
45 { return; }
46 statusEl.textContent = text || "";
47 statusEl.classList.toggle("error", !!isError);
48 }
49
50 function closeInlineItemSearch ()
51 {
52 if (itemPickContext?.resultsEl)
53 { itemPickContext.resultsEl.replaceChildren(); }
54 itemPickContext = null;
55 }
56
57 function characterLabel (row)
58 {
59 const name = `${row.firstName ?? ""} ${row.lastName ?? ""}`.trim();
60 const account = row.accountUsername ? ` · @${row.accountUsername}` : "";
61 return `${name}${account}`;
62 }
63
64 function renderResults ()
65 {
66 resultsEl.replaceChildren();
67 if (!characters.length)
68 {
69 resultsEl.textContent = "No characters found.";
70 return;
71 }
72 for (const row of characters)
73 {
74 const btn = document.createElement("button");
75 btn.type = "button";
76 btn.className = selected?.characterId === row.characterId ? "active" : "";
77 btn.textContent = characterLabel(row);
78 btn.addEventListener("click", () =>
79 {
80 selected = row;
81 giftItems = [];
82 messageText = "";
83 closeInlineItemSearch();
84 render();
85 });
86 resultsEl.append(btn);
87 }
88 }
89
90 function renderInlineItemSearch (query)
91 {
92 if (!itemPickContext)
93 { return; }
94 const { resultsEl: pickResults } = itemPickContext;
95 pickResults.replaceChildren();
96 const q = String(query ?? "").trim().toLowerCase();
97 const taken = new Set(giftItems.map((row) => row.itemId));
98 const matches = listAllItemPickerEntries().filter((item) =>
99 {
100 if (taken.has(item.itemId))
101 { return false; }
102 if (!q)
103 { return true; }
104 return item.displayName.toLowerCase().includes(q)
105 || item.key.toLowerCase().includes(q)
106 || String(item.itemId).includes(q);
107 }).slice(0, 40);
108 if (!matches.length)
109 {
110 pickResults.textContent = "No matching items.";
111 return;
112 }
113 for (const item of matches)
114 {
115 const row = document.createElement("button");
116 row.type = "button";
117 row.className = "shop-item-search-row";
118 const name = document.createElement("span");
119 name.className = "shop-item-search-row-name";
120 name.textContent = item.displayName;
121 const key = document.createElement("span");
122 key.className = "shop-item-search-row-key";
123 key.textContent = `${item.key} (#${item.itemId})`;
124 row.append(name, key);
125 row.addEventListener("click", () =>
126 {
127 giftItems.push({
128 itemId: item.itemId,
129 quantity: 1,
130 displayName: item.displayName
131 });
132 closeInlineItemSearch();
133 renderDetail();
134 });
135 pickResults.append(row);
136 }
137 }
138
139 function renderPreview ()
140 {
141 const preview = detailEl.querySelector("#gifts-letter-preview");
142 const signature = detailEl.querySelector("#gifts-letter-signature");
143 if (!preview || !selected)
144 { return; }
145 const displayName = `${selected.firstName} ${selected.lastName}`.trim();
146 preview.textContent = formatGiftLetterBody({
147 characterDisplayName: displayName,
148 message: messageText,
149 items: giftItems
150 });
151 if (signature)
152 {
153 signature.textContent = formatLetterSignature({
154 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
155 authorOrganization: QUESTWARD_GIFT_ORG
156 });
157 }
158 }
159
160 function renderDetail ()
161 {
162 detailEl.replaceChildren();
163 if (!selected)
164 {
165 detailEl.textContent = "Search for a character, then select one to compose a gift.";
166 return;
167 }
168
169 const heading = document.createElement("h3");
170 heading.textContent = `Gift to ${characterLabel(selected)}`;
171 detailEl.append(heading);
172
173 const messageLabel = document.createElement("label");
174 messageLabel.className = "gifts-message-label";
175 messageLabel.textContent = "Message";
176 const messageArea = document.createElement("textarea");
177 messageArea.id = "gifts-message";
178 messageArea.rows = 5;
179 messageArea.placeholder = "Write the personal note included in the letter…";
180 messageArea.value = messageText;
181 messageArea.addEventListener("input", () =>
182 {
183 messageText = messageArea.value;
184 renderPreview();
185 });
186 messageLabel.append(messageArea);
187 detailEl.append(messageLabel);
188
189 const itemsHeader = document.createElement("div");
190 itemsHeader.className = "gifts-items-header";
191 const itemsTitle = document.createElement("strong");
192 itemsTitle.textContent = "Items";
193 const addBtn = document.createElement("button");
194 addBtn.type = "button";
195 addBtn.textContent = "Add item";
196 itemsHeader.append(itemsTitle, addBtn);
197 detailEl.append(itemsHeader);
198
199 const itemSearch = document.createElement("input");
200 itemSearch.type = "search";
201 itemSearch.placeholder = "Search items…";
202 itemSearch.hidden = true;
203 itemSearch.autocomplete = "off";
204 const itemResults = document.createElement("div");
205 itemResults.className = "gifts-item-search-results";
206 detailEl.append(itemSearch, itemResults);
207
208 addBtn.addEventListener("click", () =>
209 {
210 itemPickContext = { inputEl: itemSearch, resultsEl: itemResults };
211 itemSearch.hidden = false;
212 itemSearch.value = "";
213 renderInlineItemSearch("");
214 itemSearch.focus();
215 });
216 itemSearch.addEventListener("input", () => renderInlineItemSearch(itemSearch.value));
217
218 const list = document.createElement("div");
219 list.className = "gifts-item-list";
220 if (!giftItems.length)
221 {
222 const empty = document.createElement("p");
223 empty.className = "hint";
224 empty.textContent = "No items yet.";
225 list.append(empty);
226 }
227 else
228 {
229 for (let index = 0; index < giftItems.length; index++)
230 {
231 const entry = giftItems[index];
232 const row = document.createElement("div");
233 row.className = "gifts-item-row";
234 const name = document.createElement("span");
235 name.textContent = entry.displayName
236 || itemDefinition(entry.itemId)?.displayName
237 || `Item ${entry.itemId}`;
238 const qty = document.createElement("input");
239 qty.type = "number";
240 qty.min = "1";
241 qty.max = "100000";
242 qty.value = String(entry.quantity);
243 qty.addEventListener("change", () =>
244 {
245 entry.quantity = Math.max(1, Math.min(100000, qty.valueAsNumber || 1));
246 qty.value = String(entry.quantity);
247 renderPreview();
248 });
249 const remove = document.createElement("button");
250 remove.type = "button";
251 remove.textContent = "Remove";
252 remove.addEventListener("click", () =>
253 {
254 giftItems.splice(index, 1);
255 renderDetail();
256 });
257 row.append(name, qty, remove);
258 list.append(row);
259 }
260 }
261 detailEl.append(list);
262
263 const previewWrap = document.createElement("div");
264 previewWrap.className = "gifts-preview-wrap";
265 const previewTitle = document.createElement("strong");
266 previewTitle.textContent = "Letter preview";
267 const preview = document.createElement("pre");
268 preview.id = "gifts-letter-preview";
269 preview.className = "gifts-letter-preview";
270 const signature = document.createElement("pre");
271 signature.id = "gifts-letter-signature";
272 signature.className = "gifts-letter-signature";
273 previewWrap.append(previewTitle, preview, signature);
274 detailEl.append(previewWrap);
275
276 const sendBtn = document.createElement("button");
277 sendBtn.type = "button";
278 sendBtn.id = "gifts-send";
279 sendBtn.textContent = "Send Gift";
280 sendBtn.addEventListener("click", () =>
281 {
282 if (!selected)
283 { return; }
284 setStatus("Sending gift…");
285 socket.send({
286 type: MessageType.editorSendGift,
287 characterId: selected.characterId,
288 message: messageText,
289 items: giftItems.map((row) => ({
290 itemId: row.itemId,
291 quantity: row.quantity
292 }))
293 });
294 });
295 detailEl.append(sendBtn);
296 renderPreview();
297 }
298
299 function render ()
300 {
301 renderResults();
302 renderDetail();
303 }
304
305 function runSearch ()
306 {
307 const query = searchInput.value.trim();
308 if (!query)
309 {
310 setStatus("Enter a character or account name.", true);
311 return;
312 }
313 setStatus("Searching…");
314 socket.send({ type: MessageType.editorSearchGiftCharacters, query });
315 }
316
317 document.getElementById("open-gifts").addEventListener("click", () =>
318 {
319 setStatus("");
320 show(true);
321 });
322 document.getElementById("gifts-close").addEventListener("click", () => show(false));
323 backdrop.addEventListener("click", () => show(false));
324 searchBtn.addEventListener("click", runSearch);
325 searchInput.addEventListener("keydown", (event) =>
326 {
327 if (event.key === "Enter")
328 {
329 event.preventDefault();
330 runSearch();
331 }
332 });
333
334 return {
335 isOpen: () => open,
336 handleError (message)
337 {
338 setStatus(message || "Gift failed.", true);
339 },
340 handleMessage (message)
341 {
342 if (message.type === MessageType.editorGiftCharacters)
343 {
344 characters = message.characters ?? [];
345 if (selected && !characters.some((row) => row.characterId === selected.characterId))
346 { selected = null; }
347 setStatus(characters.length ? `${characters.length} character(s)` : "No matches.");
348 render();
349 return;
350 }
351 if (message.type === MessageType.editorGiftSent)
352 {
353 const name = `${message.firstName ?? ""} ${message.lastName ?? ""}`.trim();
354 setStatus(`Gift sent to ${name}.`);
355 giftItems = [];
356 messageText = "";
357 renderDetail();
358 }
359 }
360 };
361 }
@@ -0,0 +1,361 @@
1import { listAllItemPickerEntries, itemDefinition } from "/shared/definitions/items.js";
2import {
3 formatGiftLetterBody,
4 QUESTWARD_GIFT_AUTHOR,
5 QUESTWARD_GIFT_ORG
6} from "/shared/courier/giftLetters.js";
7import { formatLetterSignature } from "/shared/courier/systemLetters.js";
8
9export function initGiftsModal ({ socket, MessageType })
10{
11 const backdrop = document.getElementById("gifts-backdrop");
12 const modal = document.getElementById("gifts-modal");
13 const resultsEl = document.getElementById("gifts-results");
14 const detailEl = document.getElementById("gifts-detail");
15 const statusEl = document.getElementById("gifts-status");
16 const searchInput = document.getElementById("gifts-search-input");
17 const searchBtn = document.getElementById("gifts-search-btn");
18 let open = false;
19 /** @type {any[]} */
20 let characters = [];
21 /** @type {any|null} */
22 let selected = null;
23 /** @type {Array<{ itemId: number, quantity: number, displayName: string }>} */
24 let giftItems = [];
25 let messageText = "";
26 /** @type {null | { resultsEl: HTMLElement, inputEl: HTMLInputElement }} */
27 let itemPickContext = null;
28
29 function show (visible)
30 {
31 open = visible;
32 backdrop.hidden = !visible;
33 modal.hidden = !visible;
34 if (!visible)
35 {
36 closeInlineItemSearch();
37 return;
38 }
39 render();
40 }
41
42 function setStatus (text, isError = false)
43 {
44 if (!statusEl)
45 { return; }
46 statusEl.textContent = text || "";
47 statusEl.classList.toggle("error", !!isError);
48 }
49
50 function closeInlineItemSearch ()
51 {
52 if (itemPickContext?.resultsEl)
53 { itemPickContext.resultsEl.replaceChildren(); }
54 itemPickContext = null;
55 }
56
57 function characterLabel (row)
58 {
59 const name = `${row.firstName ?? ""} ${row.lastName ?? ""}`.trim();
60 const account = row.accountUsername ? ` · @${row.accountUsername}` : "";
61 return `${name}${account}`;
62 }
63
64 function renderResults ()
65 {
66 resultsEl.replaceChildren();
67 if (!characters.length)
68 {
69 resultsEl.textContent = "No characters found.";
70 return;
71 }
72 for (const row of characters)
73 {
74 const btn = document.createElement("button");
75 btn.type = "button";
76 btn.className = selected?.characterId === row.characterId ? "active" : "";
77 btn.textContent = characterLabel(row);
78 btn.addEventListener("click", () =>
79 {
80 selected = row;
81 giftItems = [];
82 messageText = "";
83 closeInlineItemSearch();
84 render();
85 });
86 resultsEl.append(btn);
87 }
88 }
89
90 function renderInlineItemSearch (query)
91 {
92 if (!itemPickContext)
93 { return; }
94 const { resultsEl: pickResults } = itemPickContext;
95 pickResults.replaceChildren();
96 const q = String(query ?? "").trim().toLowerCase();
97 const taken = new Set(giftItems.map((row) => row.itemId));
98 const matches = listAllItemPickerEntries().filter((item) =>
99 {
100 if (taken.has(item.itemId))
101 { return false; }
102 if (!q)
103 { return true; }
104 return item.displayName.toLowerCase().includes(q)
105 || item.key.toLowerCase().includes(q)
106 || String(item.itemId).includes(q);
107 }).slice(0, 40);
108 if (!matches.length)
109 {
110 pickResults.textContent = "No matching items.";
111 return;
112 }
113 for (const item of matches)
114 {
115 const row = document.createElement("button");
116 row.type = "button";
117 row.className = "shop-item-search-row";
118 const name = document.createElement("span");
119 name.className = "shop-item-search-row-name";
120 name.textContent = item.displayName;
121 const key = document.createElement("span");
122 key.className = "shop-item-search-row-key";
123 key.textContent = `${item.key} (#${item.itemId})`;
124 row.append(name, key);
125 row.addEventListener("click", () =>
126 {
127 giftItems.push({
128 itemId: item.itemId,
129 quantity: 1,
130 displayName: item.displayName
131 });
132 closeInlineItemSearch();
133 renderDetail();
134 });
135 pickResults.append(row);
136 }
137 }
138
139 function renderPreview ()
140 {
141 const preview = detailEl.querySelector("#gifts-letter-preview");
142 const signature = detailEl.querySelector("#gifts-letter-signature");
143 if (!preview || !selected)
144 { return; }
145 const displayName = `${selected.firstName} ${selected.lastName}`.trim();
146 preview.textContent = formatGiftLetterBody({
147 characterDisplayName: displayName,
148 message: messageText,
149 items: giftItems
150 });
151 if (signature)
152 {
153 signature.textContent = formatLetterSignature({
154 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
155 authorOrganization: QUESTWARD_GIFT_ORG
156 });
157 }
158 }
159
160 function renderDetail ()
161 {
162 detailEl.replaceChildren();
163 if (!selected)
164 {
165 detailEl.textContent = "Search for a character, then select one to compose a gift.";
166 return;
167 }
168
169 const heading = document.createElement("h3");
170 heading.textContent = `Gift to ${characterLabel(selected)}`;
171 detailEl.append(heading);
172
173 const messageLabel = document.createElement("label");
174 messageLabel.className = "gifts-message-label";
175 messageLabel.textContent = "Message";
176 const messageArea = document.createElement("textarea");
177 messageArea.id = "gifts-message";
178 messageArea.rows = 5;
179 messageArea.placeholder = "Write the personal note included in the letter…";
180 messageArea.value = messageText;
181 messageArea.addEventListener("input", () =>
182 {
183 messageText = messageArea.value;
184 renderPreview();
185 });
186 messageLabel.append(messageArea);
187 detailEl.append(messageLabel);
188
189 const itemsHeader = document.createElement("div");
190 itemsHeader.className = "gifts-items-header";
191 const itemsTitle = document.createElement("strong");
192 itemsTitle.textContent = "Items";
193 const addBtn = document.createElement("button");
194 addBtn.type = "button";
195 addBtn.textContent = "Add item";
196 itemsHeader.append(itemsTitle, addBtn);
197 detailEl.append(itemsHeader);
198
199 const itemSearch = document.createElement("input");
200 itemSearch.type = "search";
201 itemSearch.placeholder = "Search items…";
202 itemSearch.hidden = true;
203 itemSearch.autocomplete = "off";
204 const itemResults = document.createElement("div");
205 itemResults.className = "gifts-item-search-results";
206 detailEl.append(itemSearch, itemResults);
207
208 addBtn.addEventListener("click", () =>
209 {
210 itemPickContext = { inputEl: itemSearch, resultsEl: itemResults };
211 itemSearch.hidden = false;
212 itemSearch.value = "";
213 renderInlineItemSearch("");
214 itemSearch.focus();
215 });
216 itemSearch.addEventListener("input", () => renderInlineItemSearch(itemSearch.value));
217
218 const list = document.createElement("div");
219 list.className = "gifts-item-list";
220 if (!giftItems.length)
221 {
222 const empty = document.createElement("p");
223 empty.className = "hint";
224 empty.textContent = "No items yet.";
225 list.append(empty);
226 }
227 else
228 {
229 for (let index = 0; index < giftItems.length; index++)
230 {
231 const entry = giftItems[index];
232 const row = document.createElement("div");
233 row.className = "gifts-item-row";
234 const name = document.createElement("span");
235 name.textContent = entry.displayName
236 || itemDefinition(entry.itemId)?.displayName
237 || `Item ${entry.itemId}`;
238 const qty = document.createElement("input");
239 qty.type = "number";
240 qty.min = "1";
241 qty.max = "100000";
242 qty.value = String(entry.quantity);
243 qty.addEventListener("change", () =>
244 {
245 entry.quantity = Math.max(1, Math.min(100000, qty.valueAsNumber || 1));
246 qty.value = String(entry.quantity);
247 renderPreview();
248 });
249 const remove = document.createElement("button");
250 remove.type = "button";
251 remove.textContent = "Remove";
252 remove.addEventListener("click", () =>
253 {
254 giftItems.splice(index, 1);
255 renderDetail();
256 });
257 row.append(name, qty, remove);
258 list.append(row);
259 }
260 }
261 detailEl.append(list);
262
263 const previewWrap = document.createElement("div");
264 previewWrap.className = "gifts-preview-wrap";
265 const previewTitle = document.createElement("strong");
266 previewTitle.textContent = "Letter preview";
267 const preview = document.createElement("pre");
268 preview.id = "gifts-letter-preview";
269 preview.className = "gifts-letter-preview";
270 const signature = document.createElement("pre");
271 signature.id = "gifts-letter-signature";
272 signature.className = "gifts-letter-signature";
273 previewWrap.append(previewTitle, preview, signature);
274 detailEl.append(previewWrap);
275
276 const sendBtn = document.createElement("button");
277 sendBtn.type = "button";
278 sendBtn.id = "gifts-send";
279 sendBtn.textContent = "Send Gift";
280 sendBtn.addEventListener("click", () =>
281 {
282 if (!selected)
283 { return; }
284 setStatus("Sending gift…");
285 socket.send({
286 type: MessageType.editorSendGift,
287 characterId: selected.characterId,
288 message: messageText,
289 items: giftItems.map((row) => ({
290 itemId: row.itemId,
291 quantity: row.quantity
292 }))
293 });
294 });
295 detailEl.append(sendBtn);
296 renderPreview();
297 }
298
299 function render ()
300 {
301 renderResults();
302 renderDetail();
303 }
304
305 function runSearch ()
306 {
307 const query = searchInput.value.trim();
308 if (!query)
309 {
310 setStatus("Enter a character or account name.", true);
311 return;
312 }
313 setStatus("Searching…");
314 socket.send({ type: MessageType.editorSearchGiftCharacters, query });
315 }
316
317 document.getElementById("open-gifts").addEventListener("click", () =>
318 {
319 setStatus("");
320 show(true);
321 });
322 document.getElementById("gifts-close").addEventListener("click", () => show(false));
323 backdrop.addEventListener("click", () => show(false));
324 searchBtn.addEventListener("click", runSearch);
325 searchInput.addEventListener("keydown", (event) =>
326 {
327 if (event.key === "Enter")
328 {
329 event.preventDefault();
330 runSearch();
331 }
332 });
333
334 return {
335 isOpen: () => open,
336 handleError (message)
337 {
338 setStatus(message || "Gift failed.", true);
339 },
340 handleMessage (message)
341 {
342 if (message.type === MessageType.editorGiftCharacters)
343 {
344 characters = message.characters ?? [];
345 if (selected && !characters.some((row) => row.characterId === selected.characterId))
346 { selected = null; }
347 setStatus(characters.length ? `${characters.length} character(s)` : "No matches.");
348 render();
349 return;
350 }
351 if (message.type === MessageType.editorGiftSent)
352 {
353 const name = `${message.firstName ?? ""} ${message.lastName ?? ""}`.trim();
354 setStatus(`Gift sent to ${name}.`);
355 giftItems = [];
356 messageText = "";
357 renderDetail();
358 }
359 }
360 };
361}
client/src/editor/main.js +9 −0
@@ -39,6 +39,7 @@ import { initPaletteModal } from "./paletteModal.js";
39 39 import { initTileConfigModal } from "./tileConfigModal.js";
40 40 import { initQuestsModal } from "./questsModal.js";
41 41 import { initDialoguesModal } from "./dialoguesModal.js";
42 import { initGiftsModal } from "./giftsModal.js";
42 43 import { createDimensionCombobox } from "./dimensionCombobox.js";
43 44 import
44 45 {
@@ -81,6 +82,7 @@ let paletteModal;
81 82 let tileConfigModal;
82 83 let questsModal;
83 84 let dialoguesModal;
85 let giftsModal;
84 86 let catalog = { grounds: {}, blocks: {}, images: [] };
85 87 let imageUrlByName = new Map();
86 88 let hoverLocal = null;
@@ -930,6 +932,7 @@ function anyModalOpen ()
930 932 || tileConfigModal?.isOpen()
931 933 || questsModal?.isOpen()
932 934 || dialoguesModal?.isOpen()
935 || giftsModal?.isOpen()
933 936 || !$("unsaved-chunk-modal")?.hidden;
934 937 }
935 938
@@ -1263,6 +1266,9 @@ async function main ()
1263 1266 dialoguesModal?.handleMessage(message);
1264 1267 tileConfigModal?.handleMessage(message);
1265 1268 }
1269 else if (message.type === MessageType.editorGiftCharacters
1270 || message.type === MessageType.editorGiftSent)
1271 { giftsModal?.handleMessage(message); }
1266 1272 else if (message.type === MessageType.editorChunk)
1267 1273 {
1268 1274 const msgDim = normalizeDimensionId(message.dimensionId ?? OVERWORLD_ID);
@@ -1307,6 +1313,8 @@ async function main ()
1307 1313 else if (message.type === MessageType.error)
1308 1314 {
1309 1315 $("error").textContent = message.message;
1316 if (giftsModal?.isOpen())
1317 { giftsModal.handleError?.(message.message); }
1310 1318 pendingCreatedDimensionId = null;
1311 1319 navigateAfterSave = false;
1312 1320 dimensionCombo?.setValue(selectedDimensionId);
@@ -1390,6 +1398,7 @@ async function main ()
1390 1398 });
1391 1399 questsModal = initQuestsModal({ socket, MessageType });
1392 1400 dialoguesModal = initDialoguesModal({ socket, MessageType });
1401 giftsModal = initGiftsModal({ socket, MessageType });
1393 1402 initSidePanelTabs();
1394 1403 game.startGame();
1395 1404 useNearestNeighbour(scene, game.images);
@@ -39,6 +39,7 @@ import { initPaletteModal } from "./paletteModal.js";
39import { initTileConfigModal } from "./tileConfigModal.js";
39import { initTileConfigModal } from "./tileConfigModal.js";
40import { initQuestsModal } from "./questsModal.js";
40import { initQuestsModal } from "./questsModal.js";
41import { initDialoguesModal } from "./dialoguesModal.js";
41import { initDialoguesModal } from "./dialoguesModal.js";
42import { initGiftsModal } from "./giftsModal.js";
42import { createDimensionCombobox } from "./dimensionCombobox.js";
43import { createDimensionCombobox } from "./dimensionCombobox.js";
43import
44import
44{
45{
@@ -81,6 +82,7 @@ let paletteModal;
81let tileConfigModal;
82let tileConfigModal;
82let questsModal;
83let questsModal;
83let dialoguesModal;
84let dialoguesModal;
85let giftsModal;
84let catalog = { grounds: {}, blocks: {}, images: [] };
86let catalog = { grounds: {}, blocks: {}, images: [] };
85let imageUrlByName = new Map();
87let imageUrlByName = new Map();
86let hoverLocal = null;
88let hoverLocal = null;
@@ -930,6 +932,7 @@ function anyModalOpen ()
930 || tileConfigModal?.isOpen()
932 || tileConfigModal?.isOpen()
931 || questsModal?.isOpen()
933 || questsModal?.isOpen()
932 || dialoguesModal?.isOpen()
934 || dialoguesModal?.isOpen()
935 || giftsModal?.isOpen()
933 || !$("unsaved-chunk-modal")?.hidden;
936 || !$("unsaved-chunk-modal")?.hidden;
934}
937}
935
938
@@ -1263,6 +1266,9 @@ async function main ()
1263 dialoguesModal?.handleMessage(message);
1266 dialoguesModal?.handleMessage(message);
1264 tileConfigModal?.handleMessage(message);
1267 tileConfigModal?.handleMessage(message);
1265 }
1268 }
1269 else if (message.type === MessageType.editorGiftCharacters
1270 || message.type === MessageType.editorGiftSent)
1271 { giftsModal?.handleMessage(message); }
1266 else if (message.type === MessageType.editorChunk)
1272 else if (message.type === MessageType.editorChunk)
1267 {
1273 {
1268 const msgDim = normalizeDimensionId(message.dimensionId ?? OVERWORLD_ID);
1274 const msgDim = normalizeDimensionId(message.dimensionId ?? OVERWORLD_ID);
@@ -1307,6 +1313,8 @@ async function main ()
1307 else if (message.type === MessageType.error)
1313 else if (message.type === MessageType.error)
1308 {
1314 {
1309 $("error").textContent = message.message;
1315 $("error").textContent = message.message;
1316 if (giftsModal?.isOpen())
1317 { giftsModal.handleError?.(message.message); }
1310 pendingCreatedDimensionId = null;
1318 pendingCreatedDimensionId = null;
1311 navigateAfterSave = false;
1319 navigateAfterSave = false;
1312 dimensionCombo?.setValue(selectedDimensionId);
1320 dimensionCombo?.setValue(selectedDimensionId);
@@ -1390,6 +1398,7 @@ async function main ()
1390 });
1398 });
1391 questsModal = initQuestsModal({ socket, MessageType });
1399 questsModal = initQuestsModal({ socket, MessageType });
1392 dialoguesModal = initDialoguesModal({ socket, MessageType });
1400 dialoguesModal = initDialoguesModal({ socket, MessageType });
1401 giftsModal = initGiftsModal({ socket, MessageType });
1393 initSidePanelTabs();
1402 initSidePanelTabs();
1394 game.startGame();
1403 game.startGame();
1395 useNearestNeighbour(scene, game.images);
1404 useNearestNeighbour(scene, game.images);
client/src/play/main.js +16 −2
@@ -1,4 +1,5 @@
1 1 import { MessageType, GAIT, CHUNK_SIZE, STATIC_CHUNK_RADIUS } from "/shared/protocol/constants.js";
2 import { validateCharacterNames } from "/shared/characters/names.js";
2 3 import { COMBAT_RANGE_TILES } from "/shared/spells/constants.js";
3 4 import { BlockType, BLOCK_DEFINITIONS, GROUND_DEFINITIONS, normalizeGround, resourceNodeDisplayName, isChopableTreeBlock, isPickablePlantBlock } from "/shared/definitions/tiles.js";
4 5 import { OVERWORLD_ID } from "/shared/world/dimensions.js";
@@ -2340,10 +2341,23 @@ document.getElementById("create-form").addEventListener("submit", (event) =>
2340 2341 const createError = document.getElementById("create-error");
2341 2342 if (createError)
2342 2343 { createError.textContent = ""; }
2343 socket.send({
2344 type: MessageType.createCharacter,
2344 const names = validateCharacterNames({
2345 2345 firstName: document.getElementById("first-name").value,
2346 2346 lastName: document.getElementById("last-name").value,
2347 isAdmin: !!session?.isAdmin
2348 });
2349 if (!names.ok)
2350 {
2351 if (createError)
2352 { createError.textContent = names.reason; }
2353 else
2354 { showError(names.reason); }
2355 return;
2356 }
2357 socket.send({
2358 type: MessageType.createCharacter,
2359 firstName: names.firstName,
2360 lastName: names.lastName,
2347 2361 sex: document.getElementById("sex").value,
2348 2362 hair: createHairControls?.currentHair?.() ?? null,
2349 2363 clothing: createClothingControls?.currentClothing?.() ?? null
@@ -1,4 +1,5 @@
1import { MessageType, GAIT, CHUNK_SIZE, STATIC_CHUNK_RADIUS } from "/shared/protocol/constants.js";
1import { MessageType, GAIT, CHUNK_SIZE, STATIC_CHUNK_RADIUS } from "/shared/protocol/constants.js";
2import { validateCharacterNames } from "/shared/characters/names.js";
2import { COMBAT_RANGE_TILES } from "/shared/spells/constants.js";
3import { COMBAT_RANGE_TILES } from "/shared/spells/constants.js";
3import { BlockType, BLOCK_DEFINITIONS, GROUND_DEFINITIONS, normalizeGround, resourceNodeDisplayName, isChopableTreeBlock, isPickablePlantBlock } from "/shared/definitions/tiles.js";
4import { BlockType, BLOCK_DEFINITIONS, GROUND_DEFINITIONS, normalizeGround, resourceNodeDisplayName, isChopableTreeBlock, isPickablePlantBlock } from "/shared/definitions/tiles.js";
4import { OVERWORLD_ID } from "/shared/world/dimensions.js";
5import { OVERWORLD_ID } from "/shared/world/dimensions.js";
@@ -2340,10 +2341,23 @@ document.getElementById("create-form").addEventListener("submit", (event) =>
2340 const createError = document.getElementById("create-error");
2341 const createError = document.getElementById("create-error");
2341 if (createError)
2342 if (createError)
2342 { createError.textContent = ""; }
2343 { createError.textContent = ""; }
2343 socket.send({
2344 const names = validateCharacterNames({
2344 type: MessageType.createCharacter,
2345 firstName: document.getElementById("first-name").value,
2345 firstName: document.getElementById("first-name").value,
2346 lastName: document.getElementById("last-name").value,
2346 lastName: document.getElementById("last-name").value,
2347 isAdmin: !!session?.isAdmin
2348 });
2349 if (!names.ok)
2350 {
2351 if (createError)
2352 { createError.textContent = names.reason; }
2353 else
2354 { showError(names.reason); }
2355 return;
2356 }
2357 socket.send({
2358 type: MessageType.createCharacter,
2359 firstName: names.firstName,
2360 lastName: names.lastName,
2347 sex: document.getElementById("sex").value,
2361 sex: document.getElementById("sex").value,
2348 hair: createHairControls?.currentHair?.() ?? null,
2362 hair: createHairControls?.currentHair?.() ?? null,
2349 clothing: createClothingControls?.currentClothing?.() ?? null
2363 clothing: createClothingControls?.currentClothing?.() ?? null
client/ui/editor.css +120 −3
@@ -1253,7 +1253,8 @@ label {
1253 1253
1254 1254
1255 1255 #quests-backdrop,
1256 #dialogues-backdrop {
1256 #dialogues-backdrop,
1257 #gifts-backdrop {
1257 1258 position: fixed;
1258 1259 inset: 0;
1259 1260 background: rgba(0, 0, 0, 0.62);
@@ -1261,7 +1262,8 @@ label {
1261 1262 }
1262 1263
1263 1264 #quests-modal,
1264 #dialogues-modal {
1265 #dialogues-modal,
1266 #gifts-modal {
1265 1267 position: fixed;
1266 1268 inset: 5vh 5vw;
1267 1269 z-index: 20;
@@ -1275,12 +1277,15 @@ label {
1275 1277 #quests-modal[hidden],
1276 1278 #quests-backdrop[hidden],
1277 1279 #dialogues-modal[hidden],
1278 #dialogues-backdrop[hidden] {
1280 #dialogues-backdrop[hidden],
1281 #gifts-modal[hidden],
1282 #gifts-backdrop[hidden] {
1279 1283 display: none !important;
1280 1284 }
1281 1285
1282 1286 #quests-modal>header,
1283 1287 #dialogues-modal>header,
1288 #gifts-modal>header,
1284 1289 #quests-modal>footer,
1285 1290 #dialogues-modal>footer {
1286 1291 display: flex;
@@ -1298,6 +1303,118 @@ label {
1298 1303 justify-content: flex-end;
1299 1304 }
1300 1305
1306 .gifts-layout {
1307 flex: 1;
1308 min-height: 0;
1309 display: flex;
1310 overflow: hidden;
1311 }
1312
1313 .gifts-search-pane {
1314 width: 260px;
1315 flex-shrink: 0;
1316 border-right: 1px solid #2c3340;
1317 padding: 0.65rem;
1318 display: flex;
1319 flex-direction: column;
1320 gap: 0.5rem;
1321 overflow: auto;
1322 background: #12151c;
1323 }
1324
1325 .gifts-search-label {
1326 display: flex;
1327 flex-direction: column;
1328 gap: 0.35rem;
1329 font-size: 0.85rem;
1330 }
1331
1332 .gifts-detail {
1333 flex: 1;
1334 min-width: 0;
1335 overflow: auto;
1336 padding: 0.85rem 1rem;
1337 display: flex;
1338 flex-direction: column;
1339 gap: 0.75rem;
1340 }
1341
1342 .gifts-message-label {
1343 display: flex;
1344 flex-direction: column;
1345 gap: 0.35rem;
1346 }
1347
1348 .gifts-message-label textarea {
1349 width: 100%;
1350 min-height: 6rem;
1351 resize: vertical;
1352 font: inherit;
1353 }
1354
1355 .gifts-items-header {
1356 display: flex;
1357 align-items: center;
1358 justify-content: space-between;
1359 gap: 0.5rem;
1360 }
1361
1362 .gifts-item-list {
1363 display: flex;
1364 flex-direction: column;
1365 gap: 0.35rem;
1366 }
1367
1368 .gifts-item-row {
1369 display: flex;
1370 align-items: center;
1371 gap: 0.5rem;
1372 }
1373
1374 .gifts-item-row span {
1375 flex: 1;
1376 min-width: 0;
1377 }
1378
1379 .gifts-item-row input[type="number"] {
1380 width: 5rem;
1381 }
1382
1383 .gifts-item-search-results {
1384 display: flex;
1385 flex-direction: column;
1386 gap: 0.2rem;
1387 max-height: 10rem;
1388 overflow: auto;
1389 }
1390
1391 .gifts-preview-wrap {
1392 display: flex;
1393 flex-direction: column;
1394 gap: 0.4rem;
1395 margin-top: 0.25rem;
1396 }
1397
1398 .gifts-letter-preview,
1399 .gifts-letter-signature {
1400 margin: 0;
1401 padding: 0.75rem;
1402 background: #0f1218;
1403 border: 1px solid #2c3340;
1404 white-space: pre-wrap;
1405 font-family: Georgia, "Times New Roman", serif;
1406 font-size: 0.92rem;
1407 line-height: 1.35;
1408 }
1409
1410 .gifts-letter-signature {
1411 opacity: 0.9;
1412 }
1413
1414 #gifts-status.error {
1415 color: #e8a0a0;
1416 }
1417
1301 1418 .content-editor-layout {
1302 1419 flex: 1;
1303 1420 min-height: 0;
@@ -1253,7 +1253,8 @@ label {
1253
1253
1254
1254
1255#quests-backdrop,
1255#quests-backdrop,
1256#dialogues-backdrop {
1256#dialogues-backdrop,
1257#gifts-backdrop {
1257 position: fixed;
1258 position: fixed;
1258 inset: 0;
1259 inset: 0;
1259 background: rgba(0, 0, 0, 0.62);
1260 background: rgba(0, 0, 0, 0.62);
@@ -1261,7 +1262,8 @@ label {
1261}
1262}
1262
1263
1263#quests-modal,
1264#quests-modal,
1264#dialogues-modal {
1265#dialogues-modal,
1266#gifts-modal {
1265 position: fixed;
1267 position: fixed;
1266 inset: 5vh 5vw;
1268 inset: 5vh 5vw;
1267 z-index: 20;
1269 z-index: 20;
@@ -1275,12 +1277,15 @@ label {
1275#quests-modal[hidden],
1277#quests-modal[hidden],
1276#quests-backdrop[hidden],
1278#quests-backdrop[hidden],
1277#dialogues-modal[hidden],
1279#dialogues-modal[hidden],
1278#dialogues-backdrop[hidden] {
1280#dialogues-backdrop[hidden],
1281#gifts-modal[hidden],
1282#gifts-backdrop[hidden] {
1279 display: none !important;
1283 display: none !important;
1280}
1284}
1281
1285
1282#quests-modal>header,
1286#quests-modal>header,
1283#dialogues-modal>header,
1287#dialogues-modal>header,
1288#gifts-modal>header,
1284#quests-modal>footer,
1289#quests-modal>footer,
1285#dialogues-modal>footer {
1290#dialogues-modal>footer {
1286 display: flex;
1291 display: flex;
@@ -1298,6 +1303,118 @@ label {
1298 justify-content: flex-end;
1303 justify-content: flex-end;
1299}
1304}
1300
1305
1306.gifts-layout {
1307 flex: 1;
1308 min-height: 0;
1309 display: flex;
1310 overflow: hidden;
1311}
1312
1313.gifts-search-pane {
1314 width: 260px;
1315 flex-shrink: 0;
1316 border-right: 1px solid #2c3340;
1317 padding: 0.65rem;
1318 display: flex;
1319 flex-direction: column;
1320 gap: 0.5rem;
1321 overflow: auto;
1322 background: #12151c;
1323}
1324
1325.gifts-search-label {
1326 display: flex;
1327 flex-direction: column;
1328 gap: 0.35rem;
1329 font-size: 0.85rem;
1330}
1331
1332.gifts-detail {
1333 flex: 1;
1334 min-width: 0;
1335 overflow: auto;
1336 padding: 0.85rem 1rem;
1337 display: flex;
1338 flex-direction: column;
1339 gap: 0.75rem;
1340}
1341
1342.gifts-message-label {
1343 display: flex;
1344 flex-direction: column;
1345 gap: 0.35rem;
1346}
1347
1348.gifts-message-label textarea {
1349 width: 100%;
1350 min-height: 6rem;
1351 resize: vertical;
1352 font: inherit;
1353}
1354
1355.gifts-items-header {
1356 display: flex;
1357 align-items: center;
1358 justify-content: space-between;
1359 gap: 0.5rem;
1360}
1361
1362.gifts-item-list {
1363 display: flex;
1364 flex-direction: column;
1365 gap: 0.35rem;
1366}
1367
1368.gifts-item-row {
1369 display: flex;
1370 align-items: center;
1371 gap: 0.5rem;
1372}
1373
1374.gifts-item-row span {
1375 flex: 1;
1376 min-width: 0;
1377}
1378
1379.gifts-item-row input[type="number"] {
1380 width: 5rem;
1381}
1382
1383.gifts-item-search-results {
1384 display: flex;
1385 flex-direction: column;
1386 gap: 0.2rem;
1387 max-height: 10rem;
1388 overflow: auto;
1389}
1390
1391.gifts-preview-wrap {
1392 display: flex;
1393 flex-direction: column;
1394 gap: 0.4rem;
1395 margin-top: 0.25rem;
1396}
1397
1398.gifts-letter-preview,
1399.gifts-letter-signature {
1400 margin: 0;
1401 padding: 0.75rem;
1402 background: #0f1218;
1403 border: 1px solid #2c3340;
1404 white-space: pre-wrap;
1405 font-family: Georgia, "Times New Roman", serif;
1406 font-size: 0.92rem;
1407 line-height: 1.35;
1408}
1409
1410.gifts-letter-signature {
1411 opacity: 0.9;
1412}
1413
1414#gifts-status.error {
1415 color: #e8a0a0;
1416}
1417
1301.content-editor-layout {
1418.content-editor-layout {
1302 flex: 1;
1419 flex: 1;
1303 min-height: 0;
1420 min-height: 0;
server/src/characters/service.js +10 −4
@@ -7,6 +7,7 @@ import {
7 7 normalizeHairStyle
8 8 } from "../../../shared/appearance/hair.js";
9 9 import { normalizeCreateClothing } from "../../../shared/items/createClothing.js";
10 import { validateCharacterNames } from "../../../shared/characters/names.js";
10 11
11 12 export class CharacterService
12 13 {
@@ -23,10 +24,15 @@ export class CharacterService
23 24
24 25 create (account, firstName, lastName, sex, hair = null, starterSettings = null, clothing = null)
25 26 {
26 const first = String(firstName ?? "").trim();
27 const last = String(lastName ?? "").trim();
28 if (!first || !last)
29 { throw userError("First and last name are required."); }
27 const names = validateCharacterNames({
28 firstName,
29 lastName,
30 isAdmin: !!account?.is_admin
31 });
32 if (!names.ok)
33 { throw userError(names.reason); }
34 const first = names.firstName;
35 const last = names.lastName;
30 36 if (sex !== SEX.male && sex !== SEX.female)
31 37 { throw userError("Sex must be male or female."); }
32 38
@@ -7,6 +7,7 @@ import {
7 normalizeHairStyle
7 normalizeHairStyle
8} from "../../../shared/appearance/hair.js";
8} from "../../../shared/appearance/hair.js";
9import { normalizeCreateClothing } from "../../../shared/items/createClothing.js";
9import { normalizeCreateClothing } from "../../../shared/items/createClothing.js";
10import { validateCharacterNames } from "../../../shared/characters/names.js";
10
11
11export class CharacterService
12export class CharacterService
12{
13{
@@ -23,10 +24,15 @@ export class CharacterService
23
24
24 create (account, firstName, lastName, sex, hair = null, starterSettings = null, clothing = null)
25 create (account, firstName, lastName, sex, hair = null, starterSettings = null, clothing = null)
25 {
26 {
26 const first = String(firstName ?? "").trim();
27 const names = validateCharacterNames({
27 const last = String(lastName ?? "").trim();
28 firstName,
28 if (!first || !last)
29 lastName,
29 { throw userError("First and last name are required."); }
30 isAdmin: !!account?.is_admin
31 });
32 if (!names.ok)
33 { throw userError(names.reason); }
34 const first = names.firstName;
35 const last = names.lastName;
30 if (sex !== SEX.male && sex !== SEX.female)
36 if (sex !== SEX.male && sex !== SEX.female)
31 { throw userError("Sex must be male or female."); }
37 { throw userError("Sex must be male or female."); }
32
38
server/src/gateway/websocket.js +20 −1
@@ -13,7 +13,7 @@ import { resolveAccount } from "../auth/routes.js";
13 13
14 14 let nextSessionId = 1;
15 15
16 export function attachGateway ({ httpServer, auth, stateDb, characters, friends, editor, simulation, deploy = null })
16 export function attachGateway ({ httpServer, auth, stateDb, characters, friends, editor, gifts, simulation, deploy = null })
17 17 {
18 18 const wss = new WebSocketServer({ server: httpServer, path: "/ws" });
19 19 const sessions = new Map();
@@ -1034,6 +1034,25 @@ export function attachGateway ({ httpServer, auth, stateDb, characters, friends,
1034 1034 ...editor.deleteDialogue(message.dialogueId, session.authSubject)
1035 1035 });
1036 1036 break;
1037 case MessageType.editorSearchGiftCharacters:
1038 requireAdmin(session);
1039 send(session, {
1040 type: MessageType.editorGiftCharacters,
1041 query: String(message.query ?? ""),
1042 ...gifts.search(message.query)
1043 });
1044 break;
1045 case MessageType.editorSendGift:
1046 requireAdmin(session);
1047 send(session, {
1048 type: MessageType.editorGiftSent,
1049 ...gifts.sendGift({
1050 characterId: message.characterId,
1051 message: message.message,
1052 items: message.items
1053 })
1054 });
1055 break;
1037 1056 case MessageType.dialogueChoose:
1038 1057 requirePlaying(session);
1039 1058 simulation.enqueue(session.id, {
@@ -13,7 +13,7 @@ import { resolveAccount } from "../auth/routes.js";
13
13
14let nextSessionId = 1;
14let nextSessionId = 1;
15
15
16export function attachGateway ({ httpServer, auth, stateDb, characters, friends, editor, simulation, deploy = null })
16export function attachGateway ({ httpServer, auth, stateDb, characters, friends, editor, gifts, simulation, deploy = null })
17{
17{
18 const wss = new WebSocketServer({ server: httpServer, path: "/ws" });
18 const wss = new WebSocketServer({ server: httpServer, path: "/ws" });
19 const sessions = new Map();
19 const sessions = new Map();
@@ -1034,6 +1034,25 @@ export function attachGateway ({ httpServer, auth, stateDb, characters, friends,
1034 ...editor.deleteDialogue(message.dialogueId, session.authSubject)
1034 ...editor.deleteDialogue(message.dialogueId, session.authSubject)
1035 });
1035 });
1036 break;
1036 break;
1037 case MessageType.editorSearchGiftCharacters:
1038 requireAdmin(session);
1039 send(session, {
1040 type: MessageType.editorGiftCharacters,
1041 query: String(message.query ?? ""),
1042 ...gifts.search(message.query)
1043 });
1044 break;
1045 case MessageType.editorSendGift:
1046 requireAdmin(session);
1047 send(session, {
1048 type: MessageType.editorGiftSent,
1049 ...gifts.sendGift({
1050 characterId: message.characterId,
1051 message: message.message,
1052 items: message.items
1053 })
1054 });
1055 break;
1037 case MessageType.dialogueChoose:
1056 case MessageType.dialogueChoose:
1038 requirePlaying(session);
1057 requirePlaying(session);
1039 simulation.enqueue(session.id, {
1058 simulation.enqueue(session.id, {
server/src/gifts/service.js added +179 −0
@@ -0,0 +1,179 @@
1 import { randomUUID } from "node:crypto";
2 import { ItemId, itemDefinition, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3 import { insertStackGrowable, normalizeVault } from "../../../shared/items/inventory.js";
4 import { attachOrigins, godsOrigin, writtenOrigin } from "../../../shared/items/origin.js";
5 import {
6 formatGiftLetterBody,
7 QUESTWARD_GIFT_AUTHOR,
8 QUESTWARD_GIFT_ORG
9 } from "../../../shared/courier/giftLetters.js";
10
11 function userError (message)
12 {
13 const error = new Error(message);
14 error.userFacing = true;
15 return error;
16 }
17
18 export class GiftService
19 {
20 constructor (stateDb, simulation)
21 {
22 this.stateDb = stateDb;
23 this.simulation = simulation;
24 }
25
26 search (query)
27 {
28 const rows = this.stateDb.searchCharactersForGift(query);
29 return {
30 characters: rows.map((row) => ({
31 characterId: row.character_id,
32 firstName: row.first_name,
33 lastName: row.last_name,
34 accountId: row.account_id,
35 accountUsername: row.account_username ?? null
36 }))
37 };
38 }
39
40 /**
41 * Credit gift items to the character bank and queue a signed Questward letter.
42 * @param {{ characterId: number, message?: string, items?: Array<{ itemId: number, quantity: number }> }} payload
43 */
44 sendGift (payload)
45 {
46 const characterId = payload?.characterId | 0;
47 const character = this.stateDb.getCharacter(characterId);
48 if (!character)
49 { throw userError("Character not found."); }
50
51 const items = normalizeGiftItems(payload?.items);
52 if (!items.length)
53 { throw userError("Pick at least one item to gift."); }
54
55 const message = String(payload?.message ?? "").replace(/\r\n/g, "\n").trim();
56 if (!message)
57 { throw userError("Write a gift message."); }
58 if (message.length > LETTER_MAX_BODY_CHARS)
59 { throw userError("Gift message is too long."); }
60
61 const displayName = `${character.first_name} ${character.last_name}`.trim();
62 const credited = [];
63 for (const entry of items)
64 {
65 const def = itemDefinition(entry.itemId);
66 if (!def)
67 { throw userError(`Unknown item ${entry.itemId}.`); }
68 const stack = attachOrigins({
69 itemId: entry.itemId,
70 quantity: entry.quantity,
71 origins: [{ origin: godsOrigin(), quantity: entry.quantity }]
72 });
73 this.#creditBank(characterId, stack, def);
74 credited.push({
75 itemId: entry.itemId,
76 quantity: entry.quantity,
77 displayName: def.displayName ?? `Item ${entry.itemId}`
78 });
79 }
80
81 const body = formatGiftLetterBody({
82 characterDisplayName: displayName,
83 message,
84 items: credited
85 });
86 this.#dispatchGiftLetter(character, body);
87
88 return {
89 ok: true,
90 characterId,
91 firstName: character.first_name,
92 lastName: character.last_name,
93 items: credited
94 };
95 }
96
97 #creditBank (characterId, stack, def)
98 {
99 const bag = this.#loadBag(characterId);
100 if (!bag)
101 { throw userError("Character bag not found."); }
102 const vault = normalizeVault(
103 bag.vaultReserved != null
104 ? { slots: bag.vault, reserved: bag.vaultReserved }
105 : bag.vault
106 );
107 const result = insertStackGrowable(vault.slots, stack, def);
108 if ((result.remainder | 0) > 0)
109 { throw userError("That character's bank is full."); }
110 bag.vault = result.slots;
111 bag.vaultReserved = vault.reserved;
112 this.#persistBag(characterId, bag);
113 }
114
115 #dispatchGiftLetter (character, body)
116 {
117 const trimmed = String(body ?? "").replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
118 const stack = attachOrigins({
119 itemId: ItemId.letter,
120 quantity: 1,
121 origins: [{ origin: writtenOrigin(QUESTWARD_GIFT_AUTHOR), quantity: 1 }],
122 instance: {
123 kind: "letter",
124 letterId: randomUUID(),
125 authorCharacterId: 0,
126 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
127 authorOrganization: QUESTWARD_GIFT_ORG,
128 body: trimmed,
129 opened: false,
130 writtenAt: Date.now()
131 }
132 });
133 const originTileX = character.tile_x | 0;
134 const originTileY = character.tile_y | 0;
135 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY);
136 this.simulation.courier.dispatchSystemLetter({
137 characterId: character.character_id,
138 originTileX: bank?.tileX ?? originTileX,
139 originTileY: bank?.tileY ?? originTileY,
140 stack
141 });
142 }
143
144 #loadBag (characterId)
145 {
146 const onlineId = this.simulation.characterEntities.get(characterId | 0);
147 return onlineId
148 ? this.simulation.bagOf(onlineId)
149 : this.stateDb.getBag(characterId);
150 }
151
152 #persistBag (characterId, bag)
153 {
154 this.stateDb.saveBag(characterId, bag);
155 const onlineId = this.simulation.characterEntities.get(characterId | 0);
156 if (onlineId)
157 {
158 this.simulation.applyBag?.(onlineId, bag);
159 this.simulation.pushInventory?.(characterId, bag);
160 }
161 }
162 }
163
164 function normalizeGiftItems (raw)
165 {
166 if (!Array.isArray(raw))
167 { return []; }
168 /** @type {Map<number, number>} */
169 const merged = new Map();
170 for (const row of raw)
171 {
172 const itemId = row?.itemId | 0;
173 const quantity = Math.max(1, Math.min(100_000, row?.quantity | 0 || 1));
174 if (!itemId || !itemDefinition(itemId))
175 { continue; }
176 merged.set(itemId, (merged.get(itemId) ?? 0) + quantity);
177 }
178 return [...merged.entries()].map(([itemId, quantity]) => ({ itemId, quantity }));
179 }
@@ -0,0 +1,179 @@
1import { randomUUID } from "node:crypto";
2import { ItemId, itemDefinition, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3import { insertStackGrowable, normalizeVault } from "../../../shared/items/inventory.js";
4import { attachOrigins, godsOrigin, writtenOrigin } from "../../../shared/items/origin.js";
5import {
6 formatGiftLetterBody,
7 QUESTWARD_GIFT_AUTHOR,
8 QUESTWARD_GIFT_ORG
9} from "../../../shared/courier/giftLetters.js";
10
11function userError (message)
12{
13 const error = new Error(message);
14 error.userFacing = true;
15 return error;
16}
17
18export class GiftService
19{
20 constructor (stateDb, simulation)
21 {
22 this.stateDb = stateDb;
23 this.simulation = simulation;
24 }
25
26 search (query)
27 {
28 const rows = this.stateDb.searchCharactersForGift(query);
29 return {
30 characters: rows.map((row) => ({
31 characterId: row.character_id,
32 firstName: row.first_name,
33 lastName: row.last_name,
34 accountId: row.account_id,
35 accountUsername: row.account_username ?? null
36 }))
37 };
38 }
39
40 /**
41 * Credit gift items to the character bank and queue a signed Questward letter.
42 * @param {{ characterId: number, message?: string, items?: Array<{ itemId: number, quantity: number }> }} payload
43 */
44 sendGift (payload)
45 {
46 const characterId = payload?.characterId | 0;
47 const character = this.stateDb.getCharacter(characterId);
48 if (!character)
49 { throw userError("Character not found."); }
50
51 const items = normalizeGiftItems(payload?.items);
52 if (!items.length)
53 { throw userError("Pick at least one item to gift."); }
54
55 const message = String(payload?.message ?? "").replace(/\r\n/g, "\n").trim();
56 if (!message)
57 { throw userError("Write a gift message."); }
58 if (message.length > LETTER_MAX_BODY_CHARS)
59 { throw userError("Gift message is too long."); }
60
61 const displayName = `${character.first_name} ${character.last_name}`.trim();
62 const credited = [];
63 for (const entry of items)
64 {
65 const def = itemDefinition(entry.itemId);
66 if (!def)
67 { throw userError(`Unknown item ${entry.itemId}.`); }
68 const stack = attachOrigins({
69 itemId: entry.itemId,
70 quantity: entry.quantity,
71 origins: [{ origin: godsOrigin(), quantity: entry.quantity }]
72 });
73 this.#creditBank(characterId, stack, def);
74 credited.push({
75 itemId: entry.itemId,
76 quantity: entry.quantity,
77 displayName: def.displayName ?? `Item ${entry.itemId}`
78 });
79 }
80
81 const body = formatGiftLetterBody({
82 characterDisplayName: displayName,
83 message,
84 items: credited
85 });
86 this.#dispatchGiftLetter(character, body);
87
88 return {
89 ok: true,
90 characterId,
91 firstName: character.first_name,
92 lastName: character.last_name,
93 items: credited
94 };
95 }
96
97 #creditBank (characterId, stack, def)
98 {
99 const bag = this.#loadBag(characterId);
100 if (!bag)
101 { throw userError("Character bag not found."); }
102 const vault = normalizeVault(
103 bag.vaultReserved != null
104 ? { slots: bag.vault, reserved: bag.vaultReserved }
105 : bag.vault
106 );
107 const result = insertStackGrowable(vault.slots, stack, def);
108 if ((result.remainder | 0) > 0)
109 { throw userError("That character's bank is full."); }
110 bag.vault = result.slots;
111 bag.vaultReserved = vault.reserved;
112 this.#persistBag(characterId, bag);
113 }
114
115 #dispatchGiftLetter (character, body)
116 {
117 const trimmed = String(body ?? "").replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
118 const stack = attachOrigins({
119 itemId: ItemId.letter,
120 quantity: 1,
121 origins: [{ origin: writtenOrigin(QUESTWARD_GIFT_AUTHOR), quantity: 1 }],
122 instance: {
123 kind: "letter",
124 letterId: randomUUID(),
125 authorCharacterId: 0,
126 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
127 authorOrganization: QUESTWARD_GIFT_ORG,
128 body: trimmed,
129 opened: false,
130 writtenAt: Date.now()
131 }
132 });
133 const originTileX = character.tile_x | 0;
134 const originTileY = character.tile_y | 0;
135 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY);
136 this.simulation.courier.dispatchSystemLetter({
137 characterId: character.character_id,
138 originTileX: bank?.tileX ?? originTileX,
139 originTileY: bank?.tileY ?? originTileY,
140 stack
141 });
142 }
143
144 #loadBag (characterId)
145 {
146 const onlineId = this.simulation.characterEntities.get(characterId | 0);
147 return onlineId
148 ? this.simulation.bagOf(onlineId)
149 : this.stateDb.getBag(characterId);
150 }
151
152 #persistBag (characterId, bag)
153 {
154 this.stateDb.saveBag(characterId, bag);
155 const onlineId = this.simulation.characterEntities.get(characterId | 0);
156 if (onlineId)
157 {
158 this.simulation.applyBag?.(onlineId, bag);
159 this.simulation.pushInventory?.(characterId, bag);
160 }
161 }
162}
163
164function normalizeGiftItems (raw)
165{
166 if (!Array.isArray(raw))
167 { return []; }
168 /** @type {Map<number, number>} */
169 const merged = new Map();
170 for (const row of raw)
171 {
172 const itemId = row?.itemId | 0;
173 const quantity = Math.max(1, Math.min(100_000, row?.quantity | 0 || 1));
174 if (!itemId || !itemDefinition(itemId))
175 { continue; }
176 merged.set(itemId, (merged.get(itemId) ?? 0) + quantity);
177 }
178 return [...merged.entries()].map(([itemId, quantity]) => ({ itemId, quantity }));
179}
server/src/index.js +3 −0
@@ -4,6 +4,7 @@ import { StateDatabase } from "./persistence/stateDb.js";
4 4 import { EditorService } from "./editor/service.js";
5 5 import { CharacterService } from "./characters/service.js";
6 6 import { FriendService } from "./friends/service.js";
7 import { GiftService } from "./gifts/service.js";
7 8 import { createAuth } from "./auth/index.js";
8 9 import { Simulation } from "./simulation/simulation.js";
9 10 import { createHttpServer, repoRootFrom } from "./gateway/http.js";
@@ -26,6 +27,7 @@ const editor = new EditorService(worldDb);
26 27 const characters = new CharacterService(stateDb, console);
27 28 const friends = new FriendService(stateDb);
28 29 const simulation = new Simulation(worldDb, stateDb);
30 const gifts = new GiftService(stateDb, simulation);
29 31 const auth = createAuth(stateDb);
30 32 const httpServer = createHttpServer(rootDir, { auth, stateDb });
31 33
@@ -55,6 +57,7 @@ const gateway = attachGateway({
55 57 characters,
56 58 friends,
57 59 editor,
60 gifts,
58 61 simulation,
59 62 deploy: deployBridge
60 63 });
@@ -4,6 +4,7 @@ import { StateDatabase } from "./persistence/stateDb.js";
4import { EditorService } from "./editor/service.js";
4import { EditorService } from "./editor/service.js";
5import { CharacterService } from "./characters/service.js";
5import { CharacterService } from "./characters/service.js";
6import { FriendService } from "./friends/service.js";
6import { FriendService } from "./friends/service.js";
7import { GiftService } from "./gifts/service.js";
7import { createAuth } from "./auth/index.js";
8import { createAuth } from "./auth/index.js";
8import { Simulation } from "./simulation/simulation.js";
9import { Simulation } from "./simulation/simulation.js";
9import { createHttpServer, repoRootFrom } from "./gateway/http.js";
10import { createHttpServer, repoRootFrom } from "./gateway/http.js";
@@ -26,6 +27,7 @@ const editor = new EditorService(worldDb);
26const characters = new CharacterService(stateDb, console);
27const characters = new CharacterService(stateDb, console);
27const friends = new FriendService(stateDb);
28const friends = new FriendService(stateDb);
28const simulation = new Simulation(worldDb, stateDb);
29const simulation = new Simulation(worldDb, stateDb);
30const gifts = new GiftService(stateDb, simulation);
29const auth = createAuth(stateDb);
31const auth = createAuth(stateDb);
30const httpServer = createHttpServer(rootDir, { auth, stateDb });
32const httpServer = createHttpServer(rootDir, { auth, stateDb });
31
33
@@ -55,6 +57,7 @@ const gateway = attachGateway({
55 characters,
57 characters,
56 friends,
58 friends,
57 editor,
59 editor,
60 gifts,
58 simulation,
61 simulation,
59 deploy: deployBridge
62 deploy: deployBridge
60});
63});
server/src/persistence/stateDb.js +55 −0
@@ -745,6 +745,61 @@ export class StateDatabase
745 745 `).get(normalizeName(firstName), normalizeName(lastName)) ?? null;
746 746 }
747 747
748 /**
749 * Admin gift search: match first name, last name, "first last", or account username.
750 * @param {string} query
751 * @param {number} [limit]
752 */
753 searchCharactersForGift (query, limit = 40)
754 {
755 const raw = String(query ?? "").trim();
756 if (!raw)
757 { return []; }
758 const cap = Math.min(100, Math.max(1, limit | 0 || 40));
759 const needle = `%${normalizeName(raw).replace(/%/g, "")}%`;
760 const parts = raw.split(/\s+/u).filter(Boolean);
761 const firstPart = parts[0] ? normalizeName(parts[0]) : "";
762 const lastPart = parts.length >= 2 ? normalizeName(parts.slice(1).join(" ")) : "";
763
764 if (parts.length >= 2 && firstPart && lastPart)
765 {
766 return this.db.prepare(`
767 SELECT
768 c.character_id,
769 c.first_name,
770 c.last_name,
771 c.account_id,
772 a.username AS account_username
773 FROM characters c
774 LEFT JOIN accounts a ON a.account_id = c.account_id
775 WHERE (c.first_normalized = ? AND c.last_normalized = ?)
776 OR c.first_normalized LIKE ?
777 OR c.last_normalized LIKE ?
778 OR lower(COALESCE(a.username, '')) LIKE ?
779 OR (c.first_normalized || ' ' || c.last_normalized) LIKE ?
780 ORDER BY c.last_normalized ASC, c.first_normalized ASC, c.character_id ASC
781 LIMIT ?
782 `).all(firstPart, lastPart, needle, needle, needle, needle, cap);
783 }
784
785 return this.db.prepare(`
786 SELECT
787 c.character_id,
788 c.first_name,
789 c.last_name,
790 c.account_id,
791 a.username AS account_username
792 FROM characters c
793 LEFT JOIN accounts a ON a.account_id = c.account_id
794 WHERE c.first_normalized LIKE ?
795 OR c.last_normalized LIKE ?
796 OR lower(COALESCE(a.username, '')) LIKE ?
797 OR (c.first_normalized || ' ' || c.last_normalized) LIKE ?
798 ORDER BY c.last_normalized ASC, c.first_normalized ASC, c.character_id ASC
799 LIMIT ?
800 `).all(needle, needle, needle, needle, cap);
801 }
802
748 803 getCharacterBounty (characterId)
749 804 {
750 805 const row = this.db.prepare(`
@@ -745,6 +745,61 @@ export class StateDatabase
745 `).get(normalizeName(firstName), normalizeName(lastName)) ?? null;
745 `).get(normalizeName(firstName), normalizeName(lastName)) ?? null;
746 }
746 }
747
747
748 /**
749 * Admin gift search: match first name, last name, "first last", or account username.
750 * @param {string} query
751 * @param {number} [limit]
752 */
753 searchCharactersForGift (query, limit = 40)
754 {
755 const raw = String(query ?? "").trim();
756 if (!raw)
757 { return []; }
758 const cap = Math.min(100, Math.max(1, limit | 0 || 40));
759 const needle = `%${normalizeName(raw).replace(/%/g, "")}%`;
760 const parts = raw.split(/\s+/u).filter(Boolean);
761 const firstPart = parts[0] ? normalizeName(parts[0]) : "";
762 const lastPart = parts.length >= 2 ? normalizeName(parts.slice(1).join(" ")) : "";
763
764 if (parts.length >= 2 && firstPart && lastPart)
765 {
766 return this.db.prepare(`
767 SELECT
768 c.character_id,
769 c.first_name,
770 c.last_name,
771 c.account_id,
772 a.username AS account_username
773 FROM characters c
774 LEFT JOIN accounts a ON a.account_id = c.account_id
775 WHERE (c.first_normalized = ? AND c.last_normalized = ?)
776 OR c.first_normalized LIKE ?
777 OR c.last_normalized LIKE ?
778 OR lower(COALESCE(a.username, '')) LIKE ?
779 OR (c.first_normalized || ' ' || c.last_normalized) LIKE ?
780 ORDER BY c.last_normalized ASC, c.first_normalized ASC, c.character_id ASC
781 LIMIT ?
782 `).all(firstPart, lastPart, needle, needle, needle, needle, cap);
783 }
784
785 return this.db.prepare(`
786 SELECT
787 c.character_id,
788 c.first_name,
789 c.last_name,
790 c.account_id,
791 a.username AS account_username
792 FROM characters c
793 LEFT JOIN accounts a ON a.account_id = c.account_id
794 WHERE c.first_normalized LIKE ?
795 OR c.last_normalized LIKE ?
796 OR lower(COALESCE(a.username, '')) LIKE ?
797 OR (c.first_normalized || ' ' || c.last_normalized) LIKE ?
798 ORDER BY c.last_normalized ASC, c.first_normalized ASC, c.character_id ASC
799 LIMIT ?
800 `).all(needle, needle, needle, needle, cap);
801 }
802
748 getCharacterBounty (characterId)
803 getCharacterBounty (characterId)
749 {
804 {
750 const row = this.db.prepare(`
805 const row = this.db.prepare(`
server/tests/gifts.test.js added +126 −0
@@ -0,0 +1,126 @@
1 import test from "node:test";
2 import assert from "node:assert/strict";
3 import {
4 validateCharacterNamePart,
5 validateCharacterNames,
6 RESERVED_ADMIN_SURNAME
7 } from "../../shared/characters/names.js";
8 import {
9 formatGiftLetterBody,
10 QUESTWARD_GIFT_AUTHOR,
11 QUESTWARD_GIFT_ORG
12 } from "../../shared/courier/giftLetters.js";
13 import { formatLetterSignature } from "../../shared/courier/systemLetters.js";
14 import { ItemId } from "../../shared/definitions/items.js";
15 import { BlockType } from "../../shared/definitions/tiles.js";
16 import { createEmptyChunkData, encodeChunkBlob, decodeChunkBlob } from "../src/world/chunkData.js";
17 import { GiftService } from "../src/gifts/service.js";
18 import { makeCharacter, makeSimulation } from "./helpers/simulationHarness.js";
19
20 function placeBank (worldDb, tileX, tileY)
21 {
22 const chunkX = Math.floor(tileX / 16);
23 const chunkY = Math.floor(tileY / 16);
24 const localX = ((tileX % 16) + 16) % 16;
25 const localY = ((tileY % 16) + 16) % 16;
26 const revisionId = worldDb.getActiveRevisionId();
27 const row = worldDb.getChunkVersion(chunkX, chunkY, revisionId);
28 const data = row
29 ? decodeChunkBlob(row.data_blob, undefined, chunkX, chunkY)
30 : createEmptyChunkData();
31 data.open = true;
32 data.blocks[localY * 16 + localX] = { typeId: BlockType.bank, state: 0 };
33 worldDb.saveChunkVersion(chunkX, chunkY, revisionId, true, encodeChunkBlob(data));
34 }
35
36 test("character names allow letters and hyphens only", () =>
37 {
38 assert.equal(validateCharacterNamePart("Anne-Marie").ok, true);
39 assert.equal(validateCharacterNamePart("Bob").ok, true);
40 assert.equal(validateCharacterNamePart("Bob Smith").ok, false);
41 assert.equal(validateCharacterNamePart("Bob2").ok, false);
42 assert.equal(validateCharacterNamePart("O'Brien").ok, false);
43 assert.equal(validateCharacterNamePart("---").ok, false);
44 });
45
46 test("Questward surname is admin-only", () =>
47 {
48 const denied = validateCharacterNames({
49 firstName: "John",
50 lastName: "Questward",
51 isAdmin: false
52 });
53 assert.equal(denied.ok, false);
54 const allowed = validateCharacterNames({
55 firstName: "John",
56 lastName: RESERVED_ADMIN_SURNAME,
57 isAdmin: true
58 });
59 assert.equal(allowed.ok, true);
60 assert.equal(allowed.lastName, RESERVED_ADMIN_SURNAME);
61 });
62
63 test("gift letter body and signature match Questward CEO format", () =>
64 {
65 const body = formatGiftLetterBody({
66 characterDisplayName: "Tim Falken",
67 message: "Enjoy these supplies.",
68 items: [{ displayName: "Stick", quantity: 3 }]
69 });
70 assert.match(body, /^Dear Tim Falken\n/);
71 assert.match(body, /Enjoy these supplies\./);
72 assert.match(body, /• 3× Stick/);
73 assert.match(body, /Thank you for playing Questward\./);
74 assert.equal(
75 formatLetterSignature({
76 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
77 authorOrganization: QUESTWARD_GIFT_ORG
78 }),
79 "Signed:\nJohn Questward\nCEO of Questward"
80 );
81 });
82
83 test("admin gift credits bank and queues a system letter", () =>
84 {
85 const harness = makeSimulation({ workerCount: 1 });
86 try
87 {
88 placeBank(harness.worldDb, 8, 8);
89 harness.simulation.courier.refreshBankIndex();
90
91 const character = makeCharacter(harness.stateDb, {
92 tileX: 8,
93 tileY: 8,
94 firstName: "Gift",
95 lastName: "Target"
96 });
97 const gifts = new GiftService(harness.stateDb, harness.simulation);
98 const before = harness.stateDb.getBag(character.character_id);
99 const stickBefore = (before.vault ?? []).reduce(
100 (sum, slot) => sum + (slot?.itemId === ItemId.stick ? (slot.quantity | 0) : 0),
101 0
102 );
103
104 const result = gifts.sendGift({
105 characterId: character.character_id,
106 message: "A small thank-you.",
107 items: [{ itemId: ItemId.stick, quantity: 5 }]
108 });
109 assert.equal(result.ok, true);
110
111 const after = harness.stateDb.getBag(character.character_id);
112 const stickAfter = (after.vault ?? []).reduce(
113 (sum, slot) => sum + (slot?.itemId === ItemId.stick ? (slot.quantity | 0) : 0),
114 0
115 );
116 assert.equal(stickAfter, stickBefore + 5);
117
118 const held = harness.stateDb.listHeldCourierDeliveries(character.character_id);
119 const foundHeld = held.some((row) =>
120 row.cargo?.stack?.instance?.authorDisplayName === QUESTWARD_GIFT_AUTHOR
121 );
122 assert.ok(foundHeld, "expected a held gift letter for the offline character");
123 }
124 finally
125 { harness.close(); }
126 });
@@ -0,0 +1,126 @@
1import test from "node:test";
2import assert from "node:assert/strict";
3import {
4 validateCharacterNamePart,
5 validateCharacterNames,
6 RESERVED_ADMIN_SURNAME
7} from "../../shared/characters/names.js";
8import {
9 formatGiftLetterBody,
10 QUESTWARD_GIFT_AUTHOR,
11 QUESTWARD_GIFT_ORG
12} from "../../shared/courier/giftLetters.js";
13import { formatLetterSignature } from "../../shared/courier/systemLetters.js";
14import { ItemId } from "../../shared/definitions/items.js";
15import { BlockType } from "../../shared/definitions/tiles.js";
16import { createEmptyChunkData, encodeChunkBlob, decodeChunkBlob } from "../src/world/chunkData.js";
17import { GiftService } from "../src/gifts/service.js";
18import { makeCharacter, makeSimulation } from "./helpers/simulationHarness.js";
19
20function placeBank (worldDb, tileX, tileY)
21{
22 const chunkX = Math.floor(tileX / 16);
23 const chunkY = Math.floor(tileY / 16);
24 const localX = ((tileX % 16) + 16) % 16;
25 const localY = ((tileY % 16) + 16) % 16;
26 const revisionId = worldDb.getActiveRevisionId();
27 const row = worldDb.getChunkVersion(chunkX, chunkY, revisionId);
28 const data = row
29 ? decodeChunkBlob(row.data_blob, undefined, chunkX, chunkY)
30 : createEmptyChunkData();
31 data.open = true;
32 data.blocks[localY * 16 + localX] = { typeId: BlockType.bank, state: 0 };
33 worldDb.saveChunkVersion(chunkX, chunkY, revisionId, true, encodeChunkBlob(data));
34}
35
36test("character names allow letters and hyphens only", () =>
37{
38 assert.equal(validateCharacterNamePart("Anne-Marie").ok, true);
39 assert.equal(validateCharacterNamePart("Bob").ok, true);
40 assert.equal(validateCharacterNamePart("Bob Smith").ok, false);
41 assert.equal(validateCharacterNamePart("Bob2").ok, false);
42 assert.equal(validateCharacterNamePart("O'Brien").ok, false);
43 assert.equal(validateCharacterNamePart("---").ok, false);
44});
45
46test("Questward surname is admin-only", () =>
47{
48 const denied = validateCharacterNames({
49 firstName: "John",
50 lastName: "Questward",
51 isAdmin: false
52 });
53 assert.equal(denied.ok, false);
54 const allowed = validateCharacterNames({
55 firstName: "John",
56 lastName: RESERVED_ADMIN_SURNAME,
57 isAdmin: true
58 });
59 assert.equal(allowed.ok, true);
60 assert.equal(allowed.lastName, RESERVED_ADMIN_SURNAME);
61});
62
63test("gift letter body and signature match Questward CEO format", () =>
64{
65 const body = formatGiftLetterBody({
66 characterDisplayName: "Tim Falken",
67 message: "Enjoy these supplies.",
68 items: [{ displayName: "Stick", quantity: 3 }]
69 });
70 assert.match(body, /^Dear Tim Falken\n/);
71 assert.match(body, /Enjoy these supplies\./);
72 assert.match(body, /• 3× Stick/);
73 assert.match(body, /Thank you for playing Questward\./);
74 assert.equal(
75 formatLetterSignature({
76 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
77 authorOrganization: QUESTWARD_GIFT_ORG
78 }),
79 "Signed:\nJohn Questward\nCEO of Questward"
80 );
81});
82
83test("admin gift credits bank and queues a system letter", () =>
84{
85 const harness = makeSimulation({ workerCount: 1 });
86 try
87 {
88 placeBank(harness.worldDb, 8, 8);
89 harness.simulation.courier.refreshBankIndex();
90
91 const character = makeCharacter(harness.stateDb, {
92 tileX: 8,
93 tileY: 8,
94 firstName: "Gift",
95 lastName: "Target"
96 });
97 const gifts = new GiftService(harness.stateDb, harness.simulation);
98 const before = harness.stateDb.getBag(character.character_id);
99 const stickBefore = (before.vault ?? []).reduce(
100 (sum, slot) => sum + (slot?.itemId === ItemId.stick ? (slot.quantity | 0) : 0),
101 0
102 );
103
104 const result = gifts.sendGift({
105 characterId: character.character_id,
106 message: "A small thank-you.",
107 items: [{ itemId: ItemId.stick, quantity: 5 }]
108 });
109 assert.equal(result.ok, true);
110
111 const after = harness.stateDb.getBag(character.character_id);
112 const stickAfter = (after.vault ?? []).reduce(
113 (sum, slot) => sum + (slot?.itemId === ItemId.stick ? (slot.quantity | 0) : 0),
114 0
115 );
116 assert.equal(stickAfter, stickBefore + 5);
117
118 const held = harness.stateDb.listHeldCourierDeliveries(character.character_id);
119 const foundHeld = held.some((row) =>
120 row.cargo?.stack?.instance?.authorDisplayName === QUESTWARD_GIFT_AUTHOR
121 );
122 assert.ok(foundHeld, "expected a held gift letter for the offline character");
123 }
124 finally
125 { harness.close(); }
126});
shared/characters/names.js added +56 −0
@@ -0,0 +1,56 @@
1 /** Character name rules shared by create UI and authoritative server create. */
2
3 export const CHARACTER_NAME_MAX_LENGTH = 24;
4
5 /** Letters and hyphen only (no spaces, digits, or other punctuation). */
6 export const CHARACTER_NAME_PATTERN = /^[A-Za-z-]+$/u;
7
8 /** Reserved surname — only game admins may claim it. */
9 export const RESERVED_ADMIN_SURNAME = "questward";
10
11 /**
12 * @param {unknown} value
13 * @param {"first"|"last"} part
14 * @returns {{ ok: true, value: string } | { ok: false, reason: string }}
15 */
16 export function validateCharacterNamePart (value, part = "first")
17 {
18 const label = part === "last" ? "Last name" : "First name";
19 const trimmed = String(value ?? "").trim();
20 if (!trimmed)
21 { return { ok: false, reason: `${label} is required.` }; }
22 if (trimmed.length > CHARACTER_NAME_MAX_LENGTH)
23 { return { ok: false, reason: `${label} is too long.` }; }
24 if (!CHARACTER_NAME_PATTERN.test(trimmed))
25 {
26 return {
27 ok: false,
28 reason: `${label} may only use letters A–Z and hyphens.`
29 };
30 }
31 if (/^-+$/u.test(trimmed))
32 { return { ok: false, reason: `${label} must include a letter.` }; }
33 return { ok: true, value: trimmed };
34 }
35
36 /**
37 * @param {{ firstName: unknown, lastName: unknown, isAdmin?: boolean }} opts
38 * @returns {{ ok: true, firstName: string, lastName: string } | { ok: false, reason: string }}
39 */
40 export function validateCharacterNames ({ firstName, lastName, isAdmin = false })
41 {
42 const first = validateCharacterNamePart(firstName, "first");
43 if (!first.ok)
44 { return first; }
45 const last = validateCharacterNamePart(lastName, "last");
46 if (!last.ok)
47 { return last; }
48 if (last.value.toLocaleLowerCase() === RESERVED_ADMIN_SURNAME && !isAdmin)
49 {
50 return {
51 ok: false,
52 reason: "That last name is reserved."
53 };
54 }
55 return { ok: true, firstName: first.value, lastName: last.value };
56 }
@@ -0,0 +1,56 @@
1/** Character name rules shared by create UI and authoritative server create. */
2
3export const CHARACTER_NAME_MAX_LENGTH = 24;
4
5/** Letters and hyphen only (no spaces, digits, or other punctuation). */
6export const CHARACTER_NAME_PATTERN = /^[A-Za-z-]+$/u;
7
8/** Reserved surname — only game admins may claim it. */
9export const RESERVED_ADMIN_SURNAME = "questward";
10
11/**
12 * @param {unknown} value
13 * @param {"first"|"last"} part
14 * @returns {{ ok: true, value: string } | { ok: false, reason: string }}
15 */
16export function validateCharacterNamePart (value, part = "first")
17{
18 const label = part === "last" ? "Last name" : "First name";
19 const trimmed = String(value ?? "").trim();
20 if (!trimmed)
21 { return { ok: false, reason: `${label} is required.` }; }
22 if (trimmed.length > CHARACTER_NAME_MAX_LENGTH)
23 { return { ok: false, reason: `${label} is too long.` }; }
24 if (!CHARACTER_NAME_PATTERN.test(trimmed))
25 {
26 return {
27 ok: false,
28 reason: `${label} may only use letters A–Z and hyphens.`
29 };
30 }
31 if (/^-+$/u.test(trimmed))
32 { return { ok: false, reason: `${label} must include a letter.` }; }
33 return { ok: true, value: trimmed };
34}
35
36/**
37 * @param {{ firstName: unknown, lastName: unknown, isAdmin?: boolean }} opts
38 * @returns {{ ok: true, firstName: string, lastName: string } | { ok: false, reason: string }}
39 */
40export function validateCharacterNames ({ firstName, lastName, isAdmin = false })
41{
42 const first = validateCharacterNamePart(firstName, "first");
43 if (!first.ok)
44 { return first; }
45 const last = validateCharacterNamePart(lastName, "last");
46 if (!last.ok)
47 { return last; }
48 if (last.value.toLocaleLowerCase() === RESERVED_ADMIN_SURNAME && !isAdmin)
49 {
50 return {
51 ok: false,
52 reason: "That last name is reserved."
53 };
54 }
55 return { ok: true, firstName: first.value, lastName: last.value };
56}
shared/courier/giftLetters.js added +51 −0
@@ -0,0 +1,51 @@
1 import { LETTER_MAX_BODY_CHARS, itemDefinition, itemDisplayName } from "../definitions/items.js";
2
3 export const QUESTWARD_GIFT_AUTHOR = "John Questward";
4 export const QUESTWARD_GIFT_ORG = "CEO of Questward";
5
6 /**
7 * @param {{ displayName: string, quantity: number }} item
8 */
9 export function formatGiftItemBullet (item)
10 {
11 const qty = Math.max(1, item.quantity | 0);
12 const name = String(item.displayName ?? "Item").trim() || "Item";
13 return `• ${qty}× ${name}`;
14 }
15
16 /**
17 * Build the gift pigeon letter body (shared by server send + editor live preview).
18 * @param {{
19 * characterDisplayName: string,
20 * message?: string,
21 * items?: Array<{ displayName?: string, itemId?: number, quantity?: number }>
22 * }} opts
23 */
24 export function formatGiftLetterBody ({ characterDisplayName, message = "", items = [] })
25 {
26 const name = String(characterDisplayName ?? "").trim() || "Adventurer";
27 const custom = String(message ?? "").replace(/\r\n/g, "\n").trim();
28 const lines = (items ?? []).map((row) =>
29 {
30 const def = row.itemId != null ? itemDefinition(row.itemId) : null;
31 const displayName = row.displayName
32 ?? (def ? itemDisplayName({ itemId: row.itemId, quantity: row.quantity }, def) : null)
33 ?? def?.displayName
34 ?? `Item ${row.itemId ?? "?"}`;
35 return formatGiftItemBullet({ displayName, quantity: row.quantity });
36 });
37 const itemBlock = lines.length
38 ? lines.join("\n")
39 : "• (no items selected)";
40 const parts = [
41 `Dear ${name}`,
42 "",
43 custom || "(Your message here.)",
44 "",
45 "The following items were added to your bank:",
46 itemBlock,
47 "",
48 "Thank you for playing Questward."
49 ];
50 return parts.join("\n").slice(0, LETTER_MAX_BODY_CHARS);
51 }
@@ -0,0 +1,51 @@
1import { LETTER_MAX_BODY_CHARS, itemDefinition, itemDisplayName } from "../definitions/items.js";
2
3export const QUESTWARD_GIFT_AUTHOR = "John Questward";
4export const QUESTWARD_GIFT_ORG = "CEO of Questward";
5
6/**
7 * @param {{ displayName: string, quantity: number }} item
8 */
9export function formatGiftItemBullet (item)
10{
11 const qty = Math.max(1, item.quantity | 0);
12 const name = String(item.displayName ?? "Item").trim() || "Item";
13 return `• ${qty}× ${name}`;
14}
15
16/**
17 * Build the gift pigeon letter body (shared by server send + editor live preview).
18 * @param {{
19 * characterDisplayName: string,
20 * message?: string,
21 * items?: Array<{ displayName?: string, itemId?: number, quantity?: number }>
22 * }} opts
23 */
24export function formatGiftLetterBody ({ characterDisplayName, message = "", items = [] })
25{
26 const name = String(characterDisplayName ?? "").trim() || "Adventurer";
27 const custom = String(message ?? "").replace(/\r\n/g, "\n").trim();
28 const lines = (items ?? []).map((row) =>
29 {
30 const def = row.itemId != null ? itemDefinition(row.itemId) : null;
31 const displayName = row.displayName
32 ?? (def ? itemDisplayName({ itemId: row.itemId, quantity: row.quantity }, def) : null)
33 ?? def?.displayName
34 ?? `Item ${row.itemId ?? "?"}`;
35 return formatGiftItemBullet({ displayName, quantity: row.quantity });
36 });
37 const itemBlock = lines.length
38 ? lines.join("\n")
39 : "• (no items selected)";
40 const parts = [
41 `Dear ${name}`,
42 "",
43 custom || "(Your message here.)",
44 "",
45 "The following items were added to your bank:",
46 itemBlock,
47 "",
48 "Thank you for playing Questward."
49 ];
50 return parts.join("\n").slice(0, LETTER_MAX_BODY_CHARS);
51}
shared/courier/systemLetters.js +6 −0
@@ -3,6 +3,12 @@
3 3 export const CENTRAL_EXCHANGE_ORG = "Central Exchange";
4 4 export const BANK_LETTER_AUTHOR = "The Bank";
5 5 export const BOUNTY_OFFICE_AUTHOR = "Bounty Office";
6 export {
7 QUESTWARD_GIFT_AUTHOR,
8 QUESTWARD_GIFT_ORG,
9 formatGiftLetterBody,
10 formatGiftItemBullet
11 } from "./giftLetters.js";
6 12
7 13 export function isCentralExchangeLetter (instance)
8 14 {
@@ -3,6 +3,12 @@
3export const CENTRAL_EXCHANGE_ORG = "Central Exchange";
3export const CENTRAL_EXCHANGE_ORG = "Central Exchange";
4export const BANK_LETTER_AUTHOR = "The Bank";
4export const BANK_LETTER_AUTHOR = "The Bank";
5export const BOUNTY_OFFICE_AUTHOR = "Bounty Office";
5export const BOUNTY_OFFICE_AUTHOR = "Bounty Office";
6export {
7 QUESTWARD_GIFT_AUTHOR,
8 QUESTWARD_GIFT_ORG,
9 formatGiftLetterBody,
10 formatGiftItemBullet
11} from "./giftLetters.js";
6
12
7export function isCentralExchangeLetter (instance)
13export function isCentralExchangeLetter (instance)
8{
14{
shared/protocol/constants.js +4 −0
@@ -260,6 +260,10 @@ export const MessageType = Object.freeze({
260 260 editorDialogues: "EDITOR_DIALOGUES",
261 261 editorSaveDialogue: "EDITOR_SAVE_DIALOGUE",
262 262 editorDeleteDialogue: "EDITOR_DELETE_DIALOGUE",
263 editorSearchGiftCharacters: "EDITOR_SEARCH_GIFT_CHARACTERS",
264 editorGiftCharacters: "EDITOR_GIFT_CHARACTERS",
265 editorSendGift: "EDITOR_SEND_GIFT",
266 editorGiftSent: "EDITOR_GIFT_SENT",
263 267 editorListDimensions: "EDITOR_LIST_DIMENSIONS",
264 268 editorDimensions: "EDITOR_DIMENSIONS",
265 269 editorCreateDimension: "EDITOR_CREATE_DIMENSION",
@@ -260,6 +260,10 @@ export const MessageType = Object.freeze({
260 editorDialogues: "EDITOR_DIALOGUES",
260 editorDialogues: "EDITOR_DIALOGUES",
261 editorSaveDialogue: "EDITOR_SAVE_DIALOGUE",
261 editorSaveDialogue: "EDITOR_SAVE_DIALOGUE",
262 editorDeleteDialogue: "EDITOR_DELETE_DIALOGUE",
262 editorDeleteDialogue: "EDITOR_DELETE_DIALOGUE",
263 editorSearchGiftCharacters: "EDITOR_SEARCH_GIFT_CHARACTERS",
264 editorGiftCharacters: "EDITOR_GIFT_CHARACTERS",
265 editorSendGift: "EDITOR_SEND_GIFT",
266 editorGiftSent: "EDITOR_GIFT_SENT",
263 editorListDimensions: "EDITOR_LIST_DIMENSIONS",
267 editorListDimensions: "EDITOR_LIST_DIMENSIONS",
264 editorDimensions: "EDITOR_DIMENSIONS",
268 editorDimensions: "EDITOR_DIMENSIONS",
265 editorCreateDimension: "EDITOR_CREATE_DIMENSION",
269 editorCreateDimension: "EDITOR_CREATE_DIMENSION",