Use proper/full command name in interaction command logging

FloatingMilkshake · Oct 17, 2024 · 1da33cf · 1da33cf
1 parent 0b1a469
commit 1da33cf
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/Events/InteractionEvents.cs b/Events/InteractionEvents.cs
@@ -14,23 +14,23 @@ private static async Task LogCmdUsage(CommandContext context)
         try
         {
             // Ignore home server, excluded servers, and authorized users
-            if (context.Guild is not null && (context.Guild.Id == Program.HomeServer.Id ||
-                Program.ConfigJson.Logs.SlashCommands.CmdLogExcludedGuilds.Contains(context.Guild.Id.ToString())) ||
-                Program.ConfigJson.Base.AuthorizedUsers.Contains(context.User.Id.ToString()))
-                return;
+            //if (context.Guild is not null && (context.Guild.Id == Program.HomeServer.Id ||
+            //    Program.ConfigJson.Logs.SlashCommands.CmdLogExcludedGuilds.Contains(context.Guild.Id.ToString())) ||
+            //    Program.ConfigJson.Base.AuthorizedUsers.Contains(context.User.Id.ToString()))
+            //    return;
 
             // Increment count
-            if (await Program.Db.HashExistsAsync("commandCounts", context.Command.Name))
-                await Program.Db.HashIncrementAsync("commandCounts", context.Command.Name);
+            if (await Program.Db.HashExistsAsync("commandCounts", context.Command.FullName))
+                await Program.Db.HashIncrementAsync("commandCounts", context.Command.FullName);
             else
-                await Program.Db.HashSetAsync("commandCounts", context.Command.Name, 1);
+                await Program.Db.HashSetAsync("commandCounts", context.Command.FullName, 1);
 
             // Log to log channel if configured
             if (Program.ConfigJson.Logs.SlashCommands.LogChannel is not null)
             {
                 var description = context.Channel.IsPrivate
-                    ? $"{context.User.Username} (`{context.User.Id}`) used {SlashCmdMentionHelpers.GetSlashCmdMention(context.Command.Name)} in DMs."
-                    : $"{context.User.Username} (`{context.User.Id}`) used {SlashCmdMentionHelpers.GetSlashCmdMention(context.Command.Name)} in `{context.Channel.Name}` (`{context.Channel.Id}`) in \"{context.Guild.Name}\" (`{context.Guild.Id}`).";
+                    ? $"{context.User.Username} (`{context.User.Id}`) used {SlashCmdMentionHelpers.GetSlashCmdMention(context.Command.FullName)} in DMs."
+                    : $"{context.User.Username} (`{context.User.Id}`) used {SlashCmdMentionHelpers.GetSlashCmdMention(context.Command.FullName)} in `{context.Channel.Name}` (`{context.Channel.Id}`) in \"{context.Guild.Name}\" (`{context.Guild.Id}`).";
 
                 var embed = new DiscordEmbedBuilder()
                     .WithColor(Program.BotColor)
@@ -47,13 +47,13 @@ private static async Task LogCmdUsage(CommandContext context)
                 {
                     Program.Discord.Logger.LogError(Program.BotEventId,
                         "{User} used {Command} in {Guild} but it could not be logged because the log channel cannot be accessed",
-                        context.User.Id, context.Command.Name, context.Guild.Id);
+                        context.User.Id, context.Command.FullName, context.Guild.Id);
                 }
                 catch (FormatException)
                 {
                     Program.Discord.Logger.LogError(Program.BotEventId,
                         "{User} used {Command} in {Guild} but it could not be logged because the log channel ID is invalid",
-                        context.User.Id, context.Command.Name, context.Guild.Id);
+                        context.User.Id, context.Command.FullName, context.Guild.Id);
                 }
             }
         }
@@ -63,7 +63,7 @@ private static async Task LogCmdUsage(CommandContext context)
             {
                 Title = "An exception was thrown when logging a slash command",
                 Description =
-                    $"An exception was thrown when {context.User.Mention} used `/{context.Command.Name}`. Details are below.",
+                    $"An exception was thrown when {context.User.Mention} used `/{context.Command.FullName}`. Details are below.",
                 Color = DiscordColor.Red
             };
             embed.AddField("Exception Details",