wtclaude
12d50fd615
Clears the 124 CODE_SMELL findings from the SonarQube scan (server, client, and bot). All changes are behaviour-preserving refactors — no route, protocol, schema, or config changes — verified against the full server (381) and client (43) test suites plus a clean client build. By rule: - S3776 (20, cognitive complexity): extract helpers/handlers so each function drops under the threshold — shard model upsert builders, page/wiki update, block validation, notification stream mapping (dispatch table), SSO mobile login, shard ingest deps, uo-link socket backfill/connect, the bot slash- command dispatchers + discord manager, and the Shard/UserDetail/HeroEditor/ CharacterStats React components. - S4624 (34, nested template literals): pull inner templates into locals / a withQs() helper; rewrite shardEvents.describe() as a formatter table. - S3358 (35, nested ternaries): lift to if/else vars, lookup maps, small components, or guarded JSX expressions. - S6479 (12, array-index React keys): key by stable content instead of index (two in-editor lists left as-is; index matches their by-index edit model). - S6353 (6): [0-9]/[^0-9] -> \d/\D. S125 (5): reword state-shape comments that parsed as code. S3800/S3782 (botScore): JSDoc-type PATH_WEIGHTS tuples. - S6481 (2): memoize Auth/Site context values (and SiteContext brand). - S4144: dedupe HeroEditor upload handler into useImageUpload(). - S1126 (2), S6035, S5869 (redundant A-Z under /i), S5843 (town-name regex -> prefix list): assorted one-liners. Co-Authored-By: Claude <noreply@anthropic.com>
73 lines
2.7 KiB
JavaScript
73 lines
2.7 KiB
JavaScript
// Roll the sidecar's raw presence.online `byRegion` map (many named ServUO
|
||
// regions) up into a handful of labelled display buckets for the "Players Online"
|
||
// widget. This is the ONE place to retune the grouping — edit BUCKETS (order +
|
||
// membership) and the widget follows. Anything not matched lands in "Wilderness"
|
||
// so the bucket counts always reconcile to the true total.
|
||
|
||
// Named cities/towns, matched as a prefix on the (space/apostrophe-stripped)
|
||
// region name so "skara brae", "serpent's hold", etc. all resolve. Kept as a
|
||
// list rather than one giant alternation regex (simpler to read and retune).
|
||
const TOWN_PREFIXES = [
|
||
'moonglow', 'minoc', 'trinsic', 'jhelom', 'yew', 'skarabrae', 'magincia',
|
||
'newmagincia', 'vesper', 'nujelm', 'cove', 'ocllo', 'serpenthold', 'serpentshold',
|
||
'wind', 'delucia', 'papua',
|
||
]
|
||
const normalizeRegion = (r) => String(r).toLowerCase().replace(/['’\s]/g, '')
|
||
|
||
// Ordered list of buckets. `label` shows in the widget; `match(region)` decides
|
||
// membership. First matching bucket wins; the last bucket is the catch-all.
|
||
export const BUCKETS = [
|
||
{
|
||
id: 'britain',
|
||
label: 'Britain',
|
||
// Passthrough for the capital + its immediate surrounds.
|
||
match: (r) => /^britain/i.test(r),
|
||
},
|
||
{
|
||
id: 'towns',
|
||
label: 'Towns',
|
||
// The other named cities/towns.
|
||
match: (r) => {
|
||
const norm = normalizeRegion(r)
|
||
return TOWN_PREFIXES.some((t) => norm.startsWith(t))
|
||
},
|
||
},
|
||
{
|
||
id: 'dungeons',
|
||
label: 'Dungeons',
|
||
match: (r) =>
|
||
/(despise|destard|deceit|shame|hythloth|covetous|wrong|terathan|fire|ice|orc cave|dungeon|abyss|doom|khaldun|wrong|blackthorn|exodus|labyrinth|underworld)/i.test(
|
||
r,
|
||
),
|
||
},
|
||
{
|
||
id: 'housing',
|
||
label: 'Housing',
|
||
// House regions expose themselves as named house/townhouse regions.
|
||
match: (r) => /(house|townhouse|homestead|tent)/i.test(r),
|
||
},
|
||
{
|
||
id: 'wilderness',
|
||
label: 'Wilderness',
|
||
// Catch-all: the unnamed "Wilderness" region + anything unmatched above.
|
||
match: () => true,
|
||
},
|
||
]
|
||
|
||
// Given a raw { region: count } map, return [{ id, label, count }] in BUCKETS
|
||
// order, dropping empty buckets, with the summed total also returned.
|
||
export function bucketize(byRegion = {}) {
|
||
const totals = new Map(BUCKETS.map((b) => [b.id, 0]))
|
||
let total = 0
|
||
for (const [region, n] of Object.entries(byRegion || {})) {
|
||
const count = Number(n) || 0
|
||
total += count
|
||
const bucket = BUCKETS.find((b) => b.match(String(region))) || BUCKETS[BUCKETS.length - 1]
|
||
totals.set(bucket.id, totals.get(bucket.id) + count)
|
||
}
|
||
const rows = BUCKETS.map((b) => ({ id: b.id, label: b.label, count: totals.get(b.id) })).filter(
|
||
(r) => r.count > 0,
|
||
)
|
||
return { rows, total }
|
||
}
|