Merge branch 'dev' into 'main'

Dev See merge request illegitimate/illegitimate-bot!196
2024-01-24 09:50:31 +00:00
parent e178d7b48f 9a022ec002
commit 32e33bca9a
1 changed files with 14 additions and 4 deletions
--- a/src/events/server/interactions/logBtnsCmds.ts
+++ b/src/events/server/interactions/logBtnsCmds.ts
@@ -9,19 +9,29 @@ export = {

    execute(interaction: ChatInputCommandInteraction | ButtonInteraction) {
        if (interaction.isCommand()) {
+            let subcommand: string | null
+
            try {
+                subcommand = interaction.options.getSubcommand()
+            } catch (e) {
+                subcommand = null
+            }
+
+            if (subcommand) {
                console.log(
                    color(
-                        interaction.user.username + " ran " +
+                        interaction.user.username + "#" +
+                        interaction.user.discriminator + " ran " +
                        interaction.commandName + " " +
-                        interaction.options.getSubcommand(),
+                        subcommand,
                        "pink"
                    )
                )
-            } catch {
+            } else {
                console.log(
                    color(
-                        interaction.user.username + " ran " +
+                        interaction.user.username + "#" +
+                        interaction.user.discriminator + " ran " +
                        interaction.commandName,
                        "pink"
                    )