Upgrade DSharpPlus to alpha.5

selfdocumentingcode · selfdocumentingcode · commit f42c7320435e · 2025-02-22T16:23:11.000+01:00
diff --git a/src/Kattbot/Infrastructure/NoWayGateway.cs b/src/Kattbot/Infrastructure/NoWayGateway.cs
@@ -6,17 +6,21 @@ namespace Kattbot.Infrastructure;
 // ReSharper disable once ClassNeverInstantiated.Global
 public class NoWayGateway : IGatewayController
 {
-    public Task ZombiedAsync(IGatewayClient client)
+    public async Task ZombiedAsync(IGatewayClient client)
     {
-        // TODO implement zombie handling
-        return Task.CompletedTask;
+        await client.ReconnectAsync();
     }
 
     public Task HeartbeatedAsync(IGatewayClient client)
     {
         return Task.CompletedTask;
     }
 
+    public Task ResumeAttemptedAsync(IGatewayClient client)
+    {
+        return Task.CompletedTask;
+    }
+
     public Task ReconnectRequestedAsync(IGatewayClient client)
     {
         return Task.CompletedTask;
diff --git a/src/Kattbot/Kattbot.csproj b/src/Kattbot/Kattbot.csproj
@@ -21,9 +21,9 @@
         <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
         <PackageReference Include="TiktokenSharp" Version="1.1.6" />
         <PackageReference Include="CommandLineArgumentsParser" Version="3.0.23" />
-        <PackageReference Include="DSharpPlus" Version="5.0.0-nightly-02356" />
-        <PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-nightly-02356" />
-        <PackageReference Include="DSharpPlus.Interactivity" Version="5.0.0-nightly-02356" />
+        <PackageReference Include="DSharpPlus" Version="5.0.0-alpha.5" />
+        <PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-alpha.5" />
+        <PackageReference Include="DSharpPlus.Interactivity" Version="5.0.0-alpha.5" />
         <PackageReference Include="MediatR" Version="12.4.1" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
diff --git a/src/Kattbot/Workers/DiscordLoggerWorker.cs b/src/Kattbot/Workers/DiscordLoggerWorker.cs
@@ -86,7 +86,7 @@ await errorLogChannel.SendMessageAsync(
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Welp");
+            _logger.LogCritical(ex, "Welp");
         }
     }
 
@@ -101,6 +101,6 @@ private async Task<DiscordChannel> ResolverLogChannel(ulong guildId, ulong chann
 
         discordGuild.Channels.TryGetValue(channelId, out DiscordChannel? discordChannel);
 
-        return discordChannel ??= await discordGuild.GetChannelAsync(channelId);
+        return discordChannel ?? await discordGuild.GetChannelAsync(channelId);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,21 @@ namespace Kattbot.Infrastructure;`
`6`	`6`	`// ReSharper disable once ClassNeverInstantiated.Global`
`7`	`7`	`public class NoWayGateway : IGatewayController`
`8`	`8`	`{`
`9`		`- public Task ZombiedAsync(IGatewayClient client)`
	`9`	`+ public async Task ZombiedAsync(IGatewayClient client)`
`10`	`10`	`{`
`11`		`- // TODO implement zombie handling`
`12`		`- return Task.CompletedTask;`
	`11`	`+ await client.ReconnectAsync();`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`public Task HeartbeatedAsync(IGatewayClient client)`
`16`	`15`	`{`
`17`	`16`	`return Task.CompletedTask;`
`18`	`17`	`}`
`19`	`18`
	`19`	`+ public Task ResumeAttemptedAsync(IGatewayClient client)`
	`20`	`+ {`
	`21`	`+ return Task.CompletedTask;`
	`22`	`+ }`
	`23`	`+`
`20`	`24`	`public Task ReconnectRequestedAsync(IGatewayClient client)`
`21`	`25`	`{`
`22`	`26`	`return Task.CompletedTask;`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ await errorLogChannel.SendMessageAsync(`
`86`	`86`	`}`
`87`	`87`	`catch (Exception ex)`
`88`	`88`	`{`
`89`		`- _logger.LogError(ex, "Welp");`
	`89`	`+ _logger.LogCritical(ex, "Welp");`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`@@ -101,6 +101,6 @@ private async Task<DiscordChannel> ResolverLogChannel(ulong guildId, ulong chann`
`101`	`101`
`102`	`102`	`discordGuild.Channels.TryGetValue(channelId, out DiscordChannel? discordChannel);`
`103`	`103`
`104`		`- return discordChannel ??= await discordGuild.GetChannelAsync(channelId);`
	`104`	`+ return discordChannel ?? await discordGuild.GetChannelAsync(channelId);`
`105`	`105`	`}`
`106`	`106`	`}`