Update to new DSP version

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "Libs/DSharpPlus"]
+	path = Libs/DSharpPlus
+	url = https://github.com/DSharpPlus/DSharpPlus.git
+	branch = aki/sharding

ModularAssistentForDiscordServer.sln

@@ -10,6 +10,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{574BAEF3-5632-4726-A8E1-3A60997E3615}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DSharpPlus", "Libs\DSharpPlus\DSharpPlus\DSharpPlus.csproj", "{4621D464-9FA4-49A9-B83E-7151D0165323}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DSharpPlus.Commands", "Libs\DSharpPlus\DSharpPlus.Commands\DSharpPlus.Commands.csproj", "{68B430C9-249C-4166-B9A1-369596A4A964}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DSharpPlus.Interactivity", "Libs\DSharpPlus\DSharpPlus.Interactivity\DSharpPlus.Interactivity.csproj", "{4D977814-F030-4643-BF67-741FDA152D6A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DSharpPlus.Rest", "Libs\DSharpPlus\DSharpPlus.Rest\DSharpPlus.Rest.csproj", "{C7A08C2E-6CB7-4B8F-BE22-BA835749D3F4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,6 +30,22 @@ Global
 		{13E4FD67-0ADF-48D0-9EF7-837991B465A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{13E4FD67-0ADF-48D0-9EF7-837991B465A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13E4FD67-0ADF-48D0-9EF7-837991B465A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4621D464-9FA4-49A9-B83E-7151D0165323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4621D464-9FA4-49A9-B83E-7151D0165323}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4621D464-9FA4-49A9-B83E-7151D0165323}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4621D464-9FA4-49A9-B83E-7151D0165323}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68B430C9-249C-4166-B9A1-369596A4A964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68B430C9-249C-4166-B9A1-369596A4A964}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68B430C9-249C-4166-B9A1-369596A4A964}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68B430C9-249C-4166-B9A1-369596A4A964}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D977814-F030-4643-BF67-741FDA152D6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D977814-F030-4643-BF67-741FDA152D6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D977814-F030-4643-BF67-741FDA152D6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D977814-F030-4643-BF67-741FDA152D6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7A08C2E-6CB7-4B8F-BE22-BA835749D3F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7A08C2E-6CB7-4B8F-BE22-BA835749D3F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7A08C2E-6CB7-4B8F-BE22-BA835749D3F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7A08C2E-6CB7-4B8F-BE22-BA835749D3F4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ModularAssistentForDiscordServer/Commands/ContextMenu/TranslateMessage.cs

@@ -34,16 +34,16 @@ public TranslateMessage(TranslateInformationService translateInformationService,
         _translateInformationService = translateInformationService;
         _translator = translator;
     }
-    
+
     [SlashCommandTypes(DiscordApplicationCommandType.MessageContextMenu), Command("Translate message")]
-    public async Task TranslateAsync(SlashCommandContext ctx,  DiscordMessage targetMessage)
+    public async Task TranslateAsync(SlashCommandContext ctx, DiscordMessage targetMessage)
     {
         await ctx.DeferAsync(true);
 
         string? preferredLanguage = await _translateInformationService.GetPreferredLanguageAsync(ctx.User.Id);
         bool isPreferredLanguageSet = !preferredLanguage.IsNullOrWhiteSpace();
-       
-        if(!isPreferredLanguageSet)
+
+        if (!isPreferredLanguageSet)
         {
             preferredLanguage = "en-US";
         }
@@ -54,15 +54,15 @@ public async Task TranslateAsync(SlashCommandContext ctx,  DiscordMessage target
 
         if (messageContent.IsNullOrWhiteSpace())
         {
-            await ctx.CreateResponse_Error("⚠️ Message is empty!");
+            await ctx.RespondErrorAsync("⚠️ Message is empty!");
             return;
         }
-        
-        TextResult translatedMessage = 
+
+        TextResult translatedMessage =
             await _translator.TranslateTextAsync(messageContent, null, preferredLanguage!);
-        
+
         DiscordEmbedBuilder embed = new DiscordEmbedBuilder()
-            .WithAuthor(message.Author?.Username, 
+            .WithAuthor(message.Author?.Username,
                 message.Author?.AvatarUrl)
             .WithDescription(translatedMessage.Text)
             .WithColor(new DiscordColor(0, 255, 194))
@@ -83,8 +83,8 @@ public async Task TranslateAsync(SlashCommandContext ctx,  DiscordMessage target
             .AddComponents(new DiscordButtonComponent(DiscordButtonStyle.Primary, "setLanguage", "Set your language to en-US")
                 .AsActionButton(ActionDiscordButtonEnum.SetTranslationLanguage, "en-US"))
             .AsEphemeral();
-        
-        
+
+
         await ctx.FollowupAsync(followUpMessage);
     }
 }

ModularAssistentForDiscordServer/Commands/Slash/About.cs

@@ -53,7 +53,7 @@ public async Task AboutCommand(CommandContext ctx)
             .AddField("D#+ Version:", ctx.Client.VersionString)
             .AddField("Guilds", ctx.Client.Guilds.Count.ToString(), true)
             .AddField("Uptime", date.Humanize(), true)
-            .AddField("Ping", $"{ctx.Client.Ping} ms", true)
+            //.AddField("Ping", $"{ctx.Client.Ping} ms", true)
             .AddField("Add me", addMe);
 
         discordMessageBuilder.AddEmbed(discordEmbedBuilder.Build());

ModularAssistentForDiscordServer/Commands/Slash/BotStats.cs

@@ -13,12 +13,14 @@
 // limitations under the License.
 
 using System.ComponentModel;
+using System.Configuration;
 using System.Diagnostics;
 using DSharpPlus;
 using DSharpPlus.Commands;
 using DSharpPlus.Entities;
 using Humanizer;
 using MADS.Entities;
+using MADS.Extensions;
 using Microsoft.EntityFrameworkCore;
 
 namespace MADS.Commands.Slash;
@@ -37,6 +39,7 @@ public BotStats(IDbContextFactory<MadsContext> contextFactory, DiscordRestClient
     [Command("botstats"), Description("Get statistics about the bot")]
     public async Task GetBotStatsAsync(CommandContext ctx)
     {
+        await ctx.DeferAsync(true);
         await using MadsContext db = await _contextFactory.CreateDbContextAsync();
         Stopwatch swDb = new();
         Stopwatch swRest = new();
@@ -46,7 +49,7 @@ public async Task GetBotStatsAsync(CommandContext ctx)
         _ = await db.Guilds.FirstOrDefaultAsync();
         swDb.Stop();
 
-        _ = await _discordRestClient.GetChannelAsync(ctx.Guild.Channels.Values.First().Id);
+        _ = await _discordRestClient.GetChannelAsync(ctx.Channel.Id);
         swRest.Start();
         _ = await _discordRestClient.GetChannelAsync(ctx.Channel.Id);
         swRest.Stop();
@@ -55,7 +58,7 @@ public async Task GetBotStatsAsync(CommandContext ctx)
 
         int members = db.Users.Count();
         int guilds = db.Guilds.Count();
-        int ping = ctx.Client.Ping;
+        //int ping = ctx.Client.Ping;
         GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, true, true);
         string heapMemory = $"{process.PrivateMemorySize64 / 1024 / 1024} MB";
 
@@ -66,7 +69,7 @@ public async Task GetBotStatsAsync(CommandContext ctx)
             .AddField("Membercount:", members.ToString("N0"), true)
             .AddField("Guildcount:", guilds.ToString("N0"), true)
             .AddField("Threads:", $"{ThreadPool.ThreadCount}", true)
-            .AddField("Websocket Latency:", ping.ToString("N0") + " ms", true)
+            //.AddField("Websocket Latency:", ping.ToString("N0") + " ms", true)
             .AddField("DB Latency:", swDb.ElapsedMilliseconds.ToString("N0") + " ms", true)
             .AddField("Rest Latency:", swRest.ElapsedMilliseconds.ToString("N0") + " ms", true)
             .AddField("Memory:", heapMemory, true)

ModularAssistentForDiscordServer/Commands/Slash/MessageSnipe.cs

@@ -15,6 +15,7 @@
 using System.ComponentModel;
 using DSharpPlus;
 using DSharpPlus.Commands;
+using DSharpPlus.Commands.ContextChecks;
 using DSharpPlus.Entities;
 using MADS.CustomComponents;
 using MADS.Extensions;
@@ -31,13 +32,13 @@ public MessageSnipe(MessageSnipeService messageSnipeService)
         _messageSnipeService = messageSnipeService;
     }
 
-    [Command("snipe"), Description("Snipes the last deleted message.")]
+    [Command("snipe"), Description("Snipes the last deleted message."), RequireGuild]
     public async Task SnipeAsync(CommandContext ctx)
     {
         await DoSnipeAsync(ctx, false);
     }
 
-    [Command("snipeedit"), Description("Snipes the last edited message.")]
+    [Command("snipeedit"), Description("Snipes the last edited message."), RequireGuild]
     public async Task SnipeEditAsync(CommandContext ctx)
     {
         await DoSnipeAsync(ctx, true);
@@ -53,7 +54,7 @@ private async Task DoSnipeAsync(CommandContext ctx, bool edit)
 
         if (!result || message is null)
         {
-            await ctx.EditResponse_Error(
+            await ctx.RespondAsync(
                 "⚠️ No message to snipe! Either nothing was deleted, or the message has expired (12 hours)!");
             return;
         }
@@ -64,14 +65,14 @@ await ctx.EditResponse_Error(
             content = string.Concat(content.AsSpan(0, 497), "...");
         }
 
-        DiscordMember? member = message.Author is not null ? await ctx.Guild.GetMemberAsync(message.Author.Id) : null;
+        DiscordMember? member = message.Author is not null ? await ctx.Guild!.GetMemberAsync(message.Author.Id) : null;
 
         DiscordEmbedBuilder embed = new DiscordEmbedBuilder()
             .WithAuthor(
                 $"{member?.DisplayName ?? message.Author?.GlobalName}" + (edit ? " (Edited)" : ""),
                 iconUrl: message.Author?.GetAvatarUrl(ImageFormat.Png))
             .WithFooter(
-                $"{(edit ? "Edit" : "Deletion")} sniped by {ctx.Member.DisplayName}",
+                $"{(edit ? "Edit" : "Deletion")} sniped by {ctx.Member!.DisplayName}",
                 ctx.User.AvatarUrl);
 
         if (!string.IsNullOrEmpty(content))
@@ -124,6 +125,6 @@ public async Task DeleteSnipeAsync(CommandContext ctx)
         _messageSnipeService.DeleteMessage(ctx.Channel.Id);
         _messageSnipeService.DeleteEditedMessage(ctx.Channel.Id);
 
-        await ctx.EditResponse_Success("✅ Snipe cache cleared!");
+        await ctx.RespondSuccessAsync("✅ Snipe cache cleared!");
     }
 }

ModularAssistentForDiscordServer/Commands/Slash/Ping.cs

@@ -32,8 +32,9 @@ public async Task PingCommand(CommandContext ctx)
             .WithTitle("Status")
             .WithTimestamp(DateTime.Now)
             .WithColor(new DiscordColor(0, 255, 194))
-            .AddField("Uptime", $"{DateTimeOffset.UtcNow.Subtract(process.StartTime).Humanize(3, minUnit: TimeUnit.Millisecond, maxUnit: TimeUnit.Day)}")
-            .AddField("Websocket ping", $"{ctx.Client.Ping} ms");
+            .AddField("Uptime",
+                $"{DateTimeOffset.UtcNow.Subtract(process.StartTime).Humanize(3, minUnit: TimeUnit.Millisecond, maxUnit: TimeUnit.Day)}");
+            //.AddField("Websocket ping", $"{ctx.Client.Ping} ms");
 
         DiscordInteractionResponseBuilder responseBuilder = new();
         responseBuilder.AddEmbed(discordEmbedBuilder).AsEphemeral();

ModularAssistentForDiscordServer/Commands/Slash/Purge.cs

@@ -32,15 +32,15 @@ public async Task PurgeMessages
     {
         if (amount > 100)
         {
-            await ctx.CreateResponse_Error("You cannot purge more than 100 messages at once", true);
+            await ctx.RespondErrorAsync("You cannot purge more than 100 messages at once", true);
             return;
         }
 
         await ctx.DeferAsync();
         DiscordMessage? response = await ctx.GetResponseAsync()!;
-        
+
         List<DiscordMessage> messages = [];
-        await foreach (DiscordMessage msg in ctx.Channel.GetMessagesAsync((int) amount))
+        await foreach (DiscordMessage msg in ctx.Channel.GetMessagesAsync((int)amount))
         {
             messages.Add(msg);
         }

ModularAssistentForDiscordServer/Commands/Slash/Reminder.cs

@@ -53,7 +53,7 @@ public async Task AddReminder
 
         if (timeSpan is null)
         {
-            await ctx.EditResponse_Error("Invalid timespan (5s, 3m, 7h, 2d)");
+            await ctx.RespondErrorAsync("Invalid timespan (5s, 3m, 7h, 2d)");
             return;
         }
 
@@ -71,7 +71,7 @@ public async Task AddReminder
 
         ReminderDbEntity reminder = await _reminderService.AddReminder(newReminder);
 
-        await ctx.EditResponse_Success($"Reminder created with id `{reminder.Id}`. I will remind you in {Formatter.Timestamp(timeSpan.Value)}");
+        await ctx.RespondSuccessAsync($"Reminder created with id `{reminder.Id}`. I will remind you in {Formatter.Timestamp(timeSpan.Value)}");
     }
 
     [Command("list"), Description("list your Reminder")]
@@ -110,15 +110,15 @@ long id
 
         if (reminder is null)
         {
-            await ctx.EditResponse_Error("Reminder does not exists");
+            await ctx.RespondErrorAsync("Reminder does not exists");
             return;
         }
 
         bool success = await _reminderService.TryDeleteById((ulong) id, ctx.User.Id);
 
         if (!success)
         {
-            await ctx.EditResponse_Error("Something went wrong. Are you sure you own this reminder?");
+            await ctx.RespondErrorAsync("Something went wrong. Are you sure you own this reminder?");
             return;
         }
 

ModularAssistentForDiscordServer/Commands/Slash/StarboardConfig.cs

@@ -53,7 +53,7 @@ public async Task StarboardConfigCommand
 
         MadsContext db = await _contextFactory.CreateDbContextAsync();
 
-        GuildConfigDbEntity guildConfig = db.Configs.First(x => x.GuildId == ctx.Guild.Id);
+        GuildConfigDbEntity guildConfig = db.Configs.First(x => x.GuildId == ctx.Guild!.Id);
 
         if (!DiscordEmoji.TryFromUnicode(emojiString, out DiscordEmoji emoji))
         {

ModularAssistentForDiscordServer/Commands/Slash/Translation.cs

@@ -29,21 +29,21 @@ public class Translation
 {
     private readonly TranslateInformationService _translationUserInfo;
     private readonly Translator _translator;
-    
+
     public Translation(TranslateInformationService translationUserInfo, Translator translator)
     {
         _translationUserInfo = translationUserInfo;
         _translator = translator;
     }
-    
+
     [Command("info"), Description("Get your preferred language")]
     public async Task InfoAsync(CommandContext ctx)
     {
         string? lang = await _translationUserInfo.GetPreferredLanguageAsync(ctx.User.Id);
-        
-        await ctx.CreateResponse_Success($"Language set to `{lang ?? "null"}`");
+
+        await ctx.RespondSuccessAsync($"Language set to `{lang ?? "null"}`");
     }
-    
+
     [Command("setLanguage"), Description("Set your preferred language")]
     public async Task SetLanguageAsync
     (
@@ -54,15 +54,15 @@ public async Task SetLanguageAsync
     {
         if (string.IsNullOrWhiteSpace(language))
         {
-            await ctx.CreateResponse_Error("⚠️ Language can't be empty!");
+            await ctx.RespondErrorAsync("⚠️ Language can't be empty!");
             return;
         }
 
         string code = TranslateInformationService.StandardizeLang(language);
-        
+
         _translationUserInfo.SetPreferredLanguage(ctx.User.Id, code);
-        
-        await ctx.CreateResponse_Success($"✅ Language set to {code}");
+
+        await ctx.RespondSuccessAsync($"✅ Language set to {code}");
     }
 
     [Command("translate"), Description("Translate a text")]
@@ -78,22 +78,22 @@ public async Task TranslateText
     )
     {
         await ctx.DeferAsync();
-        
+
         if (string.IsNullOrWhiteSpace(text))
         {
             await ctx.EditResponseAsync(new DiscordWebhookBuilder()
                 .WithContent("⚠️ Text can't be empty!"));
             return;
         }
-        
+
         TextResult translatedText = await _translator.TranslateTextAsync(text, null, language);
-        
+
         DiscordEmbedBuilder embed = new DiscordEmbedBuilder()
             .WithDescription(translatedText.Text)
             .WithColor(new DiscordColor(0, 255, 194))
             .WithFooter($"Translated from {translatedText.DetectedSourceLanguageCode} to {language}")
             .WithTimestamp(DateTime.Now);
-        
+
         DiscordInteractionResponseBuilder responseBuilder = new();
         responseBuilder.AddEmbed(embed).AsEphemeral(!publicResult);