C#10ify

DiscordChatExporter.Cli.Tests/Fixtures/ExportWrapperFixture.cs

@@ -14,10 +14,10 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Exporting;
 using JsonExtensions;
 
-namespace DiscordChatExporter.Cli.Tests.Fixtures
+namespace DiscordChatExporter.Cli.Tests.Fixtures;
+
+public class ExportWrapperFixture : IDisposable
 {
-    public class ExportWrapperFixture : IDisposable
-    {
     private string DirPath { get; } = Path.Combine(
         Path.GetDirectoryName(typeof(ExportWrapperFixture).Assembly.Location) ?? Directory.GetCurrentDirectory(),
         "ExportCache",
@@ -128,5 +128,4 @@ namespace DiscordChatExporter.Cli.Tests.Fixtures
     }
 
     public void Dispose() => DirectoryEx.DeleteIfExists(DirPath);
-    }
 }

DiscordChatExporter.Cli.Tests/Fixtures/TempOutputFixture.cs

@@ -2,10 +2,10 @@
 using System.IO;
 using DiscordChatExporter.Cli.Tests.Utils;
 
-namespace DiscordChatExporter.Cli.Tests.Fixtures
+namespace DiscordChatExporter.Cli.Tests.Fixtures;
+
+public class TempOutputFixture : IDisposable
 {
-    public class TempOutputFixture : IDisposable
-    {
     public string DirPath { get; } = Path.Combine(
         Path.GetDirectoryName(typeof(TempOutputFixture).Assembly.Location) ?? Directory.GetCurrentDirectory(),
         "Temp",
@@ -19,5 +19,4 @@ namespace DiscordChatExporter.Cli.Tests.Fixtures
     public string GetTempFilePath() => GetTempFilePath(Guid.NewGuid() + ".tmp");
 
     public void Dispose() => DirectoryEx.DeleteIfExists(DirPath);
-    }
 }

DiscordChatExporter.Cli.Tests/Infra/Secrets.cs

@@ -1,10 +1,10 @@
 using System;
 using System.IO;
 
-namespace DiscordChatExporter.Cli.Tests.Infra
+namespace DiscordChatExporter.Cli.Tests.Infra;
+
+internal static class Secrets
 {
-    internal static class Secrets
-    {
     private static readonly Lazy<string> DiscordTokenLazy = new(() =>
     {
         var fromEnvironment = Environment.GetEnvironmentVariable("DISCORD_TOKEN");
@@ -42,5 +42,4 @@ namespace DiscordChatExporter.Cli.Tests.Infra
     public static string DiscordToken => DiscordTokenLazy.Value;
 
     public static bool IsDiscordTokenBot => IsDiscordTokenBotLazy.Value;
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/CsvWriting/ContentSpecs.cs

@@ -4,10 +4,10 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting;
+
+public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Messages_are_exported_correctly()
     {
@@ -27,5 +27,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting
             "Yeet"
         );
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs

@@ -13,10 +13,10 @@ using FluentAssertions;
 using JsonExtensions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
 {
-    public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
-    {
     [Fact]
     public async Task Messages_filtered_after_specific_date_only_include_messages_sent_after_that_date()
     {
@@ -156,5 +156,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs
                 .WhenTypeIs<DateTimeOffset>();
         });
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/FilterSpecs.cs

@@ -12,10 +12,10 @@ using FluentAssertions;
 using JsonExtensions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
 {
-    public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
-    {
     [Fact]
     public async Task Messages_filtered_by_text_only_include_messages_that_contain_that_text()
     {
@@ -131,5 +131,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs
             .Should()
             .ContainSingle("This has mention");
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/AttachmentSpecs.cs

@@ -6,10 +6,10 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Message_with_a_generic_attachment_is_rendered_correctly()
     {
@@ -89,5 +89,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
             "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
         );
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/ContentSpecs.cs

@@ -6,10 +6,10 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Messages_are_exported_correctly()
     {
@@ -39,5 +39,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
             "Yeet"
         );
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/EmbedSpecs.cs

@@ -6,10 +6,10 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Message_with_an_embed_is_rendered_correctly()
     {
@@ -60,5 +60,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         // Assert
         iframeSrc.Should().StartWithEquivalentOf("https://www.youtube.com/embed/qOWW4OlgbvE");
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/MentionSpecs.cs

@@ -6,10 +6,10 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task User_mention_is_rendered_correctly()
     {
@@ -62,5 +62,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         // Assert
         message.Text().Trim().Should().Be("Role mention: @Role 1");
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/ReplySpecs.cs

@@ -6,10 +6,10 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record ReplySpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record ReplySpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Reply_to_a_normal_message_is_rendered_correctly()
     {
@@ -53,5 +53,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
             .Be("Click to see attachment 🖼️");
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/JsonWriting/AttachmentSpecs.cs

@@ -6,10 +6,10 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Message_with_a_generic_attachment_is_rendered_correctly()
     {
@@ -97,5 +97,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
         attachments.Single().GetProperty("fileName").GetString().Should().Be("file_example_MP3_1MG.mp3");
         attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(1087849);
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/JsonWriting/ContentSpecs.cs

@@ -5,10 +5,10 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Messages_are_exported_correctly()
     {
@@ -38,5 +38,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
             "Yeet"
         );
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/JsonWriting/EmbedSpecs.cs

@@ -6,10 +6,10 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Message_with_an_embed_is_rendered_correctly()
     {
@@ -54,5 +54,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
         embedFields[2].GetProperty("value").GetString().Should().Be("Value 3");
         embedFields[2].GetProperty("isInline").GetBoolean().Should().BeTrue();
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/JsonWriting/MentionSpecs.cs

@@ -6,10 +6,10 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task User_mention_is_rendered_correctly()
     {
@@ -67,5 +67,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
         // Assert
         message.GetProperty("content").GetString().Should().Be("Role mention: @Role 1");
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/PartitioningSpecs.cs

@@ -10,10 +10,10 @@ using DiscordChatExporter.Core.Exporting.Partitioning;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public record PartitioningSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
 {
-    public record PartitioningSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
-    {
     [Fact]
     public async Task Messages_partitioned_by_count_are_split_into_multiple_files_correctly()
     {
@@ -63,5 +63,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs
             .Should()
             .HaveCount(2);
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/PlainTextWriting/ContentSpecs.cs

@@ -4,10 +4,10 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting;
+
+public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
-    public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
-    {
     [Fact]
     public async Task Messages_are_exported_correctly()
     {
@@ -27,5 +27,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting
             "Yeet"
         );
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/SelfContainedSpecs.cs

@@ -11,10 +11,10 @@ using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public record SelfContainedSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
 {
-    public record SelfContainedSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
-    {
     [Fact]
     public async Task Messages_in_self_contained_export_only_reference_local_file_resources()
     {
@@ -45,5 +45,4 @@ namespace DiscordChatExporter.Cli.Tests.Specs
             .Should()
             .BeTrue();
     }
-    }
 }

DiscordChatExporter.Cli.Tests/TestData/ChannelIds.cs

@@ -1,9 +1,9 @@
 using DiscordChatExporter.Core.Discord;
 
-namespace DiscordChatExporter.Cli.Tests.TestData
+namespace DiscordChatExporter.Cli.Tests.TestData;
+
+public static class ChannelIds
 {
-    public static class ChannelIds
-    {
     public static Snowflake AttachmentTestCases { get; } = Snowflake.Parse("885587741654536192");
 
     public static Snowflake DateRangeTestCases { get; } = Snowflake.Parse("866674248747319326");
@@ -17,5 +17,4 @@ namespace DiscordChatExporter.Cli.Tests.TestData
     public static Snowflake ReplyTestCases { get; } = Snowflake.Parse("866459871934677052");
 
     public static Snowflake SelfContainedTestCases { get; } = Snowflake.Parse("887441432678379560");
-    }
 }

DiscordChatExporter.Cli.Tests/Utils/DirectoryEx.cs

@@ -1,9 +1,9 @@
 using System.IO;
 
-namespace DiscordChatExporter.Cli.Tests.Utils
+namespace DiscordChatExporter.Cli.Tests.Utils;
+
+internal static class DirectoryEx
 {
-    internal static class DirectoryEx
-    {
     public static void DeleteIfExists(string dirPath, bool recursive = true)
     {
         try
@@ -20,5 +20,4 @@ namespace DiscordChatExporter.Cli.Tests.Utils
         DeleteIfExists(dirPath);
         Directory.CreateDirectory(dirPath);
     }
-    }
 }

DiscordChatExporter.Cli.Tests/Utils/Html.cs

@@ -1,12 +1,11 @@
 using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;
 
-namespace DiscordChatExporter.Cli.Tests.Utils
+namespace DiscordChatExporter.Cli.Tests.Utils;
+
+internal static class Html
 {
-    internal static class Html
-    {
     private static readonly IHtmlParser Parser = new HtmlParser();
 
     public static IHtmlDocument Parse(string source) => Parser.ParseDocument(source);
-    }
 }

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -16,10 +16,10 @@ using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands.Base
+namespace DiscordChatExporter.Cli.Commands.Base;
+
+public abstract class ExportCommandBase : TokenCommandBase
 {
-    public abstract class ExportCommandBase : TokenCommandBase
-    {
     [CommandOption("output", 'o', Description = "Output file or directory path.")]
     public string OutputPath { get; init; } = Directory.GetCurrentDirectory();
 
@@ -152,5 +152,4 @@ namespace DiscordChatExporter.Cli.Commands.Base
 
         await ExecuteAsync(console, channels);
     }
-    }
 }

DiscordChatExporter.Cli/Commands/Base/TokenCommandBase.cs

@@ -4,10 +4,10 @@ using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Core.Discord;
 
-namespace DiscordChatExporter.Cli.Commands.Base
+namespace DiscordChatExporter.Cli.Commands.Base;
+
+public abstract class TokenCommandBase : ICommand
 {
-    public abstract class TokenCommandBase : ICommand
-    {
     [CommandOption("token", 't', IsRequired = true, EnvironmentVariable = "DISCORD_TOKEN", Description = "Authentication token.")]
     public string TokenValue { get; init; } = "";
 
@@ -26,5 +26,4 @@ namespace DiscordChatExporter.Cli.Commands.Base
     protected DiscordClient Discord => _discordClient ??= new DiscordClient(AuthToken);
 
     public abstract ValueTask ExecuteAsync(IConsole console);
-    }
 }

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -5,11 +5,11 @@ using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("exportall", Description = "Export all accessible channels.")]
+public class ExportAllCommand : ExportCommandBase
 {
-    [Command("exportall", Description = "Export all accessible channels.")]
-    public class ExportAllCommand : ExportCommandBase
-    {
     [CommandOption("include-dm", Description = "Include direct message channels.")]
     public bool IncludeDirectMessages { get; init; } = true;
 
@@ -37,5 +37,4 @@ namespace DiscordChatExporter.Cli.Commands
 
         await base.ExecuteAsync(console, channels);
     }
-    }
 }

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

@@ -6,16 +6,15 @@ using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("export", Description = "Export one or multiple channels.")]
+public class ExportChannelsCommand : ExportCommandBase
 {
-    [Command("export", Description = "Export one or multiple channels.")]
-    public class ExportChannelsCommand : ExportCommandBase
-    {
     // TODO: change this to plural (breaking change)
     [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID(s).")]
     public IReadOnlyList<Snowflake> ChannelIds { get; init; } = Array.Empty<Snowflake>();
 
     public override async ValueTask ExecuteAsync(IConsole console) =>
         await base.ExecuteAsync(console, ChannelIds);
-    }
 }

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -6,11 +6,11 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("exportdm", Description = "Export all direct message channels.")]
+public class ExportDirectMessagesCommand : ExportCommandBase
 {
-    [Command("exportdm", Description = "Export all direct message channels.")]
-    public class ExportDirectMessagesCommand : ExportCommandBase
-    {
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         var cancellationToken = console.RegisterCancellationHandler();
@@ -21,5 +21,4 @@ namespace DiscordChatExporter.Cli.Commands
 
         await base.ExecuteAsync(console, textChannels);
     }
-    }
 }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -6,11 +6,11 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("exportguild", Description = "Export all channels within specified guild.")]
+public class ExportGuildCommand : ExportCommandBase
 {
-    [Command("exportguild", Description = "Export all channels within specified guild.")]
-    public class ExportGuildCommand : ExportCommandBase
-    {
     [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
     public Snowflake GuildId { get; init; }
 
@@ -24,5 +24,4 @@ namespace DiscordChatExporter.Cli.Commands
 
         await base.ExecuteAsync(console, textChannels);
     }
-    }
 }

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -7,11 +7,11 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("channels", Description = "Get the list of channels in a guild.")]
+public class GetChannelsCommand : TokenCommandBase
 {
-    [Command("channels", Description = "Get the list of channels in a guild.")]
-    public class GetChannelsCommand : TokenCommandBase
-    {
     [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
     public Snowflake GuildId { get; init; }
 
@@ -41,5 +41,4 @@ namespace DiscordChatExporter.Cli.Commands
                 await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
         }
     }
-    }
 }

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -7,11 +7,11 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("dm", Description = "Get the list of direct message channels.")]
+public class GetDirectMessageChannelsCommand : TokenCommandBase
 {
-    [Command("dm", Description = "Get the list of direct message channels.")]
-    public class GetDirectMessageChannelsCommand : TokenCommandBase
-    {
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         var cancellationToken = console.RegisterCancellationHandler();
@@ -38,5 +38,4 @@ namespace DiscordChatExporter.Cli.Commands
                 await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
         }
     }
-    }
 }

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -6,11 +6,11 @@ using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("guilds", Description = "Get the list of accessible guilds.")]
+public class GetGuildsCommand : TokenCommandBase
 {
-    [Command("guilds", Description = "Get the list of accessible guilds.")]
-    public class GetGuildsCommand : TokenCommandBase
-    {
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         var cancellationToken = console.RegisterCancellationHandler();
@@ -31,5 +31,4 @@ namespace DiscordChatExporter.Cli.Commands
                 await console.Output.WriteLineAsync(guild.Name);
         }
     }
-    }
 }

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -4,11 +4,11 @@ using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("guide", Description = "Explains how to obtain token, guild or channel ID.")]
+public class GuideCommand : ICommand
 {
-    [Command("guide", Description = "Explains how to obtain token, guild or channel ID.")]
-    public class GuideCommand : ICommand
-    {
     public ValueTask ExecuteAsync(IConsole console)
     {
         // User token
@@ -67,5 +67,4 @@ namespace DiscordChatExporter.Cli.Commands
 
         return default;
     }
-    }
 }

DiscordChatExporter.Cli/Program.cs

@@ -1,14 +1,6 @@
-using System.Threading.Tasks;
+using CliFx;
-using CliFx;
 
-namespace DiscordChatExporter.Cli
+return await new CliApplicationBuilder()
-{
-    public static class Program
-    {
-        public static async Task<int> Main(string[] args) =>
-            await new CliApplicationBuilder()
     .AddCommandsFromThisAssembly()
     .Build()
     .RunAsync(args);
-    }
-}

DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs

@@ -3,10 +3,10 @@ using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using Spectre.Console;
 
-namespace DiscordChatExporter.Cli.Utils.Extensions
+namespace DiscordChatExporter.Cli.Utils.Extensions;
+
+internal static class ConsoleExtensions
 {
-    internal static class ConsoleExtensions
-    {
     public static IAnsiConsole CreateAnsiConsole(this IConsole console) =>
         AnsiConsole.Create(new AnsiConsoleSettings
         {
@@ -47,5 +47,4 @@ namespace DiscordChatExporter.Cli.Utils.Extensions
             progressTask.StopTask();
         }
     }
-    }
 }

DiscordChatExporter.Core/Discord/AuthToken.cs

@@ -1,13 +1,12 @@
 using System.Net.Http.Headers;
 
-namespace DiscordChatExporter.Core.Discord
+namespace DiscordChatExporter.Core.Discord;
+
+public record AuthToken(AuthTokenKind Kind, string Value)
 {
-    public record AuthToken(AuthTokenKind Kind, string Value)
-    {
     public AuthenticationHeaderValue GetAuthenticationHeader() => Kind switch
     {
         AuthTokenKind.Bot => new AuthenticationHeaderValue("Bot", Value),
         _ => new AuthenticationHeaderValue(Value)
     };
-    }
 }

DiscordChatExporter.Core/Discord/AuthTokenKind.cs

@@ -1,8 +1,7 @@
-namespace DiscordChatExporter.Core.Discord
+namespace DiscordChatExporter.Core.Discord;
+
+public enum AuthTokenKind
 {
-    public enum AuthTokenKind
-    {
     User,
     Bot
-    }
 }

DiscordChatExporter.Core/Discord/Data/Attachment.cs

@@ -6,17 +6,17 @@ using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
-    // https://discord.com/developers/docs/resources/channel#attachment-object
+// https://discord.com/developers/docs/resources/channel#attachment-object
-    public partial record Attachment(
+public partial record Attachment(
     Snowflake Id,
     string Url,
     string FileName,
     int? Width,
     int? Height,
     FileSize FileSize) : IHasId
-    {
+{
     public string FileExtension => Path.GetExtension(FileName);
 
     public bool IsImage => FileFormat.IsImage(FileExtension);
@@ -26,10 +26,10 @@ namespace DiscordChatExporter.Core.Discord.Data
     public bool IsAudio => FileFormat.IsAudio(FileExtension);
 
     public bool IsSpoiler => FileName.StartsWith("SPOILER_", StringComparison.Ordinal);
-    }
+}
 
-    public partial record Attachment
+public partial record Attachment
-    {
+{
     public static Attachment Parse(JsonElement json)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
@@ -41,5 +41,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new Attachment(id, url, fileName, width, height, fileSize);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -4,10 +4,10 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
-    // https://discord.com/developers/docs/resources/channel#channel-object
+// https://discord.com/developers/docs/resources/channel#channel-object
-    public partial record Channel(
+public partial record Channel(
     Snowflake Id,
     ChannelKind Kind,
     Snowflake GuildId,
@@ -15,7 +15,7 @@ namespace DiscordChatExporter.Core.Discord.Data
     string Name,
     int? Position,
     string? Topic) : IHasId
-    {
+{
     public bool IsTextChannel => Kind is
         ChannelKind.GuildTextChat or
         ChannelKind.DirectTextChat or
@@ -24,10 +24,10 @@ namespace DiscordChatExporter.Core.Discord.Data
         ChannelKind.GuildStore;
 
     public bool IsVoiceChannel => !IsTextChannel;
-    }
+}
 
-    public partial record Channel
+public partial record Channel
-    {
+{
     private static ChannelCategory GetFallbackCategory(ChannelKind channelKind) => new(
         Snowflake.Zero,
         channelKind switch
@@ -68,5 +68,4 @@ namespace DiscordChatExporter.Core.Discord.Data
             topic
         );
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -3,10 +3,10 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
+
+public record ChannelCategory(Snowflake Id, string Name, int? Position) : IHasId
 {
-    public record ChannelCategory(Snowflake Id, string Name, int? Position) : IHasId
-    {
     public static ChannelCategory Unknown { get; } = new(Snowflake.Zero, "<unknown category>", 0);
 
     public static ChannelCategory Parse(JsonElement json, int? position = null)
@@ -23,5 +23,4 @@ namespace DiscordChatExporter.Core.Discord.Data
             position ?? json.GetPropertyOrNull("position")?.GetInt32()
         );
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/ChannelKind.cs

@@ -1,9 +1,9 @@
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
+// Order of enum fields needs to match the order in the docs.
+public enum ChannelKind
 {
-    // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
-    // Order of enum fields needs to match the order in the docs.
-    public enum ChannelKind
-    {
     GuildTextChat = 0,
     DirectTextChat,
     GuildVoiceChat,
@@ -11,5 +11,4 @@
     GuildCategory,
     GuildNews,
     GuildStore
-    }
 }

DiscordChatExporter.Core/Discord/Data/Common/FileSize.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace DiscordChatExporter.Core.Discord.Data.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common;
+
+// Loosely based on https://github.com/omar/ByteSize (MIT license)
+public readonly partial record struct FileSize(long TotalBytes)
 {
-    // Loosely based on https://github.com/omar/ByteSize (MIT license)
-    public readonly partial record struct FileSize(long TotalBytes)
-    {
     public double TotalKiloBytes => TotalBytes / 1024.0;
     public double TotalMegaBytes => TotalKiloBytes / 1024.0;
     public double TotalGigaBytes => TotalMegaBytes / 1024.0;
@@ -40,10 +40,9 @@ namespace DiscordChatExporter.Core.Discord.Data.Common
 
     [ExcludeFromCodeCoverage]
     public override string ToString() => $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}";
-    }
+}
-
+
-    public partial record struct FileSize
+public partial record struct FileSize
-    {
+{
-        public static FileSize FromBytes(long bytes) => new(bytes);
+    public static FileSize FromBytes(long bytes) => new(bytes);
-    }
 }

DiscordChatExporter.Core/Discord/Data/Common/IHasId.cs

@@ -1,7 +1,6 @@
-namespace DiscordChatExporter.Core.Discord.Data.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common;
+
+public interface IHasId
 {
-    public interface IHasId
-    {
     Snowflake Id { get; }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Common/IdBasedEqualityComparer.cs

@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Core.Discord.Data.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common;
+
+public class IdBasedEqualityComparer : IEqualityComparer<IHasId>
 {
-    public class IdBasedEqualityComparer : IEqualityComparer<IHasId>
-    {
     public static IdBasedEqualityComparer Instance { get; } = new();
 
     public bool Equals(IHasId? x, IHasId? y) => x?.Id == y?.Id;
 
     public int GetHashCode(IHasId obj) => obj.Id.GetHashCode();
-    }
 }

DiscordChatExporter.Core/Discord/Data/Embeds/Embed.cs

@@ -6,10 +6,10 @@ using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
-    // https://discord.com/developers/docs/resources/channel#embed-object
+// https://discord.com/developers/docs/resources/channel#embed-object
-    public partial record Embed(
+public partial record Embed(
     string? Title,
     string? Url,
     DateTimeOffset? Timestamp,
@@ -20,7 +20,7 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
     EmbedImage? Thumbnail,
     EmbedImage? Image,
     EmbedFooter? Footer)
-    {
+{
     public PlainImageEmbedProjection? TryGetPlainImage() =>
         PlainImageEmbedProjection.TryResolve(this);
 
@@ -29,10 +29,10 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
     public YouTubeVideoEmbedProjection? TryGetYouTubeVideo() =>
         YouTubeVideoEmbedProjection.TryResolve(this);
-    }
+}
 
-    public partial record Embed
+public partial record Embed
-    {
+{
     public static Embed Parse(JsonElement json)
     {
         var title = json.GetPropertyOrNull("title")?.GetStringOrNull();
@@ -63,5 +63,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
             footer
         );
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Embeds/EmbedAuthor.cs

@@ -1,15 +1,15 @@
 using System.Text.Json;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
-    // https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
-    public record EmbedAuthor(
+public record EmbedAuthor(
     string? Name,
     string? Url,
     string? IconUrl,
     string? IconProxyUrl)
-    {
+{
     public static EmbedAuthor Parse(JsonElement json)
     {
         var name = json.GetPropertyOrNull("name")?.GetStringOrNull();
@@ -19,5 +19,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new EmbedAuthor(name, url, iconUrl, iconProxyUrl);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Embeds/EmbedField.cs

@@ -2,14 +2,14 @@ using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
-    // https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
-    public record EmbedField(
+public record EmbedField(
     string Name,
     string Value,
     bool IsInline)
-    {
+{
     public static EmbedField Parse(JsonElement json)
     {
         var name = json.GetProperty("name").GetNonWhiteSpaceString();
@@ -18,5 +18,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new EmbedField(name, value, isInline);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Embeds/EmbedFooter.cs

@@ -2,14 +2,14 @@ using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
-    // https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
-    public record EmbedFooter(
+public record EmbedFooter(
     string Text,
     string? IconUrl,
     string? IconProxyUrl)
-    {
+{
     public static EmbedFooter Parse(JsonElement json)
     {
         var text = json.GetProperty("text").GetNonWhiteSpaceString();
@@ -18,5 +18,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new EmbedFooter(text, iconUrl, iconProxyUrl);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Embeds/EmbedImage.cs

@@ -1,15 +1,15 @@
 using System.Text.Json;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
-    // https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
-    public record EmbedImage(
+public record EmbedImage(
     string? Url,
     string? ProxyUrl,
     int? Width,
     int? Height)
-    {
+{
     public static EmbedImage Parse(JsonElement json)
     {
         var url = json.GetPropertyOrNull("url")?.GetStringOrNull();
@@ -19,5 +19,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new EmbedImage(url, proxyUrl, width, height);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Embeds/PlainImageEmbedProjection.cs

@@ -3,10 +3,10 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Utils;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+
+public record PlainImageEmbedProjection(string Url)
 {
-    public record PlainImageEmbedProjection(string Url)
-    {
     public static PlainImageEmbedProjection? TryResolve(Embed embed)
     {
         if (string.IsNullOrWhiteSpace(embed.Url))
@@ -30,5 +30,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new PlainImageEmbedProjection(embed.Url);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Embeds/SpotifyTrackEmbedProjection.cs

@@ -1,14 +1,14 @@
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
-    public partial record SpotifyTrackEmbedProjection(string TrackId)
-    {
-        public string Url => $"https://open.spotify.com/embed/track/{TrackId}";
-    }
 
-    public partial record SpotifyTrackEmbedProjection
+public partial record SpotifyTrackEmbedProjection(string TrackId)
-    {
+{
+    public string Url => $"https://open.spotify.com/embed/track/{TrackId}";
+}
+
+public partial record SpotifyTrackEmbedProjection
+{
     private static string? TryParseTrackId(string embedUrl)
     {
         // https://open.spotify.com/track/1LHZMWefF9502NPfArRfvP?si=3efac6ce9be04f0a
@@ -30,5 +30,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new SpotifyTrackEmbedProjection(trackId);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Embeds/YouTubeVideoEmbedProjection.cs

@@ -1,14 +1,14 @@
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
-    public partial record YouTubeVideoEmbedProjection(string VideoId)
-    {
-        public string Url => $"https://www.youtube.com/embed/{VideoId}";
-    }
 
-    public partial record YouTubeVideoEmbedProjection
+public partial record YouTubeVideoEmbedProjection(string VideoId)
-    {
+{
+    public string Url => $"https://www.youtube.com/embed/{VideoId}";
+}
+
+public partial record YouTubeVideoEmbedProjection
+{
     // Adapted from YoutubeExplode
     // https://github.com/Tyrrrz/YoutubeExplode/blob/5be164be20019783913f76fcc98f18c65aebe9f0/YoutubeExplode/Videos/VideoId.cs#L34-L64
     private static string? TryParseVideoId(string embedUrl)
@@ -45,5 +45,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new YouTubeVideoEmbedProjection(videoId);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -4,25 +4,25 @@ using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
-    // https://discord.com/developers/docs/resources/emoji#emoji-object
+// https://discord.com/developers/docs/resources/emoji#emoji-object
-    public partial record Emoji(
+public partial record Emoji(
     // Only present on custom emoji
     string? Id,
     // Name of custom emoji (e.g. LUL) or actual representation of standard emoji (e.g. 🙂)
     string Name,
     bool IsAnimated,
     string ImageUrl)
-    {
+{
     // Name of custom emoji (e.g. LUL) or name of standard emoji (e.g. slight_smile)
     public string Code => !string.IsNullOrWhiteSpace(Id)
         ? Name
         : EmojiIndex.TryGetCode(Name) ?? Name;
-    }
+}
 
-    public partial record Emoji
+public partial record Emoji
-    {
+{
     private static string GetTwemojiName(string name) => string.Join("-",
         name
             .GetRunes()
@@ -56,5 +56,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new Emoji(id, name, isAnimated, imageUrl);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -3,11 +3,11 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/guild#guild-object
+public record Guild(Snowflake Id, string Name, string IconUrl) : IHasId
 {
-    // https://discord.com/developers/docs/resources/guild#guild-object
-    public record Guild(Snowflake Id, string Name, string IconUrl) : IHasId
-    {
     public static Guild DirectMessages { get; } = new(
         Snowflake.Zero,
         "Direct Messages",
@@ -32,5 +32,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new Guild(id, name, iconUrl);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Member.cs

@@ -6,19 +6,19 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
-    // https://discord.com/developers/docs/resources/guild#guild-member-object
+// https://discord.com/developers/docs/resources/guild#guild-member-object
-    public partial record Member(
+public partial record Member(
     User User,
     string Nick,
     IReadOnlyList<Snowflake> RoleIds) : IHasId
-    {
+{
     public Snowflake Id => User.Id;
-    }
+}
 
-    public partial record Member
+public partial record Member
-    {
+{
     public static Member CreateForUser(User user) => new(
         user,
         user.Name,
@@ -43,5 +43,4 @@ namespace DiscordChatExporter.Core.Discord.Data
             roleIds
         );
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -7,10 +7,10 @@ using DiscordChatExporter.Core.Discord.Data.Embeds;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
-    // https://discord.com/developers/docs/resources/channel#message-object
+// https://discord.com/developers/docs/resources/channel#message-object
-    public record Message(
+public record Message(
     Snowflake Id,
     MessageKind Kind,
     User Author,
@@ -25,7 +25,7 @@ namespace DiscordChatExporter.Core.Discord.Data
     IReadOnlyList<User> MentionedUsers,
     MessageReference? Reference,
     Message? ReferencedMessage) : IHasId
-    {
+{
     public static Message Parse(JsonElement json)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
@@ -85,5 +85,4 @@ namespace DiscordChatExporter.Core.Discord.Data
             referencedMessage
         );
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/MessageKind.cs

@@ -1,8 +1,8 @@
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/channel#message-object-message-types
+public enum MessageKind
 {
-    // https://discord.com/developers/docs/resources/channel#message-object-message-types
-    public enum MessageKind
-    {
     Default = 0,
     RecipientAdd = 1,
     RecipientRemove = 2,
@@ -12,5 +12,4 @@
     ChannelPinnedMessage = 6,
     GuildMemberJoin = 7,
     Reply = 19
-    }
 }

DiscordChatExporter.Core/Discord/Data/MessageReference.cs

@@ -2,11 +2,11 @@ using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure
+public record MessageReference(Snowflake? MessageId, Snowflake? ChannelId, Snowflake? GuildId)
 {
-    // https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure
-    public record MessageReference(Snowflake? MessageId, Snowflake? ChannelId, Snowflake? GuildId)
-    {
     public static MessageReference Parse(JsonElement json)
     {
         var messageId = json.GetPropertyOrNull("message_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
@@ -15,5 +15,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new MessageReference(messageId, channelId, guildId);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Reaction.cs

@@ -1,11 +1,11 @@
 using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/channel#reaction-object
+public record Reaction(Emoji Emoji, int Count)
 {
-    // https://discord.com/developers/docs/resources/channel#reaction-object
-    public record Reaction(Emoji Emoji, int Count)
-    {
     public static Reaction Parse(JsonElement json)
     {
         var emoji = json.GetProperty("emoji").Pipe(Emoji.Parse);
@@ -13,5 +13,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new Reaction(emoji, count);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Role.cs

@@ -4,11 +4,11 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/topics/permissions#role-object
+public record Role(Snowflake Id, string Name, int Position, Color? Color) : IHasId
 {
-    // https://discord.com/developers/docs/topics/permissions#role-object
-    public record Role(Snowflake Id, string Name, int Position, Color? Color) : IHasId
-    {
     public static Role Parse(JsonElement json)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
@@ -24,5 +24,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new Role(id, name, position, color);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/User.cs

@@ -4,23 +4,23 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
-    // https://discord.com/developers/docs/resources/user#user-object
+// https://discord.com/developers/docs/resources/user#user-object
-    public partial record User(
+public partial record User(
     Snowflake Id,
     bool IsBot,
     int Discriminator,
     string Name,
     string AvatarUrl) : IHasId
-    {
+{
     public string DiscriminatorFormatted => $"{Discriminator:0000}";
 
     public string FullName => $"{Name}#{DiscriminatorFormatted}";
-    }
+}
 
-    public partial record User
+public partial record User
-    {
+{
     private static string GetDefaultAvatarUrl(int discriminator) =>
         $"https://cdn.discordapp.com/embed/avatars/{discriminator % 5}.png";
 
@@ -47,5 +47,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new User(id, isBot, discriminator, name, avatarUrl);
     }
-    }
 }

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -14,10 +14,10 @@ using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Http;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord
+namespace DiscordChatExporter.Core.Discord;
+
+public class DiscordClient
 {
-    public class DiscordClient
-    {
     private readonly AuthToken _token;
     private readonly Uri _baseUri = new("https://discord.com/api/v8/", UriKind.Absolute);
 
@@ -299,5 +299,4 @@ namespace DiscordChatExporter.Core.Discord
             }
         }
     }
-    }
 }

DiscordChatExporter.Core/Discord/Snowflake.cs

@@ -3,20 +3,20 @@ using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Discord
+namespace DiscordChatExporter.Core.Discord;
+
+public readonly partial record struct Snowflake(ulong Value)
 {
-    public readonly partial record struct Snowflake(ulong Value)
-    {
     public DateTimeOffset ToDate() => DateTimeOffset.FromUnixTimeMilliseconds(
         (long)((Value >> 22) + 1420070400000UL)
     ).ToLocalTime();
 
     [ExcludeFromCodeCoverage]
     public override string ToString() => Value.ToString(CultureInfo.InvariantCulture);
-    }
+}
 
-    public partial record struct Snowflake
+public partial record struct Snowflake
-    {
+{
     public static Snowflake Zero { get; } = new(0);
 
     public static Snowflake FromDate(DateTimeOffset date) => new(
@@ -47,10 +47,9 @@ namespace DiscordChatExporter.Core.Discord
         TryParse(str, formatProvider) ?? throw new FormatException($"Invalid snowflake '{str}'.");
 
     public static Snowflake Parse(string str) => Parse(str, null);
-    }
+}
-
+
-    public partial record struct Snowflake : IComparable<Snowflake>
+public partial record struct Snowflake : IComparable<Snowflake>
-    {
+{
-        public int CompareTo(Snowflake other) => Value.CompareTo(other.Value);
+    public int CompareTo(Snowflake other) => Value.CompareTo(other.Value);
-    }
 }

DiscordChatExporter.Core/Exceptions/DiscordChatExporterException.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Net.Http;
 
-namespace DiscordChatExporter.Core.Exceptions
+namespace DiscordChatExporter.Core.Exceptions;
+
+public partial class DiscordChatExporterException : Exception
 {
-    public partial class DiscordChatExporterException : Exception
-    {
     public bool IsFatal { get; }
 
     public DiscordChatExporterException(string message, bool isFatal = false)
@@ -12,10 +12,10 @@ namespace DiscordChatExporter.Core.Exceptions
     {
         IsFatal = isFatal;
     }
-    }
+}
 
-    public partial class DiscordChatExporterException
+public partial class DiscordChatExporterException
-    {
+{
     internal static DiscordChatExporterException FailedHttpRequest(HttpResponseMessage response)
     {
         var message = $@"
@@ -41,5 +41,4 @@ Failed to perform an HTTP request.
 
     internal static DiscordChatExporterException ChannelIsEmpty() =>
         new("No messages found for the specified period.");
-    }
 }

DiscordChatExporter.Core/Exporting/ChannelExporter.cs

@@ -9,10 +9,10 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
+
+public class ChannelExporter
 {
-    public class ChannelExporter
-    {
     private readonly DiscordClient _discord;
 
     public ChannelExporter(DiscordClient discord) => _discord = discord;
@@ -79,5 +79,4 @@ namespace DiscordChatExporter.Core.Exporting
         if (!exportedAnything)
             throw DiscordChatExporterException.ChannelIsEmpty();
     }
-    }
 }

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -10,10 +10,10 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
+
+internal class ExportContext
 {
-    internal class ExportContext
-    {
     private readonly MediaDownloader _mediaDownloader;
 
     public ExportRequest Request { get; }
@@ -102,5 +102,4 @@ namespace DiscordChatExporter.Core.Exporting
             return url;
         }
     }
-    }
 }

DiscordChatExporter.Core/Exporting/ExportFormat.cs

@@ -1,18 +1,18 @@
 using System;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
+
+public enum ExportFormat
 {
-    public enum ExportFormat
-    {
     PlainText,
     HtmlDark,
     HtmlLight,
     Csv,
     Json
-    }
+}
 
-    public static class ExportFormatExtensions
+public static class ExportFormatExtensions
-    {
+{
     public static string GetFileExtension(this ExportFormat format) => format switch
     {
         ExportFormat.PlainText => "txt",
@@ -32,5 +32,4 @@ namespace DiscordChatExporter.Core.Exporting
         ExportFormat.Json => "JSON",
         _ => throw new ArgumentOutOfRangeException(nameof(format))
     };
-    }
 }

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -8,9 +8,9 @@ using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
 using DiscordChatExporter.Core.Utils;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
-{
+
-    public partial record ExportRequest(
+public partial record ExportRequest(
     Guild Guild,
     Channel Channel,
     string OutputPath,
@@ -22,7 +22,7 @@ namespace DiscordChatExporter.Core.Exporting
     bool ShouldDownloadMedia,
     bool ShouldReuseMedia,
     string DateFormat)
-    {
+{
     private string? _outputBaseFilePath;
     public string OutputBaseFilePath => _outputBaseFilePath ??= GetOutputBaseFilePath(
         Guild,
@@ -36,10 +36,10 @@ namespace DiscordChatExporter.Core.Exporting
     public string OutputBaseDirPath => Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath;
 
     public string OutputMediaDirPath => $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
-    }
+}
 
-    public partial record ExportRequest
+public partial record ExportRequest
-    {
+{
     private static string GetOutputBaseFilePath(
         Guild guild,
         Channel channel,
@@ -123,5 +123,4 @@ namespace DiscordChatExporter.Core.Exporting
 
         return buffer.ToString();
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/BinaryExpressionKind.cs

@@ -1,8 +1,7 @@
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal enum BinaryExpressionKind
 {
-    internal enum BinaryExpressionKind
-    {
     Or,
     And
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/BinaryExpressionMessageFilter.cs

@@ -1,10 +1,10 @@
 using System;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal class BinaryExpressionMessageFilter : MessageFilter
 {
-    internal class BinaryExpressionMessageFilter : MessageFilter
-    {
     private readonly MessageFilter _first;
     private readonly MessageFilter _second;
     private readonly BinaryExpressionKind _kind;
@@ -22,5 +22,4 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         BinaryExpressionKind.And => _first.IsMatch(message) && _second.IsMatch(message),
         _ => throw new InvalidOperationException($"Unknown binary expression kind '{_kind}'.")
     };
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs

@@ -2,10 +2,10 @@
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal class ContainsMessageFilter : MessageFilter
 {
-    internal class ContainsMessageFilter : MessageFilter
-    {
     private readonly string _text;
 
     public ContainsMessageFilter(string text) => _text = text;
@@ -30,5 +30,4 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
                 IsMatch(f.Value)
             )
         );
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/FromMessageFilter.cs

@@ -1,10 +1,10 @@
 using System;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal class FromMessageFilter : MessageFilter
 {
-    internal class FromMessageFilter : MessageFilter
-    {
     private readonly string _value;
 
     public FromMessageFilter(string value) => _value = value;
@@ -13,5 +13,4 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         string.Equals(_value, message.Author.Name, StringComparison.OrdinalIgnoreCase) ||
         string.Equals(_value, message.Author.FullName, StringComparison.OrdinalIgnoreCase) ||
         string.Equals(_value, message.Author.Id.ToString(), StringComparison.OrdinalIgnoreCase);
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/HasMessageFilter.cs

@@ -3,10 +3,10 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal class HasMessageFilter : MessageFilter
 {
-    internal class HasMessageFilter : MessageFilter
-    {
     private readonly MessageContentMatchKind _kind;
 
     public HasMessageFilter(MessageContentMatchKind kind) => _kind = kind;
@@ -21,5 +21,4 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         MessageContentMatchKind.Sound => message.Attachments.Any(file => file.IsAudio),
         _ => throw new InvalidOperationException($"Unknown message content match kind '{_kind}'.")
     };
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs

@@ -2,10 +2,10 @@
 using System.Linq;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal class MentionsMessageFilter : MessageFilter
 {
-    internal class MentionsMessageFilter : MessageFilter
-    {
     private readonly string _value;
 
     public MentionsMessageFilter(string value) => _value = value;
@@ -15,5 +15,4 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         string.Equals(_value, user.FullName, StringComparison.OrdinalIgnoreCase) ||
         string.Equals(_value, user.Id.ToString(), StringComparison.OrdinalIgnoreCase)
     );
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/MessageContentMatchKind.cs

@@ -1,12 +1,11 @@
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal enum MessageContentMatchKind
 {
-    internal enum MessageContentMatchKind
-    {
     Link,
     Embed,
     File,
     Video,
     Image,
     Sound
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/MessageFilter.cs

@@ -2,17 +2,16 @@
 using DiscordChatExporter.Core.Exporting.Filtering.Parsing;
 using Superpower;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
-    public abstract partial class MessageFilter
-    {
-        public abstract bool IsMatch(Message message);
-    }
 
-    public partial class MessageFilter
+public abstract partial class MessageFilter
-    {
+{
+    public abstract bool IsMatch(Message message);
+}
+
+public partial class MessageFilter
+{
     public static MessageFilter Null { get; } = new NullMessageFilter();
 
     public static MessageFilter Parse(string value) => FilterGrammar.Filter.Parse(value);
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/NegatedMessageFilter.cs

@@ -1,13 +1,12 @@
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal class NegatedMessageFilter : MessageFilter
 {
-    internal class NegatedMessageFilter : MessageFilter
-    {
     private readonly MessageFilter _filter;
 
     public NegatedMessageFilter(MessageFilter filter) => _filter = filter;
 
     public override bool IsMatch(Message message) => !_filter.IsMatch(message);
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/NullMessageFilter.cs

@@ -1,9 +1,8 @@
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal class NullMessageFilter : MessageFilter
 {
-    internal class NullMessageFilter : MessageFilter
-    {
     public override bool IsMatch(Message message) => true;
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/Parsing/FilterGrammar.cs

@@ -2,10 +2,10 @@
 using Superpower;
 using Superpower.Parsers;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
+namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing;
+
+internal static class FilterGrammar
 {
-    internal static class FilterGrammar
-    {
     private static readonly TextParser<char> EscapedCharacter =
         Character.EqualTo('\\').IgnoreThen(Character.AnyChar);
 
@@ -98,5 +98,4 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
 
     public static readonly TextParser<MessageFilter> Filter =
         BinaryExpressionFilter.Token().AtEnd();
-    }
 }

DiscordChatExporter.Core/Exporting/MediaDownloader.cs

@@ -10,10 +10,10 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
+
+internal partial class MediaDownloader
 {
-    internal partial class MediaDownloader
-    {
     private readonly string _workingDirPath;
     private readonly bool _reuseMedia;
 
@@ -47,7 +47,7 @@ namespace DiscordChatExporter.Core.Exporting
             using var response = await Http.Client.GetAsync(url, cancellationToken);
             await using (var output = File.Create(filePath))
             {
-                    await response.Content.CopyToAsync(output);
+                await response.Content.CopyToAsync(output, cancellationToken);
             }
 
             // Try to set the file date according to the last-modified header
@@ -77,10 +77,10 @@ namespace DiscordChatExporter.Core.Exporting
 
         return _pathCache[url] = filePath;
     }
-    }
+}
 
-    internal partial class MediaDownloader
+internal partial class MediaDownloader
-    {
+{
     private static string GetUrlHash(string url)
     {
         using var hash = SHA256.Create();
@@ -106,5 +106,4 @@ namespace DiscordChatExporter.Core.Exporting
 
         return PathEx.EscapePath(fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension);
     }
-    }
 }

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -5,10 +5,10 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Writers;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
+
+internal partial class MessageExporter : IAsyncDisposable
 {
-    internal partial class MessageExporter : IAsyncDisposable
-    {
     private readonly ExportContext _context;
 
     private int _partitionIndex;
@@ -62,10 +62,10 @@ namespace DiscordChatExporter.Core.Exporting
     }
 
     public async ValueTask DisposeAsync() => await ResetWriterAsync();
-    }
+}
 
-    internal partial class MessageExporter
+internal partial class MessageExporter
-    {
+{
     private static string GetPartitionFilePath(string baseFilePath, int partitionIndex)
     {
         // First partition - don't change file name
@@ -101,5 +101,4 @@ namespace DiscordChatExporter.Core.Exporting
             _ => throw new ArgumentOutOfRangeException(nameof(format), $"Unknown export format '{format}'.")
         };
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Partitioning/FileSizePartitionLimit.cs

@@ -1,12 +1,11 @@
-namespace DiscordChatExporter.Core.Exporting.Partitioning
+namespace DiscordChatExporter.Core.Exporting.Partitioning;
+
+internal class FileSizePartitionLimit : PartitionLimit
 {
-    internal class FileSizePartitionLimit : PartitionLimit
-    {
     private readonly long _limit;
 
     public FileSizePartitionLimit(long limit) => _limit = limit;
 
     public override bool IsReached(long messagesWritten, long bytesWritten) =>
         bytesWritten >= _limit;
-    }
 }

DiscordChatExporter.Core/Exporting/Partitioning/MessageCountPartitionLimit.cs

@@ -1,12 +1,11 @@
-namespace DiscordChatExporter.Core.Exporting.Partitioning
+namespace DiscordChatExporter.Core.Exporting.Partitioning;
+
+internal class MessageCountPartitionLimit : PartitionLimit
 {
-    internal class MessageCountPartitionLimit : PartitionLimit
-    {
     private readonly long _limit;
 
     public MessageCountPartitionLimit(long limit) => _limit = limit;
 
     public override bool IsReached(long messagesWritten, long bytesWritten) =>
         messagesWritten >= _limit;
-    }
 }

DiscordChatExporter.Core/Exporting/Partitioning/NullPartitionLimit.cs

@@ -1,7 +1,6 @@
-namespace DiscordChatExporter.Core.Exporting.Partitioning
+namespace DiscordChatExporter.Core.Exporting.Partitioning;
+
+internal class NullPartitionLimit : PartitionLimit
 {
-    internal class NullPartitionLimit : PartitionLimit
-    {
     public override bool IsReached(long messagesWritten, long bytesWritten) => false;
-    }
 }

DiscordChatExporter.Core/Exporting/Partitioning/PartitionLimit.cs

@@ -2,15 +2,15 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Exporting.Partitioning
+namespace DiscordChatExporter.Core.Exporting.Partitioning;
-{
-    public abstract partial class PartitionLimit
-    {
-        public abstract bool IsReached(long messagesWritten, long bytesWritten);
-    }
 
-    public partial class PartitionLimit
+public abstract partial class PartitionLimit
-    {
+{
+    public abstract bool IsReached(long messagesWritten, long bytesWritten);
+}
+
+public partial class PartitionLimit
+{
     public static PartitionLimit Null { get; } = new NullPartitionLimit();
 
     private static long? TryParseFileSizeBytes(string value, IFormatProvider? formatProvider = null)
@@ -59,5 +59,4 @@ namespace DiscordChatExporter.Core.Exporting.Partitioning
 
     public static PartitionLimit Parse(string value, IFormatProvider? formatProvider = null) =>
         TryParse(value, formatProvider) ?? throw new FormatException($"Invalid partition limit '{value}'.");
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/CsvMessageWriter.cs

@@ -7,10 +7,10 @@ using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers;
+
+internal partial class CsvMessageWriter : MessageWriter
 {
-    internal partial class CsvMessageWriter : MessageWriter
-    {
     private readonly TextWriter _writer;
 
     public CsvMessageWriter(Stream stream, ExportContext context)
@@ -103,14 +103,13 @@ namespace DiscordChatExporter.Core.Exporting.Writers
         await _writer.DisposeAsync();
         await base.DisposeAsync();
     }
-    }
+}
 
-    internal partial class CsvMessageWriter
+internal partial class CsvMessageWriter
-    {
+{
     private static string CsvEncode(string value)
     {
         value = value.Replace("\"", "\"\"");
         return $"\"{value}\"";
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroup.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Writers.Html
+namespace DiscordChatExporter.Core.Exporting.Writers.Html;
+
+// Used for grouping contiguous messages in HTML export
+internal partial class MessageGroup
 {
-    // Used for grouping contiguous messages in HTML export
-    internal partial class MessageGroup
-    {
     public User Author { get; }
 
     public DateTimeOffset Timestamp { get; }
@@ -31,10 +31,10 @@ namespace DiscordChatExporter.Core.Exporting.Writers.Html
         ReferencedMessage = referencedMessage;
         Messages = messages;
     }
-    }
+}
 
-    internal partial class MessageGroup
+internal partial class MessageGroup
-    {
+{
     public static bool CanJoin(Message message1, Message message2) =>
         // Must be from the same author
         message1.Author.Id == message2.Author.Id &&
@@ -57,5 +57,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers.Html
             messages
         );
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplateContext.cs

@@ -1,9 +1,9 @@
 using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
 
-namespace DiscordChatExporter.Core.Exporting.Writers.Html
+namespace DiscordChatExporter.Core.Exporting.Writers.Html;
+
+internal class MessageGroupTemplateContext
 {
-    internal class MessageGroupTemplateContext
-    {
     public ExportContext ExportContext { get; }
 
     public MessageGroup MessageGroup { get; }
@@ -16,5 +16,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers.Html
 
     public string FormatMarkdown(string? markdown, bool isJumboAllowed = true) =>
         HtmlMarkdownVisitor.Format(ExportContext, markdown ?? "", isJumboAllowed);
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplateContext.cs

@@ -1,7 +1,7 @@
-namespace DiscordChatExporter.Core.Exporting.Writers.Html
+namespace DiscordChatExporter.Core.Exporting.Writers.Html;
+
+internal class PostambleTemplateContext
 {
-    internal class PostambleTemplateContext
-    {
     public ExportContext ExportContext { get; }
 
     public long MessagesWritten { get; }
@@ -11,5 +11,4 @@
         ExportContext = exportContext;
         MessagesWritten = messagesWritten;
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplateContext.cs

@@ -1,9 +1,9 @@
 using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
 
-namespace DiscordChatExporter.Core.Exporting.Writers.Html
+namespace DiscordChatExporter.Core.Exporting.Writers.Html;
+
+internal class PreambleTemplateContext
 {
-    internal class PreambleTemplateContext
-    {
     public ExportContext ExportContext { get; }
 
     public string ThemeName { get; }
@@ -16,5 +16,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers.Html
 
     public string FormatMarkdown(string? markdown, bool isJumboAllowed = true) =>
         HtmlMarkdownVisitor.Format(ExportContext, markdown ?? "", isJumboAllowed);
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs

@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Writers.Html;
 
-namespace DiscordChatExporter.Core.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers;
+
+internal class HtmlMessageWriter : MessageWriter
 {
-    internal class HtmlMessageWriter : MessageWriter
-    {
     private readonly TextWriter _writer;
     private readonly string _themeName;
 
@@ -92,5 +92,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers
         await _writer.DisposeAsync();
         await base.DisposeAsync();
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs

@@ -9,10 +9,10 @@ using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Writing;
 
-namespace DiscordChatExporter.Core.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers;
+
+internal class JsonMessageWriter : MessageWriter
 {
-    internal class JsonMessageWriter : MessageWriter
-    {
     private readonly Utf8JsonWriter _writer;
 
     public JsonMessageWriter(Stream stream, ExportContext context)
@@ -323,5 +323,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers
         await _writer.DisposeAsync();
         await base.DisposeAsync();
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs

@@ -9,10 +9,10 @@ using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
+namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
+
+internal partial class HtmlMarkdownVisitor : MarkdownVisitor
 {
-    internal partial class HtmlMarkdownVisitor : MarkdownVisitor
-    {
     private readonly ExportContext _context;
     private readonly StringBuilder _buffer;
     private readonly bool _isJumbo;
@@ -169,10 +169,10 @@ namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 
         return base.VisitUnixTimestamp(timestamp);
     }
-    }
+}
 
-    internal partial class HtmlMarkdownVisitor
+internal partial class HtmlMarkdownVisitor
-    {
+{
     private static string HtmlEncode(string text) => WebUtility.HtmlEncode(text);
 
     public static string Format(ExportContext context, string markdown, bool isJumboAllowed = true)
@@ -189,5 +189,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 
         return buffer.ToString();
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/PlainTextMarkdownVisitor.cs

@@ -4,10 +4,10 @@ using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
+namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
+
+internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
 {
-    internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
-    {
     private readonly ExportContext _context;
     private readonly StringBuilder _buffer;
 
@@ -78,10 +78,10 @@ namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 
         return base.VisitUnixTimestamp(timestamp);
     }
-    }
+}
 
-    internal partial class PlainTextMarkdownVisitor
+internal partial class PlainTextMarkdownVisitor
-    {
+{
     public static string Format(ExportContext context, string markdown)
     {
         var nodes = MarkdownParser.ParseMinimal(markdown);
@@ -91,5 +91,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 
         return buffer.ToString();
     }
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/MessageWriter.cs

@@ -4,10 +4,10 @@ using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers;
+
+internal abstract class MessageWriter : IAsyncDisposable
 {
-    internal abstract class MessageWriter : IAsyncDisposable
-    {
     protected Stream Stream { get; }
 
     protected ExportContext Context { get; }
@@ -33,5 +33,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers
     public virtual ValueTask WritePostambleAsync(CancellationToken cancellationToken = default) => default;
 
     public virtual async ValueTask DisposeAsync() => await Stream.DisposeAsync();
-    }
 }

DiscordChatExporter.Core/Exporting/Writers/PlainTextMessageWriter.cs

@@ -7,10 +7,10 @@ using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
 using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
 
-namespace DiscordChatExporter.Core.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers;
+
+internal class PlainTextMessageWriter : MessageWriter
 {
-    internal class PlainTextMessageWriter : MessageWriter
-    {
     private readonly TextWriter _writer;
 
     public PlainTextMessageWriter(Stream stream, ExportContext context)
@@ -176,5 +176,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers
         await _writer.DisposeAsync();
         await base.DisposeAsync();
     }
-    }
 }

DiscordChatExporter.Core/Markdown/EmojiNode.cs

@@ -1,14 +1,14 @@
 using DiscordChatExporter.Core.Utils;
 
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown;
-{
+
-    internal record EmojiNode(
+internal record EmojiNode(
     // Only present on custom emoji
     string? Id,
     // Name of custom emoji (e.g. LUL) or actual representation of standard emoji (e.g. 🙂)
     string Name,
     bool IsAnimated) : MarkdownNode
-    {
+{
     // Name of custom emoji (e.g. LUL) or name of standard emoji (e.g. slight_smile)
     public string Code => !string.IsNullOrWhiteSpace(Id)
         ? Name
@@ -20,5 +20,4 @@ namespace DiscordChatExporter.Core.Markdown
         : this(null, name, false)
     {
     }
-    }
 }

DiscordChatExporter.Core/Markdown/FormattingKind.cs

@@ -1,12 +1,11 @@
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown;
+
+internal enum FormattingKind
 {
-    internal enum FormattingKind
-    {
     Bold,
     Italic,
     Underline,
     Strikethrough,
     Spoiler,
     Quote
-    }
 }

DiscordChatExporter.Core/Markdown/FormattingNode.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown;
-{
+
-    internal record FormattingNode(FormattingKind Kind, IReadOnlyList<MarkdownNode> Children) : MarkdownNode;
+internal record FormattingNode(FormattingKind Kind, IReadOnlyList<MarkdownNode> Children) : MarkdownNode;
-}

DiscordChatExporter.Core/Markdown/InlineCodeBlockNode.cs

@@ -1,4 +1,3 @@
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown;
-{
+
-    internal record InlineCodeBlockNode(string Code) : MarkdownNode;
+internal record InlineCodeBlockNode(string Code) : MarkdownNode;
-}

DiscordChatExporter.Core/Markdown/LinkNode.cs

@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown;
-{
+
-    internal record LinkNode(
+internal record LinkNode(
     string Url,
     IReadOnlyList<MarkdownNode> Children) : MarkdownNode
-    {
+{
     public LinkNode(string url)
         : this(url, new[] { new TextNode(url) })
     {
     }
-    }
 }

DiscordChatExporter.Core/Markdown/MarkdownNode.cs

@@ -1,4 +1,3 @@
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown;
-{
+
-    internal abstract record MarkdownNode;
+internal abstract record MarkdownNode;
-}