fix: add missing primary_guild field

Fixes DISCATSHARP-2EM Fixes DISCATSHARP-2EK
Aiko-IT-Systems · Jan 9, 2025 · 01f1b20 · 01f1b20
1 parent ebe051d
commit 01f1b20
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 0 deletions.
diff --git a/DisCatSharp.Experimental/DiscordApiClientHook.cs b/DisCatSharp.Experimental/DiscordApiClientHook.cs
@@ -236,6 +236,7 @@ internal async Task<DiscordSearchGuildMembersResponse> SearchGuildMembersAsync(u
 					old.Locale = usr.Locale;
 					old.GlobalName = usr.GlobalName;
 					old.Clan = usr.Clan;
+					old.PrimaryGuild = usr.PrimaryGuild;
 					return old;
 				});
 			}

diff --git a/DisCatSharp/Clients/DiscordClient.Dispatch.cs b/DisCatSharp/Clients/DiscordClient.Dispatch.cs
@@ -771,6 +771,7 @@ internal async Task OnReadyEventAsync(ReadyPayload ready, JArray rawGuilds)
 							old.Locale = usr.Locale;
 							old.GlobalName = usr.GlobalName;
 							old.Clan = usr.Clan;
+							old.PrimaryGuild = usr.PrimaryGuild;
 							return old;
 						});
 
@@ -1971,6 +1972,7 @@ internal async Task OnGuildMemberAddEventAsync(TransportMember member, DiscordGu
 			old.Locale = usr.Locale;
 			old.GlobalName = usr.GlobalName;
 			old.Clan = usr.Clan;
+			old.PrimaryGuild = usr.PrimaryGuild;
 			return old;
 		});
 
@@ -2045,6 +2047,7 @@ internal async Task OnGuildMemberUpdateEventAsync(TransportMember member, Discor
 			old.Locale = usr.Locale;
 			old.GlobalName = usr.GlobalName;
 			old.Clan = usr.Clan;
+			old.PrimaryGuild = usr.PrimaryGuild;
 			return old;
 		});
 

diff --git a/DisCatSharp/Clients/DiscordClient.cs b/DisCatSharp/Clients/DiscordClient.cs
@@ -538,6 +538,7 @@ public async Task<DiscordUser> GetUserAsync(ulong userId, bool fetch = false)
 			old.Pronouns = usr.Pronouns;
 			old.GlobalName = usr.GlobalName;
 			old.Clan = usr.Clan;
+			old.PrimaryGuild = usr.PrimaryGuild;
 			return old;
 		});
 
@@ -1624,6 +1625,7 @@ private DiscordUser UpdateUser(DiscordUser usr, ulong? guildId, DiscordGuild? gu
 					old.Locale = usr.Locale;
 					old.GlobalName = usr.GlobalName;
 					old.Clan = usr.Clan;
+					old.PrimaryGuild = usr.PrimaryGuild;
 					return old;
 				});
 
@@ -1662,6 +1664,7 @@ private DiscordUser UpdateUser(DiscordUser usr, ulong? guildId, DiscordGuild? gu
 				old.Locale = usr.Locale;
 				old.GlobalName = usr.GlobalName;
 				old.Clan = usr.Clan;
+				old.PrimaryGuild = usr.PrimaryGuild;
 				return old;
 			});
 
@@ -1841,6 +1844,7 @@ private void UpdateCachedGuild(DiscordGuild newGuild, JArray? rawMembers)
 					old.Locale = usr.Locale;
 					old.GlobalName = usr.GlobalName;
 					old.Clan = usr.Clan;
+					old.PrimaryGuild = usr.PrimaryGuild;
 					return old;
 				});
 

diff --git a/DisCatSharp/Entities/Guild/DiscordGuild.cs b/DisCatSharp/Entities/Guild/DiscordGuild.cs
@@ -2078,6 +2078,7 @@ public async Task<IReadOnlyCollection<DiscordMember>> GetAllMembersAsync()
 					old.Locale = usr.Locale;
 					old.GlobalName = usr.GlobalName;
 					old.Clan = usr.Clan;
+					old.PrimaryGuild = usr.PrimaryGuild;
 					return old;
 				});
 				var mbr = new DiscordMember(xtm)

diff --git a/DisCatSharp/Entities/Guild/DiscordMember.cs b/DisCatSharp/Entities/Guild/DiscordMember.cs
@@ -794,6 +794,16 @@ public override DiscordClan? Clan
 		internal set => this.User.Clan = value;
 	}
 
+	/// <summary>
+	///     Gets the member's primary guild.
+	/// </summary>
+	[JsonIgnore]
+	public override DiscordClan? PrimaryGuild
+	{
+		get => this.User.PrimaryGuild;
+		internal set => this.User.PrimaryGuild = value;
+	}
+
 	/// <summary>
 	///     Gets whether the member is a bot.
 	/// </summary>

diff --git a/DisCatSharp/Entities/User/DiscordUser.cs b/DisCatSharp/Entities/User/DiscordUser.cs
@@ -65,6 +65,7 @@ internal DiscordUser(TransportUser transport)
 		this.Pronouns = transport.Pronouns;
 		this.GlobalName = transport.GlobalName;
 		this.Clan = transport.Clan;
+		this.PrimaryGuild = transport.PrimaryGuild;
 	}
 
 	/// <summary>
@@ -156,6 +157,12 @@ public string? BannerUrl
 	[JsonProperty("clan", NullValueHandling = NullValueHandling.Ignore), DiscordUnreleased]
 	public virtual DiscordClan? Clan { get; internal set; }
 
+	/// <summary>
+	///     Gets the users primary guild.
+	/// </summary>
+	[JsonProperty("primary_guild", NullValueHandling = NullValueHandling.Ignore), DiscordUnreleased]
+	public virtual DiscordClan? PrimaryGuild { get; internal set; }
+
 	/// <summary>
 	///     Gets the user's avatar hash.
 	/// </summary>

diff --git a/DisCatSharp/Net/Abstractions/Transport/TransportUser.cs b/DisCatSharp/Net/Abstractions/Transport/TransportUser.cs
@@ -175,6 +175,12 @@ internal string UsernameWithGlobalName
 	[JsonProperty("clan", NullValueHandling = NullValueHandling.Ignore)]
 	public DiscordClan? Clan { get; internal set; }
 
+	/// <summary>
+	///     Gets the users primary guild.
+	/// </summary>
+	[JsonProperty("primary_guild", NullValueHandling = NullValueHandling.Ignore), DiscordUnreleased]
+	public DiscordClan? PrimaryGuild { get; internal set; }
+
 	/// <summary>
 	///     Gets the users pronouns.
 	/// </summary>

diff --git a/DisCatSharp/Net/Rest/DiscordApiClient.cs b/DisCatSharp/Net/Rest/DiscordApiClient.cs
@@ -476,6 +476,7 @@ internal async Task<IReadOnlyList<DiscordMember>> SearchGuildMembersAsync(ulong
 				old.Locale = usr.Locale;
 				old.GlobalName = usr.GlobalName;
 				old.Clan = usr.Clan;
+				old.PrimaryGuild = usr.PrimaryGuild;
 				return old;
 			});