Realm names chosen in the Manager (#61, #209)

Settings, Startup lists every realm of the server with its name. The choice is kept in
Settings/realm-names.json of the main folder; the launcher, the realm-list setup and the
client's Config.wtf use it, and a running database gets it at once. Names are 1-32
characters without quotation marks or control characters, written as escaped SQL.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ДмитрийandClaude Opus 5.5 committed 2026-11-15 20:08:48 +05:00
1 parent 20d4c3351e
commit d1534ebc92
18 files changed
+396 -26

No files matched your search

+1
View File
@@ -39,6 +39,7 @@ export {};
if(cmd==="pending_update") return null;
if(cmd==="plugin:app|version") return "0.8.2";
if(cmd==="release_history") throw new Error("Offline demo: using bundled notes");
if(cmd==="realm_names"||cmd==="realm_rename"){const w=window as any;w.__rn=w.__rn??{};const defs:[number,string][]=[[1,"Conquest of Azeroth"],[2,"Wildcard"]];if(cmd==="realm_rename"){await new Promise(r=>setTimeout(r,300));const n=(args.name??"").trim();if(n.length>32||n.includes('"'))throw new Error("The realm name can have at most 32 characters.");if(n)w.__rn[args.realmId]=n;else delete w.__rn[args.realmId];}return defs.map(([id,d])=>({id,name:w.__rn[id]??d,defaultName:d,custom:id in w.__rn}));}
if(cmd==="realm_profiles") return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:withReborn&&running};
if(cmd==="realm_simultaneous") { if(running) throw new Error("Stop both realms before changing simultaneous startup."); simultaneous=args.enabled; wildcardCreated ||= simultaneous; return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:false,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:false}; }
if(cmd==="realm_with_reborn") { if(running) throw new Error("Stop all realms before changing which realms start together."); withReborn=args.enabled; rebornCreated ||= withReborn; return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:false,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:false}; }
+7
View File
@@ -773,6 +773,13 @@ const de: Partial<Record<keyof typeof en, string>> = {
"overview.reportBtn": "Diagnose sammeln und melden",
// Realmlist switcher and modules page
"realm.namesTitle": "Realmnamen",
"realm.namesHint": "So heißt der Realm in der Realmliste der Spieler. Ein laufender Server zeigt den Namen sofort, und er bleibt nach Updates erhalten.",
"realm.nameSave": "Speichern",
"realm.nameReset": "Standardname",
"realm.nameDefault": "Standard: {name}",
"realm.nameSaved": "Gespeichert.",
"realm.nameQuotes": "Anführungszeichen sind nicht erlaubt: Der Spielclient speichert den Namen in Anführungszeichen.",
"realm.profileLabel": "Realm",
"realm.switching": "Realm wird gewechselt…",
"realm.rebornCreate": "Warcraft-Reborn-Realm erstellen",
+7
View File
@@ -57,6 +57,13 @@ const en = {
"remote.hostInstead": "Host my own server",
"welcome.roleSubtitle": "How would you like to play?",
"realm.namesTitle": "Realm names",
"realm.namesHint": "The name players see in the realm list. A running server shows it at once, and it stays after updates.",
"realm.nameSave": "Save",
"realm.nameReset": "Default name",
"realm.nameDefault": "Default: {name}",
"realm.nameSaved": "Saved.",
"realm.nameQuotes": "Quotation marks are not allowed: the game client stores the name in quotes.",
"realm.profileLabel": "Realm",
"realm.startupTitle": "Realm startup",
"realm.secondWorld": "Second world",
+7
View File
@@ -773,6 +773,13 @@ const es: Partial<Record<keyof typeof en, string>> = {
"overview.reportBtn": "Reunir el diagnóstico y avisar",
// Realmlist switcher and modules page
"realm.namesTitle": "Nombres de los reinos",
"realm.namesHint": "El nombre que ven los jugadores en la lista de reinos. Un servidor en marcha lo muestra al instante y se mantiene tras las actualizaciones.",
"realm.nameSave": "Guardar",
"realm.nameReset": "Nombre predeterminado",
"realm.nameDefault": "Predeterminado: {name}",
"realm.nameSaved": "Guardado.",
"realm.nameQuotes": "No se permiten comillas: el cliente del juego guarda el nombre entre comillas.",
"realm.profileLabel": "Reino",
"realm.switching": "Cambiando de reino…",
"realm.rebornCreate": "Crear reino Warcraft Reborn",
+7
View File
@@ -773,6 +773,13 @@ const fr: Partial<Record<keyof typeof en, string>> = {
"overview.reportBtn": "Rassembler le diagnostic et signaler",
// Realmlist switcher and modules page
"realm.namesTitle": "Noms des royaumes",
"realm.namesHint": "Le nom que les joueurs voient dans la liste des royaumes. Un serveur en marche l'affiche aussitôt, et il reste après les mises à jour.",
"realm.nameSave": "Enregistrer",
"realm.nameReset": "Nom par défaut",
"realm.nameDefault": "Par défaut : {name}",
"realm.nameSaved": "Enregistré.",
"realm.nameQuotes": "Les guillemets ne sont pas autorisés : le client du jeu enregistre le nom entre guillemets.",
"realm.profileLabel": "Royaume",
"realm.switching": "Changement de royaume…",
"realm.rebornCreate": "Créer le royaume Warcraft Reborn",
+7
View File
@@ -60,6 +60,13 @@ const ru: Partial<Record<keyof typeof en, string>> = {
"remote.hostInstead": "Создать свой сервер",
"welcome.roleSubtitle": "Как вы хотите играть?",
"realm.namesTitle": "Названия реалмов",
"realm.namesHint": "Так реалм называется в списке реалмов у игроков. Работающий сервер показывает новое название сразу, и оно сохраняется после обновлений.",
"realm.nameSave": "Сохранить",
"realm.nameReset": "Стандартное название",
"realm.nameDefault": "По умолчанию: {name}",
"realm.nameSaved": "Сохранено.",
"realm.nameQuotes": "Кавычки нельзя: клиент игры хранит название в кавычках.",
"realm.profileLabel": "Реалм",
"realm.startupTitle": "Запуск реалмов",
"realm.secondWorld": "Второй мир",
+7
View File
@@ -58,6 +58,13 @@ const zh = {
"remote.hostInstead": "搭建自己的服务器",
"welcome.roleSubtitle": "你想如何游玩?",
"realm.namesTitle": "服务器名称",
"realm.namesHint": "玩家在服务器列表中看到的名称。运行中的服务器会立即显示新名称,更新后也会保留。",
"realm.nameSave": "保存",
"realm.nameReset": "默认名称",
"realm.nameDefault": "默认:{name}",
"realm.nameSaved": "已保存。",
"realm.nameQuotes": "不能使用引号:游戏客户端用引号保存名称。",
"realm.profileLabel": "服务器",
"realm.switching": "正在切换服务器…",
"realm.rebornCreate": "创建 Warcraft Reborn 服务器",
+3
View File
@@ -57,6 +57,7 @@ export interface StatusView {
}
export type RealmMode = "coa" | "wildcard" | "reborn";
export interface RealmName { id: number; name: string; defaultName: string; custom: boolean }
export interface RealmProfiles { active: RealmMode; wildcard_created: boolean; reborn_created: boolean; reborn_supported: boolean; supported: boolean; recovery_pending: boolean; simultaneous: boolean; secondary_world_port: number | null; secondary_running: boolean; with_reborn: boolean; reborn_world_port: number | null; reborn_running: boolean }
export interface DatabaseCheck {
realm: RealmMode;
@@ -486,6 +487,8 @@ export const api = {
realmProfiles: (id: string) => invoke<RealmProfiles>("realm_profiles", { id }),
realmSelect: (id: string, mode: RealmMode, restart: boolean) => invoke<RealmProfiles>("realm_select", { id, mode, restart }),
realmSimultaneous: (id: string, enabled: boolean) => invoke<RealmProfiles>("realm_simultaneous", { id, enabled }),
realmNames: (id: string) => invoke<RealmName[]>("realm_names", { id }),
realmRename: (id: string, realmId: number, name: string | null) => invoke<RealmName[]>("realm_rename", { id, realmId, name }),
realmWithReborn: (id: string, enabled: boolean) => invoke<RealmProfiles>("realm_with_reborn", { id, enabled }),
checkDatabase: (id: string) => invoke<DatabaseCheck[]>("check_database", { id }),
repairServer: (id: string) => invoke<RepairReport>("repair_server", { id }),
+60
View File
@@ -0,0 +1,60 @@
import { useEffect, useState } from "react";
import { api, asUiError, type RealmName } from "@/lib/api";
import { Card } from "@/components/ui/card";
import { Button } from "@/components/ui/button";
import { useT } from "@/i18n";
const MAX_CHARS = 32;
export function RealmNameSettings({ serverId }: { serverId: string }) {
const t = useT();
const [realms, setRealms] = useState<RealmName[] | null>(null);
const [drafts, setDrafts] = useState<Record<number, string>>({});
const [busy, setBusy] = useState(false);
const [saved, setSaved] = useState<number | null>(null);
const [error, setError] = useState<string | null>(null);
function show(list: RealmName[]) {
setRealms(list);
setDrafts(Object.fromEntries(list.map(r => [r.id, r.name])));
}
useEffect(() => {
let alive = true;
void api.realmNames(serverId).then(list => { if (alive) show(list); }).catch(e => { if (alive) setError(asUiError(e).technical); });
return () => { alive = false; };
}, [serverId]);
async function rename(id: number, name: string | null) {
setBusy(true); setError(null); setSaved(null);
try { show(await api.realmRename(serverId, id, name)); setSaved(id); }
catch (e) { setError(asUiError(e).technical); }
finally { setBusy(false); }
}
return <Card className="mt-6 p-6" aria-busy={busy}>
<h2 className="font-semibold">{t("realm.namesTitle")}</h2>
<p className="mt-1 text-sm text-muted">{t("realm.namesHint")}</p>
{realms?.map(r => {
const draft = drafts[r.id] ?? r.name;
const invalid = draft.trim().length === 0 || draft.trim().length > MAX_CHARS || draft.includes('"');
return <div key={r.id} className="mt-4">
<div className="flex flex-wrap items-center gap-2">
<input
className="min-w-0 flex-1 rounded border border-line bg-bg px-3 py-1.5 text-sm text-ink outline-none focus:border-gold"
value={draft}
maxLength={MAX_CHARS}
aria-label={t("realm.nameDefault", { name: r.defaultName })}
disabled={busy}
onChange={e => setDrafts(d => ({ ...d, [r.id]: e.target.value }))}
/>
<Button size="sm" disabled={busy || invalid || draft.trim() === r.name} onClick={() => void rename(r.id, draft)}>{t("realm.nameSave")}</Button>
{r.custom && <Button size="sm" variant="ghost" disabled={busy} onClick={() => void rename(r.id, null)}>{t("realm.nameReset")}</Button>}
</div>
<p className="mt-1 text-xs text-muted">{t("realm.nameDefault", { name: r.defaultName })}{saved === r.id ? ` · ${t("realm.nameSaved")}` : ""}</p>
{draft.includes('"') && <p className="mt-1 text-xs text-warn">{t("realm.nameQuotes")}</p>}
</div>;
})}
{error && <p className="mt-3 text-sm text-bad" role="alert">{error}</p>}
</Card>;
}
+2 -1
View File
@@ -12,6 +12,7 @@ import { ReleaseHistory, type HistorySelection } from "./ReleaseHistory";
import { ClientCard } from "./ClientCard";
import { GameDataCard } from "./GameDataCard";
import { RealmStartupSettings } from "./RealmStartupSettings";
import { RealmNameSettings } from "./RealmNameSettings";
import { AutoRestartSettings } from "./AutoRestartSettings";
import { DiagnosticsCard } from "./DiagnosticsCard";
import { RepairCard } from "./RepairCard";
@@ -50,7 +51,7 @@ export function SettingsHome({ serverId, path, onForget }: { serverId: string; s
<button onClick={() => setSection("client")} className="mt-5 flex w-full cursor-pointer items-center justify-between gap-3 rounded-lg border border-line px-5 py-4 text-left text-sm hover:bg-white/5"><span>{t("settings.clientLink")}</span><span aria-hidden>→</span></button>
<ReleaseHistory selection={history} onSelect={setHistory} />
</div>
<div hidden={section !== "startup"} className="max-w-3xl"><RealmStartupSettings serverId={serverId} /><AutoRestartSettings serverId={serverId} /></div>
<div hidden={section !== "startup"} className="max-w-3xl"><RealmNameSettings serverId={serverId} /><RealmStartupSettings serverId={serverId} /><AutoRestartSettings serverId={serverId} /></div>
<div hidden={section !== "client"} className="max-w-3xl"><ClientCard serverId={serverId} /><GameDataCard serverId={serverId} /></div>
<div hidden={section !== "service"} className="max-w-3xl"><ServerLoggingSettings serverId={serverId} /><DiagnosticsCard serverId={serverId} /><RepairCard serverId={serverId} /><RemoveServerCard serverId={serverId} path={path} onForget={onForget} /></div>
<div hidden={section !== "interface"} className="max-w-3xl"><Card className="mt-6 p-6"><h2 className="font-semibold">{t("settings.language")}</h2><p className="mt-1 text-sm text-muted">{t("settings.languageHint")}</p><LanguagePicker className="mt-4" /></Card><WindowSettings /><PublicServerSettings /></div>