Update version

Closes #521

.config/dotnet-tools.json

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

.github/workflows/CD-Docker.yml

@@ -14,16 +14,17 @@ jobs:
         uses: actions/checkout@v2.3.3
 
       - name: Get release version
-        id: get-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:${{ steps.get-version.outputs.tag }} -t tyrrrz/discordchatexporter:stable .
+        run: docker build -t tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }} -t tyrrrz/discordchatexporter:stable .
 
-      - name: Deploy
+      - name: Deploy (version)
-        run: |
+        run: docker push tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }}
-          docker push tyrrrz/discordchatexporter:${{ steps.get-version.outputs.tag }}
+
-          docker push tyrrrz/discordchatexporter:stable
+      - name: Deploy (stable)
+        run: docker push tyrrrz/discordchatexporter:stable

.github/workflows/CD.yml

@@ -14,18 +14,13 @@ jobs:
         uses: actions/checkout@v2.3.3
 
       - name: Get release version
-        id: get-version
+        id: get_version
         uses: dawidd6/action-get-tag@v1
 
-      - name: Install .NET (v3.1)
+      - name: Install .NET
         uses: actions/setup-dotnet@v1.7.2
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 6.0.x
-
-      - name: Install .NET (v5.0)
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: 5.0.x
 
       - name: Build & publish (CLI)
         run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
@@ -85,5 +80,5 @@ jobs:
             }
           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>"
+              "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
+          dotnet-version: 6.0.x
-
-      - name: Install .NET (v5.0)
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: 5.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,12 @@
+### 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))

Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
-    <Version>2.30.1</Version>
+    <Version>2.31</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Alexey Golub</Copyright>
     <LangVersion>preview</LangVersion>

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="AngleSharp" Version="0.16.1" />
-    <PackageReference Include="FluentAssertions" Version="6.1.0" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
-    <PackageReference Include="JsonExtensions" Version="1.1.0" />
+    <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.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,210 +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()
-                .StartWithEquivalentOf("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()
-                .StartWithEquivalentOf("https://www.youtube.com/embed/qOWW4OlgbvE");
-        }
-    }
-}

DiscordChatExporter.Cli.Tests/Fixtures/ExportWrapperFixture.cs

@@ -0,0 +1,132 @@
+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
+                {
+                    TokenValue = Secrets.DiscordToken,
+                    IsBotToken = Secrets.IsDiscordTokenBot,
+                    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,23 @@
 using System;
 using System.IO;
+using DiscordChatExporter.Cli.Tests.Utils;
 
 namespace DiscordChatExporter.Cli.Tests.Fixtures
 {
     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()
+        public void Dispose() => DirectoryEx.DeleteIfExists(DirPath);
-        {
-            try
-            {
-                Directory.Delete(DirPath, true);
-            }
-            catch (DirectoryNotFoundException)
-            {
-            }
-        }
     }
 }

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,31 @@
+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,160 @@
+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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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,135 @@
+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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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,93 @@
+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,43 @@
+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,64 @@
+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,66 @@
+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,57 @@
+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,101 @@
+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,42 @@
+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,58 @@
+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,71 @@
+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,67 @@
+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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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,31 @@
+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,49 @@
+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
+            {
+                TokenValue = Secrets.DiscordToken,
+                IsBotToken = Secrets.IsDiscordTokenBot,
+                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,21 @@
-namespace DiscordChatExporter.Cli.Tests.TestData
+using DiscordChatExporter.Core.Discord;
+
+namespace DiscordChatExporter.Cli.Tests.TestData
 {
     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,24 @@
+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.Concurrent;
-using System.Threading.Tasks;
-
-namespace DiscordChatExporter.Cli.Tests.Utils
-{
-    internal static class GlobalCache
-    {
-        private static readonly ConcurrentDictionary<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/Commands/Base/ExportCommandBase.cs

@@ -15,7 +15,6 @@ 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
 {
@@ -54,23 +53,28 @@ 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 =>
                 {
-                    // 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, cancellationToken);
 
                             var request = new ExportRequest(
                                 guild,
@@ -86,14 +90,14 @@ namespace DiscordChatExporter.Cli.Commands.Base
                                 DateFormat
                             );
 
-                            await Exporter.ExportChannelAsync(request, progress);
+                            await Exporter.ExportChannelAsync(request, progress, cancellationToken);
                         });
                     }
-                    catch (DiscordChatExporterException ex) when (!ex.IsCritical)
+                    catch (DiscordChatExporterException ex) when (!ex.IsFatal)
                     {
                         errors[channel] = ex.Message;
                     }
-                }, ParallelLimit.ClampMin(1));
+                }, Math.Max(ParallelLimit, 1), cancellationToken);
             });
 
             // Print result
@@ -118,7 +122,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 +131,26 @@ namespace DiscordChatExporter.Cli.Commands.Base
                 await console.Output.WriteLineAsync();
             }
 
-            // Fail the command if ALL channels failed to export.
+            // Fail the command only if ALL channels failed to export.
-            // Having some of the channels fail to export is fine and expected.
+            // 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

@@ -14,7 +14,8 @@ namespace DiscordChatExporter.Cli.Commands.Base
         [CommandOption("bot", 'b', EnvironmentVariable = "DISCORD_TOKEN_BOT", Description = "Authenticate as a bot.")]
         public bool IsBotToken { get; init; }
 
-        private AuthToken GetAuthToken() => new(
+        private AuthToken? _authToken;
+        private AuthToken AuthToken => _authToken ??= new AuthToken(
             IsBotToken
                 ? AuthTokenKind.Bot
                 : AuthTokenKind.User,
@@ -22,7 +23,7 @@ namespace DiscordChatExporter.Cli.Commands.Base
         );
 
         private DiscordClient? _discordClient;
-        protected DiscordClient Discord => _discordClient ??= new DiscordClient(GetAuthToken());
+        protected DiscordClient Discord => _discordClient ??= new DiscordClient(AuthToken);
 
         public abstract ValueTask ExecuteAsync(IConsole console);
     }

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -15,21 +15,17 @@ namespace DiscordChatExporter.Cli.Commands
 
         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 = new List<Channel>();
 
-            // Aggregate channels from all guilds
+            await console.Output.WriteLineAsync("Fetching channels...");
-            await foreach (var guild in Discord.GetUserGuildsAsync())
+            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,7 @@ namespace DiscordChatExporter.Cli.Commands
                 }
             }
 
-            // Export
+            await base.ExecuteAsync(console, channels);
-            await ExportAsync(console, channels);
         }
     }
 }

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

@@ -5,7 +5,6 @@ using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Cli.Commands
 {
@@ -16,23 +15,7 @@ namespace DiscordChatExporter.Cli.Commands
         [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)
+        public override async ValueTask ExecuteAsync(IConsole console) =>
-        {
+            await base.ExecuteAsync(console, ChannelIds);
-            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);
-        }
     }
 }

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -13,15 +13,13 @@ namespace DiscordChatExporter.Cli.Commands
     {
         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 base.ExecuteAsync(console, textChannels);
-            await ExportAsync(console, textChannels);
         }
     }
 }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -16,15 +16,13 @@ namespace DiscordChatExporter.Cli.Commands
 
         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 base.ExecuteAsync(console, textChannels);
-            await ExportAsync(console, textChannels);
         }
     }
 }

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -17,7 +17,9 @@ namespace DiscordChatExporter.Cli.Commands
 
         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,9 +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($"{channel.Category.Name} / {channel.Name}");
-
-                await console.Output.WriteLineAsync();
             }
         }
     }

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -14,7 +14,9 @@ namespace DiscordChatExporter.Cli.Commands
     {
         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,9 +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($"{channel.Category.Name} / {channel.Name}");
-
-                await console.Output.WriteLineAsync();
             }
         }
     }

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -13,7 +13,9 @@ namespace DiscordChatExporter.Cli.Commands
     {
         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,9 +28,7 @@ namespace DiscordChatExporter.Cli.Commands
 
                 // Guild name
                 using (console.WithForegroundColor(ConsoleColor.White))
-                    await console.Output.WriteAsync(guild.Name);
+                    await console.Output.WriteLineAsync(guild.Name);
-
-                await console.Output.WriteLineAsync();
             }
         }
     }

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -11,6 +11,7 @@ namespace DiscordChatExporter.Cli.Commands
     {
         public ValueTask ExecuteAsync(IConsole console)
         {
+            // User token
             using (console.WithForegroundColor(ConsoleColor.White))
                 console.Output.WriteLine("To get user token:");
 
@@ -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,9 +59,9 @@ 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:");
-
             using (console.WithForegroundColor(ConsoleColor.DarkCyan))
                 console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");
 

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -7,9 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="CliFx" Version="2.0.6" />
-    <PackageReference Include="Spectre.Console" Version="0.41.0" />
+    <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/Utils/Extensions/ConsoleExtensions.cs

@@ -7,31 +7,13 @@ namespace DiscordChatExporter.Cli.Utils.Extensions
 {
     internal static class ConsoleExtensions
     {
-        private class NoopExclusivityMode : IExclusivityMode
+        public static IAnsiConsole CreateAnsiConsole(this IConsole console) =>
-        {
+            AnsiConsole.Create(new AnsiConsoleSettings
-            public T Run<T>(Func<T> func) => func();
+            {
-
+                Ansi = AnsiSupport.Detect,
-            public Task<T> Run<T>(Func<Task<T>> func) => func();
+                ColorSystem = ColorSystemSupport.Detect,
-        }
+                Out = new AnsiConsoleOutput(console.Output)
-
+            });
-        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
-                {
-                    Ansi = AnsiSupport.Detect,
-                    ColorSystem = ColorSystemSupport.Detect,
-                    Out = new AnsiConsoleOutput(console.Output),
-                    ExclusivityMode = exclusivityMode
-                }
-            );
-        }
 
         public static Progress CreateProgressTicker(this IConsole console) => console
             .CreateAnsiConsole()

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 +1,13 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Net.Http.Headers;
-using System.Net.Http.Headers;
 
 namespace DiscordChatExporter.Core.Discord
 {
-    public class AuthToken
+    public record AuthToken(AuthTokenKind Kind, string Value)
     {
-        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/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;
@@ -10,20 +9,16 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data
 {
     // https://discord.com/developers/docs/resources/channel#attachment-object
-    public partial class Attachment : IHasId
+    public partial record Attachment(
+        Snowflake Id,
+        string Url,
+        string FileName,
+        int? Width,
+        int? Height,
+        FileSize FileSize) : 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,38 +26,17 @@ 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 id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var url = json.GetProperty("url").GetString();
+            var url = json.GetProperty("url").GetNonWhiteSpaceString();
             var width = json.GetPropertyOrNull("width")?.GetInt32();
             var height = json.GetPropertyOrNull("height")?.GetInt32();
-            var fileName = json.GetProperty("filename").GetString();
+            var fileName = json.GetProperty("filename").GetNonWhiteSpaceString();
             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
 {
     // https://discord.com/developers/docs/resources/channel#channel-object
-    public partial class Channel : IHasId
+    public partial record Channel(
+        Snowflake Id,
+        ChannelKind Kind,
+        Snowflake GuildId,
+        ChannelCategory Category,
+        string Name,
+        int? Position,
+        string? Topic) : IHasId
     {
-        public Snowflake Id { get; }
-
-        public ChannelKind Kind { get; }
-
         public bool IsTextChannel => Kind is
             ChannelKind.GuildTextChat or
             ChannelKind.DirectTextChat or
@@ -23,40 +24,9 @@ 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,
@@ -74,16 +44,17 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? position = null)
         {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+            var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var guildId = json.GetPropertyOrNull("guild_id")?.GetString().Pipe(Snowflake.Parse);
+            var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var topic = json.GetPropertyOrNull("topic")?.GetString();
+            var topic = json.GetPropertyOrNull("topic")?.GetStringOrNull();
-            var kind = (ChannelKind) json.GetProperty("type").GetInt32();
+            var kind = (ChannelKind)json.GetProperty("type").GetInt32();
 
             var name =
                 // Guild channel
-                json.GetPropertyOrNull("name")?.GetString() ??
+                json.GetPropertyOrNull("name")?.GetStringOrNull() ??
                 // DM channel
-                json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name).JoinToString(", ") ??
+                json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name)
+                    .Pipe(s => string.Join(", ", s)) ??
                 // Fallback
                 id.ToString();
 

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -1,38 +1,20 @@
-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
 {
-    public partial class ChannelCategory : IHasId
+    public record ChannelCategory(Snowflake Id, string Name, int? Position) : IHasId
     {
-        public Snowflake Id { get; }
+        public static ChannelCategory Unknown { get; } = new(Snowflake.Zero, "<unknown category>", 0);
 
-        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 name =
-                json.GetPropertyOrNull("name")?.GetString() ??
+                json.GetPropertyOrNull("name")?.GetStringOrNull() ??
                 id.ToString();
 
             return new ChannelCategory(
@@ -41,7 +23,5 @@ namespace DiscordChatExporter.Core.Discord.Data
                 position ?? json.GetPropertyOrNull("position")?.GetInt32()
             );
         }
-
-        public static ChannelCategory Empty { get; } = new(Snowflake.Zero, "<unknown category>", 0);
     }
 }

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

@@ -4,16 +4,12 @@ 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 readonly partial record struct FileSize(long TotalBytes)
     {
-        public long TotalBytes { get; }
-
         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)
@@ -46,7 +42,7 @@ namespace DiscordChatExporter.Core.Discord.Data.Common
         public override string ToString() => $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}";
     }
 
-    public partial struct FileSize
+    public partial record struct FileSize
     {
         public static FileSize FromBytes(long bytes) => new(bytes);
     }

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

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

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

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using System.Linq;
 using System.Text.Json;
@@ -10,71 +9,37 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
     // https://discord.com/developers/docs/resources/channel#embed-object
-    public partial class Embed
+    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)
     {
-        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 title = json.GetPropertyOrNull("title")?.GetStringOrNull();
-            var url = json.GetPropertyOrNull("url")?.GetString();
+            var url = json.GetPropertyOrNull("url")?.GetStringOrNull();
             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 description = json.GetPropertyOrNull("description")?.GetStringOrNull();
 
             var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
             var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);

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

@@ -1,40 +1,21 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using JsonExtensions.Reading;
 
 namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
     // https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
-    public partial class EmbedAuthor
+    public record EmbedAuthor(
-    {
+        string? Name,
-        public string? Name { get; }
+        string? Url,
-
+        string? IconUrl,
-        public string? Url { get; }
+        string? IconProxyUrl)
-
-        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 name = json.GetPropertyOrNull("name")?.GetStringOrNull();
-            var url = json.GetPropertyOrNull("url")?.GetString();
+            var url = json.GetPropertyOrNull("url")?.GetStringOrNull();
-            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetString();
+            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetStringOrNull();
-            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetString();
+            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetStringOrNull();
 
             return new EmbedAuthor(name, url, iconUrl, iconProxyUrl);
         }

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

@@ -1,35 +1,19 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
 namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
     // https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
-    public partial class EmbedField
+    public record EmbedField(
-    {
+        string Name,
-        public string Name { get; }
+        string Value,
-
+        bool IsInline)
-        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 name = json.GetProperty("name").GetNonWhiteSpaceString();
-            var value = json.GetProperty("value").GetString();
+            var value = json.GetProperty("value").GetNonWhiteSpaceString();
             var isInline = json.GetPropertyOrNull("inline")?.GetBoolean() ?? false;
 
             return new EmbedField(name, value, isInline);

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

@@ -1,36 +1,20 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
 namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
     // https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
-    public partial class EmbedFooter
+    public record EmbedFooter(
-    {
+        string Text,
-        public string Text { get; }
+        string? IconUrl,
-
+        string? IconProxyUrl)
-        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 text = json.GetProperty("text").GetNonWhiteSpaceString();
-            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetString();
+            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetStringOrNull();
-            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetString();
+            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetStringOrNull();
 
             return new EmbedFooter(text, iconUrl, iconProxyUrl);
         }

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

@@ -4,31 +4,16 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
     // https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
-    public partial class EmbedImage
+    public record EmbedImage(
-    {
+        string? Url,
-        public string? Url { get; }
+        string? ProxyUrl,
-
+        int? Width,
-        public string? ProxyUrl { get; }
+        int? Height)
-
-        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 url = json.GetPropertyOrNull("url")?.GetStringOrNull();
-            var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetString();
+            var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetStringOrNull();
             var width = json.GetPropertyOrNull("width")?.GetInt32();
             var height = json.GetPropertyOrNull("height")?.GetInt32();
 

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

@@ -1,22 +1,11 @@
-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
 {
-    public partial class PlainImageEmbedProjection
+    public record PlainImageEmbedProjection(string Url)
-    {
-        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)
         {

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

@@ -1,21 +1,13 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
-using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
-    public partial class SpotifyTrackEmbedProjection
+    public partial record SpotifyTrackEmbedProjection(string TrackId)
     {
-        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)
         {

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

@@ -1,21 +1,13 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
-using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
-    public partial class YouTubeVideoEmbedProjection
+    public partial record YouTubeVideoEmbedProjection(string VideoId)
     {
-        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

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -1,51 +1,35 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Linq;
-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
+    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
+    public partial record Emoji
     {
-        private static string GetTwemojiName(string name) => name
+        private static string GetTwemojiName(string name) => string.Join("-",
-            .GetRunes()
+            name
-            // Variant selector rune is skipped in Twemoji names
+                .GetRunes()
-            .Where(r => r.Value != 0xfe0f)
+                // Variant selector rune is skipped in Twemoji names
-            .Select(r => r.Value.ToString("x"))
+                .Where(r => r.Value != 0xfe0f)
-            .JoinToString("-");
+                .Select(r => r.Value.ToString("x"))
+        );
 
         public static string GetImageUrl(string? id, string name, bool isAnimated)
         {
@@ -64,8 +48,8 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         public static Emoji Parse(JsonElement json)
         {
-            var id = json.GetPropertyOrNull("id")?.GetString();
+            var id = json.GetPropertyOrNull("id")?.GetNonWhiteSpaceString();
-            var name = json.GetProperty("name").GetString();
+            var name = json.GetProperty("name").GetNonWhiteSpaceString();
             var isAnimated = json.GetPropertyOrNull("animated")?.GetBoolean() ?? false;
 
             var imageUrl = GetImageUrl(id, name, isAnimated);

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -1,31 +1,12 @@
-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
 {
     // https://discord.com/developers/docs/resources/guild#guild-object
-    public partial class Guild : IHasId
+    public record Guild(Snowflake Id, string Name, string IconUrl) : 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,
@@ -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 id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var name = json.GetProperty("name").GetString();
+            var name = json.GetProperty("name").GetNonWhiteSpaceString();
-            var iconHash = json.GetProperty("icon").GetString();
+            var iconHash = json.GetPropertyOrNull("icon")?.GetStringOrNull();
 
             var iconUrl = !string.IsNullOrWhiteSpace(iconHash)
                 ? GetIconUrl(id, iconHash)

DiscordChatExporter.Core/Discord/Data/Member.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;
@@ -10,28 +9,15 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data
 {
     // https://discord.com/developers/docs/resources/guild#guild-member-object
-    public partial class Member : IHasId
+    public partial record Member(
+        User User,
+        string Nick,
+        IReadOnlyList<Snowflake> RoleIds) : 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,
@@ -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")?.GetStringOrNull();
 
-            var roleIds =
+            var roleIds = json
-                json.GetPropertyOrNull("roles")?.EnumerateArray().Select(j => j.GetString()).Select(Snowflake.Parse).ToArray() ??
+                .GetPropertyOrNull("roles")?
-                Array.Empty<Snowflake>();
+                .EnumerateArray()
+                .Select(j => j.GetNonWhiteSpaceString())
+                .Select(Snowflake.Parse)
+                .ToArray() ?? Array.Empty<Snowflake>();
 
             return new Member(
                 user,

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;
@@ -10,97 +9,32 @@ using JsonExtensions.Reading;
 
 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
-    }
-
     // https://discord.com/developers/docs/resources/channel#message-object
-    public partial class Message : IHasId
+    public record Message(
-    {
+        Snowflake Id,
-        public Snowflake Id { get; }
+        MessageKind Kind,
-
+        User Author,
-        public MessageKind Kind { get; }
+        DateTimeOffset Timestamp,
-
+        DateTimeOffset? EditedTimestamp,
-        public User Author { get; }
+        DateTimeOffset? CallEndedTimestamp,
-
+        bool IsPinned,
-        public DateTimeOffset Timestamp { get; }
+        string Content,
-
+        IReadOnlyList<Attachment> Attachments,
-        public DateTimeOffset? EditedTimestamp { get; }
+        IReadOnlyList<Embed> Embeds,
-
+        IReadOnlyList<Reaction> Reactions,
-        public DateTimeOffset? CallEndedTimestamp { get; }
+        IReadOnlyList<User> MentionedUsers,
-
+        MessageReference? Reference,
-        public bool IsPinned { get; }
+        Message? ReferencedMessage) : IHasId
-
-        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 callEndedTimestamp = json.GetPropertyOrNull("call")?.GetPropertyOrNull("ended_timestamp")
-            var kind = (MessageKind) json.GetProperty("type").GetInt32();
+                ?.GetDateTimeOffset();
+            var kind = (MessageKind)json.GetProperty("type").GetInt32();
             var isPinned = json.GetPropertyOrNull("pinned")?.GetBoolean() ?? false;
             var messageReference = json.GetPropertyOrNull("message_reference")?.Pipe(MessageReference.Parse);
             var referencedMessage = json.GetPropertyOrNull("referenced_message")?.Pipe(Parse);
@@ -110,12 +44,12 @@ 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 =

DiscordChatExporter.Core/Discord/Data/MessageKind.cs

@@ -0,0 +1,16 @@
+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,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
@@ -6,32 +5,13 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data
 {
     // https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure
-    public partial class MessageReference
+    public record MessageReference(Snowflake? MessageId, Snowflake? ChannelId, Snowflake? GuildId)
-    {
-        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 messageId = json.GetPropertyOrNull("message_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
-            var channelId = json.GetPropertyOrNull("channel_id")?.GetString().Pipe(Snowflake.Parse);
+            var channelId = json.GetPropertyOrNull("channel_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
-            var guildId = json.GetPropertyOrNull("guild_id")?.GetString().Pipe(Snowflake.Parse);
+            var guildId = json.GetPropertyOrNull("guild_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
 
             return new MessageReference(messageId, channelId, guildId);
         }

DiscordChatExporter.Core/Discord/Data/Reaction.cs

@@ -1,27 +1,10 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Text.Json;
-using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Core.Discord.Data
 {
     // https://discord.com/developers/docs/resources/channel#reaction-object
-    public partial class Reaction
+    public record Reaction(Emoji Emoji, int Count)
-    {
-        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)
         {

DiscordChatExporter.Core/Discord/Data/Role.cs

@@ -1,5 +1,4 @@
-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;
@@ -8,38 +7,12 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data
 {
     // https://discord.com/developers/docs/topics/permissions#role-object
-    public partial class Role : IHasId
+    public record Role(Snowflake Id, string Name, int Position, Color? Color) : 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 id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var name = json.GetProperty("name").GetString();
+            var name = json.GetProperty("name").GetNonWhiteSpaceString();
             var position = json.GetProperty("position").GetInt32();
 
             var color = json

DiscordChatExporter.Core/Discord/Data/User.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
@@ -8,41 +7,19 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data
 {
     // https://discord.com/developers/docs/resources/user#user-object
-    public partial class User : IHasId
+    public partial record User(
+        Snowflake Id,
+        bool IsBot,
+        int Discriminator,
+        string Name,
+        string AvatarUrl) : 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";
@@ -58,11 +35,11 @@ namespace DiscordChatExporter.Core.Discord.Data
 
         public static User Parse(JsonElement json)
         {
-            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+            var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
             var isBot = json.GetPropertyOrNull("bot")?.GetBoolean() ?? false;
-            var discriminator = json.GetProperty("discriminator").GetString().Pipe(int.Parse);
+            var discriminator = json.GetProperty("discriminator").GetNonWhiteSpaceString().Pipe(int.Parse);
-            var name = json.GetProperty("username").GetString();
+            var name = json.GetProperty("username").GetNonWhiteSpaceString();
-            var avatarHash = json.GetProperty("avatar").GetString();
+            var avatarHash = json.GetPropertyOrNull("avatar")?.GetStringOrNull();
 
             var avatarUrl = !string.IsNullOrWhiteSpace(avatarHash)
                 ? GetAvatarUrl(id, avatarHash)

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exceptions;
@@ -16,34 +18,33 @@ namespace DiscordChatExporter.Core.Discord
 {
     public class DiscordClient
     {
-        private readonly HttpClient _httpClient;
         private readonly AuthToken _token;
-
         private readonly Uri _baseUri = new("https://discord.com/api/v8/", UriKind.Absolute);
 
-        public DiscordClient(HttpClient httpClient, AuthToken token)
+        public DiscordClient(AuthToken token) => _token = token;
-        {
-            _httpClient = httpClient;
-            _token = token;
-        }
 
-        public DiscordClient(AuthToken token)
+        private async ValueTask<HttpResponseMessage> GetResponseAsync(
-            : this(Http.Client, token)
+            string url,
+            CancellationToken cancellationToken = default)
         {
-        }
+            return await Http.ResponsePolicy.ExecuteAsync(async innerCancellationToken =>
-
-        private async ValueTask<HttpResponseMessage> GetResponseAsync(string url) =>
-            await Http.ResponsePolicy.ExecuteAsync(async () =>
             {
                 using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
                 request.Headers.Authorization = _token.GetAuthenticationHeader();
 
-                return await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+                return await Http.Client.SendAsync(
-            });
+                    request,
+                    HttpCompletionOption.ResponseHeadersRead,
+                    innerCancellationToken
+                );
+            }, cancellationToken);
+        }
 
-        private async ValueTask<JsonElement> GetJsonResponseAsync(string url)
+        private async ValueTask<JsonElement> GetJsonResponseAsync(
+            string url,
+            CancellationToken cancellationToken = default)
         {
-            using var response = await GetResponseAsync(url);
+            using var response = await GetResponseAsync(url, cancellationToken);
 
             if (!response.IsSuccessStatusCode)
             {
@@ -56,19 +57,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 +86,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 +102,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 +142,7 @@ namespace DiscordChatExporter.Core.Discord
 
                 foreach (var channelJson in responseOrdered)
                 {
-                    var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetString();
+                    var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetStringOrNull();
 
                     var category = !string.IsNullOrWhiteSpace(parentId)
                         ? categories.GetValueOrDefault(parentId)
@@ -149,55 +157,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}");
+            var response = await TryGetJsonResponseAsync($"guilds/{guildId}/members/{user.Id}", cancellationToken);
-            return response?.Pipe(Member.Parse);
+            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")?.GetStringOrNull()?.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 +225,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 +233,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 +256,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()

DiscordChatExporter.Core/Discord/Snowflake.cs

@@ -5,29 +5,23 @@ using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Discord
 {
-    public readonly partial struct Snowflake
+    public readonly partial record struct Snowflake(ulong Value)
     {
-        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)
+        public static Snowflake FromDate(DateTimeOffset date) => new(
-        {
+            ((ulong)date.ToUnixTimeMilliseconds() - 1420070400000UL) << 22
-            var value = ((ulong) date.ToUnixTimeMilliseconds() - 1420070400000UL) << 22;
+        );
-            return new Snowflake(value);
-        }
 
         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+$") &&
+            if (Regex.IsMatch(str, @"^\d+$") && ulong.TryParse(str, NumberStyles.Number, formatProvider, out var value))
-                ulong.TryParse(str, NumberStyles.Number, formatProvider, out var value))
             {
                 return new Snowflake(value);
             }
@@ -56,18 +49,8 @@ namespace DiscordChatExporter.Core.Discord
         public static Snowflake Parse(string str) => Parse(str, null);
     }
 
-    public partial struct Snowflake : IComparable<Snowflake>, IEquatable<Snowflake>
+    public partial record struct Snowflake : IComparable<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);
     }
 }

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

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

DiscordChatExporter.Core/Exceptions/DiscordChatExporterException.cs

@@ -5,12 +5,12 @@ namespace DiscordChatExporter.Core.Exceptions
 {
     public partial class DiscordChatExporterException : Exception
     {
-        public bool IsCritical { get; }
+        public bool IsFatal { get; }
 
-        public DiscordChatExporterException(string message, bool isCritical = false)
+        public DiscordChatExporterException(string message, bool isFatal = false)
             : base(message)
         {
-            IsCritical = isCritical;
+            IsFatal = isFatal;
         }
     }
 
@@ -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.");

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;
@@ -18,12 +19,15 @@ namespace DiscordChatExporter.Core.Exporting
 
         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 contextChannels = await _discord.GetGuildChannelsAsync(request.Guild.Id, cancellationToken);
-            var contextRoles = await _discord.GetGuildRolesAsync(request.Guild.Id);
+            var contextRoles = await _discord.GetGuildRolesAsync(request.Guild.Id, cancellationToken);
 
             var context = new ExportContext(
                 request,
@@ -37,10 +41,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 +61,17 @@ namespace DiscordChatExporter.Core.Exporting
                     if (!encounteredUsers.Add(referencedUser))
                         continue;
 
-                    var member =
+                    var member = await _discord.GetGuildMemberAsync(
-                        await _discord.TryGetGuildMemberAsync(request.Guild.Id, referencedUser) ??
+                        request.Guild.Id,
-                        Member.CreateForUser(referencedUser);
+                        referencedUser,
+                        cancellationToken
+                    );
 
                     contextMembers.Add(member);
                 }
 
                 // Export message
-                await messageExporter.ExportMessageAsync(message);
+                await messageExporter.ExportMessageAsync(message, cancellationToken);
                 exportedAnything = true;
             }
 

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -4,11 +4,11 @@ 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
 {
@@ -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(
-                        .Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+                        Path.AltDirectorySeparatorChar,
-                        .Select(Uri.EscapeDataString)
+                        relativeFilePath
-                        .JoinToString(Path.AltDirectorySeparatorChar.ToString());
+                            .Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+                            .Select(Uri.EscapeDataString)
+                    );
                 }
 
                 return relativeFilePath;

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -10,76 +10,35 @@ using DiscordChatExporter.Core.Utils;
 
 namespace DiscordChatExporter.Core.Exporting
 {
-    public partial class ExportRequest
+    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 Guild Guild { get; }
+        private string? _outputBaseFilePath;
+        public string OutputBaseFilePath => _outputBaseFilePath ??= GetOutputBaseFilePath(
+            Guild,
+            Channel,
+            OutputPath,
+            Format,
+            After,
+            Before
+        );
 
-        public Channel Channel { get; }
+        public string OutputBaseDirPath => Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath;
 
-        public string OutputPath { get; }
+        public string OutputMediaDirPath => $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
-
-        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
-            );
-
-            OutputBaseDirPath = Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath;
-            OutputMediaDirPath = $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
-        }
     }
 
-    public partial class ExportRequest
+    public partial record ExportRequest
     {
         private static string GetOutputBaseFilePath(
             Guild guild,
@@ -140,17 +99,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(")");

DiscordChatExporter.Core/Exporting/Filtering/BinaryExpressionMessageFilter.cs

@@ -16,10 +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.Or => _first.IsMatch(message) || _second.IsMatch(message),
-            BinaryExpressionKind.And => _first.Filter(message) && _second.Filter(message),
+            BinaryExpressionKind.And => _first.IsMatch(message) && _second.IsMatch(message),
             _ => throw new InvalidOperationException($"Unknown binary expression kind '{_kind}'.")
         };
     }

DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs

@@ -1,4 +1,5 @@
-using System.Text.RegularExpressions;
+using System.Linq;
+using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Core.Exporting.Filtering
@@ -9,10 +10,25 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 
         public ContainsMessageFilter(string text) => _text = text;
 
-        public override bool Filter(Message message) => Regex.IsMatch(
+        private bool IsMatch(string? content) =>
-            message.Content,
+            !string.IsNullOrWhiteSpace(content) &&
-            "\\b" + _text + "\\b",
+            Regex.IsMatch(
-            RegexOptions.IgnoreCase | RegexOptions.CultureInvariant
+                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

@@ -9,7 +9,7 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 
         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

@@ -11,7 +11,7 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 
         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(),

DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs

@@ -10,7 +10,7 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 
         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/MessageFilter.cs

@@ -6,7 +6,7 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 {
     public abstract partial class MessageFilter
     {
-        public abstract bool Filter(Message message);
+        public abstract bool IsMatch(Message message);
     }
 
     public partial class MessageFilter

DiscordChatExporter.Core/Exporting/Filtering/NegatedMessageFilter.cs

@@ -8,6 +8,6 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 
         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

@@ -4,6 +4,6 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 {
     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,5 +1,4 @@
-using System.Linq;
+using DiscordChatExporter.Core.Utils.Extensions;
-using DiscordChatExporter.Core.Utils.Extensions;
 using Superpower;
 using Superpower.Parsers;
 
@@ -7,16 +6,12 @@ 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));
-
         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,7 +46,7 @@ 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)),
@@ -64,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,
@@ -81,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')

DiscordChatExporter.Core/Exporting/MediaDownloader.cs

@@ -2,10 +2,10 @@
 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;
@@ -14,24 +14,19 @@ namespace DiscordChatExporter.Core.Exporting
 {
     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)
+        public async ValueTask<string> DownloadAsync(string url, CancellationToken cancellationToken = default)
-            : this(Http.Client, workingDirPath, reuseMedia) {}
-
-        public async ValueTask<string> DownloadAsync(string url)
         {
             if (_pathCache.TryGetValue(url, out var cachedFilePath))
                 return cachedFilePath;
@@ -49,7 +44,7 @@ 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);

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Writers;
@@ -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,15 +50,15 @@ 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();
+            var writer = await GetWriterAsync(cancellationToken);
-            await writer.WriteMessageAsync(message);
+            await writer.WriteMessageAsync(message, cancellationToken);
         }
 
         public async ValueTask DisposeAsync() => await ResetWriterAsync();

DiscordChatExporter.Core/Exporting/Writers/CsvMessageWriter.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
@@ -21,29 +22,37 @@ namespace DiscordChatExporter.Core.Exporting.Writers
         private string FormatMarkdown(string? markdown) =>
             PlainTextMarkdownVisitor.Format(Context, markdown ?? "");
 
-        public override async ValueTask WritePreambleAsync() =>
+        public override async ValueTask WritePreambleAsync(CancellationToken cancellationToken = default) =>
             await _writer.WriteLineAsync("AuthorID,Author,Date,Content,Attachments,Reactions");
 
-        private async ValueTask WriteAttachmentsAsync(IReadOnlyList<Attachment> attachments)
+        private async ValueTask WriteAttachmentsAsync(
+            IReadOnlyList<Attachment> attachments,
+            CancellationToken cancellationToken = default)
         {
             var buffer = new StringBuilder();
 
             foreach (var attachment in attachments)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 buffer
                     .AppendIfNotEmpty(',')
-                    .Append(await Context.ResolveMediaUrlAsync(attachment.Url));
+                    .Append(await Context.ResolveMediaUrlAsync(attachment.Url, cancellationToken));
             }
 
             await _writer.WriteAsync(CsvEncode(buffer.ToString()));
         }
 
-        private async ValueTask WriteReactionsAsync(IReadOnlyList<Reaction> reactions)
+        private async ValueTask WriteReactionsAsync(
+            IReadOnlyList<Reaction> reactions,
+            CancellationToken cancellationToken = default)
         {
             var buffer = new StringBuilder();
 
             foreach (var reaction in reactions)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 buffer
                     .AppendIfNotEmpty(',')
                     .Append(reaction.Emoji.Name)
@@ -56,9 +65,11 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             await _writer.WriteAsync(CsvEncode(buffer.ToString()));
         }
 
-        public override async ValueTask WriteMessageAsync(Message message)
+        public override async ValueTask WriteMessageAsync(
+            Message message,
+            CancellationToken cancellationToken = default)
         {
-            await base.WriteMessageAsync(message);
+            await base.WriteMessageAsync(message, cancellationToken);
 
             // Author ID
             await _writer.WriteAsync(CsvEncode(message.Author.Id.ToString()));
@@ -77,11 +88,11 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             await _writer.WriteAsync(',');
 
             // Attachments
-            await WriteAttachmentsAsync(message.Attachments);
+            await WriteAttachmentsAsync(message.Attachments, cancellationToken);
             await _writer.WriteAsync(',');
 
             // Reactions
-            await WriteReactionsAsync(message.Reactions);
+            await WriteReactionsAsync(message.Reactions, cancellationToken);
 
             // Finish row
             await _writer.WriteLineAsync();

DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml

@@ -13,7 +13,9 @@
 
     string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);
 
-    ValueTask<string> ResolveUrlAsync(string url) => Model.ExportContext.ResolveMediaUrlAsync(url);
+    ValueTask<string> ResolveUrlAsync(string url) => Model.ExportContext.ResolveMediaUrlAsync(url, CancellationToken);
+
+    string FormatMarkdown(string markdown) => Model.FormatMarkdown(markdown);
 }
 
 <!DOCTYPE html>
@@ -146,11 +148,16 @@
         .mention {
             border-radius: 3px;
             padding: 0 2px;
-            color: #7289da;
+            color: @Themed("#dee0fc", "#505cdc");
-            background-color: rgba(114, 137, 218, .1);
+            background-color: @Themed("rgba(88, 101, 242, .3)", "rgba(88, 101, 242, .15)");
             font-weight: 500;
         }
 
+        .mention:hover {
+            background-color: #5865f2;
+            color: #ffffff
+        }
+
         .timestamp {
             border-radius: 3px;
             padding: 0 2px;
@@ -278,6 +285,7 @@
         .chatlog__reference-edited-timestamp {
             margin-left: 0.25em;
             font-size: 0.8em;
+            unicode-bidi: bidi-override;
             color: @Themed("rgba(255, 255, 255, 0.2)", "#747f8d");
         }
 
@@ -297,6 +305,7 @@
         .chatlog__messages {
             grid-column: 2;
             min-width: 50%;
+            direction: ltr;
         }
 
         .chatlog__author-name {
@@ -307,6 +316,8 @@
         .chatlog__timestamp {
             margin-left: 0.3em;
             font-size: 0.75em;
+            direction: ltr;
+            unicode-bidi: bidi-override;
             color: @Themed("rgba(255, 255, 255, 0.2)", "#747f8d");
         }
 
@@ -476,6 +487,8 @@
         .chatlog__embed-author-name {
             font-size: 0.875em;
             font-weight: 600;
+            direction: ltr;
+            unicode-bidi: bidi-override;
             color: @Themed("#ffffff", "#4f545c")
         }
 
@@ -591,17 +604,31 @@
         .chatlog__reaction {
             display: flex;
             align-items: center;
-            margin: 0.35em 0.1em 0.1em 0.1em;
+            margin: 0.35em 0.1em 0.1em 0;
-            padding: 0.2em 0.35em;
+            padding: .125rem .375rem;
-            background-color: @Themed("rgba(255, 255, 255, 0.05)", "rgba(79, 84, 92, 0.06)");
+            background-color: @Themed("#2f3136", "#f2f3f5");
-            border-radius: 3px;
+            border-radius: 8px;
+            border-color: transparent;
+            border-width: 1px;
+            border-style: solid;
+        }
+
+        .chatlog__reaction:hover {
+            border-color: @Themed("hsla(0,0%,100%,.2)", "rgba(0, 0, 0, 0.2)");
+            border-width: 1px;
+            border-style: solid;
+            background-color: @Themed("transparent", "white");
         }
 
         .chatlog__reaction-count {
             min-width: 9px;
             margin-left: 0.35em;
             font-size: 0.875em;
-            color: @Themed("rgba(255, 255, 255, 0.3)", "#747f8d");
+            color: @Themed("#b9bbbe", "#4f5660");
+        }
+
+        .chatlog__reaction:hover .chatlog__reaction-count {
+            color: @Themed("#dcddde", "#2e3338");
         }
 
         .chatlog__bot-tag {
@@ -688,11 +715,11 @@
     </div>
     <div class="preamble__entries-container">
         <div class="preamble__entry">@Model.ExportContext.Request.Guild.Name</div>
-        <div class="preamble__entry">@Model.ExportContext.Request.Channel.Category / @Model.ExportContext.Request.Channel.Name</div>
+        <div class="preamble__entry">@Model.ExportContext.Request.Channel.Category.Name / @Model.ExportContext.Request.Channel.Name</div>
 
         @if (!string.IsNullOrWhiteSpace(Model.ExportContext.Request.Channel.Topic))
         {
-            <div class="preamble__entry preamble__entry--small">@Model.ExportContext.Request.Channel.Topic</div>
+            <div class="preamble__entry preamble__entry--small">@Raw(FormatMarkdown(Model.ExportContext.Request.Channel.Topic))</div>
         }
 
         @if (Model.ExportContext.Request.After is not null || Model.ExportContext.Request.Before is not null)

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

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

DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Writers.Html;
@@ -21,31 +22,35 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _themeName = themeName;
         }
 
-        public override async ValueTask WritePreambleAsync()
+        public override async ValueTask WritePreambleAsync(CancellationToken cancellationToken = default)
         {
             var templateContext = new PreambleTemplateContext(Context, _themeName);
 
             // We are not writing directly to output because Razor
             // does not actually do asynchronous writes to stream.
             await _writer.WriteLineAsync(
-                await PreambleTemplate.RenderAsync(templateContext)
+                await PreambleTemplate.RenderAsync(templateContext, cancellationToken)
             );
         }
 
-        private async ValueTask WriteMessageGroupAsync(MessageGroup messageGroup)
+        private async ValueTask WriteMessageGroupAsync(
+            MessageGroup messageGroup,
+            CancellationToken cancellationToken = default)
         {
             var templateContext = new MessageGroupTemplateContext(Context, messageGroup);
 
             // We are not writing directly to output because Razor
             // does not actually do asynchronous writes to stream.
             await _writer.WriteLineAsync(
-                await MessageGroupTemplate.RenderAsync(templateContext)
+                await MessageGroupTemplate.RenderAsync(templateContext, cancellationToken)
             );
         }
 
-        public override async ValueTask WriteMessageAsync(Message message)
+        public override async ValueTask WriteMessageAsync(
+            Message message,
+            CancellationToken cancellationToken = default)
         {
-            await base.WriteMessageAsync(message);
+            await base.WriteMessageAsync(message, cancellationToken);
 
             // If message group is empty or the given message can be grouped, buffer the given message
             if (!_messageGroupBuffer.Any() || MessageGroup.CanJoin(_messageGroupBuffer.Last(), message))
@@ -55,25 +60,30 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             // Otherwise, flush the group and render messages
             else
             {
-                await WriteMessageGroupAsync(MessageGroup.Join(_messageGroupBuffer));
+                await WriteMessageGroupAsync(MessageGroup.Join(_messageGroupBuffer), cancellationToken);
 
                 _messageGroupBuffer.Clear();
                 _messageGroupBuffer.Add(message);
             }
         }
 
-        public override async ValueTask WritePostambleAsync()
+        public override async ValueTask WritePostambleAsync(CancellationToken cancellationToken = default)
         {
             // Flush current message group
             if (_messageGroupBuffer.Any())
-                await WriteMessageGroupAsync(MessageGroup.Join(_messageGroupBuffer));
+            {
+                await WriteMessageGroupAsync(
+                    MessageGroup.Join(_messageGroupBuffer),
+                    cancellationToken
+                );
+            }
 
             var templateContext = new PostambleTemplateContext(Context, MessagesWritten);
 
             // We are not writing directly to output because Razor
             // does not actually do asynchronous writes to stream.
             await _writer.WriteLineAsync(
-                await PostambleTemplate.RenderAsync(templateContext)
+                await PostambleTemplate.RenderAsync(templateContext, cancellationToken)
             );
         }
 

DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
@@ -30,20 +31,24 @@ namespace DiscordChatExporter.Core.Exporting.Writers
         private string FormatMarkdown(string? markdown) =>
             PlainTextMarkdownVisitor.Format(Context, markdown ?? "");
 
-        private async ValueTask WriteAttachmentAsync(Attachment attachment)
+        private async ValueTask WriteAttachmentAsync(
+            Attachment attachment,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject();
 
             _writer.WriteString("id", attachment.Id.ToString());
-            _writer.WriteString("url", await Context.ResolveMediaUrlAsync(attachment.Url));
+            _writer.WriteString("url", await Context.ResolveMediaUrlAsync(attachment.Url, cancellationToken));
             _writer.WriteString("fileName", attachment.FileName);
             _writer.WriteNumber("fileSizeBytes", attachment.FileSize.TotalBytes);
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        private async ValueTask WriteEmbedAuthorAsync(EmbedAuthor embedAuthor)
+        private async ValueTask WriteEmbedAuthorAsync(
+            EmbedAuthor embedAuthor,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject("author");
 
@@ -51,54 +56,62 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteString("url", embedAuthor.Url);
 
             if (!string.IsNullOrWhiteSpace(embedAuthor.IconUrl))
-                _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedAuthor.IconProxyUrl ?? embedAuthor.IconUrl));
+                _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedAuthor.IconProxyUrl ?? embedAuthor.IconUrl, cancellationToken));
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        private async ValueTask WriteEmbedThumbnailAsync(EmbedImage embedThumbnail)
+        private async ValueTask WriteEmbedThumbnailAsync(
+            EmbedImage embedThumbnail,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject("thumbnail");
 
             if (!string.IsNullOrWhiteSpace(embedThumbnail.Url))
-                _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedThumbnail.ProxyUrl ?? embedThumbnail.Url));
+                _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedThumbnail.ProxyUrl ?? embedThumbnail.Url, cancellationToken));
 
             _writer.WriteNumber("width", embedThumbnail.Width);
             _writer.WriteNumber("height", embedThumbnail.Height);
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        private async ValueTask WriteEmbedImageAsync(EmbedImage embedImage)
+        private async ValueTask WriteEmbedImageAsync(
+            EmbedImage embedImage,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject("image");
 
             if (!string.IsNullOrWhiteSpace(embedImage.Url))
-                _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedImage.ProxyUrl ?? embedImage.Url));
+                _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedImage.ProxyUrl ?? embedImage.Url, cancellationToken));
 
             _writer.WriteNumber("width", embedImage.Width);
             _writer.WriteNumber("height", embedImage.Height);
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        private async ValueTask WriteEmbedFooterAsync(EmbedFooter embedFooter)
+        private async ValueTask WriteEmbedFooterAsync(
+            EmbedFooter embedFooter,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject("footer");
 
             _writer.WriteString("text", embedFooter.Text);
 
             if (!string.IsNullOrWhiteSpace(embedFooter.IconUrl))
-                _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedFooter.IconProxyUrl ?? embedFooter.IconUrl));
+                _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedFooter.IconProxyUrl ?? embedFooter.IconUrl, cancellationToken));
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        private async ValueTask WriteEmbedFieldAsync(EmbedField embedField)
+        private async ValueTask WriteEmbedFieldAsync(
+            EmbedField embedField,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject();
 
@@ -107,10 +120,12 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteBoolean("isInline", embedField.IsInline);
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        private async ValueTask WriteEmbedAsync(Embed embed)
+        private async ValueTask WriteEmbedAsync(
+            Embed embed,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject();
 
@@ -123,30 +138,32 @@ namespace DiscordChatExporter.Core.Exporting.Writers
                 _writer.WriteString("color", embed.Color.Value.ToHex());
 
             if (embed.Author is not null)
-                await WriteEmbedAuthorAsync(embed.Author);
+                await WriteEmbedAuthorAsync(embed.Author, cancellationToken);
 
             if (embed.Thumbnail is not null)
-                await WriteEmbedThumbnailAsync(embed.Thumbnail);
+                await WriteEmbedThumbnailAsync(embed.Thumbnail, cancellationToken);
 
             if (embed.Image is not null)
-                await WriteEmbedImageAsync(embed.Image);
+                await WriteEmbedImageAsync(embed.Image, cancellationToken);
 
             if (embed.Footer is not null)
-                await WriteEmbedFooterAsync(embed.Footer);
+                await WriteEmbedFooterAsync(embed.Footer, cancellationToken);
 
             // Fields
             _writer.WriteStartArray("fields");
 
             foreach (var field in embed.Fields)
-                await WriteEmbedFieldAsync(field);
+                await WriteEmbedFieldAsync(field, cancellationToken);
 
             _writer.WriteEndArray();
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        private async ValueTask WriteReactionAsync(Reaction reaction)
+        private async ValueTask WriteReactionAsync(
+            Reaction reaction,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject();
 
@@ -155,16 +172,18 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteString("id", reaction.Emoji.Id);
             _writer.WriteString("name", reaction.Emoji.Name);
             _writer.WriteBoolean("isAnimated", reaction.Emoji.IsAnimated);
-            _writer.WriteString("imageUrl", await Context.ResolveMediaUrlAsync(reaction.Emoji.ImageUrl));
+            _writer.WriteString("imageUrl", await Context.ResolveMediaUrlAsync(reaction.Emoji.ImageUrl, cancellationToken));
             _writer.WriteEndObject();
 
             _writer.WriteNumber("count", reaction.Count);
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        private async ValueTask WriteMentionAsync(User mentionedUser)
+        private async ValueTask WriteMentionAsync(
+            User mentionedUser,
+            CancellationToken cancellationToken = default)
         {
             _writer.WriteStartObject();
 
@@ -175,10 +194,10 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteBoolean("isBot", mentionedUser.IsBot);
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        public override async ValueTask WritePreambleAsync()
+        public override async ValueTask WritePreambleAsync(CancellationToken cancellationToken = default)
         {
             // Root object (start)
             _writer.WriteStartObject();
@@ -187,7 +206,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteStartObject("guild");
             _writer.WriteString("id", Context.Request.Guild.Id.ToString());
             _writer.WriteString("name", Context.Request.Guild.Name);
-            _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(Context.Request.Guild.IconUrl));
+            _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(Context.Request.Guild.IconUrl, cancellationToken));
             _writer.WriteEndObject();
 
             // Channel
@@ -208,12 +227,14 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
             // Message array (start)
             _writer.WriteStartArray("messages");
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        public override async ValueTask WriteMessageAsync(Message message)
+        public override async ValueTask WriteMessageAsync(
+            Message message,
+            CancellationToken cancellationToken = default)
         {
-            await base.WriteMessageAsync(message);
+            await base.WriteMessageAsync(message, cancellationToken);
 
             _writer.WriteStartObject();
 
@@ -236,14 +257,14 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteString("nickname", Context.TryGetMember(message.Author.Id)?.Nick ?? message.Author.Name);
             _writer.WriteString("color", Context.TryGetUserColor(message.Author.Id)?.ToHex());
             _writer.WriteBoolean("isBot", message.Author.IsBot);
-            _writer.WriteString("avatarUrl", await Context.ResolveMediaUrlAsync(message.Author.AvatarUrl));
+            _writer.WriteString("avatarUrl", await Context.ResolveMediaUrlAsync(message.Author.AvatarUrl, cancellationToken));
             _writer.WriteEndObject();
 
             // Attachments
             _writer.WriteStartArray("attachments");
 
             foreach (var attachment in message.Attachments)
-                await WriteAttachmentAsync(attachment);
+                await WriteAttachmentAsync(attachment, cancellationToken);
 
             _writer.WriteEndArray();
 
@@ -251,7 +272,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteStartArray("embeds");
 
             foreach (var embed in message.Embeds)
-                await WriteEmbedAsync(embed);
+                await WriteEmbedAsync(embed, cancellationToken);
 
             _writer.WriteEndArray();
 
@@ -259,7 +280,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteStartArray("reactions");
 
             foreach (var reaction in message.Reactions)
-                await WriteReactionAsync(reaction);
+                await WriteReactionAsync(reaction, cancellationToken);
 
             _writer.WriteEndArray();
 
@@ -267,7 +288,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             _writer.WriteStartArray("mentions");
 
             foreach (var mention in message.MentionedUsers)
-                await WriteMentionAsync(mention);
+                await WriteMentionAsync(mention, cancellationToken);
 
             _writer.WriteEndArray();
 
@@ -282,10 +303,10 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             }
 
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
-        public override async ValueTask WritePostambleAsync()
+        public override async ValueTask WritePostambleAsync(CancellationToken cancellationToken = default)
         {
             // Message array (end)
             _writer.WriteEndArray();
@@ -294,7 +315,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
             // Root object (end)
             _writer.WriteEndObject();
-            await _writer.FlushAsync();
+            await _writer.FlushAsync(cancellationToken);
         }
 
         public override async ValueTask DisposeAsync()

DiscordChatExporter.Core/Exporting/Writers/MessageWriter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 
@@ -21,15 +22,15 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             Context = context;
         }
 
-        public virtual ValueTask WritePreambleAsync() => default;
+        public virtual ValueTask WritePreambleAsync(CancellationToken cancellationToken = default) => default;
 
-        public virtual ValueTask WriteMessageAsync(Message message)
+        public virtual ValueTask WriteMessageAsync(Message message, CancellationToken cancellationToken = default)
         {
             MessagesWritten++;
             return default;
         }
 
-        public virtual ValueTask WritePostambleAsync() => default;
+        public virtual ValueTask WritePostambleAsync(CancellationToken cancellationToken = default) => default;
 
         public virtual async ValueTask DisposeAsync() => await Stream.DisposeAsync();
     }

DiscordChatExporter.Core/Exporting/Writers/PlainTextMessageWriter.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
 using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
-using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Exporting.Writers
 {
@@ -35,7 +35,9 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             await _writer.WriteLineAsync();
         }
 
-        private async ValueTask WriteAttachmentsAsync(IReadOnlyList<Attachment> attachments)
+        private async ValueTask WriteAttachmentsAsync(
+            IReadOnlyList<Attachment> attachments,
+            CancellationToken cancellationToken = default)
         {
             if (!attachments.Any())
                 return;
@@ -43,15 +45,23 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             await _writer.WriteLineAsync("{Attachments}");
 
             foreach (var attachment in attachments)
-                await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(attachment.Url));
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(attachment.Url, cancellationToken));
+            }
 
             await _writer.WriteLineAsync();
         }
 
-        private async ValueTask WriteEmbedsAsync(IReadOnlyList<Embed> embeds)
+        private async ValueTask WriteEmbedsAsync(
+            IReadOnlyList<Embed> embeds,
+            CancellationToken cancellationToken = default)
         {
             foreach (var embed in embeds)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 await _writer.WriteLineAsync("{Embed}");
 
                 if (!string.IsNullOrWhiteSpace(embed.Author?.Name))
@@ -76,10 +86,10 @@ namespace DiscordChatExporter.Core.Exporting.Writers
                 }
 
                 if (!string.IsNullOrWhiteSpace(embed.Thumbnail?.Url))
-                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url));
+                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url, cancellationToken));
 
                 if (!string.IsNullOrWhiteSpace(embed.Image?.Url))
-                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Image.ProxyUrl ?? embed.Image.Url));
+                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Image.ProxyUrl ?? embed.Image.Url, cancellationToken));
 
                 if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
                     await _writer.WriteLineAsync(embed.Footer.Text);
@@ -88,7 +98,9 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             }
         }
 
-        private async ValueTask WriteReactionsAsync(IReadOnlyList<Reaction> reactions)
+        private async ValueTask WriteReactionsAsync(
+            IReadOnlyList<Reaction> reactions,
+            CancellationToken cancellationToken = default)
         {
             if (!reactions.Any())
                 return;
@@ -97,6 +109,8 @@ namespace DiscordChatExporter.Core.Exporting.Writers
 
             foreach (var reaction in reactions)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 await _writer.WriteAsync(reaction.Emoji.Name);
 
                 if (reaction.Count > 1)
@@ -108,9 +122,9 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             await _writer.WriteLineAsync();
         }
 
-        public override async ValueTask WritePreambleAsync()
+        public override async ValueTask WritePreambleAsync(CancellationToken cancellationToken = default)
         {
-            await _writer.WriteLineAsync('='.Repeat(62));
+            await _writer.WriteLineAsync(new string('=', 62));
             await _writer.WriteLineAsync($"Guild: {Context.Request.Guild.Name}");
             await _writer.WriteLineAsync($"Channel: {Context.Request.Channel.Category.Name} / {Context.Request.Channel.Name}");
 
@@ -123,13 +137,15 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             if (Context.Request.Before is not null)
                 await _writer.WriteLineAsync($"Before: {Context.FormatDate(Context.Request.Before.Value.ToDate())}");
 
-            await _writer.WriteLineAsync('='.Repeat(62));
+            await _writer.WriteLineAsync(new string('=', 62));
             await _writer.WriteLineAsync();
         }
 
-        public override async ValueTask WriteMessageAsync(Message message)
+        public override async ValueTask WriteMessageAsync(
+            Message message,
+            CancellationToken cancellationToken = default)
         {
-            await base.WriteMessageAsync(message);
+            await base.WriteMessageAsync(message, cancellationToken);
 
             // Header
             await WriteMessageHeaderAsync(message);
@@ -141,18 +157,18 @@ namespace DiscordChatExporter.Core.Exporting.Writers
             await _writer.WriteLineAsync();
 
             // Attachments, embeds, reactions
-            await WriteAttachmentsAsync(message.Attachments);
+            await WriteAttachmentsAsync(message.Attachments, cancellationToken);
-            await WriteEmbedsAsync(message.Embeds);
+            await WriteEmbedsAsync(message.Embeds, cancellationToken);
-            await WriteReactionsAsync(message.Reactions);
+            await WriteReactionsAsync(message.Reactions, cancellationToken);
 
             await _writer.WriteLineAsync();
         }
 
-        public override async ValueTask WritePostambleAsync()
+        public override async ValueTask WritePostambleAsync(CancellationToken cancellationToken = default)
         {
-            await _writer.WriteLineAsync('='.Repeat(62));
+            await _writer.WriteLineAsync(new string('=', 62));
             await _writer.WriteLineAsync($"Exported {MessagesWritten:N0} message(s)");
-            await _writer.WriteLineAsync('='.Repeat(62));
+            await _writer.WriteLineAsync(new string('=', 62));
         }
 
         public override async ValueTask DisposeAsync()

DiscordChatExporter.Core/Markdown/EmojiNode.cs

@@ -1,38 +1,24 @@
-using System.Diagnostics.CodeAnalysis;
+using DiscordChatExporter.Core.Utils;
-using DiscordChatExporter.Core.Utils;
 
 namespace DiscordChatExporter.Core.Markdown
 {
-    internal class EmojiNode : MarkdownNode
+    internal record EmojiNode(
-    {
         // 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) : MarkdownNode
+    {
         // 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 bool IsCustomEmoji => !string.IsNullOrWhiteSpace(Id);
 
-        public EmojiNode(string? id, string name, bool isAnimated)
-        {
-            Id = id;
-            Name = name;
-            IsAnimated = isAnimated;
-        }
-
         public EmojiNode(string name)
             : this(null, name, false)
         {
         }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => $"<Emoji> {Name}";
     }
 }

DiscordChatExporter.Core/Markdown/FormattingNode.cs

@@ -1,29 +1,6 @@
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 
 namespace DiscordChatExporter.Core.Markdown
 {
-    internal class FormattingNode : MarkdownNode
+    internal record FormattingNode(FormattingKind Kind, IReadOnlyList<MarkdownNode> Children) : MarkdownNode;
-    {
-        public FormattingKind Kind { get; }
-
-        public IReadOnlyList<MarkdownNode> Children { get; }
-
-        public FormattingNode(FormattingKind kind, IReadOnlyList<MarkdownNode> children)
-        {
-            Kind = kind;
-            Children = children;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString()
-        {
-            var childrenFormatted = Children.Count == 1
-                ? Children.Single().ToString()
-                : "+" + Children.Count;
-
-            return $"<{Kind}> ({childrenFormatted})";
-        }
-    }
 }

DiscordChatExporter.Core/Markdown/InlineCodeBlockNode.cs

@@ -1,17 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+namespace DiscordChatExporter.Core.Markdown
-
-namespace DiscordChatExporter.Core.Markdown
 {
-    internal class InlineCodeBlockNode : MarkdownNode
+    internal record InlineCodeBlockNode(string Code) : MarkdownNode;
-    {
-        public string Code { get; }
-
-        public InlineCodeBlockNode(string code)
-        {
-            Code = code;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => $"<Code> {Code}";
-    }
 }

DiscordChatExporter.Core/Markdown/LinkNode.cs

@@ -1,34 +1,14 @@
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 
 namespace DiscordChatExporter.Core.Markdown
 {
-    internal class LinkNode : MarkdownNode
+    internal record LinkNode(
+        string Url,
+        IReadOnlyList<MarkdownNode> Children) : MarkdownNode
     {
-        public string Url { get; }
-
-        public IReadOnlyList<MarkdownNode> Children { get; }
-
-        public LinkNode(string url, IReadOnlyList<MarkdownNode> children)
-        {
-            Url = url;
-            Children = children;
-        }
-
         public LinkNode(string url)
-            : this(url, new[] {new TextNode(url)})
+            : this(url, new[] { new TextNode(url) })
         {
         }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString()
-        {
-            var childrenFormatted = Children.Count == 1
-                ? Children.Single().ToString()
-                : "+" + Children.Count;
-
-            return $"<Link> ({childrenFormatted})";
-        }
     }
 }

DiscordChatExporter.Core/Markdown/MarkdownNode.cs

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

DiscordChatExporter.Core/Markdown/MentionNode.cs

@@ -1,20 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+namespace DiscordChatExporter.Core.Markdown
-
-namespace DiscordChatExporter.Core.Markdown
 {
-    internal class MentionNode : MarkdownNode
+    internal record MentionNode(string Id, MentionKind Kind) : MarkdownNode;
-    {
-        public string Id { get; }
-
-        public MentionKind Kind { get; }
-
-        public MentionNode(string id, MentionKind kind)
-        {
-            Id = id;
-            Kind = kind;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => $"<{Kind} mention> {Id}";
-    }
 }

DiscordChatExporter.Core/Markdown/MultiLineCodeBlockNode.cs

@@ -1,20 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+namespace DiscordChatExporter.Core.Markdown
-
-namespace DiscordChatExporter.Core.Markdown
 {
-    internal class MultiLineCodeBlockNode : MarkdownNode
+    internal record MultiLineCodeBlockNode(string Language, string Code) : MarkdownNode;
-    {
-        public string Language { get; }
-
-        public string Code { get; }
-
-        public MultiLineCodeBlockNode(string language, string code)
-        {
-            Language = language;
-            Code = code;
-        }
-
-        [ExcludeFromCodeCoverage]
-        public override string ToString() => $"<{Language}> {Code}";
-    }
 }