mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-19 01:27:51 -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
+38
-12
@@ -1,5 +1,9 @@
|
||||
"use strict";
|
||||
|
||||
const {logText} = require("./logtext.js");
|
||||
const customItems = require("./customitems.js");
|
||||
const itemControl = require("./itemcontrol.js");
|
||||
const playerItems = require("./playeritems.js");
|
||||
const crypto = require("crypto");
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
@@ -149,6 +153,11 @@ const profile = (account, from) => {
|
||||
animalType: avatar ? avatar.type : null,
|
||||
items: account.items.length,
|
||||
denItems: account.denItems.length,
|
||||
// what they made in the game's Item Maker (lib/playeritems.js)
|
||||
customItems: playerItems.madeBy(account).map(entry => ({kind: entry.kind, id: entry.id, name: entry.name,
|
||||
art: require("./itemart.js").urlOf(entry, "/account/api/itemart"), artWaiting: Boolean(entry.artPending), look: entry.artMode || "sticker"})),
|
||||
picturesStopped: Boolean(account.artBlocked),
|
||||
customItemLimits: {perDay: playerItems.PER_DAY, inAll: playerItems.IN_ALL},
|
||||
pets: account.pets.length,
|
||||
buddies: account.buddies.length,
|
||||
banned: null,
|
||||
@@ -179,7 +188,7 @@ const profile = (account, from) => {
|
||||
// hash, the 2FA secret, device passes), and what other tables hold of it.
|
||||
// what others wrote about it (reports, a moderator's notes) is not theirs
|
||||
// to be handed, and is not here.
|
||||
const SECRET_FIELDS = ["salt", "hash", "totp", "totpSetup", "devices"];
|
||||
const SECRET_FIELDS = ["salt", "hash", "totp", "totpSetup", "devices", "modNotes"];
|
||||
const dataOf = account => ({
|
||||
exportedAt: new Date().toISOString(),
|
||||
server: config.baseUrl,
|
||||
@@ -250,7 +259,7 @@ const act = (account, body, req, from, res) => {
|
||||
}
|
||||
delete account.nameRejected;
|
||||
accounts.save(account);
|
||||
console.log(`[account] a rejected username was replaced by "${account.username}" from ${from.address}`);
|
||||
console.log(`[account] a rejected username was replaced by "${logText(account.username)}" from ${logText(from.address)}`);
|
||||
return {ok: "Saved."};
|
||||
}
|
||||
// one for each account, ever: an answer that wants a follow-up says
|
||||
@@ -267,12 +276,14 @@ const act = (account, body, req, from, res) => {
|
||||
if (!passwordAgain(account, body.current)) {
|
||||
return {error: "Wrong password."};
|
||||
}
|
||||
if (accounts.setPassword(account, body.password)) {
|
||||
return {error: "Passwords need 10 characters or more, with a capital letter, a small letter and a digit."};
|
||||
const passwordProblem = accounts.setPassword(account, body.password);
|
||||
if (passwordProblem) {
|
||||
return {error: passwordProblem === "weak_password" ? "That password is too easy to guess: it is a common one, or has your username in it."
|
||||
: "Passwords need 10 characters or more, with a capital letter, a small letter and a digit."};
|
||||
}
|
||||
world.moderation.actions.kick(account);
|
||||
signOutOthers(account, req);
|
||||
console.log(`[account] "${account.username}" changed their password from ${from.address}`);
|
||||
console.log(`[account] "${logText(account.username)}" changed their password from ${logText(from.address)}`);
|
||||
return {ok: "Password changed."};
|
||||
}
|
||||
case "requestName": {
|
||||
@@ -293,7 +304,7 @@ const act = (account, body, req, from, res) => {
|
||||
world.moderation.actions.kick(account);
|
||||
}
|
||||
accounts.save(account);
|
||||
console.log(`[account] "${account.username}" ${account.locked ? "locked" : "unlocked"} from ${from.address}`);
|
||||
console.log(`[account] "${logText(account.username)}" ${logText(account.locked ? "locked" : "unlocked")} from ${logText(from.address)}`);
|
||||
return {ok: account.locked ? "Locked." : "Unlocked."};
|
||||
}
|
||||
case "feature": {
|
||||
@@ -322,11 +333,12 @@ const act = (account, body, req, from, res) => {
|
||||
const recovery = totp.confirm(account, body.code);
|
||||
if (!recovery) {
|
||||
accounts.save(account);
|
||||
return {error: "Wrong code."};
|
||||
// confirm() drops a setup older than 15 minutes: no code can match it now.
|
||||
return {error: account.totpSetup ? "Wrong code." : "Setup timed out. Turn 2FA on again and scan the new QR code."};
|
||||
}
|
||||
accounts.revokeTokens(account);
|
||||
accounts.save(account);
|
||||
console.log(`[account] "${account.username}" turned two-step sign-in on from ${from.address}`);
|
||||
console.log(`[account] "${logText(account.username)}" turned two-step sign-in on from ${logText(from.address)}`);
|
||||
return {ok: "2FA is on.", recovery};
|
||||
}
|
||||
// turning it off: the password and a code (or a recovery code).
|
||||
@@ -344,7 +356,7 @@ const act = (account, body, req, from, res) => {
|
||||
totp.turnOff(account);
|
||||
accounts.save(account);
|
||||
res.setHeader("Set-Cookie", cookieHeader("", 0, DEVICE_COOKIE));
|
||||
console.log(`[account] "${account.username}" turned two-step sign-in off from ${from.address}`);
|
||||
console.log(`[account] "${logText(account.username)}" turned two-step sign-in off from ${logText(from.address)}`);
|
||||
return {ok: "2FA is off."};
|
||||
}
|
||||
case "forgetDevices":
|
||||
@@ -352,6 +364,20 @@ const act = (account, body, req, from, res) => {
|
||||
accounts.save(account);
|
||||
return {ok: "Trusted devices forgotten."};
|
||||
// their bio, for the Bio tab of their card in the game. empty takes it off.
|
||||
// their own custom items: a new name, or gone (from everyone who has
|
||||
// one). a picture is sent to /api/itemart.
|
||||
case "itemLook":
|
||||
return playerItems.setLook(account, String(body.kind), body.id, String(body.look));
|
||||
case "itemRename":
|
||||
return playerItems.rename(account, String(body.kind), body.id, body.name);
|
||||
case "itemDelete": {
|
||||
const entry = customItems.get(String(body.kind), body.id);
|
||||
if (!entry || entry.ownerId !== account.id) {
|
||||
return {error: "That is not one of your items."};
|
||||
}
|
||||
const result = itemControl.deleteCustom(entry.kind, entry.id, world);
|
||||
return result.error ? result : {ok: `Deleted ${entry.name}.`};
|
||||
}
|
||||
case "bio": {
|
||||
// typed words others read: not while they cannot chat.
|
||||
if (world.moderation.isSilenced(account)) {
|
||||
@@ -365,7 +391,7 @@ const act = (account, body, req, from, res) => {
|
||||
// each other (lib/chat-filter.txt).
|
||||
const rule = chatFilter.broken(bio);
|
||||
if (rule) {
|
||||
console.log(`[filter] "${account.username}" bio not saved (${rule}): ${JSON.stringify(bio)}`);
|
||||
console.log(`[filter] "${logText(account.username)}" bio not saved (${logText(rule)}): ${logText(JSON.stringify(bio))}`);
|
||||
return {error: "Your bio has words that are not allowed here."};
|
||||
}
|
||||
account.bio = bio;
|
||||
@@ -446,7 +472,7 @@ const act = (account, body, req, from, res) => {
|
||||
world.disconnect(account);
|
||||
signOutOthers(account, null);
|
||||
erase(account);
|
||||
console.log(`[account] "${name}" deleted their account from ${from.address}`);
|
||||
console.log(`[account] "${logText(name)}" deleted their account from ${logText(from.address)}`);
|
||||
return {ok: "Account deleted.", deleted: true};
|
||||
}
|
||||
default:
|
||||
@@ -601,4 +627,4 @@ const handle = async (req, res, url, from, web) => {
|
||||
// called when an account's name changes or it is deleted: its page sessions end.
|
||||
const forget = account => signOutOthers(account, null);
|
||||
|
||||
module.exports = {handle, forget};
|
||||
module.exports = {handle, forget, signedInAs};
|
||||
Reference in new issue
Block a user