[Fix] Incorrect json model for Guild Scheduled Event (#2813)

* fix some cringe * whoooooooops
discord-net · Dec 26, 2023 · de4b6b9 · de4b6b9
1 parent d382e5c
commit de4b6b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/Discord.Net.Rest/API/Common/GuildScheduledEvent.cs b/src/Discord.Net.Rest/API/Common/GuildScheduledEvent.cs
@@ -1,9 +1,6 @@
 using Newtonsoft.Json;
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Discord.API
 {
@@ -16,7 +13,7 @@ internal class GuildScheduledEvent
         [JsonProperty("channel_id")]
         public Optional<ulong?> ChannelId { get; set; }
         [JsonProperty("creator_id")]
-        public Optional<ulong> CreatorId { get; set; }
+        public Optional<ulong?> CreatorId { get; set; }
         [JsonProperty("name")]
         public string Name { get; set; }
         [JsonProperty("description")]

diff --git a/src/Discord.Net.Rest/Entities/Guilds/RestGuildEvent.cs b/src/Discord.Net.Rest/Entities/Guilds/RestGuildEvent.cs
@@ -92,7 +92,7 @@ internal void Update(Model model)
                 Creator = RestUser.Create(Discord, model.Creator.Value);
             }
 
-            CreatorId = model.CreatorId.ToNullable() ?? 0; // should be changed?
+            CreatorId = model.CreatorId.GetValueOrDefault(null) ?? 0; // should be changed?
             ChannelId = model.ChannelId.IsSpecified ? model.ChannelId.Value : null;
             Name = model.Name;
             Description = model.Description.GetValueOrDefault();

diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuildEvent.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuildEvent.cs
@@ -87,7 +87,7 @@ internal void Update(Model model)
 
             if (model.CreatorId.IsSpecified)
             {
-                var guildUser = Guild.GetUser(model.CreatorId.Value);
+                var guildUser = Guild.GetUser(model.CreatorId.GetValueOrDefault(0) ?? 0);
 
                 if (guildUser != null)
                 {
@@ -96,7 +96,7 @@ internal void Update(Model model)
 
                     Creator = guildUser;
                 }
-                else if (guildUser == null && model.Creator.IsSpecified)
+                else if (model.Creator.IsSpecified)
                 {
                     guildUser = SocketGuildUser.Create(Guild, Discord.State, model.Creator.Value);
                     Creator = guildUser;