From fca6729ef083b8f5677499aee6ebc319121000dd Mon Sep 17 00:00:00 2001 From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> Date: Tue, 18 Mar 2025 19:35:24 +0200 Subject: [PATCH] Use `Uri.EscapeDataString` in a few others places --- DiscordChatExporter.Core/Utils/UrlBuilder.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DiscordChatExporter.Core/Utils/UrlBuilder.cs b/DiscordChatExporter.Core/Utils/UrlBuilder.cs index b340cd4b..801ebb85 100644 --- a/DiscordChatExporter.Core/Utils/UrlBuilder.cs +++ b/DiscordChatExporter.Core/Utils/UrlBuilder.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net; using System.Text; namespace DiscordChatExporter.Core.Utils; @@ -25,8 +24,8 @@ public class UrlBuilder if (ignoreUnsetValue && string.IsNullOrWhiteSpace(value)) return this; - var keyEncoded = WebUtility.UrlEncode(key); - var valueEncoded = WebUtility.UrlEncode(value); + var keyEncoded = Uri.EscapeDataString(key); + var valueEncoded = Uri.EscapeDataString(value); _queryParameters[keyEncoded] = valueEncoded; return this; @@ -39,9 +38,11 @@ public class UrlBuilder buffer.Append(_path); if (_queryParameters.Any()) + { buffer .Append('?') .AppendJoin('&', _queryParameters.Select(kvp => $"{kvp.Key}={kvp.Value}")); + } return buffer.ToString(); }