Merge branch 'master' into less-at-helper-spam

Author: robertt

src/modules/helpchan.ts

@@ -406,19 +406,27 @@ export class HelpChanModule extends Module {
 		else askHelpChannel.send(newMessageText);
 	}
 
+	private async getChannelMember(channel: TextChannel) {
+		return (
+			HelpUser.findOneOrFail({
+				channelId: channel.id,
+			})
+				.then(helpUser => {
+					// Clear from the cache in case they've left the server
+					channel.guild.members.cache.delete(helpUser.userId);
+					return channel.guild.members.fetch({
+						user: helpUser.userId,
+					});
+				})
+				// Do nothing, member left the guild
+				.catch(() => undefined)
+		);
+	}
+
 	private async markChannelAsDormant(channel: TextChannel) {
 		this.busyChannels.add(channel.id);
 
-		const memberPromise = HelpUser.findOneOrFail({
-			channelId: channel.id,
-		})
-			.then(helpUser =>
-				channel.guild.members.fetch({
-					user: helpUser.userId,
-				}),
-			)
-			// Do nothing, member left the guild
-			.catch(() => undefined);
+		const memberPromise = this.getChannelMember(channel);
 
 		const pinnedPromise = channel.messages.fetchPinned();
 
@@ -453,13 +461,23 @@ export class HelpChanModule extends Module {
 
 	private async checkDormantPossibilities() {
 		for (const channel of this.getOngoingChannels()) {
-			const messages = await channel.messages.fetch();
+			const [messages, member] = await Promise.all([
+				channel.messages.fetch(),
+				this.getChannelMember(channel),
+			]);
 
 			const diff =
 				Date.now() - (messages.first()?.createdAt.getTime() ?? 0);
 
-			if (diff > dormantChannelTimeout)
+			if (!member) {
+				await channel.send(
+					'Asker has left the server, closing channel...',
+				);
+			}
+			if (!member || diff > dormantChannelTimeout) {
 				await this.markChannelAsDormant(channel);
+				continue;
+			}
 		}
 	}
 

src/modules/mod.ts

@@ -1,11 +1,23 @@
 import { default as CookiecordClient, Module, listener } from 'cookiecord';
-import { Message } from 'discord.js';
+import { Message, Snowflake, User } from 'discord.js';
 import { rulesChannelId } from '../env';
 
 // Most job posts are in this format:
 // > [FOR HIRE][REMOTE][SOMETHING ELSE]
 // > Hi, I'm ponyman6000. Hire me!
-const jobPostRegex = /^(?:\[[A-Z ]+\]){2,}\n/i;
+const jobPostRegex = /^(?:\[[A-Z /-]+\]\s*){2,}\n/i;
+
+const SPAM_CHANNEL_THRESHOLD = 3;
+const SPAM_MAX_TIME = 5000;
+
+interface RecentMessageInfo {
+	author: User;
+	firstPost: Date;
+	channels: Set<Snowflake>;
+	messages: Message[];
+}
+const recentMessages = new Map<string, RecentMessageInfo>();
+const CLEANUP_RECENT_MESSAGES_MAP_INTERVAL = 10000;
 
 export class ModModule extends Module {
 	constructor(client: CookiecordClient) {
@@ -20,4 +32,43 @@ export class ModModule extends Module {
 			`${msg.author} We don't do job posts here; see <#${rulesChannelId}>`,
 		);
 	}
+
+	@listener({ event: 'message' })
+	async onRepeatedMessage(msg: Message) {
+		if (!msg.guild || msg.author.id === this.client.user!.id) return;
+		const messageIdentifier = msg.content.trim().toLowerCase();
+		if (!messageIdentifier) return;
+		let recentMessageInfo = recentMessages.get(messageIdentifier);
+		if (
+			recentMessageInfo &&
+			recentMessageInfo.author.id === msg.author.id &&
+			+recentMessageInfo.firstPost + SPAM_MAX_TIME > Date.now()
+		) {
+			recentMessageInfo.channels.add(msg.channel.id);
+			recentMessageInfo.messages.push(msg);
+			if (recentMessageInfo.channels.size >= SPAM_CHANNEL_THRESHOLD) {
+				await Promise.all([
+					msg.guild.members
+						.fetch(msg.author)
+						.then(member => void member.kick('Spam')),
+					...recentMessageInfo.messages.map(msg => void msg.delete()),
+				]);
+			}
+		} else {
+			recentMessages.set(messageIdentifier, {
+				author: msg.author,
+				firstPost: new Date(),
+				channels: new Set([msg.channel.id]),
+				messages: [msg],
+			});
+		}
+	}
 }
+
+setInterval(() => {
+	for (const [messageText, recentMessageInfo] of recentMessages) {
+		if (+recentMessageInfo.firstPost + SPAM_MAX_TIME < Date.now()) {
+			recentMessages.delete(messageText);
+		}
+	}
+}, CLEANUP_RECENT_MESSAGES_MAP_INTERVAL);

src/modules/playground.ts

@@ -101,7 +101,10 @@ export class PlaygroundModule extends Module {
 		const exec = PLAYGROUND_REGEX.exec(msg.content);
 		if (msg.author.bot || !this.editedLongLink.has(msg.id) || exec) return;
 		const botMsg = this.editedLongLink.get(msg.id);
-		await botMsg?.edit('');
+		// Edit the message to only have the embed and not the "please edit your message" message
+		await botMsg?.edit('', {
+			embed: botMsg.embeds[0],
+		});
 		this.editedLongLink.delete(msg.id);
 	}
 }

src/util/codeBlocks.ts

@@ -4,7 +4,7 @@ import { getReferencedMessage } from './getReferencedMessage';
 
 const CODEBLOCK_REGEX = /```(?:ts|typescript)?\n([\s\S]+)```/;
 
-export const PLAYGROUND_REGEX = /https?:\/\/(?:www\.)?(?:typescriptlang|staging-typescript)\.org\/(?:play|dev\/bug-workbench)(?:\/index\.html)?\/?(\??(?:\w+=[^\s#&]+)?(?:\&\w+=[^\s#&]+)*)#code\/([\w\-+_]+={0,4})/;
+export const PLAYGROUND_REGEX = /https?:\/\/(?:www\.)?(?:typescriptlang|staging-typescript)\.org\/(?:play|dev\/bug-workbench)(?:\/index\.html)?\/?(\??(?:\w+=[^\s#&]+)?(?:\&\w+=[^\s#&]+)*)#code\/([\w\-%+_]+={0,4})/;
 
 export async function findCode(message: Message, ignoreLinks = false) {
 	const codeInMessage = findCodeInMessage(message, ignoreLinks);