Merge branch 'master' into thread-fixes

Author: orta

src/modules/playground.ts

@@ -207,7 +207,7 @@ function getSelectionQueryParams(query: string, numLines: number) {
 	const [startLine, endLine] = ['pln', 'ssl']
 		// @ts-expect-error parseInt(null) is okay here since we check for NaN
 		.map(name => parseInt(params.get(name)))
-		.map(n => (n !== NaN && 1 <= n && n <= numLines ? n : undefined))
+		.map(n => (!Number.isNaN(n) && 1 <= n && n <= numLines ? n : undefined))
 		.sort((a, b) => (a ?? Infinity) - (b ?? Infinity));
 
 	return { startLine, endLine };

src/modules/rep.ts

@@ -41,13 +41,18 @@ export class RepModule extends Module {
 		const GIVE = '✅';
 		const PARTIAL_GIVE = '🤔';
 		const NO_GIVE = '❌';
+		const LAUGH = '😆';
 
 		// Check for thanks messages
 		const isThanks = this.THANKS_REGEX.test(msg.content);
 
 		if (msg.author.bot || !isThanks || !msg.guild) return;
 
-		const mentionUsers = msg.mentions.users;
+		const allMentionUsers = msg.mentions.users;
+		const mentionUsers = allMentionUsers.filter(
+			user => user.id !== msg.member?.id,
+		);
+		if (mentionUsers.size < allMentionUsers.size) await msg.react(LAUGH);
 		if (!mentionUsers.size) return;
 
 		const senderRU = await this.getOrMakeUser(msg.author);
@@ -58,7 +63,6 @@ export class RepModule extends Module {
 		if (currentSent >= this.MAX_REP) return await msg.react(NO_GIVE);
 
 		for (const user of mentionUsers.values()) {
-			if (user.id === msg.member?.id) continue;
 			if (currentSent >= this.MAX_REP)
 				return await msg.react(PARTIAL_GIVE);
 

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 = await findCodeInMessage(message, ignoreLinks);