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
+92
-3
@@ -75,9 +75,27 @@ const messagesPerMinute = limits.limiter(900, 60000);
|
||||
// the "start" message a game waits for once it has said it is ready.
|
||||
const START = {
|
||||
seed: () => [serial()],
|
||||
seedAndPlayers: game => [serial(), game.players.length],
|
||||
// then each player's sfs id and a field the game skips: a game knows
|
||||
// which player is its own by the id (GemBreakerPlayer.init), and only
|
||||
// that one aims and shoots.
|
||||
seedAndPlayers: game => [serial(), game.players.length, ...game.players.flatMap(player => [player.id, 0])],
|
||||
};
|
||||
|
||||
// the room games several players play together: "Multiplayer" on the
|
||||
// game's waiting list (MinigameManager.setupWaitListPopup), for players in
|
||||
// the same room. each client plays the same game from the same start, and
|
||||
// the server passes each player's moves on to the others: `relay` names
|
||||
// the messages passed on, true for those that go with the sender's sfs id
|
||||
// first. a full list starts the game.
|
||||
const MULTIPLAYER = {
|
||||
// GemBreaker.message: "pos" [sfsUserId, cannon angle], "shoot" [the shot's
|
||||
// nine numbers], "playerLost" [the next round's seed]. two players, a
|
||||
// field each, first to win two rounds.
|
||||
GemBreaker: {max: 2, relay: {pos: true, shoot: false, playerLost: false}},
|
||||
};
|
||||
const MAX_RELAYED_FIELDS = 12;
|
||||
const RELAYED_FIELD = /^[-0-9a-zA-Z.]{1,32}$/;
|
||||
|
||||
// serial numbers the client mixes into its award messages; any number will do.
|
||||
function serial() {
|
||||
return 1 + Math.floor(Math.random() * 1000000);
|
||||
@@ -93,7 +111,10 @@ module.exports = ({tell, leaveRoom, findOnline, blocks}) => {
|
||||
defpacks.stringId(game.title) || defpacks.stringId(FALLBACK_TITLE),
|
||||
game.swf, // extName
|
||||
game.swf, // swfName
|
||||
game.buddy ? 2 : 1, game.buddy ? 2 : 1, // min and max players
|
||||
// min and max players: more than one gives the game a waiting list
|
||||
// with "Single Player" and "Multiplayer" (lib/minigames.js MULTIPLAYER).
|
||||
game.buddy ? 2 : MULTIPLAYER[game.swf] ? MULTIPLAYER[game.swf].max : 1,
|
||||
game.buddy ? 2 : MULTIPLAYER[game.swf] ? MULTIPLAYER[game.swf].max : 1,
|
||||
0, // max spectators
|
||||
game.type,
|
||||
// the game card: the title picture on the "play" popup (not known), and
|
||||
@@ -134,6 +155,13 @@ module.exports = ({tell, leaveRoom, findOnline, blocks}) => {
|
||||
}
|
||||
session.game = null;
|
||||
game.players = game.players.filter(player => player !== session);
|
||||
if (game.lobby) {
|
||||
if (game.players.length === 0) {
|
||||
lobbies.delete(game.lobby);
|
||||
}
|
||||
tellLobby(game);
|
||||
return;
|
||||
}
|
||||
// the games' own "player left": [sfsUserId]. A buddy game takes it for
|
||||
// a win, so the one still looking at the result of a game that has been
|
||||
// decided is not told. three of them only the clients know the end of
|
||||
@@ -191,6 +219,59 @@ module.exports = ({tell, leaveRoom, findOnline, blocks}) => {
|
||||
session.sendXt("mj", game.roomId, ...game.players.map(player => player.id));
|
||||
};
|
||||
|
||||
// the waiting lists of multiplayer room games: "<gameDefId> <room>" -> a
|
||||
// game not started yet. one is answered "mj" from the room the players
|
||||
// wait in, with who waits: the client draws them from that room, so they
|
||||
// stay in it till the list is full.
|
||||
const lobbies = new Map();
|
||||
const tellLobby = game => {
|
||||
for (const player of game.players) {
|
||||
player.sendXt("mj", game.waitRoom.id, ...game.players.map(other => other.id));
|
||||
}
|
||||
};
|
||||
const joinLobby = (session, def, multi) => {
|
||||
const key = `${def.id} ${session.room.name}`;
|
||||
let game = lobbies.get(key);
|
||||
if (game && game.players.some(player => blocks.either(player.account, session.account))) {
|
||||
session.sendXt("mj", -1, "as", 0);
|
||||
tell(session, "Someone already waiting for that game is not someone you play with. Try again later.");
|
||||
return;
|
||||
}
|
||||
if (!game) {
|
||||
game = {roomId: nextGameRoomId++, def, multi, players: [], started: false, ready: new Set(), lobby: key, waitRoom: session.room};
|
||||
lobbies.set(key, game);
|
||||
}
|
||||
game.players.push(session);
|
||||
session.game = game;
|
||||
tellLobby(game);
|
||||
if (game.players.length >= multi.max) {
|
||||
lobbies.delete(key);
|
||||
game.lobby = null;
|
||||
for (const player of game.players) {
|
||||
const music = player.room ? player.room.customMusicDef : 0;
|
||||
if (def.type !== IN_ROOM) {
|
||||
leaveRoom(player);
|
||||
}
|
||||
seat(player, game, music);
|
||||
}
|
||||
start(game);
|
||||
}
|
||||
};
|
||||
|
||||
// a move in a multiplayer room game, passed on to the other players.
|
||||
const relay = (session, game, word, params) => {
|
||||
const withId = game.multi.relay[word];
|
||||
if (!game.started || params.length > MAX_RELAYED_FIELDS || !params.every(field => RELAYED_FIELD.test(String(field)))
|
||||
|| !messagesPerMinute.allow(session.account.id)) {
|
||||
return;
|
||||
}
|
||||
for (const other of game.players) {
|
||||
if (other !== session) {
|
||||
other.sendXt("mm", game.roomId, word, ...(withId ? [session.id] : []), ...params);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// starts a buddy game between two players (lib/buddygames.js says what
|
||||
// `match` is). it runs in a window over whatever room each is in.
|
||||
const startMatch = (def, sender, target) => {
|
||||
@@ -451,7 +532,7 @@ module.exports = ({tell, leaveRoom, findOnline, blocks}) => {
|
||||
},
|
||||
|
||||
// MinigameManager.launchGame: [gameDefId, multiplayer, proModeId, ?].
|
||||
mj(session, roomId, [gameDefId]) {
|
||||
mj(session, roomId, [gameDefId, multiplayer]) {
|
||||
leave(session); // a game left without a word, if any
|
||||
const def = games.get(Number(gameDefId));
|
||||
if (!def || def.ready === false || def.buddy || !session.room) {
|
||||
@@ -461,6 +542,10 @@ module.exports = ({tell, leaveRoom, findOnline, blocks}) => {
|
||||
tell(session, "That game is not ready on this server yet.");
|
||||
return;
|
||||
}
|
||||
if (multiplayer === "1" && Object.hasOwn(MULTIPLAYER, def.swf)) {
|
||||
joinLobby(session, def, MULTIPLAYER[def.swf]);
|
||||
return;
|
||||
}
|
||||
const game = {roomId: nextGameRoomId++, def, players: [session], started: false, ready: new Set()};
|
||||
const music = session.room.customMusicDef; // the client takes this from every room join
|
||||
if (def.type !== IN_ROOM) {
|
||||
@@ -490,6 +575,10 @@ module.exports = ({tell, leaveRoom, findOnline, blocks}) => {
|
||||
matchMessage(session, game, String(word), params);
|
||||
return;
|
||||
}
|
||||
if (game.multi && Object.hasOwn(game.multi.relay, String(word))) {
|
||||
relay(session, game, String(word), params);
|
||||
return;
|
||||
}
|
||||
const reply = (...fields) => session.sendXt("mm", game.roomId, ...fields);
|
||||
const own = game.def.tickets ? carnival : MESSAGES[game.def.swf];
|
||||
if (own && Object.hasOwn(own, word)) {
|
||||
|
||||
Reference in new issue
Block a user