I think now it works

ErisApps · Jul 22, 2023 · 5048467 · 5048467
1 parent d066767
commit 5048467
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/source/POI.DiscordDotNet/POI.DiscordDotNet.csproj b/source/POI.DiscordDotNet/POI.DiscordDotNet.csproj
@@ -9,11 +9,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DSharpPlus" Version="4.4.2" />
-        <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.2" />
-        <PackageReference Include="DSharpPlus.Interactivity" Version="4.4.2" />
-        <PackageReference Include="DSharpPlus.Rest" Version="4.4.2" />
-        <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.2" />
+        <PackageReference Include="DSharpPlus" Version="5.0.0-nightly-01663" />
+        <PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-nightly-01663" />
+        <PackageReference Include="DSharpPlus.Interactivity" Version="5.0.0-nightly-01663" />
+        <PackageReference Include="DSharpPlus.SlashCommands" Version="5.0.0-nightly-01663" />
         <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
         <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.1.3" />
         <PackageReference Include="Magick.NET.Core" Version="13.1.3" />

diff --git a/source/POI.DiscordDotNet/Services/Implementations/DiscordStarboardService.cs b/source/POI.DiscordDotNet/Services/Implementations/DiscordStarboardService.cs
@@ -95,7 +95,14 @@ private async Task OnReactionAdded(DiscordClient sender, MessageReactionAddEvent
 		// If the message is not in the database, create a new starboard message
 		if (foundMessage == null)
 		{
-			var embed = GetStarboardEmbed(message.Author.Username, message.Channel.Name, message.Content, message.JumpLink, message.Timestamp, (uint) messageStarCount,
+			var user = await guild.GetMemberAsync(message.Author.Id);
+			if (user == null)
+			{
+				_logger.LogError("User with id {UserId} not found in guild {GuildId}!", message.Author.Id, guild.Id);
+				return;
+			}
+
+			var embed = GetStarboardEmbed(user.DisplayName, message.Channel.Name, message.Content, message.JumpLink, message.Timestamp, (uint) messageStarCount,
 				message.Attachments.FirstOrDefault()?.Url);
 			var embedMessage = await starboardChannel.SendMessageAsync(embed);
 

diff --git a/source/POI.DiscordDotNet/Services/Implementations/UptimeManagementService.cs b/source/POI.DiscordDotNet/Services/Implementations/UptimeManagementService.cs
@@ -21,18 +21,18 @@ public void Setup(IDiscordClientProvider discordClientProvider)
 		{
 			var client = discordClientProvider.Client!;
 
-			client.Ready -= ClientOnReady;
-			client.Ready += ClientOnReady;
+			client.SessionCreated -= ClientOnReady;
+			client.SessionCreated += ClientOnReady;
 		}
 
 		public void Cleanup(IDiscordClientProvider discordClientProvider)
 		{
-			discordClientProvider.Client!.Ready -= ClientOnReady;
+			discordClientProvider.Client!.SessionCreated -= ClientOnReady;
 
 			UpSince = null;
 		}
 
-		private Task ClientOnReady(DiscordClient sender, ReadyEventArgs e)
+		private Task ClientOnReady(DiscordClient sender, SessionReadyEventArgs e)
 		{
 			_logger.LogDebug("Client OnReady event received. (Re)setting time since start");
 			UpSince = DateTimeOffset.Now.ToInstant();