Make use of C# 14 features

DiscordChatExporter.Core/Discord/RateLimitPreference.cs

@@ -13,24 +13,26 @@ public enum RateLimitPreference
 
 public static class RateLimitPreferenceExtensions
 {
-    internal static bool IsRespectedFor(
-        this RateLimitPreference rateLimitPreference,
-        TokenKind tokenKind
-    ) =>
-        tokenKind switch
-        {
-            TokenKind.User => (rateLimitPreference & RateLimitPreference.RespectForUserTokens) != 0,
-            TokenKind.Bot => (rateLimitPreference & RateLimitPreference.RespectForBotTokens) != 0,
-            _ => throw new ArgumentOutOfRangeException(nameof(tokenKind)),
-        };
+    extension(RateLimitPreference rateLimitPreference)
+    {
+        internal bool IsRespectedFor(TokenKind tokenKind) =>
+            tokenKind switch
+            {
+                TokenKind.User => (rateLimitPreference & RateLimitPreference.RespectForUserTokens)
+                    != 0,
+                TokenKind.Bot => (rateLimitPreference & RateLimitPreference.RespectForBotTokens)
+                    != 0,
+                _ => throw new ArgumentOutOfRangeException(nameof(tokenKind)),
+            };
 
-    public static string GetDisplayName(this RateLimitPreference rateLimitPreference) =>
-        rateLimitPreference switch
-        {
-            RateLimitPreference.IgnoreAll => "Always ignore",
-            RateLimitPreference.RespectForUserTokens => "Respect for user tokens",
-            RateLimitPreference.RespectForBotTokens => "Respect for bot tokens",
-            RateLimitPreference.RespectAll => "Always respect",
-            _ => throw new ArgumentOutOfRangeException(nameof(rateLimitPreference)),
-        };
+        public string GetDisplayName() =>
+            rateLimitPreference switch
+            {
+                RateLimitPreference.IgnoreAll => "Always ignore",
+                RateLimitPreference.RespectForUserTokens => "Respect for user tokens",
+                RateLimitPreference.RespectForBotTokens => "Respect for bot tokens",
+                RateLimitPreference.RespectAll => "Always respect",
+                _ => throw new ArgumentOutOfRangeException(nameof(rateLimitPreference)),
+            };
+    }
 }

DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs

@@ -103,7 +103,7 @@ internal partial class ExportAssetDownloader
             fileExtension = "";
         }
 
-        return PathEx.EscapeFileName(
+        return Path.EscapeFileName(
             fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension
         );
     }

DiscordChatExporter.Core/Exporting/ExportFormat.cs

@@ -13,25 +13,28 @@ public enum ExportFormat
 
 public static class ExportFormatExtensions
 {
-    public static string GetFileExtension(this ExportFormat format) =>
-        format switch
-        {
-            ExportFormat.PlainText => "txt",
-            ExportFormat.HtmlDark => "html",
-            ExportFormat.HtmlLight => "html",
-            ExportFormat.Csv => "csv",
-            ExportFormat.Json => "json",
-            _ => throw new ArgumentOutOfRangeException(nameof(format)),
-        };
+    extension(ExportFormat format)
+    {
+        public string GetFileExtension() =>
+            format switch
+            {
+                ExportFormat.PlainText => "txt",
+                ExportFormat.HtmlDark => "html",
+                ExportFormat.HtmlLight => "html",
+                ExportFormat.Csv => "csv",
+                ExportFormat.Json => "json",
+                _ => throw new ArgumentOutOfRangeException(nameof(format)),
+            };
 
-    public static string GetDisplayName(this ExportFormat format) =>
-        format switch
-        {
-            ExportFormat.PlainText => "TXT",
-            ExportFormat.HtmlDark => "HTML (Dark)",
-            ExportFormat.HtmlLight => "HTML (Light)",
-            ExportFormat.Csv => "CSV",
-            ExportFormat.Json => "JSON",
-            _ => throw new ArgumentOutOfRangeException(nameof(format)),
-        };
+        public string GetDisplayName() =>
+            format switch
+            {
+                ExportFormat.PlainText => "TXT",
+                ExportFormat.HtmlDark => "HTML (Dark)",
+                ExportFormat.HtmlLight => "HTML (Light)",
+                ExportFormat.Csv => "CSV",
+                ExportFormat.Json => "JSON",
+                _ => throw new ArgumentOutOfRangeException(nameof(format)),
+            };
+    }
 }

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -7,7 +7,6 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
-using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Core.Exporting;
@@ -145,7 +144,7 @@ public partial class ExportRequest
         // File extension
         buffer.Append('.').Append(format.GetFileExtension());
 
-        return PathEx.EscapeFileName(buffer.ToString());
+        return Path.EscapeFileName(buffer.ToString());
     }
 
     private static string FormatPath(
@@ -159,7 +158,7 @@ public partial class ExportRequest
             path,
             "%.",
             m =>
-                PathEx.EscapeFileName(
+                Path.EscapeFileName(
                     m.Value switch
                     {
                         "%g" => guild.Id.ToString(),

DiscordChatExporter.Core/Utils/Extensions/AsyncCollectionExtensions.cs

@@ -6,19 +6,19 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class AsyncCollectionExtensions
 {
-    private static async ValueTask<IReadOnlyList<T>> CollectAsync<T>(
-        this IAsyncEnumerable<T> asyncEnumerable
-    )
+    extension<T>(IAsyncEnumerable<T> asyncEnumerable)
     {
-        var list = new List<T>();
+        private async ValueTask<IReadOnlyList<T>> CollectAsync()
+        {
+            var list = new List<T>();
 
-        await foreach (var i in asyncEnumerable)
-            list.Add(i);
+            await foreach (var i in asyncEnumerable)
+                list.Add(i);
 
-        return list;
+            return list;
+        }
+
+        public ValueTaskAwaiter<IReadOnlyList<T>> GetAwaiter() =>
+            asyncEnumerable.CollectAsync().GetAwaiter();
     }
-
-    public static ValueTaskAwaiter<IReadOnlyList<T>> GetAwaiter<T>(
-        this IAsyncEnumerable<T> asyncEnumerable
-    ) => asyncEnumerable.CollectAsync().GetAwaiter();
 }

DiscordChatExporter.Core/Utils/Extensions/BinaryExtensions.cs

@@ -5,15 +5,18 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class BinaryExtensions
 {
-    public static string ToHex(this byte[] data, bool isUpperCase = true)
+    extension(byte[] data)
     {
-        var buffer = new StringBuilder(2 * data.Length);
-
-        foreach (var b in data)
+        public string ToHex(bool isUpperCase = true)
         {
-            buffer.Append(b.ToString(isUpperCase ? "X2" : "x2", CultureInfo.InvariantCulture));
-        }
+            var buffer = new StringBuilder(2 * data.Length);
 
-        return buffer.ToString();
+            foreach (var b in data)
+            {
+                buffer.Append(b.ToString(isUpperCase ? "X2" : "x2", CultureInfo.InvariantCulture));
+            }
+
+            return buffer.ToString();
+        }
     }
 }

DiscordChatExporter.Core/Utils/Extensions/CollectionExtensions.cs

@@ -4,25 +4,34 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class CollectionExtensions
 {
-    public static IEnumerable<T> ToSingletonEnumerable<T>(this T obj)
+    extension<T>(T obj)
     {
-        yield return obj;
+        public IEnumerable<T> ToSingletonEnumerable()
+        {
+            yield return obj;
+        }
     }
 
-    public static IEnumerable<(T value, int index)> WithIndex<T>(this IEnumerable<T> source)
+    extension<T>(IEnumerable<T> source)
     {
-        var i = 0;
-        foreach (var o in source)
-            yield return (o, i++);
+        public IEnumerable<(T value, int index)> WithIndex()
+        {
+            var i = 0;
+            foreach (var o in source)
+                yield return (o, i++);
+        }
     }
 
-    public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
+    extension<T>(IEnumerable<T?> source)
         where T : class
     {
-        foreach (var o in source)
+        public IEnumerable<T> WhereNotNull()
         {
-            if (o is not null)
-                yield return o;
+            foreach (var o in source)
+            {
+                if (o is not null)
+                    yield return o;
+            }
         }
     }
 }

DiscordChatExporter.Core/Utils/Extensions/ColorExtensions.cs

@@ -4,11 +4,14 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class ColorExtensions
 {
-    public static Color WithAlpha(this Color color, int alpha) => Color.FromArgb(alpha, color);
+    extension(Color color)
+    {
+        public Color WithAlpha(int alpha) => Color.FromArgb(alpha, color);
 
-    public static Color ResetAlpha(this Color color) => color.WithAlpha(255);
+        public Color ResetAlpha() => color.WithAlpha(255);
 
-    public static int ToRgb(this Color color) => color.ToArgb() & 0xffffff;
+        public int ToRgb() => color.ToArgb() & 0xffffff;
 
-    public static string ToHex(this Color color) => $"#{color.R:X2}{color.G:X2}{color.B:X2}";
+        public string ToHex() => $"#{color.R:X2}{color.G:X2}{color.B:X2}";
+    }
 }

DiscordChatExporter.Core/Utils/Extensions/ExceptionExtensions.cs

@@ -5,27 +5,30 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class ExceptionExtensions
 {
-    private static void PopulateChildren(this Exception exception, ICollection<Exception> children)
+    extension(Exception exception)
     {
-        if (exception is AggregateException aggregateException)
+        private void PopulateChildren(ICollection<Exception> children)
         {
-            foreach (var innerException in aggregateException.InnerExceptions)
+            if (exception is AggregateException aggregateException)
             {
-                children.Add(innerException);
-                PopulateChildren(innerException, children);
+                foreach (var innerException in aggregateException.InnerExceptions)
+                {
+                    children.Add(innerException);
+                    PopulateChildren(innerException, children);
+                }
+            }
+            else if (exception.InnerException is not null)
+            {
+                children.Add(exception.InnerException);
+                PopulateChildren(exception.InnerException, children);
             }
         }
-        else if (exception.InnerException is not null)
+
+        public IReadOnlyList<Exception> GetSelfAndChildren()
         {
-            children.Add(exception.InnerException);
-            PopulateChildren(exception.InnerException, children);
+            var children = new List<Exception> { exception };
+            PopulateChildren(exception, children);
+            return children;
         }
     }
-
-    public static IReadOnlyList<Exception> GetSelfAndChildren(this Exception exception)
-    {
-        var children = new List<Exception> { exception };
-        PopulateChildren(exception, children);
-        return children;
-    }
 }

DiscordChatExporter.Core/Utils/Extensions/GenericExtensions.cs

@@ -5,12 +5,17 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class GenericExtensions
 {
-    public static TOut Pipe<TIn, TOut>(this TIn input, Func<TIn, TOut> transform) =>
-        transform(input);
+    extension<TIn>(TIn input)
+    {
+        public TOut Pipe<TOut>(Func<TIn, TOut> transform) => transform(input);
+    }
 
-    public static T? NullIf<T>(this T value, Func<T, bool> predicate)
-        where T : struct => !predicate(value) ? value : null;
+    extension<T>(T value)
+        where T : struct
+    {
+        public T? NullIf(Func<T, bool> predicate) => !predicate(value) ? value : null;
 
-    public static T? NullIfDefault<T>(this T value)
-        where T : struct => value.NullIf(v => EqualityComparer<T>.Default.Equals(v, default));
+        public T? NullIfDefault() =>
+            value.NullIf(v => EqualityComparer<T>.Default.Equals(v, default));
+    }
 }

DiscordChatExporter.Core/Utils/Extensions/HttpExtensions.cs

@@ -4,6 +4,9 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class HttpExtensions
 {
-    public static string? TryGetValue(this HttpHeaders headers, string name) =>
-        headers.TryGetValues(name, out var values) ? string.Concat(values) : null;
+    extension(HttpHeaders headers)
+    {
+        public string? TryGetValue(string name) =>
+            headers.TryGetValues(name, out var values) ? string.Concat(values) : null;
+    }
 }

DiscordChatExporter.Core/Utils/Extensions/PathExtensions.cs

@@ -0,0 +1,29 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace DiscordChatExporter.Core.Utils.Extensions;
+
+public static class PathExtensions
+{
+    extension(Path)
+    {
+        public static string EscapeFileName(string path)
+        {
+            var buffer = new StringBuilder(path.Length);
+
+            foreach (var c in path)
+                buffer.Append(!Path.GetInvalidFileNameChars().Contains(c) ? c : '_');
+
+            // File names cannot end with a dot on Windows
+            // https://github.com/Tyrrrz/DiscordChatExporter/issues/977
+            if (OperatingSystem.IsWindows())
+            {
+                while (buffer.Length > 0 && buffer[^1] == '.')
+                    buffer.Remove(buffer.Length - 1, 1);
+            }
+
+            return buffer.ToString();
+        }
+    }
+}

DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs

@@ -5,30 +5,35 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class StringExtensions
 {
-    public static string? NullIfWhiteSpace(this string str) =>
-        !string.IsNullOrWhiteSpace(str) ? str : null;
-
-    public static string Truncate(this string str, int charCount) =>
-        str.Length > charCount ? str[..charCount] : str;
-
-    public static string ToSpaceSeparatedWords(this string str)
+    extension(string str)
     {
-        var builder = new StringBuilder(str.Length * 2);
+        public string? NullIfWhiteSpace() => !string.IsNullOrWhiteSpace(str) ? str : null;
 
-        foreach (var c in str)
+        public string Truncate(int charCount) => str.Length > charCount ? str[..charCount] : str;
+
+        public string ToSpaceSeparatedWords()
         {
-            if (char.IsUpper(c) && builder.Length > 0)
-                builder.Append(' ');
+            var builder = new StringBuilder(str.Length * 2);
 
-            builder.Append(c);
+            foreach (var c in str)
+            {
+                if (char.IsUpper(c) && builder.Length > 0)
+                    builder.Append(' ');
+
+                builder.Append(c);
+            }
+
+            return builder.ToString();
         }
 
-        return builder.ToString();
+        public T? ParseEnumOrNull<T>(bool ignoreCase = true)
+            where T : struct, Enum =>
+            Enum.TryParse<T>(str, ignoreCase, out var result) ? result : null;
     }
 
-    public static T? ParseEnumOrNull<T>(this string str, bool ignoreCase = true)
-        where T : struct, Enum => Enum.TryParse<T>(str, ignoreCase, out var result) ? result : null;
-
-    public static StringBuilder AppendIfNotEmpty(this StringBuilder builder, char value) =>
-        builder.Length > 0 ? builder.Append(value) : builder;
+    extension(StringBuilder builder)
+    {
+        public StringBuilder AppendIfNotEmpty(char value) =>
+            builder.Length > 0 ? builder.Append(value) : builder;
+    }
 }

DiscordChatExporter.Core/Utils/Extensions/SuperpowerExtensions.cs

@@ -7,18 +7,21 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class SuperpowerExtensions
 {
-    public static TextParser<T> Token<T>(this TextParser<T> parser) =>
-        parser.Between(Character.WhiteSpace.IgnoreMany(), Character.WhiteSpace.IgnoreMany());
+    extension<T>(TextParser<T> parser)
+    {
+        public TextParser<T> Token() =>
+            parser.Between(Character.WhiteSpace.IgnoreMany(), Character.WhiteSpace.IgnoreMany());
 
-    // Only used for debugging while writing Superpower parsers.
-    // From https://twitter.com/nblumhardt/status/1389349059786264578
-    [ExcludeFromCodeCoverage]
-    public static TextParser<T> Log<T>(this TextParser<T> parser, string description) =>
-        i =>
-        {
-            Console.WriteLine($"Trying {description} ->");
-            var r = parser(i);
-            Console.WriteLine($"Result was {r}");
-            return r;
-        };
+        // Only used for debugging while writing Superpower parsers.
+        // From https://twitter.com/nblumhardt/status/1389349059786264578
+        [ExcludeFromCodeCoverage]
+        public TextParser<T> Log(string description) =>
+            i =>
+            {
+                Console.WriteLine($"Trying {description} ->");
+                var r = parser(i);
+                Console.WriteLine($"Result was {r}");
+                return r;
+            };
+    }
 }

DiscordChatExporter.Core/Utils/Extensions/TimeSpanExtensions.cs

@@ -4,14 +4,17 @@ namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class TimeSpanExtensions
 {
-    public static TimeSpan Clamp(this TimeSpan value, TimeSpan min, TimeSpan max)
+    extension(TimeSpan value)
     {
-        if (value < min)
-            return min;
+        public TimeSpan Clamp(TimeSpan min, TimeSpan max)
+        {
+            if (value < min)
+                return min;
 
-        if (value > max)
-            return max;
+            if (value > max)
+                return max;
 
-        return value;
+            return value;
+        }
     }
 }

DiscordChatExporter.Core/Utils/PathEx.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Frozen;
-using System.IO;
-using System.Text;
-
-namespace DiscordChatExporter.Core.Utils;
-
-public static class PathEx
-{
-    private static readonly FrozenSet<char> InvalidFileNameChars =
-    [
-        .. Path.GetInvalidFileNameChars(),
-    ];
-
-    public static string EscapeFileName(string path)
-    {
-        var buffer = new StringBuilder(path.Length);
-
-        foreach (var c in path)
-            buffer.Append(!InvalidFileNameChars.Contains(c) ? c : '_');
-
-        // File names cannot end with a dot on Windows
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/977
-        if (OperatingSystem.IsWindows())
-        {
-            while (buffer.Length > 0 && buffer[^1] == '.')
-                buffer.Remove(buffer.Length - 1, 1);
-        }
-
-        return buffer.ToString();
-    }
-}