fix: possible nre fix

Aiko-IT-Systems · Jan 2, 2024 · e0a1dad · e0a1dad
1 parent f37488f
commit e0a1dad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/DisCatSharp/Net/Rest/RestClient.cs b/DisCatSharp/Net/Rest/RestClient.cs
@@ -526,8 +526,7 @@ private async Task ExecuteRequestAsync(BaseRestRequest request, RateLimitBucket?
 			var response = new RestResponse();
 			try
 			{
-				if (this._disposed)
-					return;
+				ObjectDisposedException.ThrowIf(this._disposed, this);
 
 				res = await this.HttpClient.SendAsync(req, HttpCompletionOption.ResponseContentRead, CancellationToken.None).ConfigureAwait(false);
 

diff --git a/DisCatSharp/Net/Rest/RestResponse.cs b/DisCatSharp/Net/Rest/RestResponse.cs
@@ -21,7 +21,7 @@ public sealed class RestResponse
 	/// <summary>
 	/// Gets the contents of the response sent by the remote party.
 	/// </summary>
-	public string Response { get; internal set; } = null!;
+	public string Response { get; internal set; }
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="RestResponse"/> class.

diff --git a/DisCatSharp/Net/Serialization/DiscordJson.cs b/DisCatSharp/Net/Serialization/DiscordJson.cs
@@ -41,7 +41,7 @@ public static string SerializeObject(object value)
 	/// <typeparam name="T">The type</typeparam>
 	/// <param name="json">The received json.</param>
 	/// <param name="discord">The discord client.</param>
-	public static T DeserializeObject<T>(string json, BaseDiscordClient? discord) where T : ObservableApiObject
+	public static T DeserializeObject<T>(string? json, BaseDiscordClient? discord) where T : ObservableApiObject
 		=> DeserializeObjectInternal<T>(json, discord);
 
 	/// <summary>
@@ -50,7 +50,7 @@ public static T DeserializeObject<T>(string json, BaseDiscordClient? discord) wh
 	/// <typeparam name="T">The enumerable type.</typeparam>
 	/// <param name="json">The received json.</param>
 	/// <param name="discord">The discord client.</param>
-	public static T DeserializeIEnumerableObject<T>(string json, BaseDiscordClient? discord) where T : IEnumerable<ObservableApiObject>
+	public static T DeserializeIEnumerableObject<T>(string? json, BaseDiscordClient? discord) where T : IEnumerable<ObservableApiObject>
 		=> DeserializeIEnumerableObjectInternal<T>(json, discord);
 
 	/// <summary>Populates an object with the values from a JSON node.</summary>
@@ -95,8 +95,11 @@ private static string SerializeObjectInternal(object value, Type type, JsonSeria
 	/// <typeparam name="T">The type</typeparam>
 	/// <param name="json">The received json.</param>
 	/// <param name="discord">The discord client.</param>
-	private static T DeserializeObjectInternal<T>(string json, BaseDiscordClient? discord) where T : ObservableApiObject
+	private static T DeserializeObjectInternal<T>(string? json, BaseDiscordClient? discord) where T : ObservableApiObject
 	{
+		if (string.IsNullOrEmpty(json))
+			return default;
+
 		var obj = JsonConvert.DeserializeObject<T>(json, new JsonSerializerSettings()
 		{
 			ContractResolver = new OptionalJsonContractResolver()
@@ -168,8 +171,11 @@ private static T DeserializeObjectInternal<T>(string json, BaseDiscordClient? di
 	/// <typeparam name="T">The enumerable type.</typeparam>
 	/// <param name="json">The received json.</param>
 	/// <param name="discord">The discord client.</param>
-	private static T DeserializeIEnumerableObjectInternal<T>(string json, BaseDiscordClient? discord) where T : IEnumerable<ObservableApiObject>
+	private static T DeserializeIEnumerableObjectInternal<T>(string? json, BaseDiscordClient? discord) where T : IEnumerable<ObservableApiObject>
 	{
+		if (string.IsNullOrEmpty(json))
+			return default;
+
 		var obj = JsonConvert.DeserializeObject<T>(json, new JsonSerializerSettings()
 		{
 			ContractResolver = new OptionalJsonContractResolver()