feat: add clan (so sentry is not annoyed)

Closes #477
Aiko-IT-Systems · Apr 19, 2024 · c2912a4 · c2912a4
1 parent 069cb48
commit c2912a4
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 0 deletions.
diff --git a/DisCatSharp/Clients/DiscordClient.Dispatch.cs b/DisCatSharp/Clients/DiscordClient.Dispatch.cs
@@ -732,6 +732,7 @@ internal async Task OnReadyEventAsync(ReadyPayload ready, JArray rawGuilds)
 							old.Pronouns = usr.Pronouns;
 							old.Locale = usr.Locale;
 							old.GlobalName = usr.GlobalName;
+							old.Clan = usr.Clan;
 							return old;
 						});
 
@@ -1905,6 +1906,7 @@ internal async Task OnGuildMemberAddEventAsync(TransportMember member, DiscordGu
 			old.Pronouns = usr.Pronouns;
 			old.Locale = usr.Locale;
 			old.GlobalName = usr.GlobalName;
+			old.Clan = usr.Clan;
 			return old;
 		});
 
@@ -1978,6 +1980,7 @@ internal async Task OnGuildMemberUpdateEventAsync(TransportMember member, Discor
 			old.Pronouns = usr.Pronouns;
 			old.Locale = usr.Locale;
 			old.GlobalName = usr.GlobalName;
+			old.Clan = usr.Clan;
 			return old;
 		});
 

diff --git a/DisCatSharp/Clients/DiscordClient.cs b/DisCatSharp/Clients/DiscordClient.cs
@@ -457,6 +457,7 @@ public async Task<DiscordUser> GetUserAsync(ulong userId, bool fetch = false)
 			old.ThemeColorsInternal = usr.ThemeColorsInternal;
 			old.Pronouns = usr.Pronouns;
 			old.GlobalName = usr.GlobalName;
+			old.Clan = usr.Clan;
 			return old;
 		});
 
@@ -1450,6 +1451,7 @@ private DiscordUser UpdateUser(DiscordUser usr, ulong? guildId, DiscordGuild? gu
 					old.Pronouns = usr.Pronouns;
 					old.Locale = usr.Locale;
 					old.GlobalName = usr.GlobalName;
+					old.Clan = usr.Clan;
 					return old;
 				});
 
@@ -1487,6 +1489,7 @@ private DiscordUser UpdateUser(DiscordUser usr, ulong? guildId, DiscordGuild? gu
 				old.Pronouns = usr.Pronouns;
 				old.Locale = usr.Locale;
 				old.GlobalName = usr.GlobalName;
+				old.Clan = usr.Clan;
 				return old;
 			});
 
@@ -1593,6 +1596,7 @@ private void UpdateCachedGuild(DiscordGuild newGuild, JArray? rawMembers)
 					old.Pronouns = usr.Pronouns;
 					old.Locale = usr.Locale;
 					old.GlobalName = usr.GlobalName;
+					old.Clan = usr.Clan;
 					return old;
 				});
 

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

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

diff --git a/DisCatSharp/Entities/User/DiscordClan.cs b/DisCatSharp/Entities/User/DiscordClan.cs
@@ -0,0 +1,33 @@
+using Newtonsoft.Json;
+
+namespace DisCatSharp.Entities;
+
+/// <summary>
+/// Represents a discord clan.
+/// </summary>
+public sealed class DiscordClan
+{
+	/// <summary>
+	/// Gets the identity guild id.
+	/// </summary>
+	[JsonProperty("identity_guild_id")]
+	public ulong IdentityGuildId { get; internal set; }
+
+	/// <summary>
+	/// Gets whether the identity is enabled and shown to everyone.
+	/// </summary>
+	[JsonProperty("identity_enabled", NullValueHandling = NullValueHandling.Ignore)]
+	public bool IdentityEnabled { get; internal set; }
+
+	/// <summary>
+	/// Gets the clan tag.
+	/// </summary>
+	[JsonProperty("tag")]
+	public string Tag { get; internal set; }
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="DiscordClan"/> class.
+	/// </summary>
+	internal DiscordClan()
+	{ }
+}
diff --git a/DisCatSharp/Entities/User/DiscordUser.cs b/DisCatSharp/Entities/User/DiscordUser.cs
@@ -52,6 +52,7 @@ internal DiscordUser(TransportUser transport)
 		this.Bio = transport.Bio;
 		this.Pronouns = transport.Pronouns;
 		this.GlobalName = transport.GlobalName;
+		this.Clan = transport.Clan;
 	}
 
 	/// <summary>
@@ -149,6 +150,12 @@ public string? BannerUrl
 	[JsonProperty("bio", NullValueHandling = NullValueHandling.Ignore)]
 	public virtual string Bio { get; internal set; }
 
+	/// <summary>
+	/// Gets the users clan.
+	/// </summary>
+	[JsonProperty("clan", NullValueHandling = NullValueHandling.Ignore), DiscordUnreleased]
+	public virtual DiscordClan? Clan { 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
@@ -134,6 +134,12 @@ internal string UsernameWithGlobalName
 	[JsonProperty("bio", NullValueHandling = NullValueHandling.Ignore)]
 	public string Bio { get; internal set; }
 
+	/// <summary>
+	/// Gets the users clan.
+	/// </summary>
+	[JsonProperty("clan", NullValueHandling = NullValueHandling.Ignore)]
+	public DiscordClan? Clan { get; internal set; }
+
 	/// <summary>
 	/// Gets the users pronouns.
 	/// </summary>

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