From 3b4d0380c86b36ee79c0a8ceb04c510d9cbde788 Mon Sep 17 00:00:00 2001 From: Adam Dorling Date: Sun, 1 Sep 2024 21:31:00 +0100 Subject: [PATCH] chore: remove debug code, rename single letter vars --- src/v2/autorespond/code_parsing/index.ts | 4 ---- src/v2/commands/npm/index.ts | 2 +- src/v2/index.ts | 1 - src/v2/modules/mod/commands/roles.ts | 5 ++++- .../events/handleNotifyRolesSelected.ts | 10 ++++----- .../onboarding/events/handleRoleSelected.ts | 22 +++++++++++-------- src/v2/modules/onboarding/utils/sneakPin.ts | 2 +- src/v2/utils/codeBlockCapturer.ts | 1 - 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/v2/autorespond/code_parsing/index.ts b/src/v2/autorespond/code_parsing/index.ts index f8f3f4b8..8dfcac6a 100644 --- a/src/v2/autorespond/code_parsing/index.ts +++ b/src/v2/autorespond/code_parsing/index.ts @@ -13,10 +13,6 @@ const jsCodeBlocks = createCodeBlockCapturer([ 'typescript', ]); -const tap = (x: T): T => { - console.log(x) - return x -} const getFirstVar = pipe([jsCodeBlocks, pluck('code'), some(hasVarInSource)]); const messageFor = (userId: string) => ` diff --git a/src/v2/commands/npm/index.ts b/src/v2/commands/npm/index.ts index c706cabd..e1191e62 100644 --- a/src/v2/commands/npm/index.ts +++ b/src/v2/commands/npm/index.ts @@ -203,7 +203,7 @@ const createNPMEmbed = ( .setURL(url) .setFooter( { - text: `requested by ${user.username}#${user.discriminator}`, + text: `requested by ${user.username}`, iconURL: user.avatarURL({ size: 64, format: 'webp' }) } ) diff --git a/src/v2/index.ts b/src/v2/index.ts index 47782b55..de3e4290 100644 --- a/src/v2/index.ts +++ b/src/v2/index.ts @@ -153,7 +153,6 @@ client.on('messageCreate', msg => { } if (NON_COMMAND_MSG_TYPES.has(msg.channel.type) && msg.guild) { - console.log("Handled") handleNonCommandGuildMessages(msg); } }); diff --git a/src/v2/modules/mod/commands/roles.ts b/src/v2/modules/mod/commands/roles.ts index d7c81ced..29aef9ea 100644 --- a/src/v2/modules/mod/commands/roles.ts +++ b/src/v2/modules/mod/commands/roles.ts @@ -18,7 +18,10 @@ const generateButtons = (roles: typeof ROLES | typeof NOTIFY_ROLES) => const chunkAndRowify = pipe< Iterable, Iterable> ->([chunk(5), map((x: ButtonBuilder[]) => new ActionRowBuilder().addComponents(...x))]); +>([ + chunk(5), + map((buttonBuilders: ButtonBuilder[]) => new ActionRowBuilder().addComponents(...buttonBuilders)) +]); export async function setupRoles( interaction: CommandInteraction diff --git a/src/v2/modules/onboarding/events/handleNotifyRolesSelected.ts b/src/v2/modules/onboarding/events/handleNotifyRolesSelected.ts index 87dc6de0..77f4334f 100644 --- a/src/v2/modules/onboarding/events/handleNotifyRolesSelected.ts +++ b/src/v2/modules/onboarding/events/handleNotifyRolesSelected.ts @@ -32,10 +32,10 @@ export const handleNotifyRolesSelected = async ( const msg = interaction.message as Message; msg.edit({ - components: msg.components.map(x => { - if (x.type === ComponentType.ActionRow) { - return new ActionRowBuilder(x) - .setComponents(...x.components.map(x => { + components: msg.components.map(component => { + if (component.type === ComponentType.ActionRow) { + return new ActionRowBuilder(component) + .setComponents(...component.components.map(x => { if (x.type === ComponentType.Button) { return new ButtonBuilder(x).setDisabled(true) } @@ -43,7 +43,7 @@ export const handleNotifyRolesSelected = async ( })) } - return x + return component }), }); diff --git a/src/v2/modules/onboarding/events/handleRoleSelected.ts b/src/v2/modules/onboarding/events/handleRoleSelected.ts index ac5448be..e44e3dfe 100644 --- a/src/v2/modules/onboarding/events/handleRoleSelected.ts +++ b/src/v2/modules/onboarding/events/handleRoleSelected.ts @@ -40,16 +40,20 @@ export const handleRoleSelected = async ( }); await msg.edit({ - components: msg.components.map(x => { - if (x.type === ComponentType.ActionRow) { - return new ActionRowBuilder(x).setComponents(x.components.map(x => { - if (x.type === ComponentType.StringSelect) { - return new StringSelectMenuBuilder(x).setDisabled(true) - } - return x as unknown as MessageActionRowComponentBuilder - })) + components: msg.components.map(component => { + if (component.type === ComponentType.ActionRow) { + return new ActionRowBuilder(component) + .setComponents( + component.components.map(subComponent => { + if (subComponent.type === ComponentType.StringSelect) { + return new StringSelectMenuBuilder(subComponent).setDisabled(true) + } + // This feels wrong, there really should be a better way to edit a component...surely + return subComponent as unknown as MessageActionRowComponentBuilder + }) + ) } - return x; + return component; }), }); diff --git a/src/v2/modules/onboarding/utils/sneakPin.ts b/src/v2/modules/onboarding/utils/sneakPin.ts index 0d0e3e93..b471a609 100644 --- a/src/v2/modules/onboarding/utils/sneakPin.ts +++ b/src/v2/modules/onboarding/utils/sneakPin.ts @@ -2,7 +2,7 @@ import { Message, MessageType } from 'discord.js'; export const sneakPin = async (msg: Message): Promise => { const awaitedPinned = msg.channel.awaitMessages({ - filter: x => x.type === MessageType.ChannelPinnedMessage, + filter: msg => msg.type === MessageType.ChannelPinnedMessage, max: 1, }); diff --git a/src/v2/utils/codeBlockCapturer.ts b/src/v2/utils/codeBlockCapturer.ts index addf3585..e348020e 100644 --- a/src/v2/utils/codeBlockCapturer.ts +++ b/src/v2/utils/codeBlockCapturer.ts @@ -14,7 +14,6 @@ export function createCodeBlockCapturer( String.raw`${BACKTICKS}(?${langAlts})\n(?[\s\S]+?)\n${BACKTICKS}`, 'gui' ); - console.log({ str }) const matches = str.matchAll(langRegex); for (const { groups: { language, code },