From 5b2d911d3c69a6eced873e19657202b610b714c2 Mon Sep 17 00:00:00 2001 From: Skyler Grey Date: Wed, 15 Mar 2023 00:37:43 +0000 Subject: [PATCH 1/7] Prettier version differences mean this styles differently on CI vs locally: this should be fixed posthaste --- src/utils/getEmojiByName.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/getEmojiByName.ts b/src/utils/getEmojiByName.ts index 56f1444..ebcb257 100644 --- a/src/utils/getEmojiByName.ts +++ b/src/utils/getEmojiByName.ts @@ -18,7 +18,7 @@ function getEmojiPaths(obj: EmojisIndex, path: string[] = []) { } getEmojiPaths(emojis); -function getEmojiByName(name: typeof EMOJIPATHS[number], format?: string): string { +function getEmojiByName(name: (typeof EMOJIPATHS)[number], format?: string): string { const parts = name.split("."); let id: string | EmojisIndex | EmojisIndex[] | undefined = emojis; for (const part of parts) { From 10ac55461d82dc01246d6ba9e37f05deaab6ef45 Mon Sep 17 00:00:00 2001 From: pineafan Date: Sun, 19 Mar 2023 10:06:19 +0000 Subject: [PATCH 2/7] Made image settings green --- src/commands/settings/automod.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/commands/settings/automod.ts b/src/commands/settings/automod.ts index db4a1c4..dc2c723 100644 --- a/src/commands/settings/automod.ts +++ b/src/commands/settings/automod.ts @@ -184,6 +184,8 @@ const imageMenu = async ( const embed = new EmojiEmbed() .setTitle("Image Settings") + .setStatus("Success") + // .setEmoji("") // TODO .setDescription( `${emojiFromBoolean(current.NSFW)} **NSFW**\n` + `${emojiFromBoolean(current.size)} **Size**\n` ); From 9ca34cd177d00b3181be3172189488e1533f36fa Mon Sep 17 00:00:00 2001 From: pineafan Date: Tue, 21 Mar 2023 18:45:58 +0000 Subject: [PATCH 3/7] Fixed grammar and embeds --- src/commands/settings/automod.ts | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/src/commands/settings/automod.ts b/src/commands/settings/automod.ts index dc2c723..684edf4 100644 --- a/src/commands/settings/automod.ts +++ b/src/commands/settings/automod.ts @@ -634,7 +634,7 @@ const mentionMenu = async ( const allowedMenu = new ActionRowBuilder().addComponents( new StringSelectMenuBuilder() .setCustomId("allowed") - .setPlaceholder("Edit exceptions") + .setPlaceholder("Edit allowed list") .addOptions( new StringSelectMenuOptionBuilder() .setLabel("Users") @@ -660,36 +660,33 @@ const mentionMenu = async ( `${emojiFromBoolean(current.roles)} **Roles**\n` + (current.allowed.rolesToMention.length > 0 ? `> *Except for ${listToAndMore( - current.allowed.rolesToMention.map((r) => `<@&${r}>`), - 3 - )}*\n` + current.allowed.rolesToMention.map((r) => `<@&${r}>`), + 3 + )}*\n` : "") + "\n" + `Except if...\n` + - `> ${ - current.allowed.users.length > 0 - ? `Member is: ${listToAndMore( - current.allowed.users.map((u) => `<@${u}>`), - 3 - )}\n` - : "" - }` + - `> ${ - current.allowed.roles.length > 0 - ? `Member has role: ${listToAndMore( - current.allowed.roles.map((r) => `<@&${r}>`), - 3 - )}\n` - : "" - }` + - `> ${ - current.allowed.channels.length > 0 - ? `In channel: ${listToAndMore( - current.allowed.channels.map((c) => `<#${c}>`), - 3 - )}\n` - : "" - }` + (current.allowed.users.length > 0 + ? `> Member is: ${listToAndMore( + current.allowed.users.map((u) => `<@${u}>`), + 3 + )}\n` + : "") + + (current.allowed.roles.length > 0 + ? `> Member has role: ${listToAndMore( + current.allowed.roles.map((r) => `<@&${r}>`), + 3 + )}\n` + : "") + + (current.allowed.channels.length > 0 + ? `> In channel: ${listToAndMore( + current.allowed.channels.map((c) => `<#${c}>`), + 3 + )}\n` + : "") + + (current.allowed.users.length == 0 || current.allowed.roles.length == 0 || current.allowed.channels.length == 0 ? + "> *No exceptions*\n" : "" + ) ) .setStatus("Success") .setEmoji("GUILD.SETTINGS.GREEN"); From dc85ab4a3d8aaed7c1a252779b629eaf75906c0f Mon Sep 17 00:00:00 2001 From: PineappleFan Date: Fri, 24 Mar 2023 17:19:17 +0000 Subject: [PATCH 4/7] Update stats.ts (said guild id) --- src/commands/nucleus/stats.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/nucleus/stats.ts b/src/commands/nucleus/stats.ts index d6577e7..d410da8 100644 --- a/src/commands/nucleus/stats.ts +++ b/src/commands/nucleus/stats.ts @@ -46,7 +46,7 @@ const confirm = async (interaction: ButtonInteraction) => { .setStyle(TextInputStyle.Short) .setLabel(`Type "${chosen}" below`) .setCustomId("confirm") - .setPlaceholder("Guild ID") + .setPlaceholder("1234567890") .setMinLength(chosen.length) .setMaxLength(chosen.length) ) From aea03fb28417eadf6240aac685be90c050c6ce7f Mon Sep 17 00:00:00 2001 From: pineafan Date: Mon, 27 Mar 2023 16:50:39 +0100 Subject: [PATCH 5/7] Attachments used staff rather than attachment channel --- src/commands/settings/logs/attachment.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/settings/logs/attachment.ts b/src/commands/settings/logs/attachment.ts index 62abd7e..62fb248 100644 --- a/src/commands/settings/logs/attachment.ts +++ b/src/commands/settings/logs/attachment.ts @@ -38,7 +38,7 @@ const callback = async (interaction: CommandInteraction): Promise => { }); let data = await client.database.guilds.read(interaction.guild!.id); - let channel = data.logging.staff.channel; + let channel = data.logging.attachments.channel; let closed = false; do { @@ -60,7 +60,7 @@ const callback = async (interaction: CommandInteraction): Promise => { .setLabel("Save") .setStyle(ButtonStyle.Success) .setEmoji(getEmojiByName("ICONS.SAVE", "id") as Discord.APIMessageComponentEmoji) - .setDisabled(channel === data.logging.staff.channel) + .setDisabled(channel === data.logging.attachments.channel) ); const embed = new EmojiEmbed() From 7c2aedd013c0a719d05dd2ead587407f512cf8b7 Mon Sep 17 00:00:00 2001 From: pineafan Date: Mon, 27 Mar 2023 16:54:52 +0100 Subject: [PATCH 6/7] lint --- src/commands/settings/automod.ts | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/commands/settings/automod.ts b/src/commands/settings/automod.ts index 7756ae7..50a2745 100644 --- a/src/commands/settings/automod.ts +++ b/src/commands/settings/automod.ts @@ -685,33 +685,35 @@ const mentionMenu = async ( `${emojiFromBoolean(current.roles)} **Roles**\n` + (current.allowed.rolesToMention.length > 0 ? `> *Except for ${listToAndMore( - current.allowed.rolesToMention.map((r) => `<@&${r}>`), - 3 - )}*\n` + current.allowed.rolesToMention.map((r) => `<@&${r}>`), + 3 + )}*\n` : "") + "\n" + `Except if...\n` + (current.allowed.users.length > 0 ? `> Member is: ${listToAndMore( - current.allowed.users.map((u) => `<@${u}>`), - 3 - )}\n` + current.allowed.users.map((u) => `<@${u}>`), + 3 + )}\n` : "") + (current.allowed.roles.length > 0 ? `> Member has role: ${listToAndMore( - current.allowed.roles.map((r) => `<@&${r}>`), - 3 - )}\n` + current.allowed.roles.map((r) => `<@&${r}>`), + 3 + )}\n` : "") + (current.allowed.channels.length > 0 ? `> In channel: ${listToAndMore( - current.allowed.channels.map((c) => `<#${c}>`), - 3 - )}\n` + current.allowed.channels.map((c) => `<#${c}>`), + 3 + )}\n` : "") + - (current.allowed.users.length == 0 || current.allowed.roles.length == 0 || current.allowed.channels.length == 0 ? - "> *No exceptions*\n" : "" - ) + (current.allowed.users.length == 0 || + current.allowed.roles.length == 0 || + current.allowed.channels.length == 0 + ? "> *No exceptions*\n" + : "") ) .setStatus("Success") .setEmoji("GUILD.SETTINGS.GREEN") From 0786898b6ed1d9b29a1e62274e1ced5df45dd8e4 Mon Sep 17 00:00:00 2001 From: PineappleFan Date: Thu, 30 Mar 2023 17:36:47 +0100 Subject: [PATCH 7/7] Update automod.ts --- src/commands/settings/automod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/settings/automod.ts b/src/commands/settings/automod.ts index 50a2745..0d9188a 100644 --- a/src/commands/settings/automod.ts +++ b/src/commands/settings/automod.ts @@ -712,7 +712,7 @@ const mentionMenu = async ( (current.allowed.users.length == 0 || current.allowed.roles.length == 0 || current.allowed.channels.length == 0 - ? "> *No exceptions*\n" + ? "> *Nobody on allowed lists*\n" : "") ) .setStatus("Success")