From cb768f55b03e2b0af1be612bb3243baced75419e Mon Sep 17 00:00:00 2001 From: Christopher F Date: Sat, 23 Dec 2017 14:29:59 -0500 Subject: [PATCH] Refactor GameParty to use dedicated current/capacity values Per feedback from @khionu --- src/Discord.Net.Core/Entities/Activities/GameParty.cs | 3 ++- .../Extensions/EntityExtensions.cs | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Discord.Net.Core/Entities/Activities/GameParty.cs b/src/Discord.Net.Core/Entities/Activities/GameParty.cs index 5e1bd7e6a..dbfe5b6ce 100644 --- a/src/Discord.Net.Core/Entities/Activities/GameParty.cs +++ b/src/Discord.Net.Core/Entities/Activities/GameParty.cs @@ -5,6 +5,7 @@ internal GameParty() { } public string Id { get; internal set; } - public int[] Size { get; internal set; } + public int Members { get; internal set; } + public int Capacity { get; internal set; } } } \ No newline at end of file diff --git a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs index 59a45682b..4aff13753 100644 --- a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs +++ b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs @@ -56,10 +56,18 @@ public static GameParty ToEntity(this API.GameParty model) { + // Discord will probably send bad data since they don't validate anything + int current = 0, cap = 0; + if (model.Size.Length == 2) + { + current = model.Size[0]; + cap = model.Size[1]; + } return new GameParty { Id = model.Id, - Size = model.Size + Members = current, + Capacity = cap, }; }