Improve development experience

src/bot-utilities.ts

@@ -358,35 +358,42 @@ export class BotUtilities {
     async get_channel(id: string) {
         const channel = await this.wheatley.client.channels.fetch(id);
         if (!channel) {
-            throw Error(`Channel ${id} not found`);
+            throw new Error(`Channel ${id} not found`);
         }
+
         assert(channel instanceof Discord.TextChannel, `Channel ${channel} (${id}) not of the expected type`);
         return channel;
     }
 
     async get_forum_channel(id: string) {
         const channel = await this.wheatley.client.channels.fetch(id);
+
         if (!channel) {
-            throw Error(`Forum channel ${id} not found`);
+            throw new Error(`Forum channel ${id} not found`);
         }
+
         assert(channel instanceof Discord.ForumChannel, `Channel ${channel} (${id}) not of the expected type`);
         return channel;
     }
 
     async get_thread_channel(id: string) {
         const channel = await this.wheatley.client.channels.fetch(id);
+
         if (!channel) {
-            throw Error(`Thread channel ${id} not found`);
+            throw new Error(`Thread channel ${id} not found`);
         }
+
         assert(channel instanceof Discord.ThreadChannel, `Channel ${channel} (${id}) not of the expected type`);
         return channel;
     }
 
     async get_category(id: string) {
         const category = await this.wheatley.client.channels.fetch(id);
+
         if (!category) {
-            throw Error(`Category ${id} not found`);
+            throw new Error(`Category ${id} not found`);
         }
+
         assert(category instanceof Discord.CategoryChannel, `Category ${category} (${id}) not of the expected type`);
         return category;
     }

src/modules/tccpp/components/anti-screenshot.ts

@@ -32,7 +32,7 @@ export default class AntiScreenshot extends BotComponent {
     private acknowledge_button!: BotButton<[]>;
 
     override async setup(commands: CommandSetBuilder) {
-        this.staff_message_log = await this.utilities.get_channel(this.wheatley.channels.staff_message_log);
+        this.staff_message_log = await this.utilities.get_channel(this.wheatley.channels.staff_message_log.id);
 
         this.acknowledge_button = commands.add(
             new ButtonInteractionBuilder("anti_screenshot_acknowledge").set_handler(

src/modules/tccpp/components/anti-self-star.ts

@@ -26,7 +26,12 @@ export default class AntiSelfStar extends BotComponent {
         if (reaction.emoji.name !== "⭐") {
             return;
         }
-        if (message.channelId == this.wheatley.channels.memes && user.id == message.author.id && has_media(message)) {
+
+        if (
+            message.channelId == this.wheatley.channels.memes.id &&
+            user.id == message.author.id &&
+            has_media(message)
+        ) {
             await this.handle_self_star(await departialize(message));
         }
     }

src/modules/tccpp/components/auto-reply.ts

@@ -27,13 +27,14 @@ export default class Autoreply extends BotComponent {
         if (message.guildId !== this.wheatley.guild.id || message.author.bot) {
             return;
         }
+
         if (
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             LLM_AUTOREPLY_ENABLED &&
             LLM_REGEX.test(message.content) &&
             !this.is_ratelimited() &&
             Math.random() <= RATELIMIT_PROBABILITY &&
-            message.channel.id !== this.wheatley.channels.bot_spam
+            message.channel.id !== this.wheatley.channels.bot_spam.id
         ) {
             this.last_reply_time = Date.now();
             M.log("firing llm auto-reply");
@@ -42,13 +43,14 @@ export default class Autoreply extends BotComponent {
                 allowedMentions: { repliedUser: false },
             });
         }
+
         if (
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             MICROSLOP_AUTOREPLY_ENABLED &&
             MICROSLOP_REGEX.test(message.content) &&
             !this.is_ratelimited() &&
             Math.random() <= RATELIMIT_PROBABILITY &&
-            message.channel.id !== this.wheatley.channels.bot_spam
+            message.channel.id !== this.wheatley.channels.bot_spam.id
         ) {
             this.last_reply_time = Date.now();
             M.log("firing microslop auto-reply");
@@ -57,6 +59,7 @@ export default class Autoreply extends BotComponent {
                 allowedMentions: { repliedUser: false },
             });
         }
+
         if (
             message.mentions.has(this.wheatley.user.id) &&
             /^(<@\d+>)?\s*is\s*this\s*true\s*\??(<@\d+>)?$/gi.test(message.content)

src/modules/tccpp/components/autoreact.ts

@@ -122,7 +122,8 @@ export default class Autoreact extends BotComponent {
                     this.wheatley.warn("Unable to find emoji nog4g");
                 }
             }
-            if (message.channel.id == this.wheatley.channels.introductions) {
+
+            if (message.channel.id == this.wheatley.channels.introductions.id) {
                 if (message.member == null) {
                     // TODO: Ping zelis?
                     M.warn("Why??", message);
@@ -132,15 +133,15 @@ export default class Autoreact extends BotComponent {
                     M.log("Waving to new user", message.author.tag, message.author.id, message.url);
                     await message.react("👋");
                 }
-            } else if (message.channel.id == this.wheatley.channels.memes && has_media(message)) {
+            } else if (message.channel.id == this.wheatley.channels.memes.id && has_media(message)) {
                 M.log("Adding star reaction", message.author.tag, message.author.id, message.url);
                 await message.react("⭐");
-            } else if (message.channel.id == this.wheatley.channels.server_suggestions) {
+            } else if (message.channel.id == this.wheatley.channels.server_suggestions.id) {
                 M.log("Adding server suggestion reactions", message.author.tag, message.author.id, message.url);
                 await message.react("👍");
                 await message.react("👎");
                 await message.react("🤷");
-            } else if (message.channel.id == this.wheatley.channels.food && has_media(message)) {
+            } else if (message.channel.id == this.wheatley.channels.food.id && has_media(message)) {
                 const reaction = message.guild!.emojis.cache.find(emoji => emoji.name === "chefskiss");
                 if (reaction !== undefined) {
                     await message.react(reaction);
@@ -152,7 +153,8 @@ export default class Autoreact extends BotComponent {
             // reaction blocked
             if (e instanceof Discord.DiscordAPIError && e.code === 90001) {
                 await message.member?.timeout(1 * MINUTE, "Thou shall not block the bot");
-                if (message.channel.id == this.wheatley.channels.server_suggestions) {
+
+                if (message.channel.id == this.wheatley.channels.server_suggestions.id) {
                     await message.delete();
                 }
             } else {
@@ -177,7 +179,8 @@ export default class Autoreact extends BotComponent {
         if (new_message.createdTimestamp && Date.now() - new_message.createdTimestamp > 5 * MINUTE) {
             return;
         }
-        if (new_message.channel.id == this.wheatley.channels.memes) {
+
+        if (new_message.channel.id == this.wheatley.channels.memes.id) {
             const bot_starred = new_message.reactions.cache.get("⭐")?.users.cache.has(this.wheatley.user.id);
             // If we haven't stared (or don't know if we've starred) and the new message has media, star
             if (!bot_starred && has_media(new_message)) {
@@ -205,7 +208,7 @@ export default class Autoreact extends BotComponent {
 
     async catch_up() {
         const TCCPP = await this.wheatley.client.guilds.fetch(this.wheatley.guild.id);
-        const introductions_channel = await TCCPP.channels.fetch(this.wheatley.channels.introductions);
+        const introductions_channel = await TCCPP.channels.fetch(this.wheatley.channels.introductions.id);
         assert(introductions_channel);
         assert(introductions_channel.type == Discord.ChannelType.GuildText);
         const messages = await introductions_channel.messages.fetch({ limit: 100, cache: false });

src/modules/tccpp/components/c-help-redirect.ts

@@ -70,8 +70,8 @@ export default class CHelpRedirect extends BotComponent {
     private cpp_help_text!: Discord.TextChannel;
 
     override async setup(commands: CommandSetBuilder) {
-        this.c_help_text = await this.utilities.get_channel(this.wheatley.channels.c_help_text);
-        this.cpp_help_text = await this.utilities.get_channel(this.wheatley.channels.cpp_help_text);
+        this.c_help_text = await this.utilities.get_channel(this.wheatley.channels.c_help_text.id);
+        this.cpp_help_text = await this.utilities.get_channel(this.wheatley.channels.cpp_help_text.id);
 
         commands.add(
             new TextBasedCommandBuilder("not-c", EarlyReplyMode.none)
@@ -190,8 +190,8 @@ export default class CHelpRedirect extends BotComponent {
         assert(command.channel instanceof Discord.GuildChannel);
 
         // Only allowed in #c-help-text
-        if (command.channel.id != this.wheatley.channels.c_help_text) {
-            await command.reply(`Can only be used in <#${this.wheatley.channels.c_help_text}>`, true);
+        if (command.channel.id != this.wheatley.channels.c_help_text.id) {
+            await command.reply(`Can only be used in <#${this.wheatley.channels.c_help_text.id}>`, true);
             return;
         }
 
@@ -200,12 +200,12 @@ export default class CHelpRedirect extends BotComponent {
         if (user) {
             await this.c_help_text.send(
                 `<@${user.id}> Your code looks like C++ code, but this is a C channel. ` +
-                    `Did you mean to post in <#${this.wheatley.channels.cpp_help_text}>?`,
+                    `Did you mean to post in <#${this.wheatley.channels.cpp_help_text.id}>?`,
             );
         } else {
             await this.c_help_text.send(
                 `This code looks like C++ code, but this is a C channel. ` +
-                    `Did you mean to post in <#${this.wheatley.channels.cpp_help_text}>?`,
+                    `Did you mean to post in <#${this.wheatley.channels.cpp_help_text.id}>?`,
             );
         }
     }
@@ -215,8 +215,8 @@ export default class CHelpRedirect extends BotComponent {
         assert(command.channel instanceof Discord.GuildChannel);
 
         // Only allowed in #cpp-help-text
-        if (command.channel.id != this.wheatley.channels.cpp_help_text) {
-            await command.reply(`Can only be used in <#${this.wheatley.channels.cpp_help_text}>`, true);
+        if (command.channel.id != this.wheatley.channels.cpp_help_text.id) {
+            await command.reply(`Can only be used in <#${this.wheatley.channels.cpp_help_text.id}>`, true);
             return;
         }
 
@@ -225,12 +225,12 @@ export default class CHelpRedirect extends BotComponent {
         if (user) {
             await this.cpp_help_text.send(
                 `<@${user.id}> Your code looks like C code, but this is a C++ channel. ` +
-                    `Did you mean to post in <#${this.wheatley.channels.c_help_text}>?`,
+                    `Did you mean to post in <#${this.wheatley.channels.c_help_text.id}>?`,
             );
         } else {
             await this.cpp_help_text.send(
                 `This code looks like C code, but this is a C++ channel. ` +
-                    `Did you mean to post in <#${this.wheatley.channels.c_help_text}>?`,
+                    `Did you mean to post in <#${this.wheatley.channels.c_help_text.id}>?`,
             );
         }
     }
@@ -256,20 +256,20 @@ export default class CHelpRedirect extends BotComponent {
         }
 
         // Only check messages in help-text channels
-        if (message.channel.id == this.wheatley.channels.c_help_text) {
+        if (message.channel.id == this.wheatley.channels.c_help_text.id) {
             if (this.check_message_for_cpp_code(message)) {
                 this.auto_triggered_users.insert(message.author.id);
                 await message.reply(
                     `<@${message.author.id}> Your code looks like C++ code, but this is a C channel. ` +
-                        `Did you mean to post in <#${this.wheatley.channels.cpp_help_text}>?`,
+                        `Did you mean to post in <#${this.wheatley.channels.cpp_help_text.id}>?`,
                 );
             }
-        } else if (message.channel.id == this.wheatley.channels.cpp_help_text) {
+        } else if (message.channel.id == this.wheatley.channels.cpp_help_text.id) {
             if (this.check_message_for_c_code(message)) {
                 this.auto_triggered_users.insert(message.author.id);
                 await message.reply(
                     `<@${message.author.id}> Your code looks like C code, but this is a C++ channel. ` +
-                        `Did you mean to post in <#${this.wheatley.channels.c_help_text}>?`,
+                        `Did you mean to post in <#${this.wheatley.channels.c_help_text.id}>?`,
                 );
             }
         }

src/modules/tccpp/components/days-since-last-incident.ts

@@ -62,7 +62,7 @@ export default class DaysSinceLastIncident extends BotComponent {
         await ensure_index(this.wheatley, this.database.monke_button_presses, { timestamp: -1 });
 
         this.days_since_last_incident = await this.utilities.get_channel(
-            this.wheatley.channels.days_since_last_incident,
+            this.wheatley.channels.days_since_last_incident.id,
         );
     }
 

src/modules/tccpp/components/forum-channels.ts

@@ -61,11 +61,11 @@ export default class ForumChannels extends BotComponent {
     private forum_control!: ForumControl;
 
     override async setup(commands: CommandSetBuilder) {
-        this.general_discussion = await this.utilities.get_channel(this.wheatley.channels.general_discussion);
-        this.cpp_help = await this.utilities.get_forum_channel(this.wheatley.channels.cpp_help);
-        this.c_help = await this.utilities.get_forum_channel(this.wheatley.channels.c_help);
-        this.cpp_help_text = await this.utilities.get_channel(this.wheatley.channels.cpp_help_text);
-        this.c_help_text = await this.utilities.get_channel(this.wheatley.channels.c_help_text);
+        this.general_discussion = await this.utilities.get_channel(this.wheatley.channels.general_discussion.id);
+        this.cpp_help = await this.utilities.get_forum_channel(this.wheatley.channels.cpp_help.id);
+        this.c_help = await this.utilities.get_forum_channel(this.wheatley.channels.c_help.id);
+        this.cpp_help_text = await this.utilities.get_channel(this.wheatley.channels.cpp_help_text.id);
+        this.c_help_text = await this.utilities.get_channel(this.wheatley.channels.c_help_text.id);
         this.forum_control = unwrap(this.wheatley.components.get("ForumControl")) as ForumControl;
     }
 
@@ -294,7 +294,7 @@ export default class ForumChannels extends BotComponent {
     is_non_forum_mirror_channel(thread: Discord.ThreadChannel) {
         return (
             thread.parentId != null &&
-            [this.wheatley.channels.code_review, this.wheatley.channels.showcase].includes(thread.parentId)
+            [this.wheatley.channels.code_review, this.wheatley.channels.showcase].some(ch => ch.id === thread.parentId)
         );
     }
 
@@ -344,7 +344,7 @@ export default class ForumChannels extends BotComponent {
                 await this.mirror_forum_post(
                     message,
                     `New ${
-                        thread.parentId == this.wheatley.channels.code_review ? "code review" : "showcase"
+                        thread.parentId == this.wheatley.channels.code_review.id ? "code review" : "showcase"
                     } post: ${thread.name}`,
                     true,
                     this.general_discussion,

src/modules/tccpp/components/memes.ts

@@ -56,7 +56,7 @@ export default class Memes extends BotComponent {
             });
             await user.send({
                 content:
-                    `Your message in <#${this.wheatley.channels.memes}> was deleted because it didn't contain ` +
+                    `Your message in <#${this.wheatley.channels.memes.id}> was deleted because it didn't contain ` +
                     `any images, videos, or media embeds. This channel is for sharing memes only. For commentary ` +
                     `please open a thread.`,
                 embeds: quote.embeds,
@@ -88,7 +88,8 @@ export default class Memes extends BotComponent {
         if (message.guildId !== this.wheatley.guild.id) {
             return;
         }
-        if (message.channel.id !== this.wheatley.channels.memes) {
+
+        if (message.channel.id !== this.wheatley.channels.memes.id) {
             return;
         }
         if (await this.should_skip(message)) {
@@ -109,7 +110,8 @@ export default class Memes extends BotComponent {
         if (new_message.guildId !== this.wheatley.guild.id) {
             return;
         }
-        if (new_message.channel.id !== this.wheatley.channels.memes) {
+
+        if (new_message.channel.id !== this.wheatley.channels.memes.id) {
             return;
         }
         const message = await departialize(new_message);