Wifi: Kick users from giveaways upon punishment

Author: mia-pi-git

server/chat-commands/moderation.ts

@@ -707,6 +707,7 @@ export const commands: Chat.ChatCommands = {
 			this.privateModAction(displayMessage);
 		}
 
+		Chat.runHandlers('onPunishUser', 'MUTE', user, room);
 		room.mute(targetUser, muteDuration);
 	},
 	mutehelp: [`/mute OR /m [username], [reason] - Mutes a user with reason for 7 minutes. Requires: % @ # &`],
@@ -803,6 +804,7 @@ export const commands: Chat.ChatCommands = {
 		const time = week ? Date.now() + 7 * 24 * 60 * 60 * 1000 : null;
 		const affected = Punishments.roomBan(room, targetUser, time, null, privateReason);
 
+		for (const u of affected) Chat.runHandlers('onPunishUser', 'ROOMBAN', u, room);
 		if (!room.settings.isPrivate && room.persist) {
 			const acAccount = (targetUser.autoconfirmed !== userid && targetUser.autoconfirmed);
 			let displayMessage = '';
@@ -923,6 +925,7 @@ export const commands: Chat.ChatCommands = {
 			affected = await Punishments.lock(userid, duration, null, false, publicReason);
 		}
 
+		for (const u of affected) Chat.runHandlers('onPunishUser', 'LOCK', u, room);
 		this.globalModlog(
 			(force ? `FORCE` : ``) + (week ? "WEEKLOCK" : (month ? "MONTHLOCK" : "LOCK")), targetUser || userid, privateReason
 		);
@@ -1127,6 +1130,7 @@ export const commands: Chat.ChatCommands = {
 		this.addGlobalModAction(`${name} was globally banned by ${user.name}.${(publicReason ? ` (${publicReason})` : ``)}`);
 
 		const affected = await Punishments.ban(userid, null, null, false, publicReason);
+		for (const u of affected) Chat.runHandlers('onPunishUser', 'BAN', u, room);
 		const acAccount = (targetUser && targetUser.autoconfirmed !== userid && targetUser.autoconfirmed);
 		let displayMessage = '';
 		if (affected.length > 1) {
@@ -1969,6 +1973,7 @@ export const commands: Chat.ChatCommands = {
 		}
 		const duration = week ? 7 * 24 * 60 * 60 * 1000 : 48 * 60 * 60 * 1000;
 		await Punishments.namelock(userid, Date.now() + duration, null, false, publicReason);
+		if (targetUser) Chat.runHandlers('onPunishUser', 'NAMELOCK', targetUser, room);
 		// Automatically upload replays as evidence/reference to the punishment
 		if (room?.battle) this.parse('/savereplay forpunishment');
 		Monitor.forceRenames.set(userid, false);
@@ -2158,6 +2163,7 @@ export const commands: Chat.ChatCommands = {
 
 		const affected = Punishments.roomBlacklist(room, targetUser, expireTime, null, reason);
 
+		for (const u of affected) Chat.runHandlers('onPunishUser', 'BLACKLIST', u, room);
 		if (!room.settings.isPrivate && room.persist) {
 			const acAccount = (targetUser.autoconfirmed !== userid && targetUser.autoconfirmed);
 			let displayMessage = '';

server/chat-plugins/wifi.tsx

@@ -920,6 +920,12 @@ export const handlers: Chat.Handlers = {
 			saveData();
 		}
 	},
+	onPunishUser(type, user, room) {
+		const game = room?.getGame(LotteryGiveaway) || room?.getGame(QuestionGiveaway);
+		if (game) {
+			game.kickUser(user);
+		}
+	},
 };
 
 export const commands: Chat.ChatCommands = {

server/chat.ts

@@ -88,6 +88,7 @@ interface Handlers {
 	onChallenge: (user: User, targetUser: User, format: string | ID) => void;
 	onMessageOffline: (context: Chat.CommandContext, message: string, targetUserID: ID) => void;
 	onBattleJoin: (slot: string, user: User, battle: RoomBattle) => void;
+	onPunishUser: (type: string, user: User, room?: Room | null) => void;
 }
 
 export interface ChatPlugin {