Remove argument from /serverinfo, restrict to guild usage, add debug cmd

Author: FloatingMilkshake

Commands/DebugCommands.cs

@@ -110,6 +110,44 @@ await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
     [Description("Commands for managing which guilds the bot is in.")]
     public static class DebugGuildsCommands
     {
+        [Command("info")]
+        [Description("Get information about a guild.")]
+        public static async Task DebugGuildsInfoCommandAsync(SlashCommandContext ctx,
+            [Parameter("guild"), Description("The ID of the guild to get info for.")] string guildId)
+        {
+            await ctx.DeferResponseAsync(ephemeral: ctx.Interaction.ShouldUseEphemeralResponse(false));
+
+            DiscordGuild guild;
+
+            try
+            {
+                guild = await ctx.Client.GetGuildAsync(Convert.ToUInt64(guildId));
+            }
+            catch (FormatException)
+            {
+                await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
+                    .WithContent("Couldn't parse that guild ID.")
+                    .AsEphemeral(ctx.Interaction.ShouldUseEphemeralResponse(false)));
+                return;
+            }
+            catch (NotFoundException)
+            {
+                await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
+                    .WithContent("I'm not in that server. There's nothing I can show you.")
+                    .AsEphemeral(ctx.Interaction.ShouldUseEphemeralResponse(false)));
+                return;
+            }
+            catch (Exception ex)
+            {
+                await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
+                    .WithContent($"Something went wrong...\n```\n{ex.GetType()}: {ex.Message}\n```")
+                    .AsEphemeral(ctx.Interaction.ShouldUseEphemeralResponse(false)));
+                return;
+            }
+
+            await ctx.FollowupAsync(new DiscordFollowupMessageBuilder(await guild.CreateInfoMessageAsync())
+                .AsEphemeral(ephemeral: ctx.Interaction.ShouldUseEphemeralResponse(false)));
+        }
 
         [Command("leave")]
         [Description("Makes the bot leave a guild. This cannot be undone!")]

Commands/ServerInfoCommands.cs

@@ -3,73 +3,14 @@
 internal class ServerInfoCommands
 {
     [Command("serverinfo")]
-    [Description("Look up information about a server.")]
+    [Description("Look up information about this server.")]
     [InteractionInstallType(DiscordApplicationIntegrationType.GuildInstall)]
-    public static async Task ServerInfoCommandAsync(SlashCommandContext ctx,
-        [Parameter("server"), Description("The ID of the server to look up. Defaults to the current server if you're not using this in DMs.")]
-        string guildId = default)
+    [InteractionAllowedContexts(DiscordInteractionContextType.Guild)]
+    public static async Task ServerInfoCommandAsync(SlashCommandContext ctx)
     {
         await ctx.DeferResponseAsync(ephemeral: ctx.Interaction.ShouldUseEphemeralResponse(false));
 
-        DiscordGuild guild;
-
-        if (ctx.Channel.IsPrivate && guildId == default)
-        {
-            await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
-                    .WithContent("You can't use this command in DMs without specifying a server ID! Please try again.")
-                    .AsEphemeral(ephemeral: ctx.Interaction.ShouldUseEphemeralResponse(false)));
-            return;
-        }
-
-        if (guildId == default)
-        {
-            guild = ctx.Guild;
-        }
-        else
-        {
-            try
-            {
-                guild = await ctx.Client.GetGuildAsync(Convert.ToUInt64(guildId));
-            }
-            catch (Exception ex) when (ex is UnauthorizedException or NotFoundException)
-            {
-                await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
-                    .WithContent("Sorry, I can't read the details for that server because I'm not in it or it doesn't exist!")
-                    .AsEphemeral(ephemeral: ctx.Interaction.ShouldUseEphemeralResponse(false)));
-                return;
-            }
-            catch (FormatException)
-            {
-                await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
-                    .WithContent("That doesn't look like a valid server ID! Please try again.")
-                    .AsEphemeral(ephemeral: ctx.Interaction.ShouldUseEphemeralResponse(false)));
-                return;
-            }
-        }
-
-        var description = "None";
-
-        if (guild.Description is not null) description = guild.Description;
-
-        var createdAt = $"{guild.Id.ToUnixTimeSeconds()}";
-
-        var categoryCount = guild.Channels.Count(channel => channel.Value.Type == DiscordChannelType.Category);
-
-        var embed = new DiscordEmbedBuilder()
-            .WithColor(Setup.Constants.BotColor)
-            .AddField("Server Owner", $"{(await guild.GetGuildOwnerAsync()).GetFullUsername()}")
-            .AddField("Description", $"{description}")
-            .AddField("Created on", $"<t:{createdAt}:F> (<t:{createdAt}:R>)")
-            .AddField("Channels", $"{guild.Channels.Count - categoryCount}", true)
-            .AddField("Categories", $"{categoryCount}", true)
-            .AddField("Roles", $"{guild.Roles.Count}", true)
-            .AddField("Members", $"{guild.MemberCount}", true)
-            .WithThumbnail($"{guild.IconUrl}")
-            .WithFooter($"Server ID: {guild.Id}");
-
-        await ctx.FollowupAsync(new DiscordFollowupMessageBuilder()
-            .WithContent($"Server Info for **{guild.Name}**")
-            .AddEmbed(embed)
+        await ctx.FollowupAsync(new DiscordFollowupMessageBuilder(await ctx.Guild.CreateInfoMessageAsync())
             .AsEphemeral(ephemeral: ctx.Interaction.ShouldUseEphemeralResponse(false)));
     }
 }

Extensions/DiscordGuildExtensions.cs

@@ -0,0 +1,34 @@
+namespace MechanicalMilkshake.Extensions;
+
+internal static class DiscordGuildExtensions
+{
+    extension(DiscordGuild guild)
+    {
+        internal async Task<DiscordMessageBuilder> CreateInfoMessageAsync()
+        {
+            var message = new DiscordMessageBuilder().WithContent($"Server Info for **{guild.Name}**");
+
+            var description = "None";
+            if (guild.Description is not null)
+                description = guild.Description;
+
+            var createdAt = $"{guild.Id.ToUnixTimeSeconds()}";
+
+            var categoryCount = guild.Channels.Count(channel => channel.Value.Type == DiscordChannelType.Category);
+
+            message.AddEmbed(new DiscordEmbedBuilder()
+                .WithColor(Setup.Constants.BotColor)
+                .AddField("Server Owner", $"{(await guild.GetGuildOwnerAsync()).GetFullUsername()}")
+                .AddField("Description", $"{description}")
+                .AddField("Created on", $"<t:{createdAt}:F> (<t:{createdAt}:R>)")
+                .AddField("Channels", $"{guild.Channels.Count - categoryCount}", true)
+                .AddField("Categories", $"{categoryCount}", true)
+                .AddField("Roles", $"{guild.Roles.Count}", true)
+                .AddField("Members", $"{guild.MemberCount}", true)
+                .WithThumbnail($"{guild.IconUrl}")
+                .WithFooter($"Server ID: {guild.Id}"));
+
+            return message;
+        }
+    }
+}