Update version

Closes #767

.config/dotnet-tools.json

@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "xamlstyler.console": {
-      "version": "3.2003.9",
-      "commands": [
-        "xstyler"
-      ]
-    }
-  }
-}

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-github: Tyrrrz
-patreon: Tyrrrz
-custom: ['buymeacoffee.com/Tyrrrz', 'tyrrrz.me/donate']

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +0,0 @@
-<!--
-
-**Important:**
-
-Please make sure that there is an existing issue that describes the problem solved by your pull request. If there isn't one, consider creating it first.
-An open issue offers a good place to iron out requirements, discuss possible solutions, and ask questions.
-
-Remember to also:
-
-- Keep your pull request focused and as small as possible. If you want to contribute multiple unrelated changes, please create separate pull requests for them.
-- Follow the coding style and conventions already established by the project. When in doubt about which style to use, ask in the comments to your pull request.
-- If you want to start a discussion regarding a specific change you've made, add a review comment to your own code. This can be used to highlight something important or to seek further input from others.
-
--->
-
-<!-- Please specify the issue addressed by this pull request -->
-Closes #ISSUE_NUMBER

.github/workflows/CD-Docker.yml

@@ -13,13 +13,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2.3.3
 
+      - name: Get release version
+        id: get_version
+        uses: dawidd6/action-get-tag@v1
+
       - name: Login
         run: docker login -u tyrrrz -p ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build
-        run: docker build -t tyrrrz/discordchatexporter:${{ github.ref }} -t tyrrrz/discordchatexporter:stable .
+        run: docker build -t tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }} -t tyrrrz/discordchatexporter:stable .
 
-      - name: Deploy
-        run: |
-          docker push tyrrrz/discordchatexporter:${{ github.ref }}
-          docker push tyrrrz/discordchatexporter:stable
+      - name: Deploy (version)
+        run: docker push tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }}
+
+      - name: Deploy (stable)
+        run: docker push tyrrrz/discordchatexporter:stable

.github/workflows/CD.yml

@@ -13,15 +13,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2.3.3
 
-      - name: Install .NET (v3.1)
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: 3.1.x
+      - name: Get release version
+        id: get_version
+        uses: dawidd6/action-get-tag@v1
 
-      - name: Install .NET (v5.0)
+      - name: Install .NET
         uses: actions/setup-dotnet@v1.7.2
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Build & publish (CLI)
         run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
@@ -71,11 +70,15 @@ jobs:
           asset_content_type: application/zip
 
       - name: Notify Discord
-        run: |
-          Invoke-WebRequest `
-           -Uri "${{ secrets.DISCORD_WEBHOOK }}" `
-           -Method "POST" `
-           -ContentType "application/json; charset=UTF-8" `
-           -Body '{"content":"**DiscordChatExporter** new version released!\nRef: `${{ github.ref }}`\nChangelog: <https://github.com/Tyrrrz/DiscordChatExporter/blob/${{ github.sha }}/Changelog.md>"}' `
-           -UseBasicParsing
-        shell: pwsh
+        uses: satak/webrequest-action@v1.2.4
+        with:
+          url: ${{ secrets.DISCORD_WEBHOOK }}
+          method: POST
+          headers: |
+            {
+              "ContentType": "application/json; charset=UTF-8"
+            }
+          payload: |
+            {
+              "content": "**DiscordChatExporter** new version released!\nVersion: `${{ steps.get_version.outputs.tag }}`\nChangelog: <https://github.com/Tyrrrz/DiscordChatExporter/blob/${{ steps.get_version.outputs.tag }}/Changelog.md>"
+            }

.github/workflows/CI-Docker.yml

@@ -19,5 +19,5 @@ jobs:
       - name: Build
         run: docker build -t tyrrrz/discordchatexporter:latest .
 
-      - name: Deploy
+      - name: Deploy (latest)
         run: docker push tyrrrz/discordchatexporter:latest

.github/workflows/CI.yml

@@ -10,17 +10,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2.3.3
 
-      - name: Install .NET (v3.1)
+      - name: Install .NET
         uses: actions/setup-dotnet@v1.7.2
         with:
-          dotnet-version: 3.1.x
-
-      - name: Install .NET (v5.0)
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Build & test
+        # Tests need access to secrets, so we can't run them against PRs because of limited trust
+        if: ${{ github.event_name != 'pull_request' }}
         run: dotnet test --configuration Release --logger GitHubActions
         env:
           DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}

Changelog.md

@@ -1,3 +1,32 @@
+### v2.32 (15-Dec-2021)
+
+- Token kind (user or bot) is now detected automatically. Removed the button to switch token kind in GUI. Option `-b|--bot` in CLI is now deprecated and does nothing.
+- Updated user token extraction guide to reflect the fact that devtools are no longer accessible in the desktop version of Discord client. The recommended workaround is to open Discord in browser. (Thanks [@Dhananjay-JSR](https://github.com/Dhananjay-JSR))
+- Fixed an issue which caused an error when parsing invalid date timestamps. Such timestamps are now rendered as "Invalid date", similarly to how the Discord client does it.
+- Fixed an issue which caused an error when parsing certain embed fields.
+- Fixed an issue which caused an error when parsing a mention to a user that has no username.
+- [GUI] Minor visual fixes.
+
+### v2.31.1 (15-Dec-2021)
+
+- Fixed an issue which caused an error when parsing certain custom emoji reactions.
+- [GUI] Improved user interface.
+
+### v2.31 (06-Dec-2021)
+
+- Changed target runtime of the application (both GUI and CLI) from .NET 3.1 to .NET 6. Those using the GUI version will not need to take any action as the application should install the necessary prerequisites automatically. Those using the CLI version will need to download and install .NET 6 runtime manually [from here](https://dotnet.microsoft.com/download/dotnet/6.0) (look for ".NET Runtime 6.0.x" section on the right and choose the distribution appropriate for your system).
+- [HTML] Updated layout design to match Discord more closely. (Thanks [@Artem](https://github.com/Scarg))
+- [HTML] Fixed an issue where markdown inside channel topic was not rendered correctly. (Thanks [@Emily](https://github.com/emillly-b))
+- [HTML] Fixed an issue where the layout was broken for messages containing text in right-to-left languages. (Thanks [@Emily](https://github.com/emillly-b))
+- Fixed an issue where text filters weren't matching content inside of embeds.
+- [GUI] Fixed a multitude of issues related to the bootstrapper.
+
+### v2.30.1 (28-Aug-2021)
+
+- [HTML] Changed user avatars to render using higher resolution images. (Thanks [@Chris Helder](https://github.com/TheDude53))
+- Fixed an issue where `has:file` message filter was not recognized. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- Fixed an issue where a unix timestamp marker with an invalid offset crashed the export process.
+
 ### v2.30 (08-Aug-2021)
 
 - [HTML] Added special casing for Spotify track embeds to render them directly using an embedded player.

Directory.Build.props

@@ -1,10 +1,10 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>2.30</Version>
+    <TargetFramework>net6.0</TargetFramework>
+    <Version>2.32</Version>
     <Company>Tyrrrz</Company>
-    <Copyright>Copyright (c) Alexey Golub</Copyright>
+    <Copyright>Copyright (c) Oleksii Holub</Copyright>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>

DiscordChatExporter.Cli.Tests/DiscordChatExporter.Cli.Tests.csproj

@@ -5,6 +5,7 @@
     <IsTestProject>true</IsTestProject>
     <CollectCoverage>true</CollectCoverage>
     <CoverletOutputFormat>opencover</CoverletOutputFormat>
+    <NoWarn>$(NoWarn);xUnit1013</NoWarn>
   </PropertyGroup>
   
   <ItemGroup>
@@ -13,11 +14,11 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.16.0" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="AngleSharp" Version="0.16.1" />
+    <PackageReference Include="FluentAssertions" Version="6.4.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
-    <PackageReference Include="JsonExtensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="JsonExtensions" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="coverlet.msbuild" Version="3.1.0" PrivateAssets="all" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />

DiscordChatExporter.Cli.Tests/EmbedSpecs.cs

@@ -1,209 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AngleSharp.Dom;
-using CliFx.Infrastructure;
-using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.TestData;
-using DiscordChatExporter.Cli.Tests.Utils;
-using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Exporting;
-using FluentAssertions;
-using JsonExtensions;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace DiscordChatExporter.Cli.Tests
-{
-    public class EmbedSpecs : IClassFixture<TempOutputFixture>
-    {
-        private readonly ITestOutputHelper _testOutput;
-        private readonly TempOutputFixture _tempOutput;
-
-        public EmbedSpecs(ITestOutputHelper testOutput, TempOutputFixture tempOutput)
-        {
-            _testOutput = testOutput;
-            _tempOutput = tempOutput;
-        }
-
-        [Fact]
-        public async Task Message_with_an_embed_is_rendered_correctly_in_JSON()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("json");
-
-            // Act
-            var jsonData = await GlobalCache.WrapAsync("embed-specs-output-json", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.EmbedTestCases)},
-                    ExportFormat = ExportFormat.Json,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(jsonData);
-
-            var json = Json.Parse(jsonData);
-
-            var messageJson = json
-                .GetProperty("messages")
-                .EnumerateArray()
-                .Single(j => string.Equals(
-                    j.GetProperty("id").GetString(),
-                    "866769910729146400",
-                    StringComparison.OrdinalIgnoreCase
-                ));
-
-            var embed = messageJson
-                .GetProperty("embeds")
-                .EnumerateArray()
-                .Single();
-
-            var embedAuthor = embed.GetProperty("author");
-            var embedThumbnail = embed.GetProperty("thumbnail");
-            var embedFooter = embed.GetProperty("footer");
-            var embedFields = embed.GetProperty("fields").EnumerateArray().ToArray();
-
-            // Assert
-            embed.GetProperty("title").GetString().Should().Be("Embed title");
-            embed.GetProperty("url").GetString().Should().Be("https://example.com");
-            embed.GetProperty("timestamp").GetString().Should().Be("2021-07-14T21:00:00+00:00");
-            embed.GetProperty("description").GetString().Should().Be("**Embed** _description_");
-            embed.GetProperty("color").GetString().Should().Be("#58B9FF");
-            embedAuthor.GetProperty("name").GetString().Should().Be("Embed author");
-            embedAuthor.GetProperty("url").GetString().Should().Be("https://example.com/author");
-            embedAuthor.GetProperty("iconUrl").GetString().Should().NotBeNullOrWhiteSpace();
-            embedThumbnail.GetProperty("url").GetString().Should().NotBeNullOrWhiteSpace();
-            embedThumbnail.GetProperty("width").GetInt32().Should().Be(120);
-            embedThumbnail.GetProperty("height").GetInt32().Should().Be(120);
-            embedFooter.GetProperty("text").GetString().Should().Be("Embed footer");
-            embedFooter.GetProperty("iconUrl").GetString().Should().NotBeNullOrWhiteSpace();
-            embedFields.Should().HaveCount(3);
-            embedFields[0].GetProperty("name").GetString().Should().Be("Field 1");
-            embedFields[0].GetProperty("value").GetString().Should().Be("Value 1");
-            embedFields[0].GetProperty("isInline").GetBoolean().Should().BeTrue();
-            embedFields[1].GetProperty("name").GetString().Should().Be("Field 2");
-            embedFields[1].GetProperty("value").GetString().Should().Be("Value 2");
-            embedFields[1].GetProperty("isInline").GetBoolean().Should().BeTrue();
-            embedFields[2].GetProperty("name").GetString().Should().Be("Field 3");
-            embedFields[2].GetProperty("value").GetString().Should().Be("Value 3");
-            embedFields[2].GetProperty("isInline").GetBoolean().Should().BeTrue();
-        }
-
-        [Fact]
-        public async Task Message_with_an_embed_is_rendered_correctly_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("embed-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.EmbedTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866769910729146400");
-            var messageText = messageHtml?.Text();
-
-            // Assert
-            messageText.Should().ContainAll(
-                "Embed author",
-                "Embed title",
-                "Embed description",
-                "Field 1", "Value 1",
-                "Field 2", "Value 2",
-                "Field 3", "Value 3",
-                "Embed footer"
-            );
-        }
-
-        [Fact]
-        public async Task Message_with_a_Spotify_track_is_rendered_using_an_iframe_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("embed-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.EmbedTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-867886632203976775");
-            var iframeHtml = messageHtml?.QuerySelector("iframe");
-
-            // Assert
-            iframeHtml.Should().NotBeNull();
-            iframeHtml?.GetAttribute("src").Should()
-                .StartWithEquivalent("https://open.spotify.com/embed/track/1LHZMWefF9502NPfArRfvP");
-        }
-
-        [Fact]
-        public async Task Message_with_a_YouTube_video_is_rendered_using_an_iframe_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("embed-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.EmbedTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866472508588294165");
-            var iframeHtml = messageHtml?.QuerySelector("iframe");
-
-            // Assert
-            iframeHtml.Should().NotBeNull();
-            iframeHtml?.GetAttribute("src").Should().StartWithEquivalent("https://www.youtube.com/embed/qOWW4OlgbvE");
-        }
-    }
-}

DiscordChatExporter.Cli.Tests/Fixtures/ExportWrapperFixture.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using AngleSharp.Html.Dom;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Exporting;
+using JsonExtensions;
+
+namespace DiscordChatExporter.Cli.Tests.Fixtures;
+
+public class ExportWrapperFixture : IDisposable
+{
+    private string DirPath { get; } = Path.Combine(
+        Path.GetDirectoryName(typeof(ExportWrapperFixture).Assembly.Location) ?? Directory.GetCurrentDirectory(),
+        "ExportCache",
+        Guid.NewGuid().ToString()
+    );
+
+    public ExportWrapperFixture() => DirectoryEx.Reset(DirPath);
+
+    private async ValueTask<string> ExportAsync(Snowflake channelId, ExportFormat format)
+    {
+        var fileName = channelId.ToString() + '.' + format.GetFileExtension();
+        var filePath = Path.Combine(DirPath, fileName);
+
+        // Perform export only if it hasn't been done before
+        if (!File.Exists(filePath))
+        {
+            await new ExportChannelsCommand
+            {
+                Token = Secrets.DiscordToken,
+                ChannelIds = new[] { channelId },
+                ExportFormat = format,
+                OutputPath = filePath
+            }.ExecuteAsync(new FakeConsole());
+        }
+
+        return await File.ReadAllTextAsync(filePath);
+    }
+
+    public async ValueTask<IHtmlDocument> ExportAsHtmlAsync(Snowflake channelId)
+    {
+        var data = await ExportAsync(channelId, ExportFormat.HtmlDark);
+        return Html.Parse(data);
+    }
+
+    public async ValueTask<JsonElement> ExportAsJsonAsync(Snowflake channelId)
+    {
+        var data = await ExportAsync(channelId, ExportFormat.Json);
+        return Json.Parse(data);
+    }
+
+    public async ValueTask<string> ExportAsPlainTextAsync(Snowflake channelId)
+    {
+        var data = await ExportAsync(channelId, ExportFormat.PlainText);
+        return data;
+    }
+
+    public async ValueTask<string> ExportAsCsvAsync(Snowflake channelId)
+    {
+        var data = await ExportAsync(channelId, ExportFormat.Csv);
+        return data;
+    }
+
+    public async ValueTask<IReadOnlyList<IElement>> GetMessagesAsHtmlAsync(Snowflake channelId)
+    {
+        var document = await ExportAsHtmlAsync(channelId);
+        return document.QuerySelectorAll("[data-message-id]").ToArray();
+    }
+
+    public async ValueTask<IReadOnlyList<JsonElement>> GetMessagesAsJsonAsync(Snowflake channelId)
+    {
+        var document = await ExportAsJsonAsync(channelId);
+        return document.GetProperty("messages").EnumerateArray().ToArray();
+    }
+
+    public async ValueTask<IElement> GetMessageAsHtmlAsync(Snowflake channelId, Snowflake messageId)
+    {
+        var messages = await GetMessagesAsHtmlAsync(channelId);
+
+        var message = messages.SingleOrDefault(e =>
+            string.Equals(
+                e.GetAttribute("data-message-id"),
+                messageId.ToString(),
+                StringComparison.OrdinalIgnoreCase
+            )
+        );
+
+        if (message is null)
+        {
+            throw new InvalidOperationException(
+                $"Message '{messageId}' does not exist in export of channel '{channelId}'."
+            );
+        }
+
+        return message;
+    }
+
+    public async ValueTask<JsonElement> GetMessageAsJsonAsync(Snowflake channelId, Snowflake messageId)
+    {
+        var messages = await GetMessagesAsJsonAsync(channelId);
+
+        var message = messages.FirstOrDefault(j =>
+            string.Equals(
+                j.GetProperty("id").GetString(),
+                messageId.ToString(),
+                StringComparison.OrdinalIgnoreCase
+            )
+        );
+
+        if (message.ValueKind == JsonValueKind.Undefined)
+        {
+            throw new InvalidOperationException(
+                $"Message '{messageId}' does not exist in export of channel '{channelId}'."
+            );
+        }
+
+        return message;
+    }
+
+    public void Dispose() => DirectoryEx.DeleteIfExists(DirPath);
+}

DiscordChatExporter.Cli.Tests/Fixtures/TempOutputFixture.cs

@@ -1,31 +1,22 @@
 using System;
 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 => Path.Combine(
+    public string DirPath { get; } = Path.Combine(
         Path.GetDirectoryName(typeof(TempOutputFixture).Assembly.Location) ?? Directory.GetCurrentDirectory(),
         "Temp",
         Guid.NewGuid().ToString()
     );
 
-        public TempOutputFixture() => Directory.CreateDirectory(DirPath);
+    public TempOutputFixture() => DirectoryEx.Reset(DirPath);
 
-        public string GetTempFilePath() => Path.Combine(DirPath, Guid.NewGuid().ToString());
+    public string GetTempFilePath(string fileName) => Path.Combine(DirPath, fileName);
 
-        public string GetTempFilePath(string extension) => Path.ChangeExtension(GetTempFilePath(), extension);
+    public string GetTempFilePath() => GetTempFilePath(Guid.NewGuid() + ".tmp");
 
-        public void Dispose()
-        {
-            try
-            {
-                Directory.Delete(DirPath, true);
-            }
-            catch (DirectoryNotFoundException)
-            {
-            }
-        }
-    }
+    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");
@@ -22,25 +22,5 @@ namespace DiscordChatExporter.Cli.Tests.Infra
         throw new InvalidOperationException("Discord token not provided for tests.");
     });
 
-        private static readonly Lazy<bool> IsDiscordTokenBotLazy = new(() =>
-        {
-            var fromEnvironment = Environment.GetEnvironmentVariable("DISCORD_TOKEN_BOT");
-            if (!string.IsNullOrWhiteSpace(fromEnvironment))
-                return string.Equals(fromEnvironment, "true", StringComparison.OrdinalIgnoreCase);
-
-            var secretFilePath = Path.Combine(
-                Path.GetDirectoryName(typeof(Secrets).Assembly.Location) ?? Directory.GetCurrentDirectory(),
-                "DiscordTokenBot.secret"
-            );
-
-            if (File.Exists(secretFilePath))
-                return true;
-
-            return false;
-        });
-
     public static string DiscordToken => DiscordTokenLazy.Value;
-
-        public static bool IsDiscordTokenBot => IsDiscordTokenBotLazy.Value;
-    }
 }

DiscordChatExporter.Cli.Tests/MentionSpecs.cs

@@ -1,319 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using AngleSharp.Dom;
-using CliFx.Infrastructure;
-using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.TestData;
-using DiscordChatExporter.Cli.Tests.Utils;
-using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Exporting;
-using FluentAssertions;
-using JsonExtensions;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace DiscordChatExporter.Cli.Tests
-{
-    public class MentionSpecs : IClassFixture<TempOutputFixture>
-    {
-        private readonly ITestOutputHelper _testOutput;
-        private readonly TempOutputFixture _tempOutput;
-
-        public MentionSpecs(ITestOutputHelper testOutput, TempOutputFixture tempOutput)
-        {
-            _testOutput = testOutput;
-            _tempOutput = tempOutput;
-        }
-
-        [Fact]
-        public async Task User_mention_is_rendered_correctly_in_JSON()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("json");
-
-            // Act
-            var jsonData = await GlobalCache.WrapAsync("mention-specs-output-json", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.MentionTestCases)},
-                    ExportFormat = ExportFormat.Json,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(jsonData);
-
-            var json = Json.Parse(jsonData);
-
-            var messageJson = json
-                .GetProperty("messages")
-                .EnumerateArray()
-                .Single(j => string.Equals(
-                    j.GetProperty("id").GetString(),
-                    "866458840245076028",
-                    StringComparison.OrdinalIgnoreCase
-                ));
-
-            // Assert
-            messageJson.GetProperty("content").GetString().Should().Be("User mention: @Tyrrrz");
-
-            messageJson
-                .GetProperty("mentions")
-                .EnumerateArray()
-                .Select(j => j.GetProperty("id").GetString())
-                .Should().Contain("128178626683338752");
-        }
-
-        [Fact]
-        public async Task User_mention_is_rendered_correctly_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("mention-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.MentionTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866458840245076028");
-
-            // Assert
-            messageHtml.Should().NotBeNull();
-            messageHtml?.Text().Trim().Should().Be("User mention: @Tyrrrz");
-            messageHtml?.InnerHtml.Should().Contain("Tyrrrz#5447");
-        }
-
-        [Fact]
-        public async Task Text_channel_mention_is_rendered_correctly_in_JSON()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("json");
-
-            // Act
-            var jsonData = await GlobalCache.WrapAsync("mention-specs-output-json", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.MentionTestCases)},
-                    ExportFormat = ExportFormat.Json,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(jsonData);
-
-            var json = Json.Parse(jsonData);
-
-            var messageJson = json
-                .GetProperty("messages")
-                .EnumerateArray()
-                .Single(j => string.Equals(
-                    j.GetProperty("id").GetString(),
-                    "866459040480624680",
-                    StringComparison.OrdinalIgnoreCase
-                ));
-
-            // Assert
-            messageJson.GetProperty("content").GetString().Should().Be("Text channel mention: #mention-tests");
-        }
-
-        [Fact]
-        public async Task Text_channel_mention_is_rendered_correctly_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("mention-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.MentionTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866459040480624680");
-
-            // Assert
-            messageHtml.Should().NotBeNull();
-            messageHtml?.Text().Trim().Should().Be("Text channel mention: #mention-tests");
-        }
-
-        [Fact]
-        public async Task Voice_channel_mention_is_rendered_correctly_in_JSON()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("json");
-
-            // Act
-            var jsonData = await GlobalCache.WrapAsync("mention-specs-output-json", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.MentionTestCases)},
-                    ExportFormat = ExportFormat.Json,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(jsonData);
-
-            var json = Json.Parse(jsonData);
-
-            var messageJson = json
-                .GetProperty("messages")
-                .EnumerateArray()
-                .Single(j => string.Equals(
-                    j.GetProperty("id").GetString(),
-                    "866459175462633503",
-                    StringComparison.OrdinalIgnoreCase
-                ));
-
-            // Assert
-            messageJson.GetProperty("content").GetString().Should().Be("Voice channel mention: #chaos-vc [voice]");
-        }
-
-        [Fact]
-        public async Task Voice_channel_mention_is_rendered_correctly_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("mention-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.MentionTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866459175462633503");
-
-            // Assert
-            messageHtml.Should().NotBeNull();
-            messageHtml?.Text().Trim().Should().Be("Voice channel mention: 🔊chaos-vc");
-        }
-
-        [Fact]
-        public async Task Role_mention_is_rendered_correctly_in_JSON()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("json");
-
-            // Act
-            var jsonData = await GlobalCache.WrapAsync("mention-specs-output-json", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.MentionTestCases)},
-                    ExportFormat = ExportFormat.Json,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(jsonData);
-
-            var json = Json.Parse(jsonData);
-
-            var messageJson = json
-                .GetProperty("messages")
-                .EnumerateArray()
-                .Single(j => string.Equals(
-                    j.GetProperty("id").GetString(),
-                    "866459254693429258",
-                    StringComparison.OrdinalIgnoreCase
-                ));
-
-            // Assert
-            messageJson.GetProperty("content").GetString().Should().Be("Role mention: @Role 1");
-        }
-
-        [Fact]
-        public async Task Role_mention_is_rendered_correctly_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("mention-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.MentionTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866459254693429258");
-
-            // Assert
-            messageHtml.Should().NotBeNull();
-            messageHtml?.Text().Trim().Should().Be("Role mention: @Role 1");
-        }
-    }
-}

DiscordChatExporter.Cli.Tests/Readme.md

@@ -10,8 +10,5 @@ In order to run these tests locally, you need to join the test server and config
     - **Using an environment variable**: set `DISCORD_TOKEN` variable to your token
 4. Run the tests: `dotnet test`
 
-> If you're submitting a pull request, you don't _have_ to run the tests locally -- they are executed automatically by CI.
-Running them locally can still sometimes be useful for debugging purposes though.
- 
 > If you want to have a new test case or a scenario added, please let me know in your pull request.
 Currently, it's not possible to add them by yourself.

DiscordChatExporter.Cli.Tests/ReplySpecs.cs

@@ -1,130 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using AngleSharp.Dom;
-using CliFx.Infrastructure;
-using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.TestData;
-using DiscordChatExporter.Cli.Tests.Utils;
-using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Exporting;
-using FluentAssertions;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace DiscordChatExporter.Cli.Tests
-{
-    public class ReplySpecs : IClassFixture<TempOutputFixture>
-    {
-        private readonly ITestOutputHelper _testOutput;
-        private readonly TempOutputFixture _tempOutput;
-
-        public ReplySpecs(ITestOutputHelper testOutput, TempOutputFixture tempOutput)
-        {
-            _testOutput = testOutput;
-            _tempOutput = tempOutput;
-        }
-
-        [Fact]
-        public async Task Reply_to_a_normal_message_is_rendered_correctly_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("reply-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.ReplyTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866460738239725598");
-
-            // Assert
-            messageHtml.Should().NotBeNull();
-            messageHtml?.Text().Trim().Should().Be("reply to original");
-            messageHtml?.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should().Be("original");
-        }
-
-        [Fact]
-        public async Task Reply_to_a_deleted_message_is_rendered_correctly_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("reply-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.ReplyTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866460975388819486");
-
-            // Assert
-            messageHtml.Should().NotBeNull();
-            messageHtml?.Text().Trim().Should().Be("reply to deleted");
-            messageHtml?.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
-                .Be("Original message was deleted or could not be loaded.");
-        }
-
-        [Fact]
-        public async Task Reply_to_a_empty_message_with_attachment_is_rendered_correctly_in_HTML()
-        {
-            // Arrange
-            var outputFilePath = _tempOutput.GetTempFilePath("html");
-
-            // Act
-            var htmlData = await GlobalCache.WrapAsync("reply-specs-output-html", async () =>
-            {
-                await new ExportChannelsCommand
-                {
-                    TokenValue = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
-                    ChannelIds = new[] {Snowflake.Parse(ChannelIds.ReplyTestCases)},
-                    ExportFormat = ExportFormat.HtmlDark,
-                    OutputPath = outputFilePath
-                }.ExecuteAsync(new FakeConsole());
-
-                return await File.ReadAllTextAsync(outputFilePath);
-            });
-
-            _testOutput.WriteLine(htmlData);
-
-            var html = Html.Parse(htmlData);
-
-            var messageHtml = html.QuerySelector("#message-866462470335627294");
-
-            // Assert
-            messageHtml.Should().NotBeNull();
-            messageHtml?.Text().Trim().Should().Be("reply to attachment");
-            messageHtml?.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
-                .Be("Click to see attachment 🖼️");
-        }
-    }
-}

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

@@ -0,0 +1,30 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting;
+
+public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Messages_are_exported_correctly()
+    {
+        // Act
+        var document = await ExportWrapper.ExportAsCsvAsync(ChannelIds.DateRangeTestCases);
+
+        // Assert
+        document.Should().ContainAll(
+            "Tyrrrz#5447",
+            "Hello world",
+            "Goodbye world",
+            "Foo bar",
+            "Hurdle Durdle",
+            "One",
+            "Two",
+            "Three",
+            "Yeet"
+        );
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs

@@ -0,0 +1,156 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Exporting;
+using FluentAssertions;
+using JsonExtensions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
+{
+    [Fact]
+    public async Task Messages_filtered_after_specific_date_only_include_messages_sent_after_that_date()
+    {
+        // Arrange
+        var after = new DateTimeOffset(2021, 07, 24, 0, 0, 0, TimeSpan.Zero);
+        var filePath = TempOutput.GetTempFilePath();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ExportFormat = ExportFormat.Json,
+            OutputPath = filePath,
+            After = Snowflake.FromDate(after)
+        }.ExecuteAsync(new FakeConsole());
+
+        var data = await File.ReadAllTextAsync(filePath);
+        var document = Json.Parse(data);
+
+        var timestamps = document
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("timestamp").GetDateTimeOffset())
+            .ToArray();
+
+        // Assert
+        timestamps.All(t => t > after).Should().BeTrue();
+
+        timestamps.Should().BeEquivalentTo(new[]
+        {
+            new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
+            new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
+            new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
+            new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero),
+            new DateTimeOffset(2021, 09, 08, 14, 26, 35, TimeSpan.Zero)
+        }, o =>
+        {
+            return o
+                .Using<DateTimeOffset>(ctx =>
+                    ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                )
+                .WhenTypeIs<DateTimeOffset>();
+        });
+    }
+
+    [Fact]
+    public async Task Messages_filtered_before_specific_date_only_include_messages_sent_before_that_date()
+    {
+        // Arrange
+        var before = new DateTimeOffset(2021, 07, 24, 0, 0, 0, TimeSpan.Zero);
+        var filePath = TempOutput.GetTempFilePath();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ExportFormat = ExportFormat.Json,
+            OutputPath = filePath,
+            Before = Snowflake.FromDate(before)
+        }.ExecuteAsync(new FakeConsole());
+
+        var data = await File.ReadAllTextAsync(filePath);
+        var document = Json.Parse(data);
+
+        var timestamps = document
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("timestamp").GetDateTimeOffset())
+            .ToArray();
+
+        // Assert
+        timestamps.All(t => t < before).Should().BeTrue();
+
+        timestamps.Should().BeEquivalentTo(new[]
+        {
+            new DateTimeOffset(2021, 07, 19, 13, 34, 18, TimeSpan.Zero),
+            new DateTimeOffset(2021, 07, 19, 15, 58, 48, TimeSpan.Zero),
+            new DateTimeOffset(2021, 07, 19, 17, 23, 58, TimeSpan.Zero)
+        }, o =>
+        {
+            return o
+                .Using<DateTimeOffset>(ctx =>
+                    ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                )
+                .WhenTypeIs<DateTimeOffset>();
+        });
+    }
+
+    [Fact]
+    public async Task Messages_filtered_between_specific_dates_only_include_messages_sent_between_those_dates()
+    {
+        // Arrange
+        var after = new DateTimeOffset(2021, 07, 24, 0, 0, 0, TimeSpan.Zero);
+        var before = new DateTimeOffset(2021, 08, 01, 0, 0, 0, TimeSpan.Zero);
+        var filePath = TempOutput.GetTempFilePath();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ExportFormat = ExportFormat.Json,
+            OutputPath = filePath,
+            Before = Snowflake.FromDate(before),
+            After = Snowflake.FromDate(after)
+        }.ExecuteAsync(new FakeConsole());
+
+        var data = await File.ReadAllTextAsync(filePath);
+        var document = Json.Parse(data);
+
+        var timestamps = document
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("timestamp").GetDateTimeOffset())
+            .ToArray();
+
+        // Assert
+        timestamps.All(t => t < before && t > after).Should().BeTrue();
+
+        timestamps.Should().BeEquivalentTo(new[]
+        {
+            new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
+            new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
+            new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
+            new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero)
+        }, o =>
+        {
+            return o
+                .Using<DateTimeOffset>(ctx =>
+                    ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                )
+                .WhenTypeIs<DateTimeOffset>();
+        });
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/FilterSpecs.cs

@@ -0,0 +1,130 @@
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Exporting.Filtering;
+using FluentAssertions;
+using JsonExtensions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
+{
+    [Fact]
+    public async Task Messages_filtered_by_text_only_include_messages_that_contain_that_text()
+    {
+        // Arrange
+        var filePath = TempOutput.GetTempFilePath();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ExportFormat = ExportFormat.Json,
+            OutputPath = filePath,
+            MessageFilter = MessageFilter.Parse("some text")
+        }.ExecuteAsync(new FakeConsole());
+
+        var data = await File.ReadAllTextAsync(filePath);
+        var document = Json.Parse(data);
+
+        // Assert
+        document
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("content").GetString())
+            .Should()
+            .ContainSingle("Some random text");
+    }
+
+    [Fact]
+    public async Task Messages_filtered_by_author_only_include_messages_sent_by_that_author()
+    {
+        // Arrange
+        var filePath = TempOutput.GetTempFilePath();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ExportFormat = ExportFormat.Json,
+            OutputPath = filePath,
+            MessageFilter = MessageFilter.Parse("from:Tyrrrz")
+        }.ExecuteAsync(new FakeConsole());
+
+        var data = await File.ReadAllTextAsync(filePath);
+        var document = Json.Parse(data);
+
+        // Assert
+        document
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("author").GetProperty("name").GetString())
+            .Should()
+            .AllBe("Tyrrrz");
+    }
+
+    [Fact]
+    public async Task Messages_filtered_by_content_only_include_messages_that_have_that_content()
+    {
+        // Arrange
+        var filePath = TempOutput.GetTempFilePath();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ExportFormat = ExportFormat.Json,
+            OutputPath = filePath,
+            MessageFilter = MessageFilter.Parse("has:image")
+        }.ExecuteAsync(new FakeConsole());
+
+        var data = await File.ReadAllTextAsync(filePath);
+        var document = Json.Parse(data);
+
+        // Assert
+        document
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("content").GetString())
+            .Should()
+            .ContainSingle("This has image");
+    }
+
+    [Fact]
+    public async Task Messages_filtered_by_mention_only_include_messages_that_have_that_mention()
+    {
+        // Arrange
+        var filePath = TempOutput.GetTempFilePath();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ExportFormat = ExportFormat.Json,
+            OutputPath = filePath,
+            MessageFilter = MessageFilter.Parse("mentions:Tyrrrz")
+        }.ExecuteAsync(new FakeConsole());
+
+        var data = await File.ReadAllTextAsync(filePath);
+        var document = Json.Parse(data);
+
+        // Assert
+        document
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("content").GetString())
+            .Should()
+            .ContainSingle("This has mention");
+    }
+}

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

@@ -0,0 +1,92 @@
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Message_with_a_generic_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885587844989612074")
+        );
+
+        var fileUrl = message.QuerySelector("a")?.GetAttribute("href");
+
+        // Assert
+        message.Text().Should().ContainAll(
+            "Generic file attachment",
+            "Test.txt",
+            "11 bytes"
+        );
+
+        fileUrl.Should().StartWithEquivalentOf(
+            "https://cdn.discordapp.com/attachments/885587741654536192/885587844964417596/Test.txt"
+        );
+    }
+
+    [Fact]
+    public async Task Message_with_an_image_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885654862656843786")
+        );
+
+        var imageUrl = message.QuerySelector("img")?.GetAttribute("src");
+
+        // Assert
+        message.Text().Should().Contain("Image attachment");
+
+        imageUrl.Should().StartWithEquivalentOf(
+            "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png"
+        );
+    }
+
+    [Fact]
+    public async Task Message_with_a_video_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885655761919836171")
+        );
+
+        var videoUrl = message.QuerySelector("video source")?.GetAttribute("src");
+
+        // Assert
+        message.Text().Should().Contain("Video attachment");
+
+        videoUrl.Should().StartWithEquivalentOf(
+            "https://cdn.discordapp.com/attachments/885587741654536192/885655761512968233/file_example_MP4_640_3MG.mp4"
+        );
+    }
+
+    [Fact]
+    public async Task Message_with_an_audio_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885656175620808734")
+        );
+
+        var audioUrl = message.QuerySelector("audio source")?.GetAttribute("src");
+
+        // Assert
+        message.Text().Should().Contain("Audio attachment");
+
+        audioUrl.Should().StartWithEquivalentOf(
+            "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
+        );
+    }
+}

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

@@ -0,0 +1,42 @@
+using System.Linq;
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Messages_are_exported_correctly()
+    {
+        // Act
+        var messages = await ExportWrapper.GetMessagesAsHtmlAsync(ChannelIds.DateRangeTestCases);
+
+        // Assert
+        messages.Select(e => e.GetAttribute("data-message-id")).Should().Equal(
+            "866674314627121232",
+            "866710679758045195",
+            "866732113319428096",
+            "868490009366396958",
+            "868505966528835604",
+            "868505969821364245",
+            "868505973294268457",
+            "885169254029213696"
+        );
+
+        messages.Select(e => e.QuerySelector(".chatlog__content")?.Text().Trim()).Should().Equal(
+            "Hello world",
+            "Goodbye world",
+            "Foo bar",
+            "Hurdle Durdle",
+            "One",
+            "Two",
+            "Three",
+            "Yeet"
+        );
+    }
+}

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

@@ -0,0 +1,63 @@
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Message_with_an_embed_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("866769910729146400")
+        );
+
+        // Assert
+        message.Text().Should().ContainAll(
+            "Embed author",
+            "Embed title",
+            "Embed description",
+            "Field 1", "Value 1",
+            "Field 2", "Value 2",
+            "Field 3", "Value 3",
+            "Embed footer"
+        );
+    }
+
+    [Fact]
+    public async Task Message_with_a_Spotify_track_is_rendered_using_an_iframe()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("867886632203976775")
+        );
+
+        var iframeSrc = message.QuerySelector("iframe")?.GetAttribute("src");
+
+        // Assert
+        iframeSrc.Should().StartWithEquivalentOf("https://open.spotify.com/embed/track/1LHZMWefF9502NPfArRfvP");
+    }
+
+    [Fact]
+    public async Task Message_with_a_YouTube_video_is_rendered_using_an_iframe()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("866472508588294165")
+        );
+
+        var iframeSrc = message.QuerySelector("iframe")?.GetAttribute("src");
+
+        // Assert
+        iframeSrc.Should().StartWithEquivalentOf("https://www.youtube.com/embed/qOWW4OlgbvE");
+    }
+}

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

@@ -0,0 +1,65 @@
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task User_mention_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("866458840245076028")
+        );
+
+        // Assert
+        message.Text().Trim().Should().Be("User mention: @Tyrrrz");
+        message.InnerHtml.Should().Contain("Tyrrrz#5447");
+    }
+
+    [Fact]
+    public async Task Text_channel_mention_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("866459040480624680")
+        );
+
+        // Assert
+        message.Text().Trim().Should().Be("Text channel mention: #mention-tests");
+    }
+
+    [Fact]
+    public async Task Voice_channel_mention_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("866459175462633503")
+        );
+
+        // Assert
+        message.Text().Trim().Should().Be("Voice channel mention: 🔊chaos-vc");
+    }
+
+    [Fact]
+    public async Task Role_mention_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("866459254693429258")
+        );
+
+        // Assert
+        message.Text().Trim().Should().Be("Role mention: @Role 1");
+    }
+}

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

@@ -0,0 +1,56 @@
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record ReplySpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Reply_to_a_normal_message_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ReplyTestCases,
+            Snowflake.Parse("866460738239725598")
+        );
+
+        // Assert
+        message.Text().Trim().Should().Be("reply to original");
+        message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should().Be("original");
+    }
+
+    [Fact]
+    public async Task Reply_to_a_deleted_message_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ReplyTestCases,
+            Snowflake.Parse("866460975388819486")
+        );
+
+        // Assert
+        message.Text().Trim().Should().Be("reply to deleted");
+        message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
+            .Be("Original message was deleted or could not be loaded.");
+    }
+
+    [Fact]
+    public async Task Reply_to_a_empty_message_with_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ReplyTestCases,
+            Snowflake.Parse("866462470335627294")
+        );
+
+        // Assert
+        message.Text().Trim().Should().Be("reply to attachment");
+        message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
+            .Be("Click to see attachment 🖼️");
+    }
+}

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

@@ -0,0 +1,100 @@
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Message_with_a_generic_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885587844989612074")
+        );
+
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Generic file attachment");
+
+        attachments.Should().HaveCount(1);
+        attachments.Single().GetProperty("url").GetString().Should().StartWithEquivalentOf(
+            "https://cdn.discordapp.com/attachments/885587741654536192/885587844964417596/Test.txt"
+        );
+        attachments.Single().GetProperty("fileName").GetString().Should().Be("Test.txt");
+        attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(11);
+    }
+
+    [Fact]
+    public async Task Message_with_an_image_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885654862656843786")
+        );
+
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Image attachment");
+
+        attachments.Should().HaveCount(1);
+        attachments.Single().GetProperty("url").GetString().Should().StartWithEquivalentOf(
+            "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png"
+        );
+        attachments.Single().GetProperty("fileName").GetString().Should().Be("bird-thumbnail.png");
+        attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(466335);
+    }
+
+    [Fact]
+    public async Task Message_with_a_video_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885655761919836171")
+        );
+
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Video attachment");
+
+        attachments.Should().HaveCount(1);
+        attachments.Single().GetProperty("url").GetString().Should().StartWithEquivalentOf(
+            "https://cdn.discordapp.com/attachments/885587741654536192/885655761512968233/file_example_MP4_640_3MG.mp4"
+        );
+        attachments.Single().GetProperty("fileName").GetString().Should().Be("file_example_MP4_640_3MG.mp4");
+        attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(3114374);
+    }
+
+    [Fact]
+    public async Task Message_with_an_audio_attachment_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885656175620808734")
+        );
+
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Audio attachment");
+
+        attachments.Should().HaveCount(1);
+        attachments.Single().GetProperty("url").GetString().Should().StartWithEquivalentOf(
+            "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
+        );
+        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

@@ -0,0 +1,41 @@
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Messages_are_exported_correctly()
+    {
+        // Act
+        var messages = await ExportWrapper.GetMessagesAsJsonAsync(ChannelIds.DateRangeTestCases);
+
+        // Assert
+        messages.Select(j => j.GetProperty("id").GetString()).Should().Equal(
+            "866674314627121232",
+            "866710679758045195",
+            "866732113319428096",
+            "868490009366396958",
+            "868505966528835604",
+            "868505969821364245",
+            "868505973294268457",
+            "885169254029213696"
+        );
+
+        messages.Select(j => j.GetProperty("content").GetString()).Should().Equal(
+            "Hello world",
+            "Goodbye world",
+            "Foo bar",
+            "Hurdle Durdle",
+            "One",
+            "Two",
+            "Three",
+            "Yeet"
+        );
+    }
+}

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

@@ -0,0 +1,57 @@
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Message_with_an_embed_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("866769910729146400")
+        );
+
+        var embed = message
+            .GetProperty("embeds")
+            .EnumerateArray()
+            .Single();
+
+        var embedAuthor = embed.GetProperty("author");
+        var embedThumbnail = embed.GetProperty("thumbnail");
+        var embedFooter = embed.GetProperty("footer");
+        var embedFields = embed.GetProperty("fields").EnumerateArray().ToArray();
+
+        // Assert
+        embed.GetProperty("title").GetString().Should().Be("Embed title");
+        embed.GetProperty("url").GetString().Should().Be("https://example.com");
+        embed.GetProperty("timestamp").GetString().Should().Be("2021-07-14T21:00:00+00:00");
+        embed.GetProperty("description").GetString().Should().Be("**Embed** _description_");
+        embed.GetProperty("color").GetString().Should().Be("#58B9FF");
+        embedAuthor.GetProperty("name").GetString().Should().Be("Embed author");
+        embedAuthor.GetProperty("url").GetString().Should().Be("https://example.com/author");
+        embedAuthor.GetProperty("iconUrl").GetString().Should().NotBeNullOrWhiteSpace();
+        embedThumbnail.GetProperty("url").GetString().Should().NotBeNullOrWhiteSpace();
+        embedThumbnail.GetProperty("width").GetInt32().Should().Be(120);
+        embedThumbnail.GetProperty("height").GetInt32().Should().Be(120);
+        embedFooter.GetProperty("text").GetString().Should().Be("Embed footer");
+        embedFooter.GetProperty("iconUrl").GetString().Should().NotBeNullOrWhiteSpace();
+        embedFields.Should().HaveCount(3);
+        embedFields[0].GetProperty("name").GetString().Should().Be("Field 1");
+        embedFields[0].GetProperty("value").GetString().Should().Be("Value 1");
+        embedFields[0].GetProperty("isInline").GetBoolean().Should().BeTrue();
+        embedFields[1].GetProperty("name").GetString().Should().Be("Field 2");
+        embedFields[1].GetProperty("value").GetString().Should().Be("Value 2");
+        embedFields[1].GetProperty("isInline").GetBoolean().Should().BeTrue();
+        embedFields[2].GetProperty("name").GetString().Should().Be("Field 3");
+        embedFields[2].GetProperty("value").GetString().Should().Be("Value 3");
+        embedFields[2].GetProperty("isInline").GetBoolean().Should().BeTrue();
+    }
+}

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

@@ -0,0 +1,70 @@
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task User_mention_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("866458840245076028")
+        );
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("User mention: @Tyrrrz");
+
+        message
+            .GetProperty("mentions")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("id").GetString())
+            .Should().Contain("128178626683338752");
+    }
+
+    [Fact]
+    public async Task Text_channel_mention_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("866459040480624680")
+        );
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Text channel mention: #mention-tests");
+    }
+
+    [Fact]
+    public async Task Voice_channel_mention_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("866459175462633503")
+        );
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Voice channel mention: #chaos-vc [voice]");
+    }
+
+    [Fact]
+    public async Task Role_mention_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("866459254693429258")
+        );
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Role mention: @Role 1");
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/PartitioningSpecs.cs

@@ -0,0 +1,64 @@
+using System.IO;
+using System.Threading.Tasks;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Exporting.Partitioning;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public record PartitioningSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
+{
+    [Fact]
+    public async Task Messages_partitioned_by_count_are_split_into_multiple_files_correctly()
+    {
+        // Arrange
+        var filePath = TempOutput.GetTempFilePath();
+        var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
+        var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ExportFormat = ExportFormat.HtmlDark,
+            OutputPath = filePath,
+            PartitionLimit = PartitionLimit.Parse("3")
+        }.ExecuteAsync(new FakeConsole());
+
+        // Assert
+        Directory.EnumerateFiles(dirPath, fileNameWithoutExt + "*")
+            .Should()
+            .HaveCount(3);
+    }
+
+    [Fact]
+    public async Task Messages_partitioned_by_file_size_are_split_into_multiple_files_correctly()
+    {
+        // Arrange
+        var filePath = TempOutput.GetTempFilePath();
+        var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
+        var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ExportFormat = ExportFormat.HtmlDark,
+            OutputPath = filePath,
+            PartitionLimit = PartitionLimit.Parse("20kb")
+        }.ExecuteAsync(new FakeConsole());
+
+        // Assert
+        Directory.EnumerateFiles(dirPath, fileNameWithoutExt + "*")
+            .Should()
+            .HaveCount(2);
+    }
+}

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

@@ -0,0 +1,30 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting;
+
+public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Messages_are_exported_correctly()
+    {
+        // Act
+        var document = await ExportWrapper.ExportAsPlainTextAsync(ChannelIds.DateRangeTestCases);
+
+        // Assert
+        document.Should().ContainAll(
+            "Tyrrrz#5447",
+            "Hello world",
+            "Goodbye world",
+            "Foo bar",
+            "Hurdle Durdle",
+            "One",
+            "Two",
+            "Three",
+            "Yeet"
+        );
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/SelfContainedSpecs.cs

@@ -0,0 +1,47 @@
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Cli.Tests.Utils;
+using DiscordChatExporter.Core.Exporting;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public record SelfContainedSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
+{
+    [Fact]
+    public async Task Messages_in_self_contained_export_only_reference_local_file_resources()
+    {
+        // Arrange
+        var filePath = TempOutput.GetTempFilePath();
+        var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.SelfContainedTestCases },
+            ExportFormat = ExportFormat.HtmlDark,
+            OutputPath = filePath,
+            ShouldDownloadMedia = true
+        }.ExecuteAsync(new FakeConsole());
+
+        var data = await File.ReadAllTextAsync(filePath);
+        var document = Html.Parse(data);
+
+        // Assert
+        document
+            .QuerySelectorAll("body [src]")
+            .Select(e => e.GetAttribute("src")!)
+            .Select(f => Path.GetFullPath(f, dirPath))
+            .All(File.Exists)
+            .Should()
+            .BeTrue();
+    }
+}

DiscordChatExporter.Cli.Tests/TestData/ChannelIds.cs

@@ -1,11 +1,20 @@
-namespace DiscordChatExporter.Cli.Tests.TestData
+using DiscordChatExporter.Core.Discord;
+
+namespace DiscordChatExporter.Cli.Tests.TestData;
+
+public static class ChannelIds
 {
-    public static class ChannelIds
-    {
-        public static string EmbedTestCases => "866472452459462687";
+    public static Snowflake AttachmentTestCases { get; } = Snowflake.Parse("885587741654536192");
 
-        public static string MentionTestCases => "866458801389174794";
+    public static Snowflake DateRangeTestCases { get; } = Snowflake.Parse("866674248747319326");
 
-        public static string ReplyTestCases => "866459871934677052";
-    }
+    public static Snowflake EmbedTestCases { get; } = Snowflake.Parse("866472452459462687");
+
+    public static Snowflake FilterTestCases { get; } = Snowflake.Parse("866744075033641020");
+
+    public static Snowflake MentionTestCases { get; } = Snowflake.Parse("866458801389174794");
+
+    public static Snowflake ReplyTestCases { get; } = Snowflake.Parse("866459871934677052");
+
+    public static Snowflake SelfContainedTestCases { get; } = Snowflake.Parse("887441432678379560");
 }

DiscordChatExporter.Cli.Tests/Utils/DirectoryEx.cs

@@ -0,0 +1,23 @@
+using System.IO;
+
+namespace DiscordChatExporter.Cli.Tests.Utils;
+
+internal static class DirectoryEx
+{
+    public static void DeleteIfExists(string dirPath, bool recursive = true)
+    {
+        try
+        {
+            Directory.Delete(dirPath, recursive);
+        }
+        catch (DirectoryNotFoundException)
+        {
+        }
+    }
+
+    public static void Reset(string dirPath)
+    {
+        DeleteIfExists(dirPath);
+        Directory.CreateDirectory(dirPath);
+    }
+}

DiscordChatExporter.Cli.Tests/Utils/GlobalCache.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace DiscordChatExporter.Cli.Tests.Utils
-{
-    internal static class GlobalCache
-    {
-        private static readonly Dictionary<string, object?> Dictionary = new();
-
-        public static async Task<T> WrapAsync<T>(string key, Func<Task<T>> getAsync)
-        {
-            if (Dictionary.TryGetValue(key, out var value) && value is T existing)
-                return existing;
-
-            var result = await getAsync();
-            Dictionary[key] = result;
-
-            return result;
-        }
-    }
-}

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

@@ -14,13 +14,11 @@ using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
-using DiscordChatExporter.Core.Utils.Extensions;
-using Tyrrrz.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();
 
@@ -54,23 +52,37 @@ namespace DiscordChatExporter.Cli.Commands.Base
     private ChannelExporter? _channelExporter;
     protected ChannelExporter Exporter => _channelExporter ??= new ChannelExporter(Discord);
 
-        protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Channel> channels)
+    protected async ValueTask ExecuteAsync(IConsole console, IReadOnlyList<Channel> channels)
     {
-            await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
+        var cancellationToken = console.RegisterCancellationHandler();
+
+        if (ShouldReuseMedia && !ShouldDownloadMedia)
+        {
+            throw new CommandException("Option --reuse-media cannot be used without --media.");
+        }
 
         var errors = new ConcurrentDictionary<Channel, string>();
 
-            // Wrap everything in a progress ticker
+        // Export
+        await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
         await console.CreateProgressTicker().StartAsync(async progressContext =>
         {
-                await channels.ParallelForEachAsync(async channel =>
+            await Parallel.ForEachAsync(
+                channels,
+                new ParallelOptions
+                {
+                    MaxDegreeOfParallelism = Math.Max(1, ParallelLimit),
+                    CancellationToken = cancellationToken
+                },
+                async (channel, innerCancellationToken) =>
                 {
-                    // Export
                     try
                     {
-                        await progressContext.StartTaskAsync($"{channel.Category} / {channel.Name}", async progress =>
+                        await progressContext.StartTaskAsync(
+                            $"{channel.Category.Name} / {channel.Name}",
+                            async progress =>
                             {
-                            var guild = await Discord.GetGuildAsync(channel.GuildId);
+                                var guild = await Discord.GetGuildAsync(channel.GuildId, innerCancellationToken);
 
                                 var request = new ExportRequest(
                                     guild,
@@ -86,14 +98,16 @@ namespace DiscordChatExporter.Cli.Commands.Base
                                     DateFormat
                                 );
 
-                            await Exporter.ExportChannelAsync(request, progress);
-                        });
+                                await Exporter.ExportChannelAsync(request, progress, innerCancellationToken);
                             }
-                    catch (DiscordChatExporterException ex) when (!ex.IsCritical)
+                        );
+                    }
+                    catch (DiscordChatExporterException ex) when (!ex.IsFatal)
                     {
                         errors[channel] = ex.Message;
                     }
-                }, ParallelLimit.ClampMin(1));
+                }
+            );
         });
 
         // Print result
@@ -118,7 +132,7 @@ namespace DiscordChatExporter.Cli.Commands.Base
 
             foreach (var (channel, error) in errors)
             {
-                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}: ");
+                await console.Output.WriteAsync($"{channel.Category.Name} / {channel.Name}: ");
 
                 using (console.WithForegroundColor(ConsoleColor.Red))
                     await console.Output.WriteLineAsync(error);
@@ -127,22 +141,25 @@ namespace DiscordChatExporter.Cli.Commands.Base
             await console.Output.WriteLineAsync();
         }
 
-            // Fail the command if ALL channels failed to export.
-            // Having some of the channels fail to export is fine and expected.
+        // Fail the command only if ALL channels failed to export.
+        // Having some of the channels fail to export is expected.
         if (errors.Count >= channels.Count)
         {
             throw new CommandException("Export failed.");
         }
     }
 
-        public override ValueTask ExecuteAsync(IConsole console)
+    protected async ValueTask ExecuteAsync(IConsole console, IReadOnlyList<Snowflake> channelIds)
     {
-            if (ShouldReuseMedia && !ShouldDownloadMedia)
+        var cancellationToken = console.RegisterCancellationHandler();
+        var channels = new List<Channel>();
+
+        foreach (var channelId in channelIds)
         {
-                throw new CommandException("Option --reuse-media cannot be used without --media.");
+            var channel = await Discord.GetChannelAsync(channelId, cancellationToken);
+            channels.Add(channel);
         }
 
-            return default;
-        }
+        await ExecuteAsync(console, channels);
     }
 }

DiscordChatExporter.Cli/Commands/Base/TokenCommandBase.cs

@@ -1,29 +1,23 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Core.Discord;
 
-namespace DiscordChatExporter.Cli.Commands.Base
-{
-    public abstract class TokenCommandBase : ICommand
-    {
-        [CommandOption("token", 't', IsRequired = true, EnvironmentVariable = "DISCORD_TOKEN", Description = "Authentication token.")]
-        public string TokenValue { get; init; } = "";
+namespace DiscordChatExporter.Cli.Commands.Base;
 
-        [CommandOption("bot", 'b', EnvironmentVariable = "DISCORD_TOKEN_BOT", Description = "Authenticate as a bot.")]
+public abstract class TokenCommandBase : ICommand
+{
+    [CommandOption("token", 't', IsRequired = true, EnvironmentVariable = "DISCORD_TOKEN", Description = "Authentication token.")]
+    public string Token { get; init; } = "";
+
+    [CommandOption("bot", 'b', EnvironmentVariable = "DISCORD_TOKEN_BOT", Description = "This option doesn't do anything. Kept for backwards compatibility.")]
+    [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
     public bool IsBotToken { get; init; }
 
-        private AuthToken GetAuthToken() => new(
-            IsBotToken
-                ? AuthTokenKind.Bot
-                : AuthTokenKind.User,
-            TokenValue
-        );
-
     private DiscordClient? _discordClient;
-        protected DiscordClient Discord => _discordClient ??= new DiscordClient(GetAuthToken());
+    protected DiscordClient Discord => _discordClient ??= new DiscordClient(Token);
 
     public abstract ValueTask ExecuteAsync(IConsole console);
-    }
 }

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -5,31 +5,27 @@ 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;
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
-            await base.ExecuteAsync(console);
-
-            // Get channel metadata
-            await console.Output.WriteLineAsync("Fetching channels...");
-
+        var cancellationToken = console.RegisterCancellationHandler();
         var channels = new List<Channel>();
 
-            // Aggregate channels from all guilds
-            await foreach (var guild in Discord.GetUserGuildsAsync())
+        await console.Output.WriteLineAsync("Fetching channels...");
+        await foreach (var guild in Discord.GetUserGuildsAsync(cancellationToken))
         {
             // Skip DMs if instructed to
             if (!IncludeDirectMessages && guild.Id == Guild.DirectMessages.Id)
                 continue;
 
-                await foreach (var channel in Discord.GetGuildChannelsAsync(guild.Id))
+            await foreach (var channel in Discord.GetGuildChannelsAsync(guild.Id, cancellationToken))
             {
                 // Skip non-text channels
                 if (!channel.IsTextChannel)
@@ -39,8 +35,6 @@ namespace DiscordChatExporter.Cli.Commands
             }
         }
 
-            // Export
-            await ExportAsync(console, channels);
-        }
+        await base.ExecuteAsync(console, channels);
     }
 }

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

@@ -5,34 +5,16 @@ using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Discord.Data;
 
-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);
-
-            // Get channel metadata
-            await console.Output.WriteLineAsync("Fetching channel(s)...");
-
-            var channels = new List<Channel>();
-
-            foreach (var channelId in ChannelIds)
-            {
-                var channel = await Discord.GetChannelAsync(channelId);
-                channels.Add(channel);
-            }
-
-            // Export
-            await ExportAsync(console, channels);
-        }
-    }
+    public override async ValueTask ExecuteAsync(IConsole console) =>
+        await base.ExecuteAsync(console, ChannelIds);
 }

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -6,22 +6,19 @@ 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)
     {
-            await base.ExecuteAsync(console);
+        var cancellationToken = console.RegisterCancellationHandler();
 
-            // Get channel metadata
         await console.Output.WriteLineAsync("Fetching channels...");
-            var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id);
+        var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken);
         var textChannels = channels.Where(c => c.IsTextChannel).ToArray();
 
-            // Export
-            await ExportAsync(console, textChannels);
-        }
+        await base.ExecuteAsync(console, textChannels);
     }
 }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -6,25 +6,22 @@ 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; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
-            await base.ExecuteAsync(console);
+        var cancellationToken = console.RegisterCancellationHandler();
 
-            // Get channel metadata
         await console.Output.WriteLineAsync("Fetching channels...");
-            var channels = await Discord.GetGuildChannelsAsync(GuildId);
+        var channels = await Discord.GetGuildChannelsAsync(GuildId, cancellationToken);
         var textChannels = channels.Where(c => c.IsTextChannel).ToArray();
 
-            // Export
-            await ExportAsync(console, textChannels);
-        }
+        await base.ExecuteAsync(console, textChannels);
     }
 }

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -7,17 +7,19 @@ 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; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
-            var channels = await Discord.GetGuildChannelsAsync(GuildId);
+        var cancellationToken = console.RegisterCancellationHandler();
+
+        var channels = await Discord.GetGuildChannelsAsync(GuildId, cancellationToken);
 
         var textChannels = channels
             .Where(c => c.IsTextChannel)
@@ -36,10 +38,7 @@ namespace DiscordChatExporter.Cli.Commands
 
             // Channel category / name
             using (console.WithForegroundColor(ConsoleColor.White))
-                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}");
-
-                await console.Output.WriteLineAsync();
-            }
+                await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
         }
     }
 }

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -7,14 +7,16 @@ 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 channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id);
+        var cancellationToken = console.RegisterCancellationHandler();
+
+        var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken);
 
         var textChannels = channels
             .Where(c => c.IsTextChannel)
@@ -33,10 +35,7 @@ namespace DiscordChatExporter.Cli.Commands
 
             // Channel category / name
             using (console.WithForegroundColor(ConsoleColor.White))
-                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}");
-
-                await console.Output.WriteLineAsync();
-            }
+                await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
         }
     }
 }

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -6,14 +6,16 @@ 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 guilds = await Discord.GetUserGuildsAsync();
+        var cancellationToken = console.RegisterCancellationHandler();
+
+        var guilds = await Discord.GetUserGuildsAsync(cancellationToken);
 
         foreach (var guild in guilds.OrderBy(g => g.Name))
         {
@@ -26,10 +28,7 @@ namespace DiscordChatExporter.Cli.Commands
 
             // Guild name
             using (console.WithForegroundColor(ConsoleColor.White))
-                    await console.Output.WriteAsync(guild.Name);
-
-                await console.Output.WriteLineAsync();
-            }
+                await console.Output.WriteLineAsync(guild.Name);
         }
     }
 }

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -4,17 +4,18 @@ 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
         using (console.WithForegroundColor(ConsoleColor.White))
             console.Output.WriteLine("To get user token:");
 
-            console.Output.WriteLine(" 1. Open Discord");
+        console.Output.WriteLine(" 1. Open Discord in your web browser and login");
         console.Output.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
         console.Output.WriteLine(" 3. Press Ctrl+Shift+M to toggle device toolbar");
         console.Output.WriteLine(" 4. Navigate to the Application tab");
@@ -25,6 +26,7 @@ namespace DiscordChatExporter.Cli.Commands
         console.Output.WriteLine(" *  Automating user accounts is technically against TOS, use at your own risk.");
         console.Output.WriteLine();
 
+        // Bot token
         using (console.WithForegroundColor(ConsoleColor.White))
             console.Output.WriteLine("To get bot token:");
 
@@ -34,6 +36,7 @@ namespace DiscordChatExporter.Cli.Commands
         console.Output.WriteLine(" 4. Under Token click Copy");
         console.Output.WriteLine();
 
+        // Guild or channel ID
         using (console.WithForegroundColor(ConsoleColor.White))
             console.Output.WriteLine("To get guild ID or guild channel ID:");
 
@@ -44,6 +47,7 @@ namespace DiscordChatExporter.Cli.Commands
         console.Output.WriteLine(" 5. Right click on the desired guild or channel and click Copy ID");
         console.Output.WriteLine();
 
+        // Direct message channel ID
         using (console.WithForegroundColor(ConsoleColor.White))
             console.Output.WriteLine("To get direct message channel ID:");
 
@@ -55,13 +59,12 @@ namespace DiscordChatExporter.Cli.Commands
         console.Output.WriteLine(" 6. Copy the first long sequence of numbers inside the URL");
         console.Output.WriteLine();
 
+        // Wiki link
         using (console.WithForegroundColor(ConsoleColor.White))
-                console.Output.WriteLine("For more information, check out the wiki:");
-
+            console.Output.WriteLine("If you have questions or issues, please refer to the wiki:");
         using (console.WithForegroundColor(ConsoleColor.DarkCyan))
             console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");
 
         return default;
     }
-    }
 }

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -6,10 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="2.0.6" />
-    <PackageReference Include="Spectre.Console" Version="0.41.0" />
+    <PackageReference Include="CliFx" Version="2.2.1" />
+    <PackageReference Include="Spectre.Console" Version="0.43.0" />
     <PackageReference Include="Gress" Version="1.2.0" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli/Program.cs

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

DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs

@@ -3,35 +3,17 @@ 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
-    {
-        private class NoopExclusivityMode : IExclusivityMode
-        {
-            public T Run<T>(Func<T> func) => func();
-
-            public Task<T> Run<T>(Func<Task<T>> func) => func();
-        }
-
-        public static IAnsiConsole CreateAnsiConsole(this IConsole console)
-        {
-            // Don't require exclusivity in tests.
-            // Workaround for https://github.com/spectreconsole/spectre.console/issues/494
-            var exclusivityMode = console is FakeConsole
-                ? new NoopExclusivityMode()
-                : null;
-
-            return AnsiConsole.Create(
-                new AnsiConsoleSettings
+    public static IAnsiConsole CreateAnsiConsole(this IConsole console) =>
+        AnsiConsole.Create(new AnsiConsoleSettings
         {
             Ansi = AnsiSupport.Detect,
             ColorSystem = ColorSystemSupport.Detect,
-                    Out = new AnsiConsoleOutput(console.Output),
-                    ExclusivityMode = exclusivityMode
-                }
-            );
-        }
+            Out = new AnsiConsoleOutput(console.Output)
+        });
 
     public static Progress CreateProgressTicker(this IConsole console) => console
         .CreateAnsiConsole()
@@ -65,5 +47,4 @@ namespace DiscordChatExporter.Cli.Utils.Extensions
             progressTask.StopTask();
         }
     }
-    }
 }

DiscordChatExporter.Cli/Utils/Pollyfills.cs

@@ -1,9 +0,0 @@
-// ReSharper disable CheckNamespace
-// TODO: remove after moving to .NET 5
-
-namespace System.Runtime.CompilerServices
-{
-    internal static class IsExternalInit
-    {
-    }
-}

DiscordChatExporter.Core/Discord/AuthToken.cs

@@ -1,27 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Net.Http.Headers;
-
-namespace DiscordChatExporter.Core.Discord
-{
-    public class AuthToken
-    {
-        public AuthTokenKind Kind { get; }
-
-        public string Value { get; }
-
-        public AuthToken(AuthTokenKind kind, string value)
-        {
-            Kind = kind;
-            Value = value;
-        }
-
-        public AuthenticationHeaderValue GetAuthenticationHeader() => Kind switch
-        {
-            AuthTokenKind.Bot => new AuthenticationHeaderValue("Bot", Value),
-            _ => new AuthenticationHeaderValue(Value)
-        };
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Value;
-    }
-}

DiscordChatExporter.Core/Discord/AuthTokenKind.cs

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

DiscordChatExporter.Core/Discord/Data/Attachment.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
@@ -7,23 +6,19 @@ 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
+public partial record Attachment(
+    Snowflake Id,
+    string Url,
+    string FileName,
+    int? Width,
+    int? Height,
+    FileSize FileSize) : IHasId
 {
-    // https://discord.com/developers/docs/resources/channel#attachment-object
-    public partial class Attachment : IHasId
-    {
-        public Snowflake Id { get; }
-
-        public string Url { get; }
-
-        public string FileName { get; }
-
     public string FileExtension => Path.GetExtension(FileName);
 
-        public int? Width { get; }
-
-        public int? Height { get; }
-
     public bool IsImage => FileFormat.IsImage(FileExtension);
 
     public bool IsVideo => FileFormat.IsVideo(FileExtension);
@@ -31,41 +26,19 @@ namespace DiscordChatExporter.Core.Discord.Data
     public bool IsAudio => FileFormat.IsAudio(FileExtension);
 
     public bool IsSpoiler => FileName.StartsWith("SPOILER_", StringComparison.Ordinal);
+}
 
-        public FileSize FileSize { get; }
-
-        public Attachment(
-            Snowflake id,
-            string url,
-            string fileName,
-            int? width,
-            int? height,
-            FileSize fileSize)
-        {
-            Id = id;
-            Url = url;
-            FileName = fileName;
-            Width = width;
-            Height = height;
-            FileSize = fileSize;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => FileName;
-    }
-
-    public partial class Attachment
-    {
+public partial record Attachment
+{
     public static Attachment Parse(JsonElement json)
     {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
-            var url = json.GetProperty("url").GetString();
-            var width = json.GetPropertyOrNull("width")?.GetInt32();
-            var height = json.GetPropertyOrNull("height")?.GetInt32();
-            var fileName = json.GetProperty("filename").GetString();
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var url = json.GetProperty("url").GetNonWhiteSpaceString();
+        var width = json.GetPropertyOrNull("width")?.GetInt32OrNull();
+        var height = json.GetPropertyOrNull("height")?.GetInt32OrNull();
+        var fileName = json.GetProperty("filename").GetNonNullString();
         var fileSize = json.GetProperty("size").GetInt64().Pipe(FileSize.FromBytes);
 
         return new Attachment(id, url, fileName, width, height, fileSize);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -1,20 +1,21 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
+using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/channel#channel-object
+public partial record Channel(
+    Snowflake Id,
+    ChannelKind Kind,
+    Snowflake GuildId,
+    ChannelCategory Category,
+    string Name,
+    int? Position,
+    string? Topic) : IHasId
 {
-    // https://discord.com/developers/docs/resources/channel#channel-object
-    public partial class Channel : IHasId
-    {
-        public Snowflake Id { get; }
-
-        public ChannelKind Kind { get; }
-
     public bool IsTextChannel => Kind is
         ChannelKind.GuildTextChat or
         ChannelKind.DirectTextChat or
@@ -23,41 +24,10 @@ namespace DiscordChatExporter.Core.Discord.Data
         ChannelKind.GuildStore;
 
     public bool IsVoiceChannel => !IsTextChannel;
+}
 
-        public Snowflake GuildId { get; }
-
-        public ChannelCategory Category { get; }
-
-        public string Name { get; }
-
-        public int? Position { get; }
-
-        public string? Topic { get; }
-
-        public Channel(
-            Snowflake id,
-            ChannelKind kind,
-            Snowflake guildId,
-            ChannelCategory category,
-            string name,
-            int? position,
-            string? topic)
-        {
-            Id = id;
-            Kind = kind;
-            GuildId = guildId;
-            Category = category;
-            Name = name;
-            Position = position;
-            Topic = topic;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Name;
-    }
-
-    public partial class Channel
-    {
+public partial record Channel
+{
     private static ChannelCategory GetFallbackCategory(ChannelKind channelKind) => new(
         Snowflake.Zero,
         channelKind switch
@@ -72,30 +42,37 @@ namespace DiscordChatExporter.Core.Discord.Data
         null
     );
 
-        public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? position = null)
+    public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? positionHint = null)
     {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
-            var guildId = json.GetPropertyOrNull("guild_id")?.GetString().Pipe(Snowflake.Parse);
-            var topic = json.GetPropertyOrNull("topic")?.GetString();
-            var kind = (ChannelKind) json.GetProperty("type").GetInt32();
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
+        var topic = json.GetPropertyOrNull("topic")?.GetStringOrNull();
+        var kind = (ChannelKind)json.GetProperty("type").GetInt32();
 
         var name =
             // Guild channel
-                json.GetPropertyOrNull("name")?.GetString() ??
+            json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
+
             // DM channel
-                json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name).JoinToString(", ") ??
+            json.GetPropertyOrNull("recipients")?
+                .EnumerateArrayOrNull()?
+                .Select(User.Parse)
+                .Select(u => u.Name)
+                .Pipe(s => string.Join(", ", s)) ??
+
             // Fallback
             id.ToString();
 
+        var position = positionHint ?? json.GetPropertyOrNull("position")?.GetInt32OrNull();
+
         return new Channel(
             id,
             kind,
             guildId ?? Guild.DirectMessages.Id,
             category ?? GetFallbackCategory(kind),
             name,
-                position ?? json.GetPropertyOrNull("position")?.GetInt32(),
+            position,
             topic
         );
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -1,47 +1,23 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
+using System.Text.Json;
 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 partial class ChannelCategory : IHasId
+    public static ChannelCategory Unknown { get; } = new(Snowflake.Zero, "<unknown category>", 0);
+
+    public static ChannelCategory Parse(JsonElement json, int? positionHint = null)
     {
-        public Snowflake Id { get; }
-
-        public string Name { get; }
-
-        public int? Position { get; }
-
-        public ChannelCategory(Snowflake id, string name, int? position)
-        {
-            Id = id;
-            Name = name;
-            Position = position;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Name;
-    }
-
-    public partial class ChannelCategory
-    {
-        public static ChannelCategory Parse(JsonElement json, int? position = null)
-        {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var position = positionHint ?? json.GetPropertyOrNull("position")?.GetInt32OrNull();
 
         var name =
-                json.GetPropertyOrNull("name")?.GetString() ??
+            json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
             id.ToString();
 
-            return new ChannelCategory(
-                id,
-                name,
-                position ?? json.GetPropertyOrNull("position")?.GetInt32()
-            );
-        }
-
-        public static ChannelCategory Empty { get; } = new(Snowflake.Zero, "<unknown category>", 0);
+        return new ChannelCategory(id, name, position);
     }
 }

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,19 +1,15 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace DiscordChatExporter.Core.Discord.Data.Common
-{
-    // Loosely based on https://github.com/omar/ByteSize (MIT license)
-    public readonly partial struct FileSize
-    {
-        public long TotalBytes { get; }
+namespace DiscordChatExporter.Core.Discord.Data.Common;
 
+// 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;
 
-        public FileSize(long bytes) => TotalBytes = bytes;
-
     private double GetLargestWholeNumberValue()
     {
         if (Math.Abs(TotalGigaBytes) >= 1)
@@ -44,10 +40,9 @@ namespace DiscordChatExporter.Core.Discord.Data.Common
 
     [ExcludeFromCodeCoverage]
     public override string ToString() => $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}";
-    }
-
-    public partial struct FileSize
-    {
-        public static FileSize FromBytes(long bytes) => new(bytes);
-    }
+}
+
+public partial record struct FileSize
+{
+    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,16 +1,12 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Core.Discord.Data.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common;
+
+public class IdBasedEqualityComparer : IEqualityComparer<IHasId>
 {
-    public partial 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();
-    }
-
-    public partial class IdBasedEqualityComparer
-    {
-        public static IdBasedEqualityComparer Instance { get; } = new();
-    }
 }

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

@@ -1,80 +1,45 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using System.Linq;
 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
+public partial record Embed(
+    string? Title,
+    string? Url,
+    DateTimeOffset? Timestamp,
+    Color? Color,
+    EmbedAuthor? Author,
+    string? Description,
+    IReadOnlyList<EmbedField> Fields,
+    EmbedImage? Thumbnail,
+    EmbedImage? Image,
+    EmbedFooter? Footer)
 {
-    // https://discord.com/developers/docs/resources/channel#embed-object
-    public partial class Embed
-    {
-        public string? Title { get; }
+    public PlainImageEmbedProjection? TryGetPlainImage() =>
+        PlainImageEmbedProjection.TryResolve(this);
 
-        public string? Url { get; }
+    public SpotifyTrackEmbedProjection? TryGetSpotifyTrack() =>
+        SpotifyTrackEmbedProjection.TryResolve(this);
 
-        public DateTimeOffset? Timestamp { get; }
+    public YouTubeVideoEmbedProjection? TryGetYouTubeVideo() =>
+        YouTubeVideoEmbedProjection.TryResolve(this);
+}
 
-        public Color? Color { get; }
-
-        public EmbedAuthor? Author { get; }
-
-        public string? Description { get; }
-
-        public IReadOnlyList<EmbedField> Fields { get; }
-
-        public EmbedImage? Thumbnail { get; }
-
-        public EmbedImage? Image { get; }
-
-        public EmbedFooter? Footer { get; }
-
-        public Embed(
-            string? title,
-            string? url,
-            DateTimeOffset? timestamp,
-            Color? color,
-            EmbedAuthor? author,
-            string? description,
-            IReadOnlyList<EmbedField> fields,
-            EmbedImage? thumbnail,
-            EmbedImage? image,
-            EmbedFooter? footer)
-        {
-            Title = title;
-            Url = url;
-            Timestamp = timestamp;
-            Color = color;
-            Author = author;
-            Description = description;
-            Fields = fields;
-            Thumbnail = thumbnail;
-            Image = image;
-            Footer = footer;
-        }
-
-        public PlainImageEmbedProjection? TryGetPlainImage() => PlainImageEmbedProjection.TryResolve(this);
-
-        public SpotifyTrackEmbedProjection? TryGetSpotifyTrack() => SpotifyTrackEmbedProjection.TryResolve(this);
-
-        public YouTubeVideoEmbedProjection? TryGetYouTubeVideo() => YouTubeVideoEmbedProjection.TryResolve(this);
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Title ?? "<untitled embed>";
-    }
-
-    public partial class Embed
-    {
+public partial record Embed
+{
     public static Embed Parse(JsonElement json)
     {
-            var title = json.GetPropertyOrNull("title")?.GetString();
-            var url = json.GetPropertyOrNull("url")?.GetString();
+        var title = json.GetPropertyOrNull("title")?.GetStringOrNull();
+        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
         var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffset();
-            var color = json.GetPropertyOrNull("color")?.GetInt32().Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
-            var description = json.GetPropertyOrNull("description")?.GetString();
+        var color = json.GetPropertyOrNull("color")?.GetInt32OrNull()?.Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
+        var description = json.GetPropertyOrNull("description")?.GetStringOrNull();
 
         var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
         var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);
@@ -82,7 +47,7 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
         var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse);
 
         var fields =
-                json.GetPropertyOrNull("fields")?.EnumerateArray().Select(EmbedField.Parse).ToArray() ??
+            json.GetPropertyOrNull("fields")?.EnumerateArrayOrNull()?.Select(EmbedField.Parse).ToArray() ??
             Array.Empty<EmbedField>();
 
         return new Embed(
@@ -98,5 +63,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
             footer
         );
     }
-    }
 }

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

@@ -1,42 +1,22 @@
-using System.Diagnostics.CodeAnalysis;
 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
+public record EmbedAuthor(
+    string? Name,
+    string? Url,
+    string? IconUrl,
+    string? IconProxyUrl)
 {
-    // https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
-    public partial class EmbedAuthor
-    {
-        public string? Name { get; }
-
-        public string? Url { get; }
-
-        public string? IconUrl { get; }
-
-        public string? IconProxyUrl { get; }
-
-        public EmbedAuthor(string? name, string? url, string? iconUrl, string? iconProxyUrl)
-        {
-            Name = name;
-            Url = url;
-            IconUrl = iconUrl;
-            IconProxyUrl = iconProxyUrl;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Name ?? "<unnamed author>";
-    }
-
-    public partial class EmbedAuthor
-    {
     public static EmbedAuthor Parse(JsonElement json)
     {
-            var name = json.GetPropertyOrNull("name")?.GetString();
-            var url = json.GetPropertyOrNull("url")?.GetString();
-            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetString();
-            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetString();
+        var name = json.GetPropertyOrNull("name")?.GetStringOrNull();
+        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
+        var iconUrl = json.GetPropertyOrNull("icon_url")?.GetNonWhiteSpaceStringOrNull();
+        var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetNonWhiteSpaceStringOrNull();
 
         return new EmbedAuthor(name, url, iconUrl, iconProxyUrl);
     }
-    }
 }

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

@@ -1,38 +1,20 @@
-using System.Diagnostics.CodeAnalysis;
 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-field-structure
+public record EmbedField(
+    string Name,
+    string Value,
+    bool IsInline)
 {
-    // https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
-    public partial class EmbedField
-    {
-        public string Name { get; }
-
-        public string Value { get; }
-
-        public bool IsInline { get; }
-
-        public EmbedField(string name, string value, bool isInline)
-        {
-            Name = name;
-            Value = value;
-            IsInline = isInline;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => $"{Name} | {Value}";
-    }
-
-    public partial class EmbedField
-    {
     public static EmbedField Parse(JsonElement json)
     {
-            var name = json.GetProperty("name").GetString();
-            var value = json.GetProperty("value").GetString();
-            var isInline = json.GetPropertyOrNull("inline")?.GetBoolean() ?? false;
+        var name = json.GetProperty("name").GetNonNullString();
+        var value = json.GetProperty("value").GetNonNullString();
+        var isInline = json.GetPropertyOrNull("inline")?.GetBooleanOrNull() ?? false;
 
         return new EmbedField(name, value, isInline);
     }
-    }
 }

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

@@ -1,38 +1,20 @@
-using System.Diagnostics.CodeAnalysis;
 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-footer-structure
+public record EmbedFooter(
+    string Text,
+    string? IconUrl,
+    string? IconProxyUrl)
 {
-    // https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
-    public partial class EmbedFooter
-    {
-        public string Text { get; }
-
-        public string? IconUrl { get; }
-
-        public string? IconProxyUrl { get; }
-
-        public EmbedFooter(string text, string? iconUrl, string? iconProxyUrl)
-        {
-            Text = text;
-            IconUrl = iconUrl;
-            IconProxyUrl = iconProxyUrl;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Text;
-    }
-
-    public partial class EmbedFooter
-    {
     public static EmbedFooter Parse(JsonElement json)
     {
-            var text = json.GetProperty("text").GetString();
-            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetString();
-            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetString();
+        var text = json.GetProperty("text").GetNonNullString();
+        var iconUrl = json.GetPropertyOrNull("icon_url")?.GetNonWhiteSpaceStringOrNull();
+        var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetNonWhiteSpaceStringOrNull();
 
         return new EmbedFooter(text, iconUrl, iconProxyUrl);
     }
-    }
 }

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

@@ -1,38 +1,22 @@
 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
+public record EmbedImage(
+    string? Url,
+    string? ProxyUrl,
+    int? Width,
+    int? Height)
 {
-    // https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
-    public partial class EmbedImage
-    {
-        public string? Url { get; }
-
-        public string? ProxyUrl { get; }
-
-        public int? Width { get; }
-
-        public int? Height { get; }
-
-        public EmbedImage(string? url, string? proxyUrl, int? width, int? height)
-        {
-            Url = url;
-            ProxyUrl = proxyUrl;
-            Height = height;
-            Width = width;
-        }
-    }
-
-    public partial class EmbedImage
-    {
     public static EmbedImage Parse(JsonElement json)
     {
-            var url = json.GetPropertyOrNull("url")?.GetString();
-            var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetString();
-            var width = json.GetPropertyOrNull("width")?.GetInt32();
-            var height = json.GetPropertyOrNull("height")?.GetInt32();
+        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
+        var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetNonWhiteSpaceStringOrNull();
+        var width = json.GetPropertyOrNull("width")?.GetInt32OrNull();
+        var height = json.GetPropertyOrNull("height")?.GetInt32OrNull();
 
         return new EmbedImage(url, proxyUrl, width, height);
     }
-    }
 }

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

@@ -1,23 +1,12 @@
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
+using System.IO;
 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 partial class PlainImageEmbedProjection
-    {
-        public string Url { get; }
-
-        public PlainImageEmbedProjection(string url) => Url = url;
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Url;
-    }
-
-    public partial class PlainImageEmbedProjection
-    {
     public static PlainImageEmbedProjection? TryResolve(Embed embed)
     {
         if (string.IsNullOrWhiteSpace(embed.Url))
@@ -41,5 +30,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new PlainImageEmbedProjection(embed.Url);
     }
-    }
 }

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

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

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

@@ -1,22 +1,14 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+
+public partial record YouTubeVideoEmbedProjection(string VideoId)
 {
-    public partial class YouTubeVideoEmbedProjection
-    {
-        public string VideoId { get; }
-
     public string Url => $"https://www.youtube.com/embed/{VideoId}";
+}
 
-        public YouTubeVideoEmbedProjection(string videoId) => VideoId = videoId;
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Url;
-    }
-
-    public partial class YouTubeVideoEmbedProjection
-    {
+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)
@@ -53,5 +45,4 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 
         return new YouTubeVideoEmbedProjection(videoId);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -1,76 +1,72 @@
-using System.Diagnostics.CodeAnalysis;
+using System;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Core.Discord.Data
-{
-    // https://discord.com/developers/docs/resources/emoji#emoji-object
-    public partial class Emoji
-    {
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/emoji#emoji-object
+public partial record Emoji(
     // Only present on custom emoji
-        public string? Id { get; }
-
+    string? Id,
     // Name of custom emoji (e.g. LUL) or actual representation of standard emoji (e.g. 🙂)
-        public string Name { get; }
-
+    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 bool IsAnimated { get; }
-
-        public string ImageUrl { get; }
-
-        public Emoji(string? id, string name, bool isAnimated, string imageUrl)
-        {
-            Id = id;
-            Name = name;
-            IsAnimated = isAnimated;
-            ImageUrl = imageUrl;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Name;
-    }
-
-    public partial class Emoji
-    {
-        private static string GetTwemojiName(string name) => name
+public partial record Emoji
+{
+    private static string GetTwemojiName(string name) => string.Join("-",
+        name
             .GetRunes()
             // Variant selector rune is skipped in Twemoji names
             .Where(r => r.Value != 0xfe0f)
             .Select(r => r.Value.ToString("x"))
-            .JoinToString("-");
+    );
 
-        public static string GetImageUrl(string? id, string name, bool isAnimated)
+    private static string GetImageUrl(string id, bool isAnimated) => isAnimated
+        ? $"https://cdn.discordapp.com/emojis/{id}.gif"
+        : $"https://cdn.discordapp.com/emojis/{id}.png";
+
+    private static string GetImageUrl(string name) =>
+        $"https://twemoji.maxcdn.com/2/svg/{GetTwemojiName(name)}.svg";
+
+    public static string GetImageUrl(string? id, string? name, bool isAnimated)
     {
         // Custom emoji
         if (!string.IsNullOrWhiteSpace(id))
-            {
-                return isAnimated
-                    ? $"https://cdn.discordapp.com/emojis/{id}.gif"
-                    : $"https://cdn.discordapp.com/emojis/{id}.png";
-            }
+            return GetImageUrl(id, isAnimated);
 
         // Standard emoji
-            var twemojiName = GetTwemojiName(name);
-            return $"https://twemoji.maxcdn.com/2/svg/{twemojiName}.svg";
+        if (!string.IsNullOrWhiteSpace(name))
+            return GetImageUrl(name);
+
+        // Either ID or name should be set
+        throw new ApplicationException("Emoji has neither ID nor name set.");
     }
 
     public static Emoji Parse(JsonElement json)
     {
-            var id = json.GetPropertyOrNull("id")?.GetString();
-            var name = json.GetProperty("name").GetString();
-            var isAnimated = json.GetPropertyOrNull("animated")?.GetBoolean() ?? false;
+        var id = json.GetPropertyOrNull("id")?.GetNonWhiteSpaceStringOrNull();
+        var name = json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull();
+        var isAnimated = json.GetPropertyOrNull("animated")?.GetBooleanOrNull() ?? false;
 
         var imageUrl = GetImageUrl(id, name, isAnimated);
 
-            return new Emoji(id, name, isAnimated, imageUrl);
-        }
+        return new Emoji(
+            id,
+            // Name may be missing if it's an emoji inside a reaction
+            name ?? "<unknown emoji>",
+            isAnimated,
+            imageUrl
+        );
     }
 }

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -1,32 +1,13 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
+using System.Text.Json;
 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 partial class Guild : IHasId
-    {
-        public Snowflake Id { get; }
-
-        public string Name { get; }
-
-        public string IconUrl { get; }
-
-        public Guild(Snowflake id, string name, string iconUrl)
-        {
-            Id = id;
-            Name = name;
-            IconUrl = iconUrl;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Name;
-    }
-
-    public partial class Guild
-    {
     public static Guild DirectMessages { get; } = new(
         Snowflake.Zero,
         "Direct Messages",
@@ -41,9 +22,9 @@ namespace DiscordChatExporter.Core.Discord.Data
 
     public static Guild Parse(JsonElement json)
     {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
-            var name = json.GetProperty("name").GetString();
-            var iconHash = json.GetProperty("icon").GetString();
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var name = json.GetProperty("name").GetNonNullString();
+        var iconHash = json.GetPropertyOrNull("icon")?.GetNonWhiteSpaceStringOrNull();
 
         var iconUrl = !string.IsNullOrWhiteSpace(iconHash)
             ? GetIconUrl(id, iconHash)
@@ -51,5 +32,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new Guild(id, name, iconUrl);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Member.cs

@@ -1,38 +1,24 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.Json;
 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
+public partial record Member(
+    User User,
+    string Nick,
+    IReadOnlyList<Snowflake> RoleIds) : IHasId
 {
-    // https://discord.com/developers/docs/resources/guild#guild-member-object
-    public partial class Member : IHasId
-    {
     public Snowflake Id => User.Id;
+}
 
-        public User User { get; }
-
-        public string Nick { get; }
-
-        public IReadOnlyList<Snowflake> RoleIds { get; }
-
-        public Member(User user, string nick, IReadOnlyList<Snowflake> roleIds)
-        {
-            User = user;
-            Nick = nick;
-            RoleIds = roleIds;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Nick;
-    }
-
-    public partial class Member
-    {
+public partial record Member
+{
     public static Member CreateForUser(User user) => new(
         user,
         user.Name,
@@ -42,11 +28,14 @@ namespace DiscordChatExporter.Core.Discord.Data
     public static Member Parse(JsonElement json)
     {
         var user = json.GetProperty("user").Pipe(User.Parse);
-            var nick = json.GetPropertyOrNull("nick")?.GetString();
+        var nick = json.GetPropertyOrNull("nick")?.GetNonWhiteSpaceStringOrNull();
 
-            var roleIds =
-                json.GetPropertyOrNull("roles")?.EnumerateArray().Select(j => j.GetString()).Select(Snowflake.Parse).ToArray() ??
-                Array.Empty<Snowflake>();
+        var roleIds = json
+            .GetPropertyOrNull("roles")?
+            .EnumerateArray()
+            .Select(j => j.GetNonWhiteSpaceString())
+            .Select(Snowflake.Parse)
+            .ToArray() ?? Array.Empty<Snowflake>();
 
         return new Member(
             user,
@@ -54,5 +43,4 @@ namespace DiscordChatExporter.Core.Discord.Data
             roleIds
         );
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
@@ -8,100 +7,35 @@ 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
+public record Message(
+    Snowflake Id,
+    MessageKind Kind,
+    User Author,
+    DateTimeOffset Timestamp,
+    DateTimeOffset? EditedTimestamp,
+    DateTimeOffset? CallEndedTimestamp,
+    bool IsPinned,
+    string Content,
+    IReadOnlyList<Attachment> Attachments,
+    IReadOnlyList<Embed> Embeds,
+    IReadOnlyList<Reaction> Reactions,
+    IReadOnlyList<User> MentionedUsers,
+    MessageReference? Reference,
+    Message? ReferencedMessage) : IHasId
 {
-    // https://discord.com/developers/docs/resources/channel#message-object-message-types
-    public enum MessageKind
-    {
-        Default = 0,
-        RecipientAdd = 1,
-        RecipientRemove = 2,
-        Call = 3,
-        ChannelNameChange = 4,
-        ChannelIconChange = 5,
-        ChannelPinnedMessage = 6,
-        GuildMemberJoin = 7,
-        Reply = 19
-    }
-
-    // https://discord.com/developers/docs/resources/channel#message-object
-    public partial class Message : IHasId
-    {
-        public Snowflake Id { get; }
-
-        public MessageKind Kind { get; }
-
-        public User Author { get; }
-
-        public DateTimeOffset Timestamp { get; }
-
-        public DateTimeOffset? EditedTimestamp { get; }
-
-        public DateTimeOffset? CallEndedTimestamp { get; }
-
-        public bool IsPinned { get; }
-
-        public string Content { get; }
-
-        public IReadOnlyList<Attachment> Attachments { get; }
-
-        public IReadOnlyList<Embed> Embeds { get; }
-
-        public IReadOnlyList<Reaction> Reactions { get; }
-
-        public IReadOnlyList<User> MentionedUsers { get; }
-
-        public MessageReference? Reference { get; }
-
-        public Message? ReferencedMessage { get; }
-
-        public Message(
-            Snowflake id,
-            MessageKind kind,
-            User author,
-            DateTimeOffset timestamp,
-            DateTimeOffset? editedTimestamp,
-            DateTimeOffset? callEndedTimestamp,
-            bool isPinned,
-            string content,
-            IReadOnlyList<Attachment> attachments,
-            IReadOnlyList<Embed> embeds,
-            IReadOnlyList<Reaction> reactions,
-            IReadOnlyList<User> mentionedUsers,
-            MessageReference? messageReference,
-            Message? referencedMessage)
-        {
-            Id = id;
-            Kind = kind;
-            Author = author;
-            Timestamp = timestamp;
-            EditedTimestamp = editedTimestamp;
-            CallEndedTimestamp = callEndedTimestamp;
-            IsPinned = isPinned;
-            Content = content;
-            Attachments = attachments;
-            Embeds = embeds;
-            Reactions = reactions;
-            MentionedUsers = mentionedUsers;
-            Reference = messageReference;
-            ReferencedMessage = referencedMessage;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Content;
-    }
-
-    public partial class Message
-    {
     public static Message Parse(JsonElement json)
     {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
         var author = json.GetProperty("author").Pipe(User.Parse);
         var timestamp = json.GetProperty("timestamp").GetDateTimeOffset();
         var editedTimestamp = json.GetPropertyOrNull("edited_timestamp")?.GetDateTimeOffset();
-            var callEndedTimestamp = json.GetPropertyOrNull("call")?.GetPropertyOrNull("ended_timestamp")?.GetDateTimeOffset();
-            var kind = (MessageKind) json.GetProperty("type").GetInt32();
-            var isPinned = json.GetPropertyOrNull("pinned")?.GetBoolean() ?? false;
+        var callEndedTimestamp = json.GetPropertyOrNull("call")?.GetPropertyOrNull("ended_timestamp")
+            ?.GetDateTimeOffset();
+        var kind = (MessageKind)json.GetProperty("type").GetInt32();
+        var isPinned = json.GetPropertyOrNull("pinned")?.GetBooleanOrNull() ?? false;
         var messageReference = json.GetPropertyOrNull("message_reference")?.Pipe(MessageReference.Parse);
         var referencedMessage = json.GetPropertyOrNull("referenced_message")?.Pipe(Parse);
 
@@ -110,28 +44,28 @@ namespace DiscordChatExporter.Core.Discord.Data
             MessageKind.RecipientAdd => "Added a recipient.",
             MessageKind.RecipientRemove => "Removed a recipient.",
             MessageKind.Call =>
-                    $"Started a call that lasted {callEndedTimestamp?.Pipe(t => t - timestamp).Pipe(t => (int) t.TotalMinutes) ?? 0} minutes.",
+                $"Started a call that lasted {callEndedTimestamp?.Pipe(t => t - timestamp).Pipe(t => (int)t.TotalMinutes) ?? 0} minutes.",
             MessageKind.ChannelNameChange => "Changed the channel name.",
             MessageKind.ChannelIconChange => "Changed the channel icon.",
             MessageKind.ChannelPinnedMessage => "Pinned a message.",
             MessageKind.GuildMemberJoin => "Joined the server.",
-                _ => json.GetPropertyOrNull("content")?.GetString() ?? ""
+            _ => json.GetPropertyOrNull("content")?.GetStringOrNull() ?? ""
         };
 
         var attachments =
-                json.GetPropertyOrNull("attachments")?.EnumerateArray().Select(Attachment.Parse).ToArray() ??
+            json.GetPropertyOrNull("attachments")?.EnumerateArrayOrNull()?.Select(Attachment.Parse).ToArray() ??
             Array.Empty<Attachment>();
 
         var embeds =
-                json.GetPropertyOrNull("embeds")?.EnumerateArray().Select(Embed.Parse).ToArray() ??
+            json.GetPropertyOrNull("embeds")?.EnumerateArrayOrNull()?.Select(Embed.Parse).ToArray() ??
             Array.Empty<Embed>();
 
         var reactions =
-                json.GetPropertyOrNull("reactions")?.EnumerateArray().Select(Reaction.Parse).ToArray() ??
+            json.GetPropertyOrNull("reactions")?.EnumerateArrayOrNull()?.Select(Reaction.Parse).ToArray() ??
             Array.Empty<Reaction>();
 
         var mentionedUsers =
-                json.GetPropertyOrNull("mentions")?.EnumerateArray().Select(User.Parse).ToArray() ??
+            json.GetPropertyOrNull("mentions")?.EnumerateArrayOrNull()?.Select(User.Parse).ToArray() ??
             Array.Empty<User>();
 
         return new Message(
@@ -151,5 +85,4 @@ namespace DiscordChatExporter.Core.Discord.Data
             referencedMessage
         );
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/MessageKind.cs

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

DiscordChatExporter.Core/Discord/Data/MessageReference.cs

@@ -1,39 +1,18 @@
-using System.Diagnostics.CodeAnalysis;
 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 partial class MessageReference
-    {
-        public Snowflake? MessageId { get; }
-
-        public Snowflake? ChannelId { get; }
-
-        public Snowflake? GuildId { get; }
-
-        public MessageReference(Snowflake? messageId, Snowflake? channelId, Snowflake? guildId)
-        {
-            MessageId = messageId;
-            ChannelId = channelId;
-            GuildId = guildId;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => MessageId?.ToString() ?? "<unknown reference>";
-    }
-
-    public partial class MessageReference
-    {
     public static MessageReference Parse(JsonElement json)
     {
-            var messageId = json.GetPropertyOrNull("message_id")?.GetString().Pipe(Snowflake.Parse);
-            var channelId = json.GetPropertyOrNull("channel_id")?.GetString().Pipe(Snowflake.Parse);
-            var guildId = json.GetPropertyOrNull("guild_id")?.GetString().Pipe(Snowflake.Parse);
+        var messageId = json.GetPropertyOrNull("message_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
+        var channelId = json.GetPropertyOrNull("channel_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
+        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
 
         return new MessageReference(messageId, channelId, guildId);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Reaction.cs

@@ -1,28 +1,11 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
+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 partial class Reaction
-    {
-        public Emoji Emoji { get; }
-
-        public int Count { get; }
-
-        public Reaction(Emoji emoji, int count)
-        {
-            Emoji = emoji;
-            Count = count;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => $"{Emoji} ({Count})";
-    }
-
-    public partial class Reaction
-    {
     public static Reaction Parse(JsonElement json)
     {
         var emoji = json.GetProperty("emoji").Pipe(Emoji.Parse);
@@ -30,5 +13,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new Reaction(emoji, count);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/Role.cs

@@ -1,45 +1,18 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
+using System.Drawing;
 using System.Text.Json;
 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 partial class Role : IHasId
-    {
-        public Snowflake Id { get; }
-
-        public string Name { get; }
-
-        public int Position { get; }
-
-        public Color? Color { get; }
-
-        public Role(
-            Snowflake id,
-            string name,
-            int position,
-            Color? color)
-        {
-            Id = id;
-            Name = name;
-            Position = position;
-            Color = color;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => Name;
-    }
-
-    public partial class Role
-    {
     public static Role Parse(JsonElement json)
     {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
-            var name = json.GetProperty("name").GetString();
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var name = json.GetProperty("name").GetNonNullString();
         var position = json.GetProperty("position").GetInt32();
 
         var color = json
@@ -51,5 +24,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new Role(id, name, position, color);
     }
-    }
 }

DiscordChatExporter.Core/Discord/Data/User.cs

@@ -1,49 +1,26 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 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
+public partial record User(
+    Snowflake Id,
+    bool IsBot,
+    int Discriminator,
+    string Name,
+    string AvatarUrl) : IHasId
 {
-    // https://discord.com/developers/docs/resources/user#user-object
-    public partial class User : IHasId
-    {
-        public Snowflake Id { get; }
-
-        public bool IsBot { get; }
-
-        public int Discriminator { get; }
-
     public string DiscriminatorFormatted => $"{Discriminator:0000}";
 
-        public string Name { get; }
-
     public string FullName => $"{Name}#{DiscriminatorFormatted}";
+}
 
-        public string AvatarUrl { get; }
-
-        public User(
-            Snowflake id,
-            bool isBot,
-            int discriminator,
-            string name,
-            string avatarUrl)
-        {
-            Id = id;
-            IsBot = isBot;
-            Discriminator = discriminator;
-            Name = name;
-            AvatarUrl = avatarUrl;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => FullName;
-    }
-
-    public partial class User
-    {
+public partial record User
+{
     private static string GetDefaultAvatarUrl(int discriminator) =>
         $"https://cdn.discordapp.com/embed/avatars/{discriminator % 5}.png";
 
@@ -53,16 +30,16 @@ namespace DiscordChatExporter.Core.Discord.Data
             ? "gif"
             : "png";
 
-            return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.{extension}?size=40";
+        return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.{extension}?size=128";
     }
 
     public static User Parse(JsonElement json)
     {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
-            var isBot = json.GetPropertyOrNull("bot")?.GetBoolean() ?? false;
-            var discriminator = json.GetProperty("discriminator").GetString().Pipe(int.Parse);
-            var name = json.GetProperty("username").GetString();
-            var avatarHash = json.GetProperty("avatar").GetString();
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var isBot = json.GetPropertyOrNull("bot")?.GetBooleanOrNull() ?? false;
+        var discriminator = json.GetProperty("discriminator").GetNonWhiteSpaceString().Pipe(int.Parse);
+        var name = json.GetProperty("username").GetNonNullString();
+        var avatarHash = json.GetPropertyOrNull("avatar")?.GetNonWhiteSpaceStringOrNull();
 
         var avatarUrl = !string.IsNullOrWhiteSpace(avatarHash)
             ? GetAvatarUrl(id, avatarHash)
@@ -70,5 +47,4 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         return new User(id, isBot, discriminator, name, avatarUrl);
     }
-    }
 }

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -3,7 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exceptions;
@@ -12,38 +15,76 @@ using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Http;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord
-{
-    public class DiscordClient
-    {
-        private readonly HttpClient _httpClient;
-        private readonly AuthToken _token;
+namespace DiscordChatExporter.Core.Discord;
 
+public class DiscordClient
+{
+    private readonly string _token;
     private readonly Uri _baseUri = new("https://discord.com/api/v8/", UriKind.Absolute);
 
-        public DiscordClient(HttpClient httpClient, AuthToken token)
-        {
-            _httpClient = httpClient;
-            _token = token;
-        }
+    private TokenKind _tokenKind = TokenKind.Unknown;
 
-        public DiscordClient(AuthToken token)
-            : this(Http.Client, token)
-        {
-        }
+    public DiscordClient(string token) => _token = token;
 
-        private async ValueTask<HttpResponseMessage> GetResponseAsync(string url) =>
-            await Http.ResponsePolicy.ExecuteAsync(async () =>
+    private async ValueTask<HttpResponseMessage> GetResponseAsync(
+        string url,
+        bool isBot,
+        CancellationToken cancellationToken = default)
     {
         using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
-                request.Headers.Authorization = _token.GetAuthenticationHeader();
 
-                return await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-            });
+        request.Headers.Authorization = isBot
+            ? new AuthenticationHeaderValue("Bot", _token)
+            : new AuthenticationHeaderValue(_token);
 
-        private async ValueTask<JsonElement> GetJsonResponseAsync(string url)
+        return await Http.Client.SendAsync(
+            request,
+            HttpCompletionOption.ResponseHeadersRead,
+            cancellationToken
+        );
+    }
+
+    private async ValueTask<HttpResponseMessage> GetResponseAsync(
+        string url,
+        CancellationToken cancellationToken = default)
     {
-            using var response = await GetResponseAsync(url);
+        return await Http.ResponsePolicy.ExecuteAsync(async innerCancellationToken =>
+        {
+            if (_tokenKind == TokenKind.User)
+                return await GetResponseAsync(url, false, innerCancellationToken);
+
+            if (_tokenKind == TokenKind.Bot)
+                return await GetResponseAsync(url, true, innerCancellationToken);
+
+            // Try to authenticate as user
+            var userResponse = await GetResponseAsync(url, false, innerCancellationToken);
+            if (userResponse.StatusCode != HttpStatusCode.Unauthorized)
+            {
+                _tokenKind = TokenKind.User;
+                return userResponse;
+            }
+
+            userResponse.Dispose();
+
+            // Otherwise, try to authenticate as bot
+            var botResponse = await GetResponseAsync(url, true, innerCancellationToken);
+            if (botResponse.StatusCode != HttpStatusCode.Unauthorized)
+            {
+                _tokenKind = TokenKind.Bot;
+                return botResponse;
+            }
+
+            // The token is probably invalid altogether.
+            // Return the last response anyway, upstream should handle the error.
+            return botResponse;
+        }, cancellationToken);
+    }
+
+    private async ValueTask<JsonElement> GetJsonResponseAsync(
+        string url,
+        CancellationToken cancellationToken = default)
+    {
+        using var response = await GetResponseAsync(url, cancellationToken);
 
         if (!response.IsSuccessStatusCode)
         {
@@ -56,19 +97,22 @@ namespace DiscordChatExporter.Core.Discord
             };
         }
 
-            return await response.Content.ReadAsJsonAsync();
+        return await response.Content.ReadAsJsonAsync(cancellationToken);
     }
 
-        private async ValueTask<JsonElement?> TryGetJsonResponseAsync(string url)
+    private async ValueTask<JsonElement?> TryGetJsonResponseAsync(
+        string url,
+        CancellationToken cancellationToken = default)
     {
-            using var response = await GetResponseAsync(url);
+        using var response = await GetResponseAsync(url, cancellationToken);
 
         return response.IsSuccessStatusCode
-                ? await response.Content.ReadAsJsonAsync()
+            ? await response.Content.ReadAsJsonAsync(cancellationToken)
             : null;
     }
 
-        public async IAsyncEnumerable<Guild> GetUserGuildsAsync()
+    public async IAsyncEnumerable<Guild> GetUserGuildsAsync(
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         yield return Guild.DirectMessages;
 
@@ -82,7 +126,7 @@ namespace DiscordChatExporter.Core.Discord
                 .SetQueryParameter("after", currentAfter.ToString())
                 .Build();
 
-                var response = await GetJsonResponseAsync(url);
+            var response = await GetJsonResponseAsync(url, cancellationToken);
 
             var isEmpty = true;
             foreach (var guild in response.EnumerateArray().Select(Guild.Parse))
@@ -98,31 +142,35 @@ namespace DiscordChatExporter.Core.Discord
         }
     }
 
-        public async ValueTask<Guild> GetGuildAsync(Snowflake guildId)
+    public async ValueTask<Guild> GetGuildAsync(
+        Snowflake guildId,
+        CancellationToken cancellationToken = default)
     {
         if (guildId == Guild.DirectMessages.Id)
             return Guild.DirectMessages;
 
-            var response = await GetJsonResponseAsync($"guilds/{guildId}");
+        var response = await GetJsonResponseAsync($"guilds/{guildId}", cancellationToken);
         return Guild.Parse(response);
     }
 
-        public async IAsyncEnumerable<Channel> GetGuildChannelsAsync(Snowflake guildId)
+    public async IAsyncEnumerable<Channel> GetGuildChannelsAsync(
+        Snowflake guildId,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         if (guildId == Guild.DirectMessages.Id)
         {
-                var response = await GetJsonResponseAsync("users/@me/channels");
+            var response = await GetJsonResponseAsync("users/@me/channels", cancellationToken);
             foreach (var channelJson in response.EnumerateArray())
                 yield return Channel.Parse(channelJson);
         }
         else
         {
-                var response = await GetJsonResponseAsync($"guilds/{guildId}/channels");
+            var response = await GetJsonResponseAsync($"guilds/{guildId}/channels", cancellationToken);
 
             var responseOrdered = response
                 .EnumerateArray()
                 .OrderBy(j => j.GetProperty("position").GetInt32())
-                    .ThenBy(j => Snowflake.Parse(j.GetProperty("id").GetString()))
+                .ThenBy(j => j.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse))
                 .ToArray();
 
             var categories = responseOrdered
@@ -134,7 +182,7 @@ namespace DiscordChatExporter.Core.Discord
 
             foreach (var channelJson in responseOrdered)
             {
-                    var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetString();
+                var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetNonWhiteSpaceStringOrNull();
 
                 var category = !string.IsNullOrWhiteSpace(parentId)
                     ? categories.GetValueOrDefault(parentId)
@@ -149,55 +197,67 @@ namespace DiscordChatExporter.Core.Discord
         }
     }
 
-        public async IAsyncEnumerable<Role> GetGuildRolesAsync(Snowflake guildId)
+    public async IAsyncEnumerable<Role> GetGuildRolesAsync(
+        Snowflake guildId,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         if (guildId == Guild.DirectMessages.Id)
             yield break;
 
-            var response = await GetJsonResponseAsync($"guilds/{guildId}/roles");
+        var response = await GetJsonResponseAsync($"guilds/{guildId}/roles", cancellationToken);
 
         foreach (var roleJson in response.EnumerateArray())
             yield return Role.Parse(roleJson);
     }
 
-        public async ValueTask<Member?> TryGetGuildMemberAsync(Snowflake guildId, User user)
+    public async ValueTask<Member> GetGuildMemberAsync(
+        Snowflake guildId,
+        User user,
+        CancellationToken cancellationToken = default)
     {
         if (guildId == Guild.DirectMessages.Id)
             return Member.CreateForUser(user);
 
-            var response = await TryGetJsonResponseAsync($"guilds/{guildId}/members/{user.Id}");
-            return response?.Pipe(Member.Parse);
+        var response = await TryGetJsonResponseAsync($"guilds/{guildId}/members/{user.Id}", cancellationToken);
+        return response?.Pipe(Member.Parse) ?? Member.CreateForUser(user);
     }
 
-        public async ValueTask<ChannelCategory> GetChannelCategoryAsync(Snowflake channelId)
+    public async ValueTask<ChannelCategory> GetChannelCategoryAsync(
+        Snowflake channelId,
+        CancellationToken cancellationToken = default)
     {
         try
         {
-                var response = await GetJsonResponseAsync($"channels/{channelId}");
+            var response = await GetJsonResponseAsync($"channels/{channelId}", cancellationToken);
             return ChannelCategory.Parse(response);
         }
         // In some cases, the Discord API returns an empty body when requesting channel category.
         // Instead, we use an empty channel category as a fallback.
         catch (DiscordChatExporterException)
         {
-                return ChannelCategory.Empty;
+            return ChannelCategory.Unknown;
         }
     }
 
-        public async ValueTask<Channel> GetChannelAsync(Snowflake channelId)
+    public async ValueTask<Channel> GetChannelAsync(
+        Snowflake channelId,
+        CancellationToken cancellationToken = default)
     {
-            var response = await GetJsonResponseAsync($"channels/{channelId}");
+        var response = await GetJsonResponseAsync($"channels/{channelId}", cancellationToken);
 
-            var parentId = response.GetPropertyOrNull("parent_id")?.GetString().Pipe(Snowflake.Parse);
+        var parentId = response.GetPropertyOrNull("parent_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
 
         var category = parentId is not null
-                ? await GetChannelCategoryAsync(parentId.Value)
+            ? await GetChannelCategoryAsync(parentId.Value, cancellationToken)
             : null;
 
         return Channel.Parse(response, category);
     }
 
-        private async ValueTask<Message?> TryGetLastMessageAsync(Snowflake channelId, Snowflake? before = null)
+    private async ValueTask<Message?> TryGetLastMessageAsync(
+        Snowflake channelId,
+        Snowflake? before = null,
+        CancellationToken cancellationToken = default)
     {
         var url = new UrlBuilder()
             .SetPath($"channels/{channelId}/messages")
@@ -205,7 +265,7 @@ namespace DiscordChatExporter.Core.Discord
             .SetQueryParameter("before", before?.ToString())
             .Build();
 
-            var response = await GetJsonResponseAsync(url);
+        var response = await GetJsonResponseAsync(url, cancellationToken);
         return response.EnumerateArray().Select(Message.Parse).LastOrDefault();
     }
 
@@ -213,13 +273,14 @@ namespace DiscordChatExporter.Core.Discord
         Snowflake channelId,
         Snowflake? after = null,
         Snowflake? before = null,
-            IProgress<double>? progress = null)
+        IProgress<double>? progress = null,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         // Get the last message in the specified range.
         // This snapshots the boundaries, which means that messages posted after the export started
         // will not appear in the output.
         // Additionally, it provides the date of the last message, which is used to calculate progress.
-            var lastMessage = await TryGetLastMessageAsync(channelId, before);
+        var lastMessage = await TryGetLastMessageAsync(channelId, before, cancellationToken);
         if (lastMessage is null || lastMessage.Timestamp < after?.ToDate())
             yield break;
 
@@ -235,7 +296,7 @@ namespace DiscordChatExporter.Core.Discord
                 .SetQueryParameter("after", currentAfter.ToString())
                 .Build();
 
-                var response = await GetJsonResponseAsync(url);
+            var response = await GetJsonResponseAsync(url, cancellationToken);
 
             var messages = response
                 .EnumerateArray()
@@ -278,5 +339,4 @@ namespace DiscordChatExporter.Core.Discord
             }
         }
     }
-    }
 }

DiscordChatExporter.Core/Discord/Snowflake.cs

@@ -3,31 +3,25 @@ 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 struct Snowflake
-    {
-        public ulong Value { get; }
-
-        public Snowflake(ulong value) => Value = value;
-
     public DateTimeOffset ToDate() => DateTimeOffset.FromUnixTimeMilliseconds(
-            (long) ((Value >> 22) + 1420070400000UL)
+        (long)((Value >> 22) + 1420070400000UL)
     ).ToLocalTime();
 
     [ExcludeFromCodeCoverage]
     public override string ToString() => Value.ToString(CultureInfo.InvariantCulture);
-    }
+}
 
-    public partial struct Snowflake
-    {
+public partial record struct Snowflake
+{
     public static Snowflake Zero { get; } = new(0);
 
-        public static Snowflake FromDate(DateTimeOffset date)
-        {
-            var value = ((ulong) date.ToUnixTimeMilliseconds() - 1420070400000UL) << 22;
-            return new Snowflake(value);
-        }
+    public static Snowflake FromDate(DateTimeOffset date) => new(
+        ((ulong)date.ToUnixTimeMilliseconds() - 1420070400000UL) << 22
+    );
 
     public static Snowflake? TryParse(string? str, IFormatProvider? formatProvider = null)
     {
@@ -35,8 +29,7 @@ namespace DiscordChatExporter.Core.Discord
             return null;
 
         // As number
-            if (Regex.IsMatch(str, @"^\d+$") &&
-                ulong.TryParse(str, NumberStyles.Number, formatProvider, out var value))
+        if (Regex.IsMatch(str, @"^\d+$") && ulong.TryParse(str, NumberStyles.Number, formatProvider, out var value))
         {
             return new Snowflake(value);
         }
@@ -54,20 +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 struct Snowflake : IComparable<Snowflake>, IEquatable<Snowflake>
-    {
-        public int CompareTo(Snowflake other) => Value.CompareTo(other.Value);
-
-        public bool Equals(Snowflake other) => CompareTo(other) == 0;
-
-        public override bool Equals(object? obj) => obj is Snowflake other && Equals(other);
-
-        public override int GetHashCode() => Value.GetHashCode();
-
-        public static bool operator ==(Snowflake left, Snowflake right) => left.Equals(right);
-
-        public static bool operator !=(Snowflake left, Snowflake right) => !(left == right);
-    }
+}
+
+public partial record struct Snowflake : IComparable<Snowflake>
+{
+    public int CompareTo(Snowflake other) => Value.CompareTo(other.Value);
 }

DiscordChatExporter.Core/Discord/TokenKind.cs

@@ -0,0 +1,8 @@
+namespace DiscordChatExporter.Core.Discord;
+
+public enum TokenKind
+{
+    Unknown,
+    User,
+    Bot
+}

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -5,11 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JsonExtensions" Version="1.1.0" />
-    <PackageReference Include="MiniRazor.CodeGen" Version="2.1.4" />
-    <PackageReference Include="Polly" Version="7.2.2" />
-    <PackageReference Include="Superpower" Version="2.3.0" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
+    <PackageReference Include="JsonExtensions" Version="1.2.0" />
+    <PackageReference Include="MiniRazor.CodeGen" Version="2.2.0" />
+    <PackageReference Include="Polly" Version="7.2.3" />
+    <PackageReference Include="Superpower" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Core/Exceptions/DiscordChatExporterException.cs

@@ -1,21 +1,21 @@
 using System;
 using System.Net.Http;
 
-namespace DiscordChatExporter.Core.Exceptions
-{
-    public partial class DiscordChatExporterException : Exception
-    {
-        public bool IsCritical { get; }
+namespace DiscordChatExporter.Core.Exceptions;
 
-        public DiscordChatExporterException(string message, bool isCritical = false)
+public partial class DiscordChatExporterException : Exception
+{
+    public bool IsFatal { get; }
+
+    public DiscordChatExporterException(string message, bool isFatal = false)
         : base(message)
     {
-            IsCritical = isCritical;
-        }
+        IsFatal = isFatal;
     }
+}
 
-    public partial class DiscordChatExporterException
-    {
+public partial class DiscordChatExporterException
+{
     internal static DiscordChatExporterException FailedHttpRequest(HttpResponseMessage response)
     {
         var message = $@"
@@ -31,7 +31,7 @@ Failed to perform an HTTP request.
     }
 
     internal static DiscordChatExporterException Unauthorized() =>
-            new("Authentication token is invalid.");
+        new("Authentication token is invalid.", true);
 
     internal static DiscordChatExporterException Forbidden() =>
         new("Access is forbidden.");
@@ -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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
@@ -8,22 +9,23 @@ 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;
 
-        public ChannelExporter(AuthToken token) : this(new DiscordClient(token)) {}
-
-        public async ValueTask ExportChannelAsync(ExportRequest request, IProgress<double>? progress = null)
+    public async ValueTask ExportChannelAsync(
+        ExportRequest request,
+        IProgress<double>? progress = null,
+        CancellationToken cancellationToken = default)
     {
         // Build context
         var contextMembers = new HashSet<Member>(IdBasedEqualityComparer.Instance);
-            var contextChannels = await _discord.GetGuildChannelsAsync(request.Guild.Id);
-            var contextRoles = await _discord.GetGuildRolesAsync(request.Guild.Id);
+        var contextChannels = await _discord.GetGuildChannelsAsync(request.Guild.Id, cancellationToken);
+        var contextRoles = await _discord.GetGuildRolesAsync(request.Guild.Id, cancellationToken);
 
         var context = new ExportContext(
             request,
@@ -37,10 +39,18 @@ namespace DiscordChatExporter.Core.Exporting
 
         var exportedAnything = false;
         var encounteredUsers = new HashSet<User>(IdBasedEqualityComparer.Instance);
-            await foreach (var message in _discord.GetMessagesAsync(request.Channel.Id, request.After, request.Before, progress))
+
+        await foreach (var message in _discord.GetMessagesAsync(
+                           request.Channel.Id,
+                           request.After,
+                           request.Before,
+                           progress,
+                           cancellationToken))
         {
+            cancellationToken.ThrowIfCancellationRequested();
+
             // Skips any messages that fail to pass the supplied filter
-                if (!request.MessageFilter.Filter(message))
+            if (!request.MessageFilter.IsMatch(message))
                 continue;
 
             // Resolve members for referenced users
@@ -49,15 +59,17 @@ namespace DiscordChatExporter.Core.Exporting
                 if (!encounteredUsers.Add(referencedUser))
                     continue;
 
-                    var member =
-                        await _discord.TryGetGuildMemberAsync(request.Guild.Id, referencedUser) ??
-                        Member.CreateForUser(referencedUser);
+                var member = await _discord.GetGuildMemberAsync(
+                    request.Guild.Id,
+                    referencedUser,
+                    cancellationToken
+                );
 
                 contextMembers.Add(member);
             }
 
             // Export message
-                await messageExporter.ExportMessageAsync(message);
+            await messageExporter.ExportMessageAsync(message, cancellationToken);
             exportedAnything = true;
         }
 
@@ -65,5 +77,4 @@ namespace DiscordChatExporter.Core.Exporting
         if (!exportedAnything)
             throw DiscordChatExporterException.ChannelIsEmpty();
     }
-    }
 }

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -4,16 +4,16 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
-using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
+
+internal class ExportContext
 {
-    internal class ExportContext
-    {
     private readonly MediaDownloader _mediaDownloader;
 
     public ExportRequest Request { get; }
@@ -63,14 +63,14 @@ namespace DiscordChatExporter.Core.Exporting
             .FirstOrDefault();
     }
 
-        public async ValueTask<string> ResolveMediaUrlAsync(string url)
+    public async ValueTask<string> ResolveMediaUrlAsync(string url, CancellationToken cancellationToken = default)
     {
         if (!Request.ShouldDownloadMedia)
             return url;
 
         try
         {
-                var filePath = await _mediaDownloader.DownloadAsync(url);
+            var filePath = await _mediaDownloader.DownloadAsync(url, cancellationToken);
 
             // We want relative path so that the output files can be copied around without breaking.
             // Base directory path may be null if the file is stored at the root or relative to working directory.
@@ -82,10 +82,12 @@ namespace DiscordChatExporter.Core.Exporting
             if (Request.Format is ExportFormat.HtmlDark or ExportFormat.HtmlLight)
             {
                 // Need to escape each path segment while keeping the directory separators intact
-                    return relativeFilePath
+                return string.Join(
+                    Path.AltDirectorySeparatorChar,
+                    relativeFilePath
                         .Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
                         .Select(Uri.EscapeDataString)
-                        .JoinToString(Path.AltDirectorySeparatorChar.ToString());
+                );
             }
 
             return relativeFilePath;
@@ -100,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,79 +8,38 @@ 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(
+    Guild Guild,
+    Channel Channel,
+    string OutputPath,
+    ExportFormat Format,
+    Snowflake? After,
+    Snowflake? Before,
+    PartitionLimit PartitionLimit,
+    MessageFilter MessageFilter,
+    bool ShouldDownloadMedia,
+    bool ShouldReuseMedia,
+    string DateFormat)
 {
-    public partial class ExportRequest
-    {
-        public Guild Guild { get; }
-
-        public Channel Channel { get; }
-
-        public string OutputPath { get; }
-
-        public string OutputBaseFilePath { get; }
-
-        public string OutputBaseDirPath { get; }
-
-        public string OutputMediaDirPath { get; }
-
-        public ExportFormat Format { get; }
-
-        public Snowflake? After { get; }
-
-        public Snowflake? Before { get; }
-
-        public PartitionLimit PartitionLimit { get; }
-
-        public MessageFilter MessageFilter { get; }
-
-        public bool ShouldDownloadMedia { get; }
-
-        public bool ShouldReuseMedia { get; }
-
-        public string DateFormat { get; }
-
-        public ExportRequest(
-            Guild guild,
-            Channel channel,
-            string outputPath,
-            ExportFormat format,
-            Snowflake? after,
-            Snowflake? before,
-            PartitionLimit partitionLimit,
-            MessageFilter messageFilter,
-            bool shouldDownloadMedia,
-            bool shouldReuseMedia,
-            string dateFormat)
-        {
-            Guild = guild;
-            Channel = channel;
-            OutputPath = outputPath;
-            Format = format;
-            After = after;
-            Before = before;
-            PartitionLimit = partitionLimit;
-            MessageFilter = messageFilter;
-            ShouldDownloadMedia = shouldDownloadMedia;
-            ShouldReuseMedia = shouldReuseMedia;
-            DateFormat = dateFormat;
-
-            OutputBaseFilePath = GetOutputBaseFilePath(
-                guild,
-                channel,
-                outputPath,
-                format,
-                after,
-                before
+    private string? _outputBaseFilePath;
+    public string OutputBaseFilePath => _outputBaseFilePath ??= GetOutputBaseFilePath(
+        Guild,
+        Channel,
+        OutputPath,
+        Format,
+        After,
+        Before
     );
 
-            OutputBaseDirPath = Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath;
-            OutputMediaDirPath = $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
-        }
-    }
+    public string OutputBaseDirPath => Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath;
 
-    public partial class ExportRequest
-    {
+    public string OutputMediaDirPath => $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
+}
+
+public partial record ExportRequest
+{
     private static string GetOutputBaseFilePath(
         Guild guild,
         Channel channel,
@@ -89,10 +48,9 @@ namespace DiscordChatExporter.Core.Exporting
         Snowflake? after = null,
         Snowflake? before = null)
     {
-
         // Formats path
         outputPath = Regex.Replace(outputPath, "%.", m =>
-                PathEx.EscapePath(m.Value switch
+            PathEx.EscapeFileName(m.Value switch
             {
                 "%g" => guild.Id.ToString(),
                 "%G" => guild.Name,
@@ -140,17 +98,17 @@ namespace DiscordChatExporter.Core.Exporting
             // Both 'after' and 'before' are set
             if (after is not null && before is not null)
             {
-                    buffer.Append($"{after?.ToDate():yyyy-MM-dd} to {before?.ToDate():yyyy-MM-dd}");
+                buffer.Append($"{after.Value.ToDate():yyyy-MM-dd} to {before.Value.ToDate():yyyy-MM-dd}");
             }
             // Only 'after' is set
             else if (after is not null)
             {
-                    buffer.Append($"after {after?.ToDate():yyyy-MM-dd}");
+                buffer.Append($"after {after.Value.ToDate():yyyy-MM-dd}");
             }
             // Only 'before' is set
-                else
+            else if (before is not null)
             {
-                    buffer.Append($"before {before?.ToDate():yyyy-MM-dd}");
+                buffer.Append($"before {before.Value.ToDate():yyyy-MM-dd}");
             }
 
             buffer.Append(")");
@@ -159,10 +117,6 @@ namespace DiscordChatExporter.Core.Exporting
         // File extension
         buffer.Append($".{format.GetFileExtension()}");
 
-            // Replace invalid chars
-            PathEx.EscapePath(buffer);
-
-            return buffer.ToString();
-        }
+        return PathEx.EscapeFileName(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;
@@ -16,11 +16,10 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         _kind = kind;
     }
 
-        public override bool Filter(Message message) => _kind switch
+    public override bool IsMatch(Message message) => _kind switch
     {
-            BinaryExpressionKind.Or => _first.Filter(message) || _second.Filter(message),
-            BinaryExpressionKind.And => _first.Filter(message) && _second.Filter(message),
+        BinaryExpressionKind.Or => _first.IsMatch(message) || _second.IsMatch(message),
+        BinaryExpressionKind.And => _first.IsMatch(message) && _second.IsMatch(message),
         _ => throw new InvalidOperationException($"Unknown binary expression kind '{_kind}'.")
     };
-    }
 }

DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs

@@ -1,18 +1,33 @@
-using System.Text.RegularExpressions;
+using System.Linq;
+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;
 
-        public override bool Filter(Message message) => Regex.IsMatch(
-            message.Content,
-            "\\b" + _text + "\\b",
+    private bool IsMatch(string? content) =>
+        !string.IsNullOrWhiteSpace(content) &&
+        Regex.IsMatch(
+            content,
+            "\\b" + Regex.Escape(_text) + "\\b",
             RegexOptions.IgnoreCase | RegexOptions.CultureInvariant
         );
-    }
+
+    public override bool IsMatch(Message message) =>
+        IsMatch(message.Content) ||
+        message.Embeds.Any(e =>
+            IsMatch(e.Title) ||
+            IsMatch(e.Author?.Name) ||
+            IsMatch(e.Description) ||
+            IsMatch(e.Footer?.Text) ||
+            e.Fields.Any(f =>
+                IsMatch(f.Name) ||
+                IsMatch(f.Value)
+            )
+        );
 }

DiscordChatExporter.Core/Exporting/Filtering/FromMessageFilter.cs

@@ -1,17 +1,16 @@
 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;
 
-        public override bool Filter(Message message) =>
+    public override bool IsMatch(Message message) =>
         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,15 +3,15 @@ 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;
 
-        public override bool Filter(Message message) => _kind switch
+    public override bool IsMatch(Message message) => _kind switch
     {
         MessageContentMatchKind.Link => Regex.IsMatch(message.Content, "https?://\\S*[^\\.,:;\"\'\\s]"),
         MessageContentMatchKind.Embed => message.Embeds.Any(),
@@ -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,18 +2,17 @@
 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;
 
-        public override bool Filter(Message message) => message.MentionedUsers.Any(user =>
+    public override bool IsMatch(Message message) => message.MentionedUsers.Any(user =>
         string.Equals(_value, user.Name, StringComparison.OrdinalIgnoreCase) ||
         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
-{
-    public abstract partial class MessageFilter
-    {
-        public abstract bool Filter(Message message);
-    }
+namespace DiscordChatExporter.Core.Exporting.Filtering;
 
-    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 Filter(Message message) => !_filter.Filter(message);
-    }
+    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 Filter(Message message) => true;
-    }
+    public override bool IsMatch(Message message) => true;
 }

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

@@ -1,22 +1,17 @@
-using System.Linq;
-using DiscordChatExporter.Core.Utils.Extensions;
+using DiscordChatExporter.Core.Utils.Extensions;
 using Superpower;
 using Superpower.Parsers;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
-{
-    internal static class FilterGrammar
-    {
-        // Choice(a, b) looks cleaner than a.Or(b)
-        private static TextParser<T> Choice<T>(params TextParser<T>[] parsers) =>
-            parsers.Aggregate((current, next) => current.Or(next));
+namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing;
 
+internal static class FilterGrammar
+{
     private static readonly TextParser<char> EscapedCharacter =
         Character.EqualTo('\\').IgnoreThen(Character.AnyChar);
 
     private static readonly TextParser<string> QuotedString =
         from open in Character.In('"', '\'')
-            from value in Choice(EscapedCharacter, Character.Except(open)).Many().Text()
+        from value in Parse.OneOf(EscapedCharacter, Character.Except(open)).Many().Text()
         from close in Character.EqualTo(open)
         select value;
 
@@ -29,10 +24,10 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
         );
 
     private static readonly TextParser<string> UnquotedString =
-            Choice(EscapedCharacter, FreeCharacter).AtLeastOnce().Text();
+        Parse.OneOf(EscapedCharacter, FreeCharacter).AtLeastOnce().Text();
 
     private static readonly TextParser<string> String =
-            Choice(QuotedString, UnquotedString).Named("text string");
+        Parse.OneOf(QuotedString, UnquotedString).Named("text string");
 
     private static readonly TextParser<MessageFilter> ContainsFilter =
         String.Select(v => (MessageFilter) new ContainsMessageFilter(v));
@@ -51,9 +46,10 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
 
     private static readonly TextParser<MessageFilter> HasFilter = Span
         .EqualToIgnoreCase("has:")
-            .IgnoreThen(Choice(
+        .IgnoreThen(Parse.OneOf(
             Span.EqualToIgnoreCase("link").IgnoreThen(Parse.Return(MessageContentMatchKind.Link)),
             Span.EqualToIgnoreCase("embed").IgnoreThen(Parse.Return(MessageContentMatchKind.Embed)),
+            Span.EqualToIgnoreCase("file").IgnoreThen(Parse.Return(MessageContentMatchKind.File)),
             Span.EqualToIgnoreCase("video").IgnoreThen(Parse.Return(MessageContentMatchKind.Video)),
             Span.EqualToIgnoreCase("image").IgnoreThen(Parse.Return(MessageContentMatchKind.Image)),
             Span.EqualToIgnoreCase("sound").IgnoreThen(Parse.Return(MessageContentMatchKind.Sound))
@@ -63,16 +59,16 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
 
     private static readonly TextParser<MessageFilter> NegatedFilter = Character
         .EqualTo('-')
-            .IgnoreThen(Parse.Ref(() => StandaloneFilter))
+        .IgnoreThen(Parse.Ref(() => StandaloneFilter!))
         .Select(f => (MessageFilter) new NegatedMessageFilter(f));
 
     private static readonly TextParser<MessageFilter> GroupedFilter =
         from open in Character.EqualTo('(')
-            from content in Parse.Ref(() => BinaryExpressionFilter).Token()
+        from content in Parse.Ref(() => BinaryExpressionFilter!).Token()
         from close in Character.EqualTo(')')
         select content;
 
-        private static readonly TextParser<MessageFilter> StandaloneFilter = Choice(
+    private static readonly TextParser<MessageFilter> StandaloneFilter = Parse.OneOf(
         GroupedFilter,
         FromFilter,
         MentionsFilter,
@@ -80,13 +76,13 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
         ContainsFilter
     );
 
-        private static readonly TextParser<MessageFilter> UnaryExpressionFilter = Choice(
+    private static readonly TextParser<MessageFilter> UnaryExpressionFilter = Parse.OneOf(
         NegatedFilter,
         StandaloneFilter
     );
 
     private static readonly TextParser<MessageFilter> BinaryExpressionFilter = Parse.Chain(
-            Choice(
+        Parse.OneOf(
             // Explicit operator
             Character.In('|', '&').Token().Try(),
             // Implicit operator (resolves to 'and')
@@ -102,5 +98,4 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
 
     public static readonly TextParser<MessageFilter> Filter =
         BinaryExpressionFilter.Token().AtEnd();
-    }
 }

DiscordChatExporter.Core/Exporting/MediaDownloader.cs

@@ -2,36 +2,31 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 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 HttpClient _httpClient;
     private readonly string _workingDirPath;
     private readonly bool _reuseMedia;
 
-        // URL -> Local file path
+    // File paths of already downloaded media
     private readonly Dictionary<string, string> _pathCache = new(StringComparer.Ordinal);
 
-        public MediaDownloader(HttpClient httpClient, string workingDirPath, bool reuseMedia)
+    public MediaDownloader(string workingDirPath, bool reuseMedia)
     {
-            _httpClient = httpClient;
         _workingDirPath = workingDirPath;
         _reuseMedia = reuseMedia;
     }
 
-        public MediaDownloader(string workingDirPath, bool reuseMedia)
-            : this(Http.Client, workingDirPath, reuseMedia) {}
-
-        public async ValueTask<string> DownloadAsync(string url)
+    public async ValueTask<string> DownloadAsync(string url, CancellationToken cancellationToken = default)
     {
         if (_pathCache.TryGetValue(url, out var cachedFilePath))
             return cachedFilePath;
@@ -49,10 +44,10 @@ namespace DiscordChatExporter.Core.Exporting
         await Http.ExceptionPolicy.ExecuteAsync(async () =>
         {
             // Download the file
-                using var response = await _httpClient.GetAsync(url);
+            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
@@ -82,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();
@@ -109,7 +104,6 @@ namespace DiscordChatExporter.Core.Exporting
         var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName);
         var fileExtension = Path.GetExtension(fileName);
 
-            return PathEx.EscapePath(fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension);
-        }
+        return PathEx.EscapeFileName(fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension);
     }
 }

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -1,13 +1,14 @@
 using System;
 using System.IO;
+using System.Threading;
 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;
@@ -18,23 +19,23 @@ namespace DiscordChatExporter.Core.Exporting
         _context = context;
     }
 
-        private async ValueTask ResetWriterAsync()
+    private async ValueTask ResetWriterAsync(CancellationToken cancellationToken = default)
     {
         if (_writer is not null)
         {
-                await _writer.WritePostambleAsync();
+            await _writer.WritePostambleAsync(cancellationToken);
             await _writer.DisposeAsync();
             _writer = null;
         }
     }
 
-        private async ValueTask<MessageWriter> GetWriterAsync()
+    private async ValueTask<MessageWriter> GetWriterAsync(CancellationToken cancellationToken = default)
     {
-            // Ensure partition limit has not been exceeded
+        // Ensure partition limit has not been reached
         if (_writer is not null &&
             _context.Request.PartitionLimit.IsReached(_writer.MessagesWritten, _writer.BytesWritten))
         {
-                await ResetWriterAsync();
+            await ResetWriterAsync(cancellationToken);
             _partitionIndex++;
         }
 
@@ -49,22 +50,22 @@ namespace DiscordChatExporter.Core.Exporting
             Directory.CreateDirectory(dirPath);
 
         var writer = CreateMessageWriter(filePath, _context.Request.Format, _context);
-            await writer.WritePreambleAsync();
+        await writer.WritePreambleAsync(cancellationToken);
 
         return _writer = writer;
     }
 
-        public async ValueTask ExportMessageAsync(Message message)
+    public async ValueTask ExportMessageAsync(Message message, CancellationToken cancellationToken = default)
     {
-            var writer = await GetWriterAsync();
-            await writer.WriteMessageAsync(message);
+        var writer = await GetWriterAsync(cancellationToken);
+        await writer.WriteMessageAsync(message, cancellationToken);
     }
 
     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
@@ -100,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;
-    }
 }