mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-19 09:37:50 -05:00
feat: stats graphs, playtime, ip search against ban evasion, 150-char chat
- stats graphs for the admin and moderator panels (lib/stats.js, public/stats-view.html) - playtime, private unless shown on the card's bio tab; set on the account page - search accounts by ip address, only against ban evasion; mods see no addresses and each search is logged - privacy policy for the above (terms version 2026-10-17) - the per-second save looks only at accounts in play, with a slow sweep of the rest - items in several dens at once; chat filter hides slurs and threats by default - sexual usernames refused; moderators may enter full rooms; guide login allowed - 150-character chat box (client build 55) - fixes: gifts, trades, dens, pets in dens, den recycling, special animals' colours, jammer walls, settings switches; the buddy list sent at login - the item giver, the rules screen and the art studio rework
This commit is contained in:
1 parent
8400d2f928
commit
04f468af2c
56 files changed
+25667
-3894
No files matched your search
+127
-32
@@ -30,7 +30,10 @@ const canEnter = (owner, visitor) => owner === visitor || owner.denPrivacy === D
|
||||
|| (owner.denPrivacy === DEN_BUDDIES_ONLY && owner.buddies.includes(visitor.username.toLowerCase()));
|
||||
const RECYCLE_FRACTION = 0.3; // matches recyclePercentage sent at login
|
||||
const FIELDS_PER_SAVED_ITEM = 17;
|
||||
const REF_DEN_ITEM = "0"; // "1" would be a pet placed in the den
|
||||
const REF_DEN_ITEM = "0";
|
||||
const REF_PET = "1";
|
||||
const PET_CATEGORY = 1; // DenItem.getInWorldId for pets (sort category 99)
|
||||
const MAX_CATEGORY = 1000;
|
||||
const CURRENCY_DIAMONDS = 3;
|
||||
|
||||
// mannequins: den items (special type 4) that stand as an animal in clothes
|
||||
@@ -88,28 +91,54 @@ const readMannequin = (account, fields) => {
|
||||
};
|
||||
};
|
||||
|
||||
// DenXtCommManager.denItemsResponse: [activeDenIdx, count, ?, (invIdx, defId,
|
||||
// placed, version, approved, imageId, creatorDbId, creatorUuid, [mannequin],
|
||||
// denStoreInvId)...]. the three after "approved" are a masterpiece's
|
||||
// where an item stands: `spots` has a place for each den it is in, by the
|
||||
// den's inventory id ({cat, x, y, flip}), so one item can be in several dens
|
||||
// at once. the client is only ever told about the den in use.
|
||||
const spotOf = (item, den) => (item.spots ? item.spots[den] : undefined);
|
||||
const isPlaced = item => Boolean(item.spots) && Object.keys(item.spots).length > 0;
|
||||
const itemsInDen = account => account.denItems.filter(item => spotOf(item, account.activeDen));
|
||||
|
||||
// the pets standing in the owner's den in use: `inDen` is {den, x, y, flip}.
|
||||
const petsInDen = account => account.pets.filter(pet => pet.inDen && pet.inDen.den === account.activeDen);
|
||||
|
||||
// DenXtCommManager.denItemsResponse: [activeDenIdx, count, petCount, (invIdx,
|
||||
// defId, placed, version, approved, imageId, creatorDbId, creatorUuid,
|
||||
// [mannequin], denStoreInvId)..., petInvIdx...]. "placed" is the category the
|
||||
// den editor gave the item (DenItem.getInWorldId) in the den in use, 0 when
|
||||
// it is not placed there. the three after "approved" are a masterpiece's
|
||||
// (lib/masterpieces.js); one not approved yet the client keeps out of dens,
|
||||
// trades and the recycler.
|
||||
const sendDenItems = session => {
|
||||
const {account} = session;
|
||||
const {denItems} = account;
|
||||
session.sendXt("di", -1, account.activeDen, denItems.length, 0,
|
||||
...denItems.flatMap(item => [item.inv, item.def, item.placed ? 1 : 0, item.version, masterpieces.itemApproved(item), ...masterpieces.itemFields(item),
|
||||
...mannequinOwnFields(account, item), 0]));
|
||||
const pets = petsInDen(account);
|
||||
session.sendXt("di", -1, account.activeDen, denItems.length, pets.length,
|
||||
...denItems.flatMap(item => {
|
||||
const spot = spotOf(item, account.activeDen);
|
||||
return [item.inv, item.def, spot ? spot.cat || 1 : 0, item.version, masterpieces.itemApproved(item), ...masterpieces.itemFields(item),
|
||||
...mannequinOwnFields(account, item), 0];
|
||||
}),
|
||||
...pets.map(pet => pet.inv));
|
||||
};
|
||||
|
||||
// DenXtCommManager.denStateResponse: [itemCount, petCount, forceReload,
|
||||
// (invIdx, defId, placed, x, y, version, flipped, userNameLink, imageId,
|
||||
// creatorDbId, creatorUuid, [mannequin], ?)...]. forceReload makes the client finish a
|
||||
// pending room change, so it is set when the den has just been entered.
|
||||
// creatorDbId, creatorUuid, [mannequin], ?)..., (invIdx, lBits, uBits, eBits,
|
||||
// category, x, y, flipped, createdTs, personality, toy, food, name)...].
|
||||
// forceReload makes the client finish a pending room change, so it is set
|
||||
// when the den has just been entered.
|
||||
const sendDenState = (session, room, forceReload = true) => {
|
||||
const placed = room.denOwner.denItems.filter(item => item.placed && item.den === room.denOwner.activeDen && masterpieces.itemApproved(item));
|
||||
session.sendXt("ds", room.id, placed.length, 0, forceReload ? 1 : 0,
|
||||
...placed.flatMap(item => [item.inv, item.def, 1, item.x, item.y, item.version, item.flip, "", ...masterpieces.itemFields(item),
|
||||
...mannequinShownFields(room.denOwner, item), 0]));
|
||||
const owner = room.denOwner;
|
||||
const placed = itemsInDen(owner).filter(item => masterpieces.itemApproved(item));
|
||||
const pets = petsInDen(owner);
|
||||
session.sendXt("ds", room.id, placed.length, pets.length, forceReload ? 1 : 0,
|
||||
...placed.flatMap(item => {
|
||||
const spot = spotOf(item, owner.activeDen);
|
||||
return [item.inv, item.def, 1, spot.x, spot.y, item.version, spot.flip, "", ...masterpieces.itemFields(item),
|
||||
...mannequinShownFields(owner, item), 0];
|
||||
}),
|
||||
...pets.flatMap(pet => [pet.inv, pet.lBits, pet.uBits, pet.eBits, PET_CATEGORY, pet.inDen.x, pet.inDen.y, pet.inDen.flip,
|
||||
pet.createdAt, pet.personality || 0, pet.toy || 0, pet.food || 0, pet.name]));
|
||||
};
|
||||
|
||||
// adds a den item to an account; used by purchases, prizes and the item
|
||||
@@ -118,7 +147,7 @@ const giveDenItem = (account, defId, version = 0) => {
|
||||
if (!hasRoom(account, "denItems")) {
|
||||
return null;
|
||||
}
|
||||
const item = {inv: account.nextInv++, def: Number(defId), version: Number(version) || 0, placed: false, den: account.activeDen, x: 0, y: 0, flip: 0};
|
||||
const item = {inv: account.nextInv++, def: Number(defId), version: Number(version) || 0, spots: {}};
|
||||
account.denItems.push(item);
|
||||
accounts.save();
|
||||
return item;
|
||||
@@ -128,13 +157,15 @@ const giveDenItem = (account, defId, version = 0) => {
|
||||
// on the screens of everyone inside it (DenXtCommManager.denEmptyResponse).
|
||||
const clearDen = (owner, findOnline) => {
|
||||
// kept so that "!den undo" can put it back (lib/commands.js).
|
||||
const placed = owner.denItems.filter(item => item.placed && item.den === owner.activeDen);
|
||||
const placed = itemsInDen(owner);
|
||||
if (placed.length) {
|
||||
owner.denUndo = {den: owner.activeDen, items: placed.map(item => ({def: item.def, version: item.version, x: item.x, y: item.y, flip: item.flip}))};
|
||||
owner.denUndo = {den: owner.activeDen, items: placed.map(item => ({def: item.def, version: item.version, ...spotOf(item, owner.activeDen)}))};
|
||||
}
|
||||
for (const item of owner.denItems.filter(candidate => candidate.den === owner.activeDen)) {
|
||||
item.placed = false;
|
||||
item.x = item.y = item.flip = 0;
|
||||
for (const item of placed) {
|
||||
delete item.spots[owner.activeDen];
|
||||
}
|
||||
for (const pet of petsInDen(owner)) {
|
||||
delete pet.inDen;
|
||||
}
|
||||
accounts.save();
|
||||
const ownerSession = findOnline(owner.username);
|
||||
@@ -234,6 +265,39 @@ const handlers = ({others, findOnline}) => {
|
||||
sendDenItems(session);
|
||||
};
|
||||
|
||||
// den rooms recycled from the den switcher (DenSwitch.removeDen): never the
|
||||
// den in use, nor slot 0. what stood in one goes back to the inventory,
|
||||
// and a den bought for gems gives back the share den items do. the reply
|
||||
// is the same as for items.
|
||||
const recycleDens = (session, invList) => {
|
||||
const {account} = session;
|
||||
const recycled = [];
|
||||
for (const invIdx of new Set(String(invList).split(",", MAX_DENS).map(Number))) {
|
||||
const den = account.dens.find(candidate => candidate.inv === invIdx);
|
||||
if (!den || den.inv === 0 || den.inv === account.activeDen || account.dens.length <= 1) {
|
||||
continue;
|
||||
}
|
||||
account.dens.splice(account.dens.indexOf(den), 1);
|
||||
for (const item of account.denItems.filter(candidate => spotOf(candidate, den.inv))) {
|
||||
delete item.spots[den.inv];
|
||||
}
|
||||
for (const pet of account.pets.filter(candidate => candidate.inDen && candidate.inDen.den === den.inv)) {
|
||||
delete pet.inDen;
|
||||
}
|
||||
const refund = Math.floor(Number((defpacks.denRoomDef(den.def) || {}).cost || 0) * RECYCLE_FRACTION);
|
||||
account.currency.gems += refund;
|
||||
achievements.currencyChanged(account, "gems", refund);
|
||||
recycled.push(den.inv);
|
||||
}
|
||||
accounts.save();
|
||||
session.sendXt("dr", -1, recycled.length, account.currency.gems, ...recycled);
|
||||
// the switcher empties the slot itself; the items that come back need
|
||||
// the inventory's list.
|
||||
if (recycled.length) {
|
||||
sendDenItems(session);
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
di(session) {
|
||||
sendDenItems(session);
|
||||
@@ -289,9 +353,12 @@ const handlers = ({others, findOnline}) => {
|
||||
sendDenItems(session);
|
||||
},
|
||||
|
||||
// DenXtCommManager.requestDenStateChange: [count, (refType, invIdx, placed,
|
||||
// x, y, flipped, userNameLink, 10 mannequin fields)...]. the reply
|
||||
// (DenEditor.onDenSaveSet) lists the inventory ids that were applied.
|
||||
// DenXtCommManager.requestDenStateChange: [count, (refType, invIdx,
|
||||
// category, x, y, flipped, userNameLink, 10 mannequin fields)...]. the
|
||||
// category is DenItem.getInWorldId: 1 furniture, toys, plants and pets,
|
||||
// 2 wall items, 3 music, the room's denCatId floors and wallpapers; 0 not
|
||||
// placed. the reply (DenEditor.onDenSaveSet) lists the inventory ids
|
||||
// that were applied.
|
||||
ds(session, roomId, params) {
|
||||
const {account} = session;
|
||||
const count = Number(params[0]);
|
||||
@@ -302,18 +369,40 @@ const handlers = ({others, findOnline}) => {
|
||||
const applied = [];
|
||||
const byInv = new Map(account.denItems.map(candidate => [candidate.inv, candidate]));
|
||||
const mannequins = account.denItems.filter(candidate => candidate.mannequin);
|
||||
const activePet = activeAvatar(account).petInvId;
|
||||
for (let i = 0; i < count; i++) {
|
||||
const [refType, invIdx, placed, x, y, flip, , ...outfit] = params.slice(1 + i * FIELDS_PER_SAVED_ITEM, 1 + (i + 1) * FIELDS_PER_SAVED_ITEM);
|
||||
const item = byInv.get(Number(invIdx));
|
||||
if (refType !== REF_DEN_ITEM || !item || ![x, y, flip].every(value => Number.isInteger(Number(value)))
|
||||
|| (placed === "1" && !masterpieces.itemApproved(item))) {
|
||||
const [refType, invIdx, category, x, y, flip, , ...outfit] = params.slice(1 + i * FIELDS_PER_SAVED_ITEM, 1 + (i + 1) * FIELDS_PER_SAVED_ITEM);
|
||||
const cat = Number(category);
|
||||
if (![x, y, flip].every(value => Number.isInteger(Number(value))) || !Number.isInteger(cat) || Math.abs(cat) > MAX_CATEGORY) {
|
||||
continue;
|
||||
}
|
||||
item.placed = placed === "1";
|
||||
item.den = account.activeDen;
|
||||
item.x = item.placed ? Number(x) : 0;
|
||||
item.y = item.placed ? Number(y) : 0;
|
||||
item.flip = item.placed ? Number(flip) : 0;
|
||||
const placed = cat !== 0;
|
||||
if (refType === REF_PET) {
|
||||
// the pet that follows its owner about is not put down (DenEditor says so).
|
||||
const pet = account.pets.find(candidate => candidate.inv === Number(invIdx));
|
||||
if (pet && !(placed && pet.inv === activePet)) {
|
||||
if (placed) {
|
||||
pet.inDen = {den: account.activeDen, x: Number(x), y: Number(y), flip: Number(flip)};
|
||||
}
|
||||
else if (pet.inDen && pet.inDen.den === account.activeDen) {
|
||||
delete pet.inDen;
|
||||
}
|
||||
applied.push(pet.inv);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
const item = byInv.get(Number(invIdx));
|
||||
if (refType !== REF_DEN_ITEM || !item || (placed && !masterpieces.itemApproved(item))) {
|
||||
continue;
|
||||
}
|
||||
// only the den in use changes: the item stays wherever else it stands.
|
||||
item.spots = item.spots || {};
|
||||
if (placed) {
|
||||
item.spots[account.activeDen] = {cat, x: Number(x), y: Number(y), flip: Number(flip)};
|
||||
}
|
||||
else {
|
||||
delete item.spots[account.activeDen];
|
||||
}
|
||||
const mannequin = isMannequin(item) && readMannequin(account, outfit);
|
||||
if (mannequin) {
|
||||
// A piece of clothing is on one mannequin at a time.
|
||||
@@ -344,6 +433,10 @@ const handlers = ({others, findOnline}) => {
|
||||
// recycleDiCallback) before it lets go of its spinner.
|
||||
dr(session, roomId, [kind, invList]) {
|
||||
const {account} = session;
|
||||
if (kind === "-1") {
|
||||
recycleDens(session, invList);
|
||||
return;
|
||||
}
|
||||
const recycled = [];
|
||||
for (const invIdx of kind === "0" ? new Set(String(invList).split(",", MAX_RECYCLED_AT_ONCE).map(Number)) : []) {
|
||||
const index = account.denItems.findIndex(item => item.inv === invIdx);
|
||||
@@ -396,6 +489,8 @@ const handlers = ({others, findOnline}) => {
|
||||
accounts.save();
|
||||
const avatar = activeAvatar(account);
|
||||
session.sendXt("dc", -1, den.def, avatar.perUserAvId, avatar.petInvId);
|
||||
// what is free and what is placed differs from den to den.
|
||||
sendDenItems(session);
|
||||
if (inOwnDen(session)) {
|
||||
const {room} = session;
|
||||
Object.assign(room, denRoom(account));
|
||||
@@ -431,4 +526,4 @@ const handlers = ({others, findOnline}) => {
|
||||
};
|
||||
};
|
||||
|
||||
module.exports = {handlers, sendDenState, sendDenItems, sendRoomProperties, giveDenItem, clearDen, denRoom, canEnter, DEF_DEN_ROOM};
|
||||
module.exports = {handlers, sendDenState, sendDenItems, sendRoomProperties, giveDenItem, clearDen, denRoom, canEnter, spotOf, isPlaced, DEF_DEN_ROOM};
|
||||
Reference in new issue
Block a user