Merge pull request #179 from tjjfvi/thread-fixes

Misc thread fixes

Author: orta

src/modules/helpthread.ts

@@ -88,7 +88,7 @@ const titleSetCooldown = 5 * 60 * 1000;
 export class HelpThreadModule extends Module {
 	@listener({ event: 'messageCreate' })
 	async onNewQuestion(msg: Message) {
-		if (!this.isHelpChannel(msg.channel)) return;
+		if (!isHelpChannel(msg.channel)) return;
 		if (msg.author.id === this.client.user!.id) return;
 		this.updateHelpInfo(msg.channel);
 		let thread = await msg.startThread({
@@ -108,7 +108,7 @@ export class HelpThreadModule extends Module {
 	@listener({ event: 'threadUpdate' })
 	async onThreadExpire(thread: ThreadChannel) {
 		if (
-			!this.isHelpThread(thread) ||
+			!isHelpThread(thread) ||
 			!((await thread.fetch()) as ThreadChannel).archived ||
 			this.manuallyArchivedThreads.delete(thread.id)
 		)
@@ -123,7 +123,7 @@ export class HelpThreadModule extends Module {
 		description: 'Help System: Close an active help thread',
 	})
 	async close(msg: Message) {
-		if (!this.isHelpThread(msg.channel))
+		if (!isHelpThread(msg.channel))
 			return await sendWithMessageOwnership(
 				msg,
 				':warning: This can only be run in a help thread',
@@ -168,38 +168,16 @@ export class HelpThreadModule extends Module {
 
 	@listener({ event: 'messageCreate' })
 	deletePinMessage(msg: Message) {
-		if (
-			this.isHelpChannel(msg.channel) &&
-			msg.type === 'CHANNEL_PINNED_MESSAGE'
-		)
+		if (isHelpChannel(msg.channel) && msg.type === 'CHANNEL_PINNED_MESSAGE')
 			msg.delete();
 	}
 
-	private isHelpChannel(
-		channel: Omit<Channel, 'partial'>,
-	): channel is TextChannel {
-		return (
-			channel instanceof TextChannel &&
-			channel.parentId == helpCategory &&
-			channel.id !== howToGetHelpChannel
-		);
-	}
-
-	private isHelpThread(
-		channel: Omit<Channel, 'partial'>,
-	): channel is ThreadChannel & { parent: TextChannel } {
-		return (
-			channel instanceof ThreadChannel &&
-			this.isHelpChannel(channel.parent!)
-		);
-	}
-
 	@command({
 		description: 'Help System: Ping the @Helper role from a help thread',
 		aliases: ['helpers'],
 	})
 	async helper(msg: Message) {
-		if (!this.isHelpThread(msg.channel)) {
+		if (!isHelpThread(msg.channel)) {
 			return sendWithMessageOwnership(
 				msg,
 				':warning: You may only ping helpers from a help thread',
@@ -249,7 +227,7 @@ export class HelpThreadModule extends Module {
 
 	@command({ single: true, description: 'Help System: Rename a help thread' })
 	async title(msg: Message, title: string) {
-		if (!this.isHelpThread(msg.channel))
+		if (!isHelpThread(msg.channel))
 			return sendWithMessageOwnership(
 				msg,
 				':warning: This can only be run in a help thread',
@@ -296,3 +274,19 @@ export class HelpThreadModule extends Module {
 		msg.channel.send({ embeds: howToGetHelpEmbeds() });
 	}
 }
+
+export function isHelpChannel(
+	channel: Omit<Channel, 'partial'>,
+): channel is TextChannel {
+	return (
+		channel instanceof TextChannel &&
+		channel.parentId == helpCategory &&
+		channel.id !== howToGetHelpChannel
+	);
+}
+
+export function isHelpThread(
+	channel: Omit<Channel, 'partial'>,
+): channel is ThreadChannel & { parent: TextChannel } {
+	return channel instanceof ThreadChannel && isHelpChannel(channel.parent!);
+}

src/modules/playground.ts

@@ -20,8 +20,13 @@ import {
 	truncate,
 } from '../util/codeBlocks';
 import { LimitedSizeMap } from '../util/limitedSizeMap';
-import { addMessageOwnership, sendWithMessageOwnership } from '../util/send';
+import {
+	addMessageOwnership,
+	getResponseChannel,
+	sendWithMessageOwnership,
+} from '../util/send';
 import fetch from 'node-fetch';
+import { isHelpChannel } from './helpthread';
 
 const LINK_SHORTENER_ENDPOINT = 'https://tsplay.dev/api/short';
 const MAX_EMBED_LENGTH = 512;
@@ -64,13 +69,14 @@ export class PlaygroundModule extends Module {
 		const exec = PLAYGROUND_REGEX.exec(msg.content);
 		if (!exec) return;
 		const embed = createPlaygroundEmbed(msg.author, exec);
-		if (exec[0] === msg.content) {
+		if (exec[0] === msg.content && !isHelpChannel(msg.channel)) {
 			// Message only contained the link
 			await sendWithMessageOwnership(msg, { embeds: [embed] });
 			await msg.delete();
 		} else {
 			// Message also contained other characters
-			const botMsg = await msg.channel.send({
+			const channel = await getResponseChannel(msg);
+			const botMsg = await channel.send({
 				embeds: [embed],
 				content: `${msg.author} Here's a shortened URL of your playground link! You can remove the full link from your message.`,
 			});

src/util/codeBlocks.ts

@@ -7,11 +7,11 @@ 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 async function findCode(message: Message, ignoreLinks = false) {
-	const codeInMessage = findCodeInMessage(message, ignoreLinks);
+	const codeInMessage = await findCodeInMessage(message, ignoreLinks);
 	if (codeInMessage) return codeInMessage;
 	const referencedMessage = await getReferencedMessage(message);
 	if (referencedMessage) {
-		const codeInReferencedMessage = findCodeInMessage(
+		const codeInReferencedMessage = await findCodeInMessage(
 			referencedMessage,
 			ignoreLinks,
 		);
@@ -20,7 +20,7 @@ export async function findCode(message: Message, ignoreLinks = false) {
 	const msgs = await message.channel.messages.fetch({ limit: 10 });
 
 	for (const msg of msgs.values()) {
-		const code = findCodeInMessage(msg, ignoreLinks);
+		const code = await findCodeInMessage(msg, ignoreLinks);
 		if (code) return code;
 	}
 }
@@ -29,10 +29,11 @@ export async function findCode(message: Message, ignoreLinks = false) {
 // 1: Normal code block annotated with ts from a non-bot
 // 2: Link to TS playground. This can be either from a bot or a normal user
 //    since we shorten playground links on their own and delete the message.
-function findCodeInMessage(
-	{ author, content, embeds }: Message,
-	ignoreLinks = false,
-) {
+async function findCodeInMessage(msg: Message, ignoreLinks = false) {
+	if (msg.type === 'THREAD_STARTER_MESSAGE') {
+		msg = await msg.fetchReference();
+	}
+	const { author, content, embeds } = msg;
 	if (!author.bot) {
 		const match = content.match(CODEBLOCK_REGEX);
 		if (match && match[1].length) {

src/util/send.ts

@@ -6,6 +6,7 @@ import {
 	PartialMessage,
 	User,
 } from 'discord.js';
+import { isHelpChannel } from '../modules/helpthread';
 import { LimitedSizeMap } from './limitedSizeMap';
 
 const messageToUserId = new LimitedSizeMap<
@@ -15,12 +16,22 @@ const messageToUserId = new LimitedSizeMap<
 
 export const DELETE_EMOJI = '🗑️';
 
+export async function getResponseChannel(message: Message) {
+	const channel = message.channel;
+	if (!isHelpChannel(channel)) return channel;
+	while (!message.thread) {
+		message = await message.fetch();
+	}
+	return message.thread;
+}
+
 export async function sendWithMessageOwnership(
 	message: Message,
 	toSend: string | MessagePayload | MessageOptions,
 	onDelete?: () => void,
 ) {
-	const sent = await message.channel.send(toSend);
+	const channel = await getResponseChannel(message);
+	const sent = await channel.send(toSend);
 	await addMessageOwnership(sent, message.author, onDelete);
 }