mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-19 01:27:51 -05:00
Merge origin/main into moderator-tools
The built client is main's here; it is rebuilt from the merged sources. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
commit
d09ee94e16
33 files changed
+649
-230
No files matched your search
+29
-14
@@ -15,6 +15,7 @@ const avatarHandlers = require("./avatars.js");
|
||||
const badges = require("./badges.js");
|
||||
const bans = require("./bans.js");
|
||||
const chatlog = require("./chatlog.js");
|
||||
const chatFilter = require("./chatfilter.js");
|
||||
const buddyModule = require("./buddies.js");
|
||||
const dens = require("./dens.js");
|
||||
const disguises = require("./disguises.js");
|
||||
@@ -306,7 +307,7 @@ const login = (session, msg) => {
|
||||
// before the session is findable, so that nothing is sent ahead of the
|
||||
// login reply.
|
||||
achievements.refresh(account);
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
online.set(key, session);
|
||||
console.log(`[world] ${account.username} logged in as sfs user ${session.id}`);
|
||||
session.sendXtJson(-1, {_cmd: "login", status: "1", params: loginParams(session)});
|
||||
@@ -480,7 +481,7 @@ const makeColour = (account, rgbs, asker = null) => {
|
||||
}
|
||||
if (entry.created) {
|
||||
account.coloursMade = {day: today, count: made + 1};
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
}
|
||||
for (const recipient of entry.created ? online.values() : asker ? [asker] : []) {
|
||||
recipient.sendXt("xcc", -1, 1, entry.id, ...entry.rgbs);
|
||||
@@ -523,7 +524,7 @@ const handlers = {
|
||||
.filter(Boolean).slice(0, MAX_FILTER_WORDS);
|
||||
session.account.filter = {level: [0, 1, 2].includes(Number(level)) ? Number(level) : 0, mode: Number(mode) === 1 ? 1 : 0,
|
||||
words: [...new Set(own)].join(","), chosen: true};
|
||||
accounts.save();
|
||||
accounts.save(session.account);
|
||||
sendFilter(session);
|
||||
},
|
||||
|
||||
@@ -796,7 +797,7 @@ const handlers = {
|
||||
vars[id] = 0;
|
||||
}
|
||||
const earned = achievements.award(account, id);
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
achievements.sendVar(session, id, earned);
|
||||
},
|
||||
|
||||
@@ -854,7 +855,7 @@ const handlers = {
|
||||
const ok = Boolean(thing) && TYPED_NAME.test(wanted) && !moderation.isSilenced(account);
|
||||
if (ok) {
|
||||
thing.name = wanted;
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
if (kind === "a" && thing === activeAvatar(account)) {
|
||||
sendAvatarData(session, session, thing.perUserAvId);
|
||||
}
|
||||
@@ -1029,14 +1030,17 @@ const playedText = seconds => {
|
||||
return `Played ${minutes} minute${minutes === 1 ? "" : "s"}`;
|
||||
};
|
||||
const cardBio = account => {
|
||||
// a bio from before the chat filter, or one a newer rule catches, is not
|
||||
// shown (lib/chat-filter.txt).
|
||||
const bio = account.bio && !chatFilter.broken(account.bio) ? account.bio : "";
|
||||
if (!account.playtimePublic) {
|
||||
return account.bio;
|
||||
return bio;
|
||||
}
|
||||
const session = online.get(account.username.toLowerCase());
|
||||
if (session) {
|
||||
countPlaytime(session);
|
||||
}
|
||||
return account.bio ? `${playedText(account.playtime)}\n\n${account.bio}` : playedText(account.playtime);
|
||||
return bio ? `${playedText(account.playtime)}\n\n${bio}` : playedText(account.playtime);
|
||||
};
|
||||
|
||||
// the time since it was last counted, added to the account's playtime.
|
||||
@@ -1068,7 +1072,7 @@ const leaveWorld = session => {
|
||||
countPlaytime(session);
|
||||
stats.session(session.account, (Date.now() - session.playStarted) / 1000);
|
||||
accounts.release(session.account);
|
||||
accounts.save();
|
||||
accounts.save(session.account);
|
||||
buddies.announce(session.account);
|
||||
}
|
||||
};
|
||||
@@ -1119,7 +1123,7 @@ const setTheme = (account, theme) => {
|
||||
return false;
|
||||
}
|
||||
account.theme = theme;
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
const session = findOnline(account.username);
|
||||
if (session) {
|
||||
reloadRoom(session);
|
||||
@@ -1227,7 +1231,7 @@ const setHideBlocked = (session, hide) => {
|
||||
}
|
||||
account.hideBlocked = hide;
|
||||
account.userVars[USER_VAR_HIDE_BLOCKED] = hide ? 1 : 0;
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
if (!hide) {
|
||||
for (const other of blocked) {
|
||||
sendAvatarCreate(session, other);
|
||||
@@ -1409,6 +1413,17 @@ module.exports = {
|
||||
return;
|
||||
}
|
||||
fields[0] = said;
|
||||
// the server's filter (lib/chatfilter.js): the line reaches
|
||||
// nobody, the sender sees the game's warning screen, and it is
|
||||
// kept in the chat log for the moderators, marked as not sent.
|
||||
const rule = chatFilter.broken(said);
|
||||
if (rule) {
|
||||
session.sendXt("uc", session.room.id, session.id, -1, 5);
|
||||
chatFilter.warn(session);
|
||||
chatlog.record(session.account, session.room.name, `(not sent) ${said}`);
|
||||
console.log(`[filter] ${session.name} in ${session.room.name}: "${said}" (${rule})`);
|
||||
return;
|
||||
}
|
||||
session.recentChat.push(`${new Date().toISOString().slice(11, 19)} ${said}`);
|
||||
session.recentChat = session.recentChat.slice(-RECENT_CHAT_LINES);
|
||||
chatlog.record(session.account, session.room.name, said);
|
||||
@@ -1484,7 +1499,7 @@ module.exports = {
|
||||
return false;
|
||||
}
|
||||
account.blocked = block ? [...account.blocked, key] : account.blocked.filter(name => name !== key);
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
const session = findOnline(account.username);
|
||||
if (session) {
|
||||
(block ? onBlocked : onUnblocked)(session, target);
|
||||
@@ -1504,7 +1519,7 @@ module.exports = {
|
||||
return;
|
||||
}
|
||||
account.nameBarData &= ~0xFF00;
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
const session = findOnline(account.username);
|
||||
if (session && session.room) {
|
||||
// AvatarXtCommManager "an": [sfsUserId, nameBarData]
|
||||
@@ -1520,7 +1535,7 @@ module.exports = {
|
||||
const avatar = activeAvatar(account);
|
||||
avatar.questLevel = level;
|
||||
avatar.questXp = adventureModule.levelXp(level);
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
const session = findOnline(account.username);
|
||||
if (session && session.room) {
|
||||
for (const viewer of session.room.sessions) {
|
||||
@@ -1607,7 +1622,7 @@ module.exports = {
|
||||
dens.sendDenState(visitor, room, false);
|
||||
}
|
||||
}
|
||||
accounts.save();
|
||||
accounts.save(...changed, maker);
|
||||
return true;
|
||||
},
|
||||
|
||||
|
||||
Reference in new issue
Block a user