Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-08-24 18:14:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Abuse-monitor: Support requiring real punishments in upgrades

Browse Source
This commit is contained in:
Mia
2022-06-01 12:19:52 -05:00
parent 5d69a3f7d7
commit 3954af2bf4
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/chat-plugins/abuse-monitor.ts
View File

@@ -100,6 +100,8 @@ interface PunishmentSettings {
modlogActions?: string[];
/** Other types of a given certainty needed beyond the primary */
secondaryTypes?: Record<string, number>;
/** Requires another punishment given to activate. */
requiresPunishment?: boolean;
}
interface FilterSettings {
@@ -237,8 +239,13 @@ export async function searchModlog(
export const classifier = new Artemis.RemoteClassifier();
export async function runActions(user: User, room: GameRoom, message: string, response: Record<string, number>) {
// always mute on flag
const roomMutes = muted.get(room) || new WeakMap();
roomMutes.set(user, Date.now() + MUTE_DURATION);
muted.set(room, roomMutes);
const keys = Utils.sortBy(Object.keys(response), k => -response[k]);
const recommended: [string, string][] = [];
const recommended: [string, string, boolean][] = [];
const prevRecommend = cache[room.roomid]?.recommended?.[user.id];
for (const punishment of settings.punishments) {
if (prevRecommend?.type) { // avoid making extra db queries by frontloading this check
@@ -279,11 +286,16 @@ export async function runActions(user: User, room: GameRoom, message: string, re
});
if (hits.length < punishment.count) continue;
}
recommended.push([punishment.punishment, type]);
recommended.push([punishment.punishment, type, !!punishment.requiresPunishment]);
}
}
if (recommended.length) {
Utils.sortBy(recommended, ([punishment]) => -PUNISHMENTS.indexOf(punishment));
if (recommended.every(k => k[2])) {
// requiresPunishment is for upgrading. if every one is an upgrade and
// there's no independent punishment, do not upgrade it
return;
}
// go by most severe
const [punishment, reason] = recommended[0];
if (cache[room.roomid]) {
@@ -299,10 +311,6 @@ export async function runActions(user: User, room: GameRoom, message: string, re
return; // we want nothing else to be executed. staff want trusted users to be reviewed manually for now
}
const roomMutes = muted.get(room) || new WeakMap();
roomMutes.set(user, Date.now() + MUTE_DURATION);
muted.set(room, roomMutes);
const result = await punishmentHandlers[toID(punishment)]?.(user, room, response, message);
writeStats('punishments', {
punishment,
@@ -1194,6 +1202,9 @@ export const commands: Chat.ChatCommands = {
}
punishment.secondaryTypes[sType] = sCertainty;
break;
case 'requirepunishment': case 'rp':
punishment.requiresPunishment = true;
break;
default:
this.errorReply(`Invalid key: ${key}`);
return this.parse(`/help am`);