commit 7caeb645566ffeb91c3ea4d2cbcdc87a1630c345
author PineappleFan <pineapplefanyt@gmail.com> Thu Mar 30 17:39:17 2023 +0100
committer GitHub <noreply@github.com> Thu Mar 30 17:39:17 2023 +0100
tree d0d72b972407cf2a295f260e2c18756d76f0c36e
parent 4365ae4b14ca306ae374b2b229dc270f58a4df73
parent 0786898b6ed1d9b29a1e62274e1ced5df45dd8e4

Development (#73)

src/commands/nucleus/stats.ts

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 @@
                     .setStyle(TextInputStyle.Short)
                     .setLabel(`Type "${chosen}" below`)
                     .setCustomId("confirm")
-                    .setPlaceholder("Guild ID")
+                    .setPlaceholder("1234567890")
                     .setMinLength(chosen.length)
                     .setMaxLength(chosen.length)
             )

src/commands/settings/automod.ts

diff --git a/src/commands/settings/automod.ts b/src/commands/settings/automod.ts
index 471af80..0d9188a 100644
--- a/src/commands/settings/automod.ts
+++ b/src/commands/settings/automod.ts
@@ -186,6 +186,8 @@
 
         const embed = new EmojiEmbed()
             .setTitle("Image Settings")
+            .setStatus("Success")
+            // .setEmoji("")  // TODO
             .setDescription(
                 `${emojiFromBoolean(current.NSFW)} **NSFW**\n` + `${emojiFromBoolean(current.size)} **Size**\n`
             )
@@ -657,7 +659,7 @@
         const allowedMenu = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(
             new StringSelectMenuBuilder()
                 .setCustomId("allowed")
-                .setPlaceholder("Edit exceptions")
+                .setPlaceholder("Edit allowed list")
                 .addOptions(
                     new StringSelectMenuOptionBuilder()
                         .setLabel("Users")
@@ -689,30 +691,29 @@
                         : "") +
                     "\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
+                        ? "> *Nobody on allowed lists*\n"
+                        : "")
             )
             .setStatus("Success")
             .setEmoji("GUILD.SETTINGS.GREEN")

src/commands/settings/logs/attachment.ts

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 @@
         });
 
     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 @@
                 .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()

src/utils/getEmojiByName.ts

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 @@
 }
 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) {