mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-19 09:37:50 -05:00
Merge origin/main into moderator-tools
Hardware bans, panel search and logs, two worlds and the verified badge, with the branch's staff roles kept: full rooms let in active staff, and address search stays with the roles that may ban addresses. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
commit
da7eb9af58
33 files changed
+2771
-166
No files matched your search
+89
-4
@@ -9,7 +9,9 @@ const adopt = require("./adopt.js");
|
||||
const badges = require("./badges.js");
|
||||
const bans = require("./bans.js");
|
||||
const colours = require("./colours.js");
|
||||
const chatlog = require("./chatlog.js");
|
||||
const config = require("../config.js");
|
||||
const devices = require("./devices.js");
|
||||
const defpacks = require("./defpacks.js");
|
||||
const limits = require("./limits.js");
|
||||
const log = require("./log.js");
|
||||
@@ -48,6 +50,7 @@ const TEN_MINUTES_MS = 600000;
|
||||
const DAY_SECONDS = 86400;
|
||||
const MAX_ANNOUNCEMENT = 300;
|
||||
const MAX_OWNED_LISTED = 300;
|
||||
const MAX_LISTED = 100; // accounts in one search of the Accounts page
|
||||
// currencies the panel can hand out, as indexes into CURRENCIES.
|
||||
const GIFT_CURRENCIES = {gems: 0, tickets: 1, diamonds: 3};
|
||||
// who a ban is written down as given by. the panel has one password and so
|
||||
@@ -157,6 +160,10 @@ const accountRow = (account, playing) => {
|
||||
level: activeAvatar(account).questLevel || 0,
|
||||
items: account.items.length + account.denItems.length,
|
||||
gems: account.currency.gems || 0,
|
||||
deviceBanned: devices.bannedId(account) !== 0,
|
||||
devicesKnown: devices.knownFor(account).ids,
|
||||
stoppedThisWeek: chatlog.notSentCount(account, 7),
|
||||
paintings: masterpieces.madeBy(account).length,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -479,6 +486,11 @@ const act = (account, body) => {
|
||||
return {ok: `${name} is no longer banned.`};
|
||||
case "kick":
|
||||
return actions.kick(account) ? {ok: `${name} was disconnected.`} : {error: `${name} is not online.`};
|
||||
// every computer they signed in from lately (lib/devices.js).
|
||||
case "banDevices":
|
||||
return staff.banDevices(account, body.reason, BY);
|
||||
case "unbanDevices":
|
||||
return staff.unbanDevicesOf(account, BY);
|
||||
// counted in hours; the game's own notice counts minutes.
|
||||
case "silence": {
|
||||
const hours = wholeNumber(body.hours, 0, MAX_BAN_HOURS);
|
||||
@@ -660,9 +672,24 @@ const handle = async (req, res, url, from, web) => {
|
||||
reply(200, overview());
|
||||
return;
|
||||
|
||||
// a page of accounts by name (lib/staff.js says in what order), never
|
||||
// all of them: with thousands, sending every one every few seconds
|
||||
// slowed the page and the game alike.
|
||||
case "GET /admin/api/accounts": {
|
||||
const playing = new Map(world.players().map(player => [player.username, player.room || "(between rooms)"]));
|
||||
reply(200, {accounts: accounts.all().map(account => accountRow(account, playing)), badges: badges.BADGES});
|
||||
const filter = url.searchParams.get("filter");
|
||||
const keep = filter === "online" ? (account, online) => online.has(account.username)
|
||||
: filter === "banned" ? account => world.moderation.banRemaining(account) !== 0 : () => true;
|
||||
const {found, total} = staff.findAccounts(url.searchParams.get("q"), keep, MAX_LISTED);
|
||||
reply(200, {accounts: found.map(account => accountRow(account, playing)), total, badges: badges.BADGES});
|
||||
return;
|
||||
}
|
||||
|
||||
// one account's row, for the one that is open whatever the list shows.
|
||||
case "GET /admin/api/account": {
|
||||
const account = accounts.byName(url.searchParams.get("username") || "");
|
||||
const playing = new Map(world.players().map(player => [player.username, player.room || "(between rooms)"]));
|
||||
reply(account ? 200 : 404, account ? {account: accountRow(account, playing), badges: badges.BADGES} : {error: "No such account."});
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -677,6 +704,28 @@ const handle = async (req, res, url, from, web) => {
|
||||
reply(found.error ? 400 : 200, found);
|
||||
return;
|
||||
}
|
||||
// who signed in from a computer, by one of its ids or the start of one.
|
||||
case "GET /admin/api/device-search": {
|
||||
const found = staff.byDevice(url.searchParams.get("q"));
|
||||
reply(found.error ? 400 : 200, found.error ? found : {players: found.players.map(entry => ({...entry,
|
||||
online: Boolean(world.findOnline(entry.username))}))});
|
||||
return;
|
||||
}
|
||||
|
||||
// what players typed, sent and posted (lib/chatlog.js), as the moderators see it.
|
||||
case "GET /admin/api/chat": {
|
||||
const params = url.searchParams;
|
||||
const lines = chatlog.search({username: (params.get("username") || "").trim().slice(0, 100), room: (params.get("room") || "").trim().slice(0, 100),
|
||||
text: (params.get("text") || "").trim().slice(0, 100), kind: params.get("kind") || "", direction: params.get("direction") || "", until: Number(params.get("until")) || 0,
|
||||
before: Number(params.get("before")) || 0});
|
||||
reply(200, {lines, more: lines.length === chatlog.PAGE, days: config.chatLogDays});
|
||||
return;
|
||||
}
|
||||
case "GET /admin/api/chat/around": {
|
||||
const found = chatlog.around(url.searchParams.get("id"));
|
||||
reply(found ? 200 : 404, found || {error: "No such line."});
|
||||
return;
|
||||
}
|
||||
|
||||
case "GET /admin/api/logs": {
|
||||
const lines = log.recent(Number(url.searchParams.get("after")) || 0, (url.searchParams.get("filter") || "").slice(0, 100));
|
||||
@@ -693,6 +742,10 @@ const handle = async (req, res, url, from, web) => {
|
||||
const result = act(account, body);
|
||||
if (result.ok) {
|
||||
console.log(`[admin] ${body.action} on "${account.username}"`);
|
||||
// in the record beside the moderators', for the player's timeline.
|
||||
if (!["password", "lastSeen", "level"].includes(body.action)) {
|
||||
modlog.record(BY, body.action, account.username, result.detail || "");
|
||||
}
|
||||
}
|
||||
reply(result.ok ? 200 : 400, result);
|
||||
return;
|
||||
@@ -705,7 +758,39 @@ const handle = async (req, res, url, from, web) => {
|
||||
}
|
||||
|
||||
case "GET /admin/api/bans":
|
||||
reply(200, {accounts: staff.disciplined(), addresses: bans.addressBans()});
|
||||
reply(200, {accounts: staff.disciplined(), addresses: bans.addressBans(), devices: devices.list(), alerts: devices.alerts()});
|
||||
return;
|
||||
|
||||
// A device ban lifted (lib/devices.js).
|
||||
case "POST /admin/api/device": {
|
||||
const result = staff.unbanDevices(body.id, BY);
|
||||
if (result.ok) {
|
||||
console.log(`[admin] device ban ${Number(body.id)} lifted`);
|
||||
modlog.record(BY, "hardware ban lifted", result.username || "");
|
||||
}
|
||||
reply(result.ok ? 200 : 400, result);
|
||||
return;
|
||||
}
|
||||
|
||||
// other accounts the same person may have, their story, and who the
|
||||
// chat filter stopped most this week (lib/staff.js, lib/chatlog.js).
|
||||
case "GET /admin/api/alts": {
|
||||
const account = accounts.byName(url.searchParams.get("username") || "");
|
||||
reply(account ? 200 : 404, account ? {alts: staff.altsOf(account), ids: devices.idsFor(account)} : {error: "No such account."});
|
||||
return;
|
||||
}
|
||||
case "GET /admin/api/timeline": {
|
||||
const account = accounts.byName(url.searchParams.get("username") || "");
|
||||
reply(account ? 200 : 404, account ? {events: staff.timelineOf(account)} : {error: "No such account."});
|
||||
return;
|
||||
}
|
||||
case "GET /admin/api/filterhits":
|
||||
reply(200, {players: chatlog.mostStopped(7, 50)});
|
||||
return;
|
||||
|
||||
// what waits, for the tabs and the page's title, on every page.
|
||||
case "GET /admin/api/counts":
|
||||
reply(200, {reports: reports.openCount(), support: support.openCount() + bans.openAppeals(), masterpieces: masterpieces.list(masterpieces.PENDING).length});
|
||||
return;
|
||||
|
||||
// who may use the moderator panel, and what each did there.
|
||||
@@ -775,8 +860,8 @@ const handle = async (req, res, url, from, web) => {
|
||||
case "GET /admin/api/masterpieces":
|
||||
reply(200, {
|
||||
review: masterpieces.needsReview(),
|
||||
waiting: masterpieces.list(masterpieces.PENDING),
|
||||
approved: masterpieces.list(masterpieces.APPROVED),
|
||||
...masterpieces.listsFor(url.searchParams.get("creator")),
|
||||
waitingCount: masterpieces.list(masterpieces.PENDING).length,
|
||||
});
|
||||
return;
|
||||
|
||||
|
||||
Reference in new issue
Block a user