mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-18 17:27:50 -05:00
feat(server): staff tools, player-made items, picture safety, chat, multiplayer games
Staff and moderation
- Invisible staff (!invisible, "xiv"): hidden from players, half see-through
to other staff, cannot chat while hidden. New permission staff.invisible.
- Summon and goto land on the player's exact spot ("xgt" before the move).
- Custom warnings (!warn PLAYER custom TEXT), shown in the warning popup.
- Mod notes (!note, !notes; lib/modnotes.js), on the player page and the
dashboard.
- Granular permissions: per-role overrides (setting rolePermissions) and
per-account grants and denies, applied live to staff who are playing
(refreshStaff re-sends "xsp").
- Item control (lib/itemcontrol.js): lock items out of the item finder
(!lock, !unlock, !locked), take an item from a player (!take), delete a
custom item from the game and every inventory.
- GET items/find: search any item by name or id, marked locked, for the
dashboards' quick lock.
Player-made items (lib/playeritems.js, "xcm")
- The Item Maker: make, rename, set the worn look, delete. 5 a day, 20 in all;
names go through the name filter.
- Admin switches: Item Maker on/off, new items wait for approval, and a
separate switch (on by default) that holds every player-uploaded picture
for a moderator. Review queue for items.approve (moderator and up).
- Pictures (lib/itemart.js): PNG, JPEG and GIF cleaned of metadata, BMP
converted to PNG; 512px and 300KB at most once cleaned.
- Worn as the maker chooses: a sticker (the picture) or a texture (the
item's shape painted with the picture).
Picture safety
- A picture waiting for approval is never served publicly: /itemart/ 404s it,
and it is only shown through /account|/mod|/admin/api/itemart to its maker
and to staff who review or make items.
- A picture turned away or taken off is remembered by SHA-256 and cannot be
uploaded again.
- Three strikes: three pictures turned away stops a player's uploads until a
moderator lets them again. Staff can stop or allow uploads by hand.
- Accounts under 24 hours old cannot upload pictures (AJ_ITEM_ART_MIN_HOURS);
uploads capped at 10 a day.
- Optional Google Cloud Vision SafeSearch (lib/image-moderation.js) for item
pictures and Art Studio paintings when AJ_GOOGLE_VISION_API_KEY is set;
fails closed when the scanner is unreachable.
Chat
- Emoji: Twemoji pictures served at /emoji/<codepoints>.png and cached in
data/emoji (lib/emoji.js).
- Smart spam filtering before the word filter (lib/chatspam.js): long runs of
one character, repeated words and lines, huge words and emoji floods are
tidied, and repeats within 20 seconds are dropped.
- Typing indicator: "xty" is passed on to everyone in the room who can see
the player, at most every 2 seconds.
Games (lib/minigames.js)
- Room games can be played together: a MULTIPLAYER table gives a game a
waiting list (Single Player / Multiplayer). Players in the same room are
matched, taken into the game together, and each one's moves are relayed to
the others. Gem Breaker is the first: two players, "pos", "shoot" and
"playerLost" relayed.
- Gem Breaker's start message now lists each player's id. Without it no
player counted as local, so even single player could not aim.
Other
- Players stay connected through the client's new 75-minute AFK limit
(idleTimeoutMs 80 minutes).
- Jam-a-Grams carry custom items and colours; Jammer Wall avatar photos are
validated (walls.js photoParam).
- Weak passwords refused (common words, or containing the username).
- Code-scanning fixes: every logged value goes through logText
(lib/logtext.js) against log injection, HSTS, path-only error logs, a
single file read in lib/names.js.
Tests: items (pictures, approval, strikes, re-upload refusal, the hidden
waiting picture, the dashboard search), staff (invisibility, goto and summon
spots, custom warnings, notes), buddygames (two-player Gem Breaker, the
typing relay), and updates for main's verified badge and spawn rooms.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
da7eb9af58
commit
e05565787f
50 files changed
+2904
-277
No files matched your search
+139
-13
@@ -1,5 +1,6 @@
|
||||
"use strict";
|
||||
|
||||
const {logText} = require("./logtext.js");
|
||||
const accounts = require("./accounts.js");
|
||||
const defpacks = require("./defpacks.js");
|
||||
|
||||
@@ -11,8 +12,8 @@ const defpacks = require("./defpacks.js");
|
||||
// ("xdi", which the patched client adds to its tables), and so is every game
|
||||
// at login, in case it was started before the item was made.
|
||||
//
|
||||
// an item is never removed, since players may have it: it can be taken out
|
||||
// of the shop, renamed and repriced.
|
||||
// an item can be taken out of the shop, renamed and repriced, or deleted:
|
||||
// then it goes from every inventory too (lib/itemcontrol.js).
|
||||
|
||||
// ids far above the game's own (clothing to about 4,600, den items to about
|
||||
// 6,000), one range per pack; names go under localization ids above the
|
||||
@@ -71,7 +72,9 @@ const apply = entry => defpacks.setCustomItem(entry.kind, rowOf(entry), entry.na
|
||||
const messages = entries => {
|
||||
const out = [];
|
||||
for (const kind of KINDS) {
|
||||
const rows = entries.filter(entry => entry.kind === kind).map(entry => ({...rowOf(entry), name: entry.name}));
|
||||
// a picture waiting for a moderator is not shown yet
|
||||
const rows = entries.filter(entry => entry.kind === kind && !entry.pending)
|
||||
.map(entry => ({...rowOf(entry), name: entry.name, art: entry.artPending ? "" : entry.art || "", artMode: entry.artMode || "sticker"}));
|
||||
for (let at = 0; at < rows.length; at += CHUNK) {
|
||||
out.push([kind, JSON.stringify(rows.slice(at, at + CHUNK)).replace(/%/g, "\\u0025")]);
|
||||
}
|
||||
@@ -80,6 +83,9 @@ const messages = entries => {
|
||||
};
|
||||
|
||||
const announce = entry => {
|
||||
if (entry.pending) {
|
||||
return;
|
||||
}
|
||||
for (const params of messages([entry])) {
|
||||
broadcast("xdi", ...params);
|
||||
}
|
||||
@@ -88,20 +94,52 @@ const announce = entry => {
|
||||
const fromRow = row => ({
|
||||
kind: row.kind, id: row.id, base: row.base, name: row.name, cost: row.cost, members: row.members === 1,
|
||||
colors: row.colors ? row.colors.split(",").map(Number) : [], inShop: row.in_shop === 1, createdBy: row.created_by, createdAt: row.created_at,
|
||||
ownerId: row.owner_id ?? null,
|
||||
art: row.art || null,
|
||||
artMode: LOOKS.includes(row.art_mode) ? row.art_mode : "sticker",
|
||||
pending: row.pending === 1,
|
||||
artPending: row.art_pending === 1,
|
||||
});
|
||||
|
||||
// a player-made item (lib/playeritems.js) has the maker's account id;
|
||||
// staff-made ones none. an item with a picture of its own (lib/itemart.js)
|
||||
// has its version. the columns came later than the table.
|
||||
const addOwnerColumn = () => {
|
||||
const columns = db().prepare("PRAGMA table_info(custom_items)").all().map(column => column.name);
|
||||
if (!columns.includes("owner_id")) {
|
||||
db().exec("ALTER TABLE custom_items ADD COLUMN owner_id INTEGER");
|
||||
}
|
||||
if (!columns.includes("art")) {
|
||||
db().exec("ALTER TABLE custom_items ADD COLUMN art TEXT");
|
||||
}
|
||||
if (!columns.includes("art_mode")) {
|
||||
db().exec("ALTER TABLE custom_items ADD COLUMN art_mode TEXT");
|
||||
}
|
||||
// waiting for a moderator (lib/playeritems.js, when the admin asks for it):
|
||||
// the item itself, or only its newest picture
|
||||
if (!columns.includes("pending")) {
|
||||
db().exec("ALTER TABLE custom_items ADD COLUMN pending INTEGER");
|
||||
}
|
||||
if (!columns.includes("art_pending")) {
|
||||
db().exec("ALTER TABLE custom_items ADD COLUMN art_pending INTEGER");
|
||||
}
|
||||
};
|
||||
|
||||
const load = () => {
|
||||
db().exec(SCHEMA);
|
||||
addOwnerColumn();
|
||||
for (const row of db().prepare("SELECT * FROM custom_items ORDER BY rowid").all()) {
|
||||
const entry = {...fromRow(row), seq: made++};
|
||||
if (!baseDef(entry.kind, entry.base)) {
|
||||
console.log(`[custom items] ${entry.kind} ${entry.id} is made from ${entry.base}, which is not in the packs; left out`);
|
||||
console.log(`[custom items] ${logText(entry.kind)} ${logText(entry.id)} is made from ${logText(entry.base)}, which is not in the packs; left out`);
|
||||
continue;
|
||||
}
|
||||
items.get(entry.kind).set(entry.id, entry);
|
||||
apply(entry);
|
||||
if (!entry.pending) {
|
||||
apply(entry);
|
||||
}
|
||||
}
|
||||
console.log(`[custom items] ${items.get("clothing").size} clothing, ${items.get("den").size} den items`);
|
||||
console.log(`[custom items] ${logText(items.get("clothing").size)} clothing, ${logText(items.get("den").size)} den items`);
|
||||
};
|
||||
|
||||
// checks what staff typed. returns {error} or the cleaned values.
|
||||
@@ -149,8 +187,10 @@ const clean = (kind, fields, current = null) => {
|
||||
};
|
||||
|
||||
// makes an item from `base`, an existing clothing piece or den item.
|
||||
// `ownerId`: the player who made it (lib/playeritems.js), or null for staff.
|
||||
// `pending`: it waits for a moderator (approve), out of the game till then.
|
||||
// returns {item} or {error}.
|
||||
const create = (kind, fields, by) => {
|
||||
const create = (kind, fields, by, ownerId = null, pending = false) => {
|
||||
if (!KINDS.includes(kind)) {
|
||||
return {error: "The kind is clothing or den."};
|
||||
}
|
||||
@@ -173,12 +213,15 @@ const create = (kind, fields, by) => {
|
||||
return values;
|
||||
}
|
||||
const id = Math.max(FIRST_ID - 1, ...items.get(kind).keys()) + 1;
|
||||
const entry = {kind, id, base: baseId, colors: [], ...values, createdBy: String(by), createdAt: now(), seq: made++};
|
||||
db().prepare("INSERT INTO custom_items (kind, id, base, name, cost, members, colors, in_shop, created_by, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
|
||||
.run(kind, id, baseId, entry.name, entry.cost, entry.members ? 1 : 0, entry.colors.join(","), entry.inShop ? 1 : 0, entry.createdBy, entry.createdAt);
|
||||
const entry = {kind, id, base: baseId, colors: [], ...values, createdBy: String(by), createdAt: now(), ownerId, artMode: "sticker", pending, artPending: false,
|
||||
seq: made++};
|
||||
db().prepare("INSERT INTO custom_items (kind, id, base, name, cost, members, colors, in_shop, created_by, created_at, owner_id, pending) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
|
||||
.run(kind, id, baseId, entry.name, entry.cost, entry.members ? 1 : 0, entry.colors.join(","), entry.inShop ? 1 : 0, entry.createdBy, entry.createdAt, ownerId, pending ? 1 : 0);
|
||||
items.get(kind).set(id, entry);
|
||||
apply(entry);
|
||||
announce(entry);
|
||||
if (!pending) {
|
||||
apply(entry);
|
||||
announce(entry);
|
||||
}
|
||||
return {item: entry};
|
||||
};
|
||||
|
||||
@@ -195,8 +238,72 @@ const update = (kind, id, fields) => {
|
||||
Object.assign(entry, values);
|
||||
db().prepare("UPDATE custom_items SET name = ?, cost = ?, members = ?, colors = ?, in_shop = ? WHERE kind = ? AND id = ?")
|
||||
.run(entry.name, entry.cost, entry.members ? 1 : 0, entry.colors.join(","), entry.inShop ? 1 : 0, kind, entry.id);
|
||||
if (!entry.pending) {
|
||||
apply(entry);
|
||||
announce(entry);
|
||||
}
|
||||
return {item: entry};
|
||||
};
|
||||
|
||||
// how a clothing item with a picture of its own is worn: "sticker" (the
|
||||
// picture where the item would be) or "texture" (the item's shape, painted
|
||||
// with the picture). the patched client draws it (LayerBitmap.paintLayer).
|
||||
const LOOKS = ["sticker", "texture"];
|
||||
|
||||
// returns {item} or {error}; every game is told.
|
||||
const setArtMode = (kind, id, mode) => {
|
||||
const entry = items.has(kind) && items.get(kind).get(Number(id));
|
||||
if (!entry) {
|
||||
return {error: "No such custom item."};
|
||||
}
|
||||
if (!LOOKS.includes(mode)) {
|
||||
return {error: "The look is sticker or texture."};
|
||||
}
|
||||
entry.artMode = mode;
|
||||
db().prepare("UPDATE custom_items SET art_mode = ? WHERE kind = ? AND id = ?").run(mode, kind, entry.id);
|
||||
announce(entry);
|
||||
return {item: entry};
|
||||
};
|
||||
|
||||
// its picture's version (lib/itemart.js), or null for none; every game is told.
|
||||
// `pending`: the picture waits for a moderator, and is not shown till then.
|
||||
const setArt = (kind, id, art, pending = false) => {
|
||||
const entry = items.has(kind) && items.get(kind).get(Number(id));
|
||||
if (!entry) {
|
||||
return;
|
||||
}
|
||||
entry.art = art || null;
|
||||
entry.artPending = Boolean(art && pending);
|
||||
db().prepare("UPDATE custom_items SET art = ?, art_pending = ? WHERE kind = ? AND id = ?").run(entry.art, entry.artPending ? 1 : 0, kind, entry.id);
|
||||
announce(entry);
|
||||
};
|
||||
|
||||
// a moderator lets an item, or its picture, in (lib/playeritems.js approve).
|
||||
// returns the entry, or null when there was nothing waiting.
|
||||
const approve = (kind, id) => {
|
||||
const entry = items.has(kind) && items.get(kind).get(Number(id));
|
||||
if (!entry || (!entry.pending && !entry.artPending)) {
|
||||
return null;
|
||||
}
|
||||
entry.pending = false;
|
||||
entry.artPending = false;
|
||||
db().prepare("UPDATE custom_items SET pending = 0, art_pending = 0 WHERE kind = ? AND id = ?").run(kind, entry.id);
|
||||
apply(entry);
|
||||
announce(entry);
|
||||
return entry;
|
||||
};
|
||||
|
||||
// deletes it from the tables (games playing keep its def row, which nothing
|
||||
// uses now). taking it from the players who have it is the caller's.
|
||||
// returns {item} or {error}.
|
||||
const remove = (kind, id) => {
|
||||
const entry = items.has(kind) && items.get(kind).get(Number(id));
|
||||
if (!entry) {
|
||||
return {error: "No such custom item."};
|
||||
}
|
||||
db().prepare("DELETE FROM custom_items WHERE kind = ? AND id = ?").run(kind, entry.id);
|
||||
items.get(kind).delete(entry.id);
|
||||
defpacks.unsetCustomItem(kind, entry.id);
|
||||
return {item: entry};
|
||||
};
|
||||
|
||||
@@ -209,8 +316,27 @@ module.exports = {
|
||||
load,
|
||||
create,
|
||||
update,
|
||||
remove,
|
||||
setArt,
|
||||
setArtMode,
|
||||
approve,
|
||||
// what waits for a moderator: items, and pictures, the oldest first
|
||||
waiting: () => list().filter(entry => entry.pending || entry.artPending).reverse(),
|
||||
LOOKS,
|
||||
list,
|
||||
get: (kind, id) => (items.has(kind) && items.get(kind).get(Number(id))) || null,
|
||||
// the account id of the player who made an item, or null (staff's, or
|
||||
// one of the game's own).
|
||||
ownerOf: (kind, id) => {
|
||||
const entry = items.has(kind) && items.get(kind).get(Number(id));
|
||||
return entry ? entry.ownerId : null;
|
||||
},
|
||||
// can this base be made into an item? (the checks of create, for a list
|
||||
// to offer only those.)
|
||||
copyable: (kind, id) => {
|
||||
const def = baseDef(kind, id);
|
||||
return Boolean(def) && Number(id) < FIRST_ID && (kind === "clothing" ? def.type === TYPE_CLOTHING : OFFERED_SPECIAL_TYPES.includes(def.specialType));
|
||||
},
|
||||
// the base an item's art is from, for a list showing what each is.
|
||||
baseName: entry => {
|
||||
const def = baseDef(entry.kind, entry.base);
|
||||
@@ -218,7 +344,7 @@ module.exports = {
|
||||
},
|
||||
// every custom item, for a game logging in.
|
||||
sendAll(session) {
|
||||
for (const params of messages(list().reverse())) {
|
||||
for (const params of messages(list().reverse().filter(entry => !entry.pending))) {
|
||||
session.sendXt("xdi", -1, ...params);
|
||||
}
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user