Minor

rampaa · Jan 28, 2024 · 6f35f40 · 6f35f40
1 parent f787796
commit 6f35f40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/JL.Core/Network/WebSocketUtils.cs b/JL.Core/Network/WebSocketUtils.cs
@@ -10,11 +10,7 @@ public static class WebSocketUtils
     private static Task? s_webSocketTask = null;
     private static CancellationTokenSource? s_webSocketCancellationTokenSource = null;
 
-    private static readonly Encoding s_utf8NoBom = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: false)
-    {
-        EncoderFallback = new EncoderReplacementFallback("\uFFFE"),
-        DecoderFallback = new DecoderReplacementFallback("\uFFFE")
-    };
+    private static readonly Encoding s_utf8NoBom = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: false);
 
     public static bool Connected => !s_webSocketTask?.IsCompleted ?? false;
 

diff --git a/JL.Core/Utilities/TextUtils.cs b/JL.Core/Utilities/TextUtils.cs
@@ -11,7 +11,7 @@ private static int FirstInvalidUnicodeSequenceIndex(string text)
 
             if (c >= '\uD800')
             {
-                if (c is '\uFFFE' || char.IsLowSurrogate(c))
+                if (c is '\uFFFD' or '\uFFFE' or '\uFFFF' || char.IsLowSurrogate(c))
                 {
                     return i;
                 }
@@ -44,7 +44,7 @@ private static string RemoveInvalidUnicodeSequences(string text, int index)
                 _ = sb.Append(c);
             }
 
-            else if (c is not '\uFFFE' && !char.IsLowSurrogate(c))
+            else if (c is '\uFFFD' or '\uFFFE' or '\uFFFF' && !char.IsLowSurrogate(c))
             {
                 if (char.IsHighSurrogate(c))
                 {