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
+35
-8
@@ -6,7 +6,10 @@ const captcha = require("./captcha.js");
|
||||
const defpacks = require("./defpacks.js");
|
||||
const devices = require("./devices.js");
|
||||
const config = require("../config.js");
|
||||
const roles = require("./roles.js");
|
||||
const dens = require("./dens.js");
|
||||
const itemControl = require("./itemcontrol.js");
|
||||
const customItems = require("./customitems.js");
|
||||
const limits = require("./limits.js");
|
||||
const world = require("./world.js");
|
||||
const {addClothing, sendClothingAdded, isUint} = require("./player.js");
|
||||
@@ -37,8 +40,12 @@ const buildCatalog = () => [
|
||||
|
||||
// `favourites` is an account's finderGiven, or null: with nothing typed, the
|
||||
// items that account took most often come first, the latest first among
|
||||
// equals. (The in-game finder says whose search it is.)
|
||||
const search = (params, favourites = null) => {
|
||||
// equals. (The in-game finder says whose search it is.) items locked out of
|
||||
// the finder (lib/itemcontrol.js) are left out, unless `seesLocked`: then
|
||||
// they are marked. an item a player made (lib/playeritems.js) is found by
|
||||
// its maker only (`askerId`), and by those who see locked ones. with
|
||||
// "base=1", only the game's own items that can be made into a new one.
|
||||
const search = (params, favourites = null, seesLocked = false, askerId = null) => {
|
||||
if (!catalog || catalogVersion !== defpacks.customVersion()) {
|
||||
catalog = buildCatalog();
|
||||
catalogVersion = defpacks.customVersion();
|
||||
@@ -46,7 +53,10 @@ const search = (params, favourites = null) => {
|
||||
const kind = params.get("kind") || "all";
|
||||
const words = (params.get("q") || "").toLowerCase().split(/\s+/).filter(Boolean);
|
||||
const matches = catalog.filter(entry => (kind === "all" || entry.kind === kind)
|
||||
&& words.every(word => entry.search.includes(word) || String(entry.id) === word));
|
||||
&& words.every(word => entry.search.includes(word) || String(entry.id) === word)
|
||||
&& (seesLocked || !itemControl.isLocked(entry.kind, entry.id))
|
||||
&& (seesLocked || [null, askerId].includes(customItems.ownerOf(entry.kind, entry.id)))
|
||||
&& (params.get("base") !== "1" || customItems.copyable(entry.kind, entry.id)));
|
||||
matches.sort((a, b) => words.includes(String(b.id)) - words.includes(String(a.id)));
|
||||
if (words.length === 0 && favourites) {
|
||||
const taken = entry => favourites[`${entry.kind}:${entry.id}`] || {count: 0, at: 0};
|
||||
@@ -54,7 +64,10 @@ const search = (params, favourites = null) => {
|
||||
}
|
||||
return {
|
||||
total: matches.length,
|
||||
results: matches.slice(0, MAX_RESULTS).map(({kind: entryKind, id, name, cost, colors}) => ({kind: entryKind, id, name, cost, colors})),
|
||||
results: matches.slice(0, MAX_RESULTS).map(({kind: entryKind, id, name, cost, colors}) => {
|
||||
const locked = seesLocked && itemControl.isLocked(entryKind, id);
|
||||
return {kind: entryKind, id, name: locked ? `${name} (locked)` : name, cost, colors, ...(locked ? {locked} : {})};
|
||||
}),
|
||||
};
|
||||
};
|
||||
|
||||
@@ -62,11 +75,19 @@ const search = (params, favourites = null) => {
|
||||
// digits alone are a colour id
|
||||
const HEX_COLOURS = /^#[0-9a-f]{6}([\s,]+#[0-9a-f]{6}){0,3}$/i;
|
||||
|
||||
const give = body => {
|
||||
// `seesLocked`: who asks may take items locked out of the finder.
|
||||
const give = (body, seesLocked = false) => {
|
||||
const account = accounts.byName(body.username);
|
||||
if (!account) {
|
||||
return {status: 404, body: {error: "No such account"}};
|
||||
}
|
||||
const maker = customItems.ownerOf(body.kind, body.id);
|
||||
if (!seesLocked && maker !== null && maker !== account.id) {
|
||||
return {status: 403, body: {error: "That item is another player's own."}};
|
||||
}
|
||||
if (!seesLocked && itemControl.isLocked(body.kind, body.id)) {
|
||||
return {status: 403, body: {error: "That item is locked out of the item finder."}};
|
||||
}
|
||||
const session = world.findOnline(account.username);
|
||||
if (body.kind === "clothing") {
|
||||
const def = defpacks.itemDef(body.id);
|
||||
@@ -130,6 +151,11 @@ const give = body => {
|
||||
|
||||
const FORBIDDEN = {status: 403, body: {error: "forbidden"}};
|
||||
|
||||
// may whoever asks see and take items locked out of the finder? staff who
|
||||
// may lock them (admins and developers) do; so does the owner, on this
|
||||
// machine, asking with no account's token (the /shop page).
|
||||
const seesLocked = (account, from) => (account ? roles.can(account, "items.create") : from.local);
|
||||
|
||||
// the account a login token is for, while it may play. A ban leaves the
|
||||
// token alone (so that the client can ask about the ban with it, below),
|
||||
// and it is good for nothing else until the ban is over.
|
||||
@@ -147,7 +173,8 @@ const handle = async (route, params, body, from) => {
|
||||
case "GET /api/search": {
|
||||
const asking = accounts.byName(params.get("username") || "");
|
||||
const known = asking && (from.local || holderOf(params.get("token")) === asking);
|
||||
return {status: 200, body: search(params, known ? asking.finderGiven : null)};
|
||||
return {status: 200, body: search(params, known ? asking.finderGiven : null, seesLocked(params.get("token") ? holderOf(params.get("token")) : null, from),
|
||||
known ? asking.id : null)};
|
||||
}
|
||||
case "GET /api/accounts":
|
||||
if (!from.local) {
|
||||
@@ -162,7 +189,7 @@ const handle = async (route, params, body, from) => {
|
||||
if (!from.local && !givesPerMinute.allow(owner.id)) {
|
||||
return {status: 429, body: {error: "Too many at once. Try again in a minute."}};
|
||||
}
|
||||
return give(body || {});
|
||||
return give(body || {}, seesLocked((body || {}).token ? owner : null, from));
|
||||
}
|
||||
case "POST /api/theme": {
|
||||
const account = accounts.byName((body || {}).username);
|
||||
@@ -260,4 +287,4 @@ const handle = async (route, params, body, from) => {
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = {handle};
|
||||
module.exports = {handle, search};
|
||||
Reference in new issue
Block a user