Update version

Closes #695

.github/workflows/docker.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build container
-        run: docker build .
+        run: docker build -f DiscordChatExporter.Cli.dockerfile .
 
   deploy-latest:
     if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master' }}
@@ -25,7 +25,7 @@ jobs:
         run: docker login -u tyrrrz -p ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build container
-        run: docker build -t tyrrrz/discordchatexporter:latest .
+        run: docker build -f DiscordChatExporter.Cli.dockerfile -t tyrrrz/discordchatexporter:latest .
 
       - name: Push container
         run: docker push tyrrrz/discordchatexporter:latest
@@ -46,7 +46,7 @@ jobs:
         run: docker login -u tyrrrz -p ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build container
-        run: docker build -t tyrrrz/discordchatexporter:stable .
+        run: docker build -f DiscordChatExporter.Cli.dockerfile -t tyrrrz/discordchatexporter:stable -t tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }} .
 
       - name: Push container (stable)
         run: docker push tyrrrz/discordchatexporter:stable

Changelog.md

@@ -1,3 +1,23 @@
+### v2.35 (02-Jul-2022)
+
+- Added support for exporting text chat in voice channels. These channels are now also displayed when browsing in the GUI and in the CLI when executing the `channels` command.
+- [GUI] Direct message channels are now sorted by the timestamp of their last message, similarly to how they appear in the Discord client.
+- [GUI] Removed artificial grouping of direct message channels into "Private" and "Group".
+- [CLI] Added runtime bootstrapper capabilities to the CLI flavor of DiscordChatExporter on Windows. Now, if you attempt to run the application without the required prerequisites installed, you will be provided with an option to install them automatically.
+- [CLI] Fixed outdated information in the usage guide. (Thanks [@Clint Herron](https://github.com/HanClinto))
+- [CLI] Added whitespace padding to the output of `guilds`, `channels`, and `dm` to make the tables look more uniform.
+- [HTML] Added hyperlinks to message timestamps, which allows you to quickly copy a link to a specific message in the export. (Thanks [@Philipp C. Heckel](https://github.com/binwiederhier))
+- [HTML] Added minification. Chat exports in HTML format are now 30-35% smaller than before.
+- [HTML] Added support for rendering embeds of Twitter posts that contain multiple images. Previously, this resulted in multiple separate embeds instead of one.
+- [HTML] Added support for rendering embeds of YouTube Shorts videos.
+- [HTML] Text content is now hidden if the message only contains a link to an image and nothing else. The link itself is resolved as an image embed.
+- [HTML] Fixed an issue where some emoji that included a zero-width-joiner rune were not rendered correctly due to a wrong Twemoji URL being generated. (Thanks [@Ethan](https://github.com/ethanndickson))
+- [HTML] Fixed an issue where replies to a message that contained a quote (i.e. `>`) were not rendered correctly.
+- [HTML] Fixed an issue where code blocks with language highlighting did not have the correct background color.
+- Added file name template token that resolves to the current date (`%d`). (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- Updated the usage guide to replace the instructions for retrieving the user token with those that appear to work for more people.
+- Updated the usage guide to feature the TOS warning more prominently.
+
 ### v2.34.1 (01-Jun-2022)
 
 - Improved retry policy to handle more transient errors. This should result in fewer errors exporting a channel due to timeout.

Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>2.34.1</Version>
+    <Version>2.35</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Oleksii Holub</Copyright>
     <LangVersion>preview</LangVersion>

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

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <NoWarn>$(NoWarn);xUnit1013</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.16.1" />
+    <PackageReference Include="AngleSharp" Version="0.17.1" />
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.0" PrivateAssets="all" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />

DiscordChatExporter.Cli.Tests/Fixtures/ExportWrapperFixture.cs

@@ -46,58 +46,46 @@ public class ExportWrapperFixture : IDisposable
         return await File.ReadAllTextAsync(filePath);
     }
 
-    public async ValueTask<IHtmlDocument> ExportAsHtmlAsync(Snowflake channelId)
+    public async ValueTask<IHtmlDocument> ExportAsHtmlAsync(Snowflake channelId) => Html.Parse(
-    {
+        await ExportAsync(channelId, ExportFormat.HtmlDark)
-        var data = await ExportAsync(channelId, ExportFormat.HtmlDark);
+    );
-        return Html.Parse(data);
-    }
 
-    public async ValueTask<JsonElement> ExportAsJsonAsync(Snowflake channelId)
+    public async ValueTask<JsonElement> ExportAsJsonAsync(Snowflake channelId) => Json.Parse(
-    {
+        await ExportAsync(channelId, ExportFormat.Json)
-        var data = await ExportAsync(channelId, ExportFormat.Json);
+    );
-        return Json.Parse(data);
-    }
 
-    public async ValueTask<string> ExportAsPlainTextAsync(Snowflake channelId)
+    public async ValueTask<string> ExportAsPlainTextAsync(Snowflake channelId) =>
-    {
+        await ExportAsync(channelId, ExportFormat.PlainText);
-        var data = await ExportAsync(channelId, ExportFormat.PlainText);
-        return data;
-    }
 
-    public async ValueTask<string> ExportAsCsvAsync(Snowflake channelId)
+    public async ValueTask<string> ExportAsCsvAsync(Snowflake channelId) =>
-    {
+        await ExportAsync(channelId, ExportFormat.Csv);
-        var data = await ExportAsync(channelId, ExportFormat.Csv);
-        return data;
-    }
 
-    public async ValueTask<IReadOnlyList<IElement>> GetMessagesAsHtmlAsync(Snowflake channelId)
+    public async ValueTask<IReadOnlyList<IElement>> GetMessagesAsHtmlAsync(Snowflake channelId) =>
-    {
+        (await ExportAsHtmlAsync(channelId))
-        var document = await ExportAsHtmlAsync(channelId);
+        .QuerySelectorAll("[data-message-id]")
-        return document.QuerySelectorAll("[data-message-id]").ToArray();
+        .ToArray();
-    }
 
-    public async ValueTask<IReadOnlyList<JsonElement>> GetMessagesAsJsonAsync(Snowflake channelId)
+    public async ValueTask<IReadOnlyList<JsonElement>> GetMessagesAsJsonAsync(Snowflake channelId) =>
-    {
+        (await ExportAsJsonAsync(channelId))
-        var document = await ExportAsJsonAsync(channelId);
+        .GetProperty("messages")
-        return document.GetProperty("messages").EnumerateArray().ToArray();
+        .EnumerateArray()
-    }
+        .ToArray();
 
     public async ValueTask<IElement> GetMessageAsHtmlAsync(Snowflake channelId, Snowflake messageId)
     {
-        var messages = await GetMessagesAsHtmlAsync(channelId);
+        var message = (await GetMessagesAsHtmlAsync(channelId))
-
+            .SingleOrDefault(e =>
-        var message = messages.SingleOrDefault(e =>
+                string.Equals(
-            string.Equals(
+                    e.GetAttribute("data-message-id"),
-                e.GetAttribute("data-message-id"),
+                    messageId.ToString(),
-                messageId.ToString(),
+                    StringComparison.OrdinalIgnoreCase
-                StringComparison.OrdinalIgnoreCase
+                )
-            )
+            );
-        );
 
         if (message is null)
         {
             throw new InvalidOperationException(
-                $"Message '{messageId}' does not exist in export of channel '{channelId}'."
+                $"Message '{messageId}' does not exist in the export of channel '{channelId}'."
             );
         }
 
@@ -106,20 +94,19 @@ public class ExportWrapperFixture : IDisposable
 
     public async ValueTask<JsonElement> GetMessageAsJsonAsync(Snowflake channelId, Snowflake messageId)
     {
-        var messages = await GetMessagesAsJsonAsync(channelId);
+        var message = (await GetMessagesAsJsonAsync(channelId))
-
+            .SingleOrDefault(j =>
-        var message = messages.FirstOrDefault(j =>
+                string.Equals(
-            string.Equals(
+                    j.GetProperty("id").GetString(),
-                j.GetProperty("id").GetString(),
+                    messageId.ToString(),
-                messageId.ToString(),
+                    StringComparison.OrdinalIgnoreCase
-                StringComparison.OrdinalIgnoreCase
+                )
-            )
+            );
-        );
 
         if (message.ValueKind == JsonValueKind.Undefined)
         {
             throw new InvalidOperationException(
-                $"Message '{messageId}' does not exist in export of channel '{channelId}'."
+                $"Message '{messageId}' does not exist in the export of channel '{channelId}'."
             );
         }
 

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

@@ -6,13 +6,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting;
 
-public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class ContentSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Messages_are_exported_correctly()
     {
         // Act
-        var document = await ExportWrapper.ExportAsCsvAsync(ChannelIds.DateRangeTestCases);
+        var document = await _exportWrapper.ExportAsCsvAsync(ChannelIds.DateRangeTestCases);
 
         // Assert
         document.Should().ContainAll(

DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs

@@ -15,14 +15,21 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
+public class DateRangeSpecs : IClassFixture<TempOutputFixture>
 {
+    private readonly TempOutputFixture _tempOutput;
+
+    public DateRangeSpecs(TempOutputFixture tempOutput)
+    {
+        _tempOutput = tempOutput;
+    }
+
     [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();
+        var filePath = _tempOutput.GetTempFilePath();
 
         // Act
         await new ExportChannelsCommand
@@ -34,16 +41,14 @@ public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempO
             After = Snowflake.FromDate(after)
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
+        // Assert
-        var document = Json.Parse(data);
+        var timestamps = Json
-
+            .Parse(await File.ReadAllTextAsync(filePath))
-        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[]
@@ -68,7 +73,7 @@ public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempO
     {
         // Arrange
         var before = new DateTimeOffset(2021, 07, 24, 0, 0, 0, TimeSpan.Zero);
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
 
         // Act
         await new ExportChannelsCommand
@@ -80,16 +85,14 @@ public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempO
             Before = Snowflake.FromDate(before)
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
+        // Assert
-        var document = Json.Parse(data);
+        var timestamps = Json
-
+            .Parse(await File.ReadAllTextAsync(filePath))
-        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[]
@@ -113,7 +116,7 @@ public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempO
         // 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();
+        var filePath = _tempOutput.GetTempFilePath();
 
         // Act
         await new ExportChannelsCommand
@@ -126,16 +129,14 @@ public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempO
             After = Snowflake.FromDate(after)
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
+        // Assert
-        var document = Json.Parse(data);
+        var timestamps = Json
-
+            .Parse(await File.ReadAllTextAsync(filePath))
-        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[]

DiscordChatExporter.Cli.Tests/Specs/FilterSpecs.cs

@@ -14,13 +14,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
+public class FilterSpecs : IClassFixture<TempOutputFixture>
 {
+    private readonly TempOutputFixture _tempOutput;
+
+    public FilterSpecs(TempOutputFixture tempOutput)
+    {
+        _tempOutput = tempOutput;
+    }
+
     [Fact]
     public async Task Messages_filtered_by_text_only_include_messages_that_contain_that_text()
     {
         // Arrange
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
 
         // Act
         await new ExportChannelsCommand
@@ -32,11 +39,9 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
             MessageFilter = MessageFilter.Parse("some text")
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
-        var document = Json.Parse(data);
-
         // Assert
-        document
+        Json
+            .Parse(await File.ReadAllTextAsync(filePath))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
@@ -48,7 +53,7 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
     public async Task Messages_filtered_by_author_only_include_messages_sent_by_that_author()
     {
         // Arrange
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
 
         // Act
         await new ExportChannelsCommand
@@ -60,11 +65,9 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
             MessageFilter = MessageFilter.Parse("from:Tyrrrz")
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
-        var document = Json.Parse(data);
-
         // Assert
-        document
+        Json
+            .Parse(await File.ReadAllTextAsync(filePath))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("author").GetProperty("name").GetString())
@@ -76,7 +79,7 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
     public async Task Messages_filtered_by_content_only_include_messages_that_have_that_content()
     {
         // Arrange
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
 
         // Act
         await new ExportChannelsCommand
@@ -88,11 +91,9 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
             MessageFilter = MessageFilter.Parse("has:image")
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
-        var document = Json.Parse(data);
-
         // Assert
-        document
+        Json
+            .Parse(await File.ReadAllTextAsync(filePath))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
@@ -104,7 +105,7 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
     public async Task Messages_filtered_by_pin_only_include_messages_that_have_been_pinned()
     {
         // Arrange
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
 
         // Act
         await new ExportChannelsCommand
@@ -116,11 +117,9 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
             MessageFilter = MessageFilter.Parse("has:pin")
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
-        var document = Json.Parse(data);
-
         // Assert
-        document
+        Json
+            .Parse(await File.ReadAllTextAsync(filePath))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
@@ -132,7 +131,7 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
     public async Task Messages_filtered_by_mention_only_include_messages_that_have_that_mention()
     {
         // Arrange
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
 
         // Act
         await new ExportChannelsCommand
@@ -144,11 +143,9 @@ public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutp
             MessageFilter = MessageFilter.Parse("mentions:Tyrrrz")
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
-        var document = Json.Parse(data);
-
         // Assert
-        document
+        Json
+            .Parse(await File.ReadAllTextAsync(filePath))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())

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

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Fixtures;
 using DiscordChatExporter.Cli.Tests.TestData;
@@ -8,19 +9,24 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
 
-public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public AttachmentSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Message_with_a_generic_attachment_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        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",
@@ -28,45 +34,52 @@ public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixtur
             "11 bytes"
         );
 
-        fileUrl.Should().StartWithEquivalentOf(
+        message
-            "https://cdn.discordapp.com/attachments/885587741654536192/885587844964417596/Test.txt"
+            .QuerySelectorAll("a")
-        );
+            .Select(e => e.GetAttribute("href"))
+            .Should()
+            .Contain(
+                "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(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.AttachmentTestCases,
             Snowflake.Parse("885654862656843786")
         );
 
-        var imageUrl = message.QuerySelector(".chatlog__attachment img")?.GetAttribute("src");
-
         // Assert
         message.Text().Should().Contain("Image attachment");
 
-        imageUrl.Should().StartWithEquivalentOf(
+        message
-            "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png"
+            .QuerySelectorAll("img")
-        );
+            .Select(e => e.GetAttribute("src"))
+            .Should()
+            .Contain(
+                "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png"
+            );
     }
 
     [Fact]
     public async Task Message_with_a_video_attachment_is_rendered_correctly()
     {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/333
+
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        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(
+        var videoUrl = message.QuerySelector("video source")?.GetAttribute("src");
+        videoUrl.Should().Be(
             "https://cdn.discordapp.com/attachments/885587741654536192/885655761512968233/file_example_MP4_640_3MG.mp4"
         );
     }
@@ -74,18 +87,19 @@ public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixtur
     [Fact]
     public async Task Message_with_an_audio_attachment_is_rendered_correctly()
     {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/333
+
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        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(
+        var audioUrl = message.QuerySelector("audio source")?.GetAttribute("src");
+        audioUrl.Should().Be(
             "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
         );
     }

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

@@ -8,13 +8,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
 
-public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class ContentSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Messages_are_exported_correctly()
     {
         // Act
-        var messages = await ExportWrapper.GetMessagesAsHtmlAsync(ChannelIds.DateRangeTestCases);
+        var messages = await _exportWrapper.GetMessagesAsHtmlAsync(ChannelIds.DateRangeTestCases);
 
         // Assert
         messages.Select(e => e.GetAttribute("data-message-id")).Should().Equal(
@@ -28,7 +35,7 @@ public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<E
             "885169254029213696"
         );
 
-        messages.Select(e => e.QuerySelector(".chatlog__content")?.Text().Trim()).Should().Equal(
+        messages.SelectMany(e => e.Text()).Should().ContainInOrder(
             "Hello world",
             "Goodbye world",
             "Foo bar",

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

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Fixtures;
 using DiscordChatExporter.Cli.Tests.TestData;
@@ -8,13 +9,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
 
-public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public EmbedSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Message_with_an_embed_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.EmbedTestCases,
             Snowflake.Parse("866769910729146400")
         );
@@ -32,32 +40,95 @@ public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<Exp
     }
 
     [Fact]
-    public async Task Message_with_a_Spotify_track_is_rendered_using_an_iframe()
+    public async Task Message_containing_an_image_link_is_rendered_with_an_image_embed()
     {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/537
+
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("991768701126852638")
+        );
+
+        // Assert
+        message
+            .QuerySelectorAll("img")
+            .Select(e => e.GetAttribute("src"))
+            .Should()
+            .Contain("https://i.redd.it/f8w05ja8s4e61.png");
+    }
+
+    [Fact]
+    public async Task Message_containing_an_image_link_and_nothing_else_is_rendered_without_text_content()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/682
+
+        // Act
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("991768701126852638")
+        );
+
+        // Assert
+        var content = message.QuerySelector(".chatlog__content")?.Text();
+        content.Should().BeNullOrEmpty();
+    }
+
+    [Fact]
+    public async Task Message_containing_a_Spotify_track_link_is_rendered_with_a_track_embed()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/657
+
+        // 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");
+        var iframeUrl = message.QuerySelector("iframe")?.GetAttribute("src");
+        iframeUrl.Should().Be("https://open.spotify.com/embed/track/1LHZMWefF9502NPfArRfvP");
     }
 
     [Fact]
-    public async Task Message_with_a_YouTube_video_is_rendered_using_an_iframe()
+    public async Task Message_containing_a_YouTube_video_link_is_rendered_with_a_video_embed()
     {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/570
+
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.EmbedTestCases,
             Snowflake.Parse("866472508588294165")
         );
 
-        var iframeSrc = message.QuerySelector("iframe")?.GetAttribute("src");
+        // Assert
+        var iframeUrl = message.QuerySelector("iframe")?.GetAttribute("src");
+        iframeUrl.Should().Be("https://www.youtube.com/embed/qOWW4OlgbvE");
+    }
+
+    [Fact]
+    public async Task Message_containing_a_Twitter_post_link_with_multiple_images_is_rendered_as_a_single_embed()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/695
+
+        // Act
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("991757444017557665")
+        );
 
         // Assert
-        iframeSrc.Should().StartWithEquivalentOf("https://www.youtube.com/embed/qOWW4OlgbvE");
+        message
+            .QuerySelectorAll("img")
+            .Select(e => e.GetAttribute("src"))
+            .Should()
+            .ContainInOrder(
+                "https://images-ext-1.discordapp.net/external/-n--xW3EHH_3jlrheVkMXHCM7T86b5Ty4-MzXCT4m1Q/https/pbs.twimg.com/media/FVYIzYPWAAAMBqZ.png",
+                "https://images-ext-2.discordapp.net/external/z5nEmGeEldV-kswydGLhqUsFHbb5AWHtdvc9XT6N5rE/https/pbs.twimg.com/media/FVYJBWJWAAMNAx2.png",
+                "https://images-ext-2.discordapp.net/external/gnip03SawMB6uZLagN5sRDpA_1Ap1CcEhMbJfK1z6WQ/https/pbs.twimg.com/media/FVYJHiRX0AANZcz.png",
+                "https://images-ext-2.discordapp.net/external/jl1v6cCbLaGmiwmKU-ZkXnF4cFsJ39f9A3-oEdqPdZs/https/pbs.twimg.com/media/FVYJNZNXwAAPnVG.png"
+            );
+
+        message.QuerySelectorAll(".chatlog__embed").Should().ContainSingle();
     }
 }

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

@@ -0,0 +1,79 @@
+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.Exporting;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public class GroupingSpecs : IClassFixture<TempOutputFixture>
+{
+    private readonly TempOutputFixture _tempOutput;
+
+    public GroupingSpecs(TempOutputFixture tempOutput)
+    {
+        _tempOutput = tempOutput;
+    }
+
+    [Fact]
+    public async Task Messages_are_grouped_correctly()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/152
+
+        // Arrange
+        var filePath = _tempOutput.GetTempFilePath();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = new[] { ChannelIds.GroupingTestCases },
+            ExportFormat = ExportFormat.HtmlDark,
+            OutputPath = filePath
+        }.ExecuteAsync(new FakeConsole());
+
+        // Assert
+        var messageGroups = Html
+            .Parse(await File.ReadAllTextAsync(filePath))
+            .QuerySelectorAll(".chatlog__message-group");
+
+        messageGroups.Should().HaveCount(2);
+
+        messageGroups[0]
+            .QuerySelectorAll(".chatlog__content")
+            .Select(e => e.Text())
+            .Should()
+            .ContainInOrder(
+                "First",
+                "Second",
+                "Third",
+                "Fourth",
+                "Fifth",
+                "Sixth",
+                "Seventh",
+                "Eighth",
+                "Ninth",
+                "Tenth"
+            );
+
+        messageGroups[1]
+            .QuerySelectorAll(".chatlog__content")
+            .Select(e => e.Text())
+            .Should()
+            .ContainInOrder(
+                "Eleventh",
+                "Twelveth",
+                "Thirteenth",
+                "Fourteenth",
+                "Fifteenth"
+            );
+    }
+}

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

@@ -8,19 +8,26 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
 
-public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class MentionSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public MentionSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task User_mention_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866458840245076028")
         );
 
         // Assert
-        message.Text().Trim().Should().Contain("User mention: @Tyrrrz");
+        message.Text().Should().Contain("User mention: @Tyrrrz");
         message.InnerHtml.Should().Contain("Tyrrrz#5447");
     }
 
@@ -28,38 +35,38 @@ public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<E
     public async Task Text_channel_mention_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459040480624680")
         );
 
         // Assert
-        message.Text().Trim().Should().Contain("Text channel mention: #mention-tests");
+        message.Text().Should().Contain("Text channel mention: #mention-tests");
     }
 
     [Fact]
     public async Task Voice_channel_mention_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459175462633503")
         );
 
         // Assert
-        message.Text().Trim().Should().Contain("Voice channel mention: 🔊chaos-vc");
+        message.Text().Should().Contain("Voice channel mention: 🔊chaos-vc");
     }
 
     [Fact]
     public async Task Role_mention_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459254693429258")
         );
 
         // Assert
-        message.Text().Trim().Should().Contain("Role mention: @Role 1");
+        message.Text().Should().Contain("Role mention: @Role 1");
     }
 }

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

@@ -8,49 +8,60 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
 
-public record ReplySpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class ReplySpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public ReplySpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Reply_to_a_normal_message_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.ReplyTestCases,
             Snowflake.Parse("866460738239725598")
         );
 
         // Assert
-        message.Text().Trim().Should().Contain("reply to original");
+        message.Text().Should().Contain("reply to original");
-        message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should().Contain("original");
+        message.QuerySelector(".chatlog__reference-link")?.Text().Should().Contain("original");
     }
 
     [Fact]
     public async Task Reply_to_a_deleted_message_is_rendered_correctly()
     {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/645
+
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.ReplyTestCases,
             Snowflake.Parse("866460975388819486")
         );
 
         // Assert
-        message.Text().Trim().Should().Contain("reply to deleted");
+        message.Text().Should().Contain("reply to deleted");
-        message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
+        message.QuerySelector(".chatlog__reference-link")?.Text().Should().Contain(
-            .Contain("Original message was deleted or could not be loaded.");
+            "Original message was deleted or could not be loaded."
+        );
     }
 
     [Fact]
     public async Task Reply_to_an_empty_message_with_attachment_is_rendered_correctly()
     {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/634
+
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.ReplyTestCases,
             Snowflake.Parse("866462470335627294")
         );
 
         // Assert
-        message.Text().Trim().Should().Contain("reply to attachment");
+        message.Text().Should().Contain("reply to attachment");
-        message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
+        message.QuerySelector(".chatlog__reference-link")?.Text().Should().Contain("Click to see attachment");
-            .Contain("Click to see attachment");
     }
 }

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

@@ -7,39 +7,40 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
 
-public record StickerSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class StickerSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public StickerSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Message_with_a_PNG_based_sticker_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.StickerTestCases,
             Snowflake.Parse("939670623158943754")
         );
 
-        var container = message.QuerySelector("[title='rock']");
-        var sourceUrl = container?.QuerySelector("img")?.GetAttribute("src");
-
         // Assert
-        container.Should().NotBeNull();
+        var stickerUrl = message.QuerySelector("[title='rock'] img")?.GetAttribute("src");
-        sourceUrl.Should().Be("https://discord.com/stickers/904215665597120572.png");
+        stickerUrl.Should().Be("https://discord.com/stickers/904215665597120572.png");
     }
 
     [Fact]
     public async Task Message_with_a_Lottie_based_sticker_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.StickerTestCases,
             Snowflake.Parse("939670526517997590")
         );
 
-        var container = message.QuerySelector("[title='Yikes']");
-        var sourceUrl = container?.QuerySelector("div[data-source]")?.GetAttribute("data-source");
-
         // Assert
-        container.Should().NotBeNull();
+        var stickerUrl = message.QuerySelector("[title='Yikes'] [data-source]")?.GetAttribute("data-source");
-        sourceUrl.Should().Be("https://discord.com/stickers/816087132447178774.json");
+        stickerUrl.Should().Be("https://discord.com/stickers/816087132447178774.json");
     }
 }

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

@@ -8,24 +8,30 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
 
-public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public AttachmentSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Message_with_a_generic_attachment_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        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");
 
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
         attachments.Should().HaveCount(1);
-        attachments.Single().GetProperty("url").GetString().Should().StartWithEquivalentOf(
+        attachments.Single().GetProperty("url").GetString().Should().Be(
             "https://cdn.discordapp.com/attachments/885587741654536192/885587844964417596/Test.txt"
         );
         attachments.Single().GetProperty("fileName").GetString().Should().Be("Test.txt");
@@ -36,18 +42,17 @@ public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixtur
     public async Task Message_with_an_image_attachment_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        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");
 
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
         attachments.Should().HaveCount(1);
-        attachments.Single().GetProperty("url").GetString().Should().StartWithEquivalentOf(
+        attachments.Single().GetProperty("url").GetString().Should().Be(
             "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png"
         );
         attachments.Single().GetProperty("fileName").GetString().Should().Be("bird-thumbnail.png");
@@ -58,18 +63,17 @@ public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixtur
     public async Task Message_with_a_video_attachment_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        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");
 
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
         attachments.Should().HaveCount(1);
-        attachments.Single().GetProperty("url").GetString().Should().StartWithEquivalentOf(
+        attachments.Single().GetProperty("url").GetString().Should().Be(
             "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");
@@ -80,18 +84,17 @@ public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixtur
     public async Task Message_with_an_audio_attachment_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        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");
 
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
         attachments.Should().HaveCount(1);
-        attachments.Single().GetProperty("url").GetString().Should().StartWithEquivalentOf(
+        attachments.Single().GetProperty("url").GetString().Should().Be(
             "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
         );
         attachments.Single().GetProperty("fileName").GetString().Should().Be("file_example_MP3_1MG.mp3");

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

@@ -7,13 +7,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
 
-public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class ContentSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Messages_are_exported_correctly()
     {
         // Act
-        var messages = await ExportWrapper.GetMessagesAsJsonAsync(ChannelIds.DateRangeTestCases);
+        var messages = await _exportWrapper.GetMessagesAsJsonAsync(ChannelIds.DateRangeTestCases);
 
         // Assert
         messages.Select(j => j.GetProperty("id").GetString()).Should().Equal(

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

@@ -8,41 +8,47 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
 
-public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public EmbedSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Message_with_an_embed_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        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
+        var embed = message.GetProperty("embeds").EnumerateArray().Single();
         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");
+
+        var embedAuthor = embed.GetProperty("author");
         embedAuthor.GetProperty("name").GetString().Should().Be("Embed author");
         embedAuthor.GetProperty("url").GetString().Should().Be("https://example.com/author");
         embedAuthor.GetProperty("iconUrl").GetString().Should().NotBeNullOrWhiteSpace();
+
+        var embedThumbnail = embed.GetProperty("thumbnail");
         embedThumbnail.GetProperty("url").GetString().Should().NotBeNullOrWhiteSpace();
         embedThumbnail.GetProperty("width").GetInt32().Should().Be(120);
         embedThumbnail.GetProperty("height").GetInt32().Should().Be(120);
+
+        var embedFooter = embed.GetProperty("footer");
         embedFooter.GetProperty("text").GetString().Should().Be("Embed footer");
         embedFooter.GetProperty("iconUrl").GetString().Should().NotBeNullOrWhiteSpace();
+
+        var embedFields = embed.GetProperty("fields").EnumerateArray().ToArray();
         embedFields.Should().HaveCount(3);
         embedFields[0].GetProperty("name").GetString().Should().Be("Field 1");
         embedFields[0].GetProperty("value").GetString().Should().Be("Value 1");

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

@@ -8,13 +8,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
 
-public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class MentionSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public MentionSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task User_mention_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        var message = await _exportWrapper.GetMessageAsJsonAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866458840245076028")
         );
@@ -26,14 +33,15 @@ public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<E
             .GetProperty("mentions")
             .EnumerateArray()
             .Select(j => j.GetProperty("id").GetString())
-            .Should().Contain("128178626683338752");
+            .Should()
+            .Contain("128178626683338752");
     }
 
     [Fact]
     public async Task Text_channel_mention_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        var message = await _exportWrapper.GetMessageAsJsonAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459040480624680")
         );
@@ -46,7 +54,7 @@ public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<E
     public async Task Voice_channel_mention_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        var message = await _exportWrapper.GetMessageAsJsonAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459175462633503")
         );
@@ -59,7 +67,7 @@ public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<E
     public async Task Role_mention_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        var message = await _exportWrapper.GetMessageAsJsonAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459254693429258")
         );

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

@@ -8,23 +8,30 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
 
-public record StickerSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class StickerSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public StickerSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Message_with_a_PNG_based_sticker_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        var message = await _exportWrapper.GetMessageAsJsonAsync(
             ChannelIds.StickerTestCases,
             Snowflake.Parse("939670623158943754")
         );
 
+        // Assert
         var sticker = message
             .GetProperty("stickers")
             .EnumerateArray()
             .Single();
 
-        // Assert
         sticker.GetProperty("id").GetString().Should().Be("904215665597120572");
         sticker.GetProperty("name").GetString().Should().Be("rock");
         sticker.GetProperty("format").GetString().Should().Be("PngAnimated");
@@ -35,17 +42,17 @@ public record StickerSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<E
     public async Task Message_with_a_Lottie_based_sticker_is_rendered_correctly()
     {
         // Act
-        var message = await ExportWrapper.GetMessageAsJsonAsync(
+        var message = await _exportWrapper.GetMessageAsJsonAsync(
             ChannelIds.StickerTestCases,
             Snowflake.Parse("939670526517997590")
         );
 
+        // Assert
         var sticker = message
             .GetProperty("stickers")
             .EnumerateArray()
             .Single();
 
-        // Assert
         sticker.GetProperty("id").GetString().Should().Be("816087132447178774");
         sticker.GetProperty("name").GetString().Should().Be("Yikes");
         sticker.GetProperty("format").GetString().Should().Be("Lottie");

DiscordChatExporter.Cli.Tests/Specs/PartitioningSpecs.cs

@@ -12,13 +12,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public record PartitioningSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
+public class PartitioningSpecs : IClassFixture<TempOutputFixture>
 {
+    private readonly TempOutputFixture _tempOutput;
+
+    public PartitioningSpecs(TempOutputFixture tempOutput)
+    {
+        _tempOutput = tempOutput;
+    }
+
     [Fact]
-    public async Task Messages_partitioned_by_count_are_split_into_multiple_files_correctly()
+    public async Task Messages_partitioned_by_count_are_split_into_a_corresponding_number_of_files()
     {
         // Arrange
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
         var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
         var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
 
@@ -39,10 +46,10 @@ public record PartitioningSpecs(TempOutputFixture TempOutput) : IClassFixture<Te
     }
 
     [Fact]
-    public async Task Messages_partitioned_by_file_size_are_split_into_multiple_files_correctly()
+    public async Task Messages_partitioned_by_file_size_are_split_into_a_corresponding_number_of_files()
     {
         // Arrange
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
         var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
         var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
 
@@ -53,7 +60,7 @@ public record PartitioningSpecs(TempOutputFixture TempOutput) : IClassFixture<Te
             ChannelIds = new[] { ChannelIds.DateRangeTestCases },
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
-            PartitionLimit = PartitionLimit.Parse("20kb")
+            PartitionLimit = PartitionLimit.Parse("1kb")
         }.ExecuteAsync(new FakeConsole());
 
         // Assert

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

@@ -6,13 +6,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting;
 
-public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+public class ContentSpecs : IClassFixture<ExportWrapperFixture>
 {
+    private readonly ExportWrapperFixture _exportWrapper;
+
+    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    {
+        _exportWrapper = exportWrapper;
+    }
+
     [Fact]
     public async Task Messages_are_exported_correctly()
     {
         // Act
-        var document = await ExportWrapper.ExportAsPlainTextAsync(ChannelIds.DateRangeTestCases);
+        var document = await _exportWrapper.ExportAsPlainTextAsync(ChannelIds.DateRangeTestCases);
 
         // Assert
         document.Should().ContainAll(

DiscordChatExporter.Cli.Tests/Specs/SelfContainedSpecs.cs

@@ -13,13 +13,20 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public record SelfContainedSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
+public class SelfContainedSpecs : IClassFixture<TempOutputFixture>
 {
+    private readonly TempOutputFixture _tempOutput;
+
+    public SelfContainedSpecs(TempOutputFixture tempOutput)
+    {
+        _tempOutput = tempOutput;
+    }
+
     [Fact]
     public async Task Messages_in_self_contained_export_only_reference_local_file_resources()
     {
         // Arrange
-        var filePath = TempOutput.GetTempFilePath();
+        var filePath = _tempOutput.GetTempFilePath();
         var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
 
         // Act
@@ -32,11 +39,9 @@ public record SelfContainedSpecs(TempOutputFixture TempOutput) : IClassFixture<T
             ShouldDownloadMedia = true
         }.ExecuteAsync(new FakeConsole());
 
-        var data = await File.ReadAllTextAsync(filePath);
-        var document = Html.Parse(data);
-
         // Assert
-        document
+        Html
+            .Parse(await File.ReadAllTextAsync(filePath))
             .QuerySelectorAll("body [src]")
             .Select(e => e.GetAttribute("src")!)
             .Select(f => Path.GetFullPath(f, dirPath))

DiscordChatExporter.Cli.Tests/TestData/ChannelIds.cs

@@ -10,7 +10,7 @@ public static class ChannelIds
 
     public static Snowflake EmbedTestCases { get; } = Snowflake.Parse("866472452459462687");
 
-    public static Snowflake StickerTestCases { get; } = Snowflake.Parse("939668868253769729");
+    public static Snowflake GroupingTestCases { get; } = Snowflake.Parse("992092091545034842");
 
     public static Snowflake FilterTestCases { get; } = Snowflake.Parse("866744075033641020");
 
@@ -19,4 +19,6 @@ public static class ChannelIds
     public static Snowflake ReplyTestCases { get; } = Snowflake.Parse("866459871934677052");
 
     public static Snowflake SelfContainedTestCases { get; } = Snowflake.Parse("887441432678379560");
+
+    public static Snowflake StickerTestCases { get; } = Snowflake.Parse("939668868253769729");
 }

DiscordChatExporter.Cli.dockerfile

@@ -0,0 +1,18 @@
+# Build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+
+COPY favicon.ico ./
+COPY NuGet.config ./
+COPY Directory.Build.props ./
+COPY DiscordChatExporter.Core ./DiscordChatExporter.Core
+COPY DiscordChatExporter.Cli ./DiscordChatExporter.Cli
+
+RUN dotnet publish DiscordChatExporter.Cli -c Release -o ./publish
+
+# Run
+FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run
+
+COPY --from=build ./publish ./
+
+WORKDIR ./out
+ENTRYPOINT ["dotnet", "/DiscordChatExporter.Cli.dll"]

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -20,34 +20,67 @@ namespace DiscordChatExporter.Cli.Commands.Base;
 
 public abstract class ExportCommandBase : TokenCommandBase
 {
-    [CommandOption("output", 'o', Description = "Output file or directory path.")]
+    [CommandOption(
+        "output",
+        'o',
+        Description = "Output file or directory path."
+    )]
     public string OutputPath { get; init; } = Directory.GetCurrentDirectory();
 
-    [CommandOption("format", 'f', Description = "Export format.")]
+    [CommandOption(
+        "format",
+        'f',
+        Description = "Export format."
+    )]
     public ExportFormat ExportFormat { get; init; } = ExportFormat.HtmlDark;
 
-    [CommandOption("after", Description = "Only include messages sent after this date or message ID.")]
+    [CommandOption(
+        "after",
+        Description = "Only include messages sent after this date or message ID."
+    )]
     public Snowflake? After { get; init; }
 
-    [CommandOption("before", Description = "Only include messages sent before this date or message ID.")]
+    [CommandOption(
+        "before",
+        Description = "Only include messages sent before this date or message ID."
+    )]
     public Snowflake? Before { get; init; }
 
-    [CommandOption("partition", 'p', Description = "Split output into partitions, each limited to this number of messages (e.g. '100') or file size (e.g. '10mb').")]
+    [CommandOption(
+        "partition",
+        'p',
+        Description = "Split output into partitions, each limited to this number of messages (e.g. '100') or file size (e.g. '10mb')."
+    )]
     public PartitionLimit PartitionLimit { get; init; } = PartitionLimit.Null;
 
-    [CommandOption("filter", Description = "Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image').")]
+    [CommandOption(
+        "filter",
+        Description = "Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image')."
+    )]
     public MessageFilter MessageFilter { get; init; } = MessageFilter.Null;
 
-    [CommandOption("parallel", Description = "Limits how many channels can be exported in parallel.")]
+    [CommandOption(
+        "parallel",
+        Description = "Limits how many channels can be exported in parallel."
+    )]
     public int ParallelLimit { get; init; } = 1;
 
-    [CommandOption("media", Description = "Download referenced media content.")]
+    [CommandOption(
+        "media",
+        Description = "Download referenced media content."
+    )]
     public bool ShouldDownloadMedia { get; init; }
 
-    [CommandOption("reuse-media", Description = "Reuse already existing media content to skip redundant downloads.")]
+    [CommandOption(
+        "reuse-media",
+        Description = "Reuse already existing media content to skip redundant downloads."
+    )]
     public bool ShouldReuseMedia { get; init; }
 
-    [CommandOption("dateformat", Description = "Format used when writing dates.")]
+    [CommandOption(
+        "dateformat",
+        Description = "Format used when writing dates."
+    )]
     public string DateFormat { get; init; } = "dd-MMM-yy hh:mm tt";
 
     private ChannelExporter? _channelExporter;
@@ -171,8 +204,8 @@ public abstract class ExportCommandBase : TokenCommandBase
     {
         // War in Ukraine message
         console.Output.WriteLine("========================================================================");
-        console.Output.WriteLine("||   Ukraine is at war! Support my country in its fight for freedom   ||");
+        console.Output.WriteLine("||   Ukraine is at war! Support my country in its fight for freedom~  ||");
-        console.Output.WriteLine("||   Learn more: https://tyrrrz.me                                    ||");
+        console.Output.WriteLine("||   Learn more on my website: https://tyrrrz.me                      ||");
         console.Output.WriteLine("========================================================================");
         console.Output.WriteLine("");
 

DiscordChatExporter.Cli/Commands/Base/TokenCommandBase.cs

@@ -9,11 +9,22 @@ namespace DiscordChatExporter.Cli.Commands.Base;
 
 public abstract class TokenCommandBase : ICommand
 {
-    [CommandOption("token", 't', IsRequired = true, EnvironmentVariable = "DISCORD_TOKEN", Description = "Authentication token.")]
+    [CommandOption(
+        "token",
+        't',
+        IsRequired = true,
+        EnvironmentVariable = "DISCORD_TOKEN",
+        Description = "Authentication token."
+    )]
     public string Token { get; init; } = "";
 
-    [CommandOption("bot", 'b', EnvironmentVariable = "DISCORD_TOKEN_BOT", Description = "This option doesn't do anything. Kept for backwards compatibility.")]
     [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
+    [CommandOption(
+        "bot",
+        'b',
+        EnvironmentVariable = "DISCORD_TOKEN_BOT",
+        Description = "This option doesn't do anything. Kept for backwards compatibility."
+    )]
     public bool IsBotToken { get; init; }
 
     private DiscordClient? _discordClient;

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -10,7 +10,10 @@ namespace DiscordChatExporter.Cli.Commands;
 [Command("exportall", Description = "Export all accessible channels.")]
 public class ExportAllCommand : ExportCommandBase
 {
-    [CommandOption("include-dm", Description = "Include direct message channels.")]
+    [CommandOption(
+        "include-dm",
+        Description = "Include direct message channels."
+    )]
     public bool IncludeDirectMessages { get; init; } = true;
 
     public override async ValueTask ExecuteAsync(IConsole console)
@@ -28,13 +31,7 @@ public class ExportAllCommand : ExportCommandBase
                 continue;
 
             await foreach (var channel in Discord.GetGuildChannelsAsync(guild.Id, cancellationToken))
-            {
-                // Skip non-text channels
-                if (!channel.IsTextChannel)
-                    continue;
-
                 channels.Add(channel);
-            }
         }
 
         await base.ExecuteAsync(console, channels);

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

@@ -12,7 +12,12 @@ namespace DiscordChatExporter.Cli.Commands;
 public class ExportChannelsCommand : ExportCommandBase
 {
     // TODO: change this to plural (breaking change)
-    [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID(s).")]
+    [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)

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -1,5 +1,4 @@
-using System.Linq;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
@@ -19,8 +18,7 @@ public class ExportDirectMessagesCommand : ExportCommandBase
 
         await console.Output.WriteLineAsync("Fetching channels...");
         var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken);
-        var textChannels = channels.Where(c => c.IsTextChannel).ToArray();
 
-        await base.ExecuteAsync(console, textChannels);
+        await base.ExecuteAsync(console, channels);
     }
 }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -1,5 +1,4 @@
-using System.Linq;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
@@ -11,7 +10,12 @@ namespace DiscordChatExporter.Cli.Commands;
 [Command("exportguild", Description = "Export all channels within specified guild.")]
 public class ExportGuildCommand : ExportCommandBase
 {
-    [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
+    [CommandOption(
+        "guild",
+        'g',
+        IsRequired = true,
+        Description = "Guild ID."
+    )]
     public Snowflake GuildId { get; init; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
@@ -22,8 +26,7 @@ public class ExportGuildCommand : ExportCommandBase
 
         await console.Output.WriteLineAsync("Fetching channels...");
         var channels = await Discord.GetGuildChannelsAsync(GuildId, cancellationToken);
-        var textChannels = channels.Where(c => c.IsTextChannel).ToArray();
 
-        await base.ExecuteAsync(console, textChannels);
+        await base.ExecuteAsync(console, channels);
     }
 }

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -12,25 +12,29 @@ namespace DiscordChatExporter.Cli.Commands;
 [Command("channels", Description = "Get the list of channels in a guild.")]
 public class GetChannelsCommand : TokenCommandBase
 {
-    [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
+    [CommandOption(
+        "guild",
+        'g',
+        IsRequired = true,
+        Description = "Guild ID."
+    )]
     public Snowflake GuildId { get; init; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         var cancellationToken = console.RegisterCancellationHandler();
 
-        var channels = await Discord.GetGuildChannelsAsync(GuildId, cancellationToken);
+        var channels = (await Discord.GetGuildChannelsAsync(GuildId, cancellationToken))
-
-        var textChannels = channels
-            .Where(c => c.IsTextChannel)
             .OrderBy(c => c.Category.Position)
             .ThenBy(c => c.Name)
             .ToArray();
 
-        foreach (var channel in textChannels)
+        foreach (var channel in channels)
         {
             // Channel ID
-            await console.Output.WriteAsync(channel.Id.ToString());
+            await console.Output.WriteAsync(
+                channel.Id.ToString().PadRight(18, ' ')
+            );
 
             // Separator
             using (console.WithForegroundColor(ConsoleColor.DarkGray))

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -16,18 +16,17 @@ public class GetDirectMessageChannelsCommand : TokenCommandBase
     {
         var cancellationToken = console.RegisterCancellationHandler();
 
-        var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken);
+        var channels = (await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken))
-
+            .OrderByDescending(c => c.LastMessageId)
-        var textChannels = channels
-            .Where(c => c.IsTextChannel)
-            .OrderBy(c => c.Category.Position)
             .ThenBy(c => c.Name)
             .ToArray();
 
-        foreach (var channel in textChannels)
+        foreach (var channel in channels)
         {
             // Channel ID
-            await console.Output.WriteAsync(channel.Id.ToString());
+            await console.Output.WriteAsync(
+                channel.Id.ToString().PadRight(18, ' ')
+            );
 
             // Separator
             using (console.WithForegroundColor(ConsoleColor.DarkGray))

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
@@ -15,12 +16,17 @@ public class GetGuildsCommand : TokenCommandBase
     {
         var cancellationToken = console.RegisterCancellationHandler();
 
-        var guilds = await Discord.GetUserGuildsAsync(cancellationToken);
+        var guilds = (await Discord.GetUserGuildsAsync(cancellationToken))
+            // Show direct messages first
+            .OrderByDescending(g => g.Id == Guild.DirectMessages.Id)
+            .ThenBy(g => g.Name);
 
-        foreach (var guild in guilds.OrderBy(g => g.Name))
+        foreach (var guild in guilds)
         {
             // Guild ID
-            await console.Output.WriteAsync(guild.Id.ToString());
+            await console.Output.WriteAsync(
+                guild.Id.ToString().PadRight(18, ' ')
+            );
 
             // Separator
             using (console.WithForegroundColor(ConsoleColor.DarkGray))

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -15,15 +15,15 @@ public class GuideCommand : ICommand
         using (console.WithForegroundColor(ConsoleColor.White))
             console.Output.WriteLine("To get user token:");
 
+        console.Output.WriteLine(" *  Automating user accounts is technically against TOS — USE AT YOUR OWN RISK!");
         console.Output.WriteLine(" 1. Open Discord in your web browser and login");
         console.Output.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
-        console.Output.WriteLine(" 3. Press Ctrl+Shift+M to toggle device toolbar");
+        console.Output.WriteLine(" 3. Navigate to the Network tab");
-        console.Output.WriteLine(" 4. Navigate to the Application tab");
+        console.Output.WriteLine(" 4. Press Ctrl+R to reload");
-        console.Output.WriteLine(" 5. On the left, expand Local Storage and select https://discord.com");
+        console.Output.WriteLine(" 5. Search for a request containing \"messages?limit=50\" or similar");
-        console.Output.WriteLine(" 6. Type \"token\" into the Filter box");
+        console.Output.WriteLine(" 6. Select the Headers tab on the right");
-        console.Output.WriteLine(" 7. If the token key does not appear, press Ctrl+R to reload");
+        console.Output.WriteLine(" 7. Scroll down to the Request Headers section");
-        console.Output.WriteLine(" 8. Copy the value of the token key");
+        console.Output.WriteLine(" 8. Copy the value of the \"authorization\" header");
-        console.Output.WriteLine(" *  Automating user accounts is technically against TOS, use at your own risk.");
         console.Output.WriteLine();
 
         // Bot token
@@ -42,7 +42,7 @@ public class GuideCommand : ICommand
 
         console.Output.WriteLine(" 1. Open Discord");
         console.Output.WriteLine(" 2. Open Settings");
-        console.Output.WriteLine(" 3. Go to Appearance section");
+        console.Output.WriteLine(" 3. Go to Advanced section");
         console.Output.WriteLine(" 4. Enable Developer Mode");
         console.Output.WriteLine(" 5. Right click on the desired guild or channel and click Copy ID");
         console.Output.WriteLine();

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -9,6 +9,7 @@
     <PackageReference Include="CliFx" Version="2.2.5" />
     <PackageReference Include="Spectre.Console" Version="0.44.0" />
     <PackageReference Include="Gress" Version="2.0.1" />
+    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.3.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Core/Discord/Data/Attachment.cs

@@ -35,10 +35,10 @@ public partial record Attachment
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
         var url = json.GetProperty("url").GetNonWhiteSpaceString();
-        var width = json.GetPropertyOrNull("width")?.GetInt32OrNull();
-        var height = json.GetPropertyOrNull("height")?.GetInt32OrNull();
         var fileName = json.GetProperty("filename").GetNonNullString();
         var description = json.GetPropertyOrNull("description")?.GetNonWhiteSpaceStringOrNull();
+        var width = json.GetPropertyOrNull("width")?.GetInt32OrNull();
+        var height = json.GetPropertyOrNull("height")?.GetInt32OrNull();
         var fileSize = json.GetProperty("size").GetInt64().Pipe(FileSize.FromBytes);
 
         return new Attachment(id, url, fileName, description, width, height, fileSize);

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -14,16 +14,10 @@ public partial record Channel(
     ChannelCategory Category,
     string Name,
     int? Position,
-    string? Topic) : IHasId
+    string? Topic,
+    Snowflake? LastMessageId) : IHasId
 {
-    public bool IsTextChannel => Kind is
+    public bool SupportsVoice => Kind is ChannelKind.GuildVoiceChat or ChannelKind.GuildStageVoice;
-        ChannelKind.GuildTextChat or
-        ChannelKind.DirectTextChat or
-        ChannelKind.DirectGroupTextChat or
-        ChannelKind.GuildNews or
-        ChannelKind.GuildStore;
-
-    public bool IsVoiceChannel => !IsTextChannel;
 }
 
 public partial record Channel
@@ -36,7 +30,6 @@ public partial record Channel
             ChannelKind.DirectTextChat => "Private",
             ChannelKind.DirectGroupTextChat => "Group",
             ChannelKind.GuildNews => "News",
-            ChannelKind.GuildStore => "Store",
             _ => "Default"
         },
         null
@@ -45,9 +38,8 @@ public partial record Channel
     public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? positionHint = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
-        var topic = json.GetPropertyOrNull("topic")?.GetStringOrNull();
         var kind = (ChannelKind)json.GetProperty("type").GetInt32();
+        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
 
         var name =
             // Guild channel
@@ -63,7 +55,16 @@ public partial record Channel
             // Fallback
             id.ToString();
 
-        var position = positionHint ?? json.GetPropertyOrNull("position")?.GetInt32OrNull();
+        var position =
+            positionHint ??
+            json.GetPropertyOrNull("position")?.GetInt32OrNull();
+
+        var topic = json.GetPropertyOrNull("topic")?.GetStringOrNull();
+
+        var lastMessageId = json
+            .GetPropertyOrNull("last_message_id")?
+            .GetNonWhiteSpaceStringOrNull()?
+            .Pipe(Snowflake.Parse);
 
         return new Channel(
             id,
@@ -72,7 +73,8 @@ public partial record Channel
             category ?? GetFallbackCategory(kind),
             name,
             position,
-            topic
+            topic,
+            lastMessageId
         );
     }
 }

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -12,12 +12,15 @@ public record ChannelCategory(Snowflake Id, string Name, int? Position) : IHasId
     public static ChannelCategory Parse(JsonElement json, int? positionHint = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-        var position = positionHint ?? json.GetPropertyOrNull("position")?.GetInt32OrNull();
 
         var name =
             json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
             id.ToString();
 
+        var position =
+            positionHint ??
+            json.GetPropertyOrNull("position")?.GetInt32OrNull();
+
         return new ChannelCategory(id, name, position);
     }
 }

DiscordChatExporter.Core/Discord/Data/ChannelKind.cs

@@ -5,10 +5,15 @@
 public enum ChannelKind
 {
     GuildTextChat = 0,
-    DirectTextChat,
+    DirectTextChat = 1,
-    GuildVoiceChat,
+    GuildVoiceChat = 2,
-    DirectGroupTextChat,
+    DirectGroupTextChat = 3,
-    GuildCategory,
+    GuildCategory = 4,
-    GuildNews,
+    GuildNews = 5,
-    GuildStore
+    GuildNewsThread = 10,
+    GuildPublicThread = 11,
+    GuildPrivateThread = 12,
+    GuildStageVoice = 13,
+    GuildDirectory = 14,
+    GuildForum = 15
 }

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

@@ -18,7 +18,7 @@ public partial record Embed(
     string? Description,
     IReadOnlyList<EmbedField> Fields,
     EmbedImage? Thumbnail,
-    EmbedImage? Image,
+    IReadOnlyList<EmbedImage> Images,
     EmbedFooter? Footer)
 {
     public PlainImageEmbedProjection? TryGetPlainImage() =>
@@ -39,17 +39,28 @@ public partial record Embed
         var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
         var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffset();
         var color = json.GetPropertyOrNull("color")?.GetInt32OrNull()?.Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
-        var description = json.GetPropertyOrNull("description")?.GetStringOrNull();
-
         var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
-        var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);
+        var description = json.GetPropertyOrNull("description")?.GetStringOrNull();
-        var image = json.GetPropertyOrNull("image")?.Pipe(EmbedImage.Parse);
-        var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse);
 
         var fields =
             json.GetPropertyOrNull("fields")?.EnumerateArrayOrNull()?.Select(EmbedField.Parse).ToArray() ??
             Array.Empty<EmbedField>();
 
+        var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);
+
+        // Under the Discord API model, embeds can only have at most one image.
+        // Because of that, embeds that are rendered with multiple images on the client
+        // (e.g. tweet embeds), are exposed from the API as multiple separate embeds.
+        // Our embed model is consistent with the user-facing side of Discord, so images
+        // are stored as an array. The API will only ever return one image, but we deal
+        // with this by merging related embeds at the end of the message parsing process.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/695
+        var images =
+            json.GetPropertyOrNull("image")?.Pipe(EmbedImage.Parse).Enumerate().ToArray() ??
+            Array.Empty<EmbedImage>();
+
+        var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse);
+
         return new Embed(
             title,
             url,
@@ -59,7 +70,7 @@ public partial record Embed
             description,
             fields,
             thumbnail,
-            image,
+            images,
             footer
         );
     }

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

@@ -10,7 +10,7 @@ public partial record YouTubeVideoEmbedProjection(string VideoId)
 public partial record YouTubeVideoEmbedProjection
 {
     // Adapted from YoutubeExplode
-    // https://github.com/Tyrrrz/YoutubeExplode/blob/5be164be20019783913f76fcc98f18c65aebe9f0/YoutubeExplode/Videos/VideoId.cs#L34-L64
+    // https://github.com/Tyrrrz/YoutubeExplode/blob/bc700b631bd105d0be208a88116347034bdca88b/YoutubeExplode/Videos/VideoId.cs#L40-L62
     private static string? TryParseVideoId(string embedUrl)
     {
         // Regular URL
@@ -31,6 +31,12 @@ public partial record YouTubeVideoEmbedProjection
         if (!string.IsNullOrWhiteSpace(embedMatch))
             return embedMatch;
 
+        // Shorts URL
+        // https://www.youtube.com/shorts/sKL1vjP0tIo
+        var shortsMatch = Regex.Match(embedUrl, @"youtube\..+?/shorts/(.*?)(?:\?|&|/|$)").Groups[1].Value;
+        if (!string.IsNullOrWhiteSpace(shortsMatch))
+            return shortsMatch;
+
         return null;
     }
 

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -24,13 +24,19 @@ public partial record Emoji(
 
 public partial record Emoji
 {
-    private static string GetTwemojiName(string name) => string.Join("-",
+    private static string GetTwemojiName(string name)
-        name
+    {
-            .GetRunes()
+        var runes = name.GetRunes();
-            // Variant selector rune is skipped in Twemoji names
+
-            .Where(r => r.Value != 0xfe0f)
+        return string.Join(
-            .Select(r => r.Value.ToString("x"))
+            "-",
-    );
+            // Variant selector rune is skipped in Twemoji names, except when the emoji also contains a zero-width joiner.
+            // VS = 0xfe0f. ZWJ = 0x200d.
+            runes.Any(r => r.Value == 0x200d)
+                ? runes.Select(r => r.Value.ToString("x"))
+                : runes.Where(r => r.Value != 0xfe0f).Select(r => r.Value.ToString("x"))
+        );
+    }
 
     private static string GetImageUrl(Snowflake id, bool isAnimated) => isAnimated
         ? $"https://cdn.discordapp.com/emojis/{id}.gif"
@@ -58,7 +64,6 @@ public partial record Emoji
         var id = json.GetPropertyOrNull("id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
         var name = json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull();
         var isAnimated = json.GetPropertyOrNull("animated")?.GetBooleanOrNull() ?? false;
-
         var imageUrl = GetImageUrl(id, name, isAnimated);
 
         return new Emoji(

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -24,8 +24,8 @@ public record Guild(Snowflake Id, string Name, string IconUrl) : IHasId
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
         var name = json.GetProperty("name").GetNonNullString();
-        var iconHash = json.GetPropertyOrNull("icon")?.GetNonWhiteSpaceStringOrNull();
 
+        var iconHash = json.GetPropertyOrNull("icon")?.GetNonWhiteSpaceStringOrNull();
         var iconUrl = !string.IsNullOrWhiteSpace(iconHash)
             ? GetIconUrl(id, iconHash)
             : GetDefaultIconUrl();

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -27,18 +27,76 @@ public record Message(
     MessageReference? Reference,
     Message? ReferencedMessage) : IHasId
 {
+    private static IReadOnlyList<Embed> NormalizeEmbeds(IReadOnlyList<Embed> embeds)
+    {
+        if (embeds.Count <= 1)
+            return embeds;
+
+        // Discord API doesn't support embeds with multiple images, even though the Discord client does.
+        // To work around this, it seems that the API returns multiple consecutive embeds with different images,
+        // which are then merged together on the client. We need to replicate the same behavior ourselves.
+        // Currently, only known case where this workaround is required is Twitter embeds.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/695
+
+        var normalizedEmbeds = new List<Embed>();
+
+        for (var i = 0; i < embeds.Count; i++)
+        {
+            var embed = embeds[i];
+
+            if (embed.Url?.Contains("://twitter.com/") == true)
+            {
+                // Find embeds with the same URL that only contain a single image and nothing else
+                var trailingEmbeds = embeds
+                    .Skip(i + 1)
+                    .TakeWhile(e =>
+                        e.Url == embed.Url &&
+                        e.Timestamp is null &&
+                        e.Author is null &&
+                        e.Color is null &&
+                        string.IsNullOrWhiteSpace(e.Description) &&
+                        !e.Fields.Any() &&
+                        e.Images.Count == 1 &&
+                        e.Footer is null
+                    )
+                    .ToArray();
+
+                if (trailingEmbeds.Any())
+                {
+                    // Concatenate all images into one embed
+                    var images = embed.Images.Concat(trailingEmbeds.SelectMany(e => e.Images)).ToArray();
+                    normalizedEmbeds.Add(embed with { Images = images });
+
+                    i += trailingEmbeds.Length;
+                }
+                else
+                {
+                    normalizedEmbeds.Add(embed);
+                }
+            }
+            else
+            {
+                normalizedEmbeds.Add(embed);
+            }
+        }
+
+        return normalizedEmbeds;
+    }
+
     public static Message Parse(JsonElement json)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var kind = (MessageKind)json.GetProperty("type").GetInt32();
         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")
+        var callEndedTimestamp = json
-            ?.GetDateTimeOffset();
+            .GetPropertyOrNull("call")?
-        var kind = (MessageKind)json.GetProperty("type").GetInt32();
+            .GetPropertyOrNull("ended_timestamp")?
+            .GetDateTimeOffset();
+
         var isPinned = json.GetPropertyOrNull("pinned")?.GetBooleanOrNull() ?? false;
-        var messageReference = json.GetPropertyOrNull("message_reference")?.Pipe(MessageReference.Parse);
-        var referencedMessage = json.GetPropertyOrNull("referenced_message")?.Pipe(Parse);
 
         var content = kind switch
         {
@@ -57,9 +115,10 @@ public record Message(
             json.GetPropertyOrNull("attachments")?.EnumerateArrayOrNull()?.Select(Attachment.Parse).ToArray() ??
             Array.Empty<Attachment>();
 
-        var embeds =
+        var embeds = NormalizeEmbeds(
             json.GetPropertyOrNull("embeds")?.EnumerateArrayOrNull()?.Select(Embed.Parse).ToArray() ??
-            Array.Empty<Embed>();
+            Array.Empty<Embed>()
+        );
 
         var stickers =
             json.GetPropertyOrNull("sticker_items")?.EnumerateArrayOrNull()?.Select(Sticker.Parse).ToArray() ??
@@ -73,6 +132,9 @@ public record Message(
             json.GetPropertyOrNull("mentions")?.EnumerateArrayOrNull()?.Select(User.Parse).ToArray() ??
             Array.Empty<User>();
 
+        var messageReference = json.GetPropertyOrNull("message_reference")?.Pipe(MessageReference.Parse);
+        var referencedMessage = json.GetPropertyOrNull("referenced_message")?.Pipe(Parse);
+
         return new Message(
             id,
             kind,

DiscordChatExporter.Core/Discord/Data/MessageReference.cs

@@ -9,9 +9,20 @@ public record MessageReference(Snowflake? MessageId, Snowflake? ChannelId, Snowf
 {
     public static MessageReference Parse(JsonElement json)
     {
-        var messageId = json.GetPropertyOrNull("message_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
+        var messageId = json
-        var channelId = json.GetPropertyOrNull("channel_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
+            .GetPropertyOrNull("message_id")?
-        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
+            .GetNonWhiteSpaceStringOrNull()?
+            .Pipe(Snowflake.Parse);
+
+        var channelId = json
+            .GetPropertyOrNull("channel_id")?
+            .GetNonWhiteSpaceStringOrNull()?
+            .Pipe(Snowflake.Parse);
+
+        var guildId = json
+            .GetPropertyOrNull("guild_id")?
+            .GetNonWhiteSpaceStringOrNull()?
+            .Pipe(Snowflake.Parse);
 
         return new MessageReference(messageId, channelId, guildId);
     }

DiscordChatExporter.Core/Discord/Data/Sticker.cs

@@ -18,7 +18,6 @@ public record Sticker(Snowflake Id, string Name, StickerFormat Format, string So
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
         var name = json.GetProperty("name").GetNonNullString();
         var format = (StickerFormat)json.GetProperty("format_type").GetInt32();
-
         var sourceUrl = GetSourceUrl(id, format);
 
         return new Sticker(id, name, format, sourceUrl);

DiscordChatExporter.Core/Discord/Data/User.cs

@@ -39,12 +39,12 @@ public partial record User
         var isBot = json.GetPropertyOrNull("bot")?.GetBooleanOrNull() ?? false;
         var discriminator = json.GetProperty("discriminator").GetNonWhiteSpaceString().Pipe(int.Parse);
         var name = json.GetProperty("username").GetNonNullString();
-        var avatarHash = json.GetPropertyOrNull("avatar")?.GetNonWhiteSpaceStringOrNull();
 
+        var avatarHash = json.GetPropertyOrNull("avatar")?.GetNonWhiteSpaceStringOrNull();
         var avatarUrl = !string.IsNullOrWhiteSpace(avatarHash)
             ? GetAvatarUrl(id, avatarHash)
             : GetDefaultAvatarUrl(discriminator);
 
         return new User(id, isBot, discriminator, name, avatarUrl);
     }
-}
+}

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -181,6 +181,8 @@ public class DiscordClient
                 .Select((j, index) => ChannelCategory.Parse(j, index + 1))
                 .ToDictionary(j => j.Id.ToString(), StringComparer.Ordinal);
 
+            // Discord positions are not deterministic, so we need to normalize them
+            // because the user may refer to the channel position via file name template.
             var position = 0;
 
             foreach (var channelJson in responseOrdered)

DiscordChatExporter.Core/Discord/Snowflake.cs

@@ -49,7 +49,15 @@ public partial record struct Snowflake
     public static Snowflake Parse(string str) => Parse(str, null);
 }
 
-public partial record struct Snowflake : IComparable<Snowflake>
+public partial record struct Snowflake : IComparable<Snowflake>, IComparable
 {
     public int CompareTo(Snowflake other) => Value.CompareTo(other.Value);
+
+    public int CompareTo(object? obj)
+    {
+        if (obj is not Snowflake other)
+            throw new ArgumentException($"Object must be of type {nameof(Snowflake)}.");
+
+        return Value.CompareTo(other.Value);
+    }
 }

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -10,6 +10,7 @@
     <PackageReference Include="MiniRazor.CodeGen" Version="2.2.1" />
     <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="Superpower" Version="3.0.0" />
+    <PackageReference Include="WebMarkupMin.Core" Version="2.9.0" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord;
@@ -61,6 +62,7 @@ public partial record ExportRequest
                 "%P" => channel.Category.Position?.ToString() ?? "0",
                 "%a" => after?.ToDate().ToString("yyyy-MM-dd") ?? "",
                 "%b" => before?.ToDate().ToString("yyyy-MM-dd") ?? "",
+                "%d" => DateTimeOffset.Now.ToString("yyyy-MM-dd"),
                 "%%" => "%",
                 _ => m.Value
             })

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

@@ -2,6 +2,7 @@
 @using System.Linq
 @using System.Threading.Tasks
 @using DiscordChatExporter.Core.Discord.Data
+@using DiscordChatExporter.Core.Discord.Data.Embeds
 @using DiscordChatExporter.Core.Exporting.Writers.Html;
 @using DiscordChatExporter.Core.Utils.Extensions
 
@@ -43,10 +44,19 @@
 }
 
 <div class="chatlog__message-group">
-@for (var i = 0; i < Model.Messages.Count; i++)
+@foreach (var (message, i) in Model.Messages.WithIndex())
 {
     var isFirst = i == 0;
-    var message = Model.Messages[i];
+
+    // Hide message content if it only contains a link to an image which is embedded, and nothing else
+    var isContentHidden =
+        message.Embeds.Count == 1 &&
+        message.Content.Trim() == PlainImageEmbedProjection.TryResolve(message.Embeds.Single())?.Url;
+
+    var isReferencedContentHidden =
+        message.ReferencedMessage is not null &&
+        message.ReferencedMessage.Embeds.Count == 1 &&
+        message.ReferencedMessage.Content.Trim() == PlainImageEmbedProjection.TryResolve(message.ReferencedMessage.Embeds.Single())?.Url;
 
     <div id="chatlog__message-container-@message.Id" class="chatlog__message-container @(message.IsPinned ? "chatlog__message-container--pinned" : null)" data-message-id="@message.Id">
         <div class="chatlog__message">
@@ -83,9 +93,9 @@
                                 <div class="chatlog__reference-author" style="@(referencedUserColor is not null ? $"color: rgb({referencedUserColor.Value.R}, {referencedUserColor.Value.G}, {referencedUserColor.Value.B})" : null)" title="@message.ReferencedMessage.Author.FullName">@referencedUserNick</div>
                                 <div class="chatlog__reference-content">
                                     <span class="chatlog__reference-link" onclick="scrollToMessage(event, '@message.ReferencedMessage.Id')">
-                                        @if (!string.IsNullOrWhiteSpace(message.ReferencedMessage.Content))
+                                        @if (!string.IsNullOrWhiteSpace(message.ReferencedMessage.Content) && !isReferencedContentHidden)
                                         {
-                                            @Raw(FormatEmbedMarkdown(message.ReferencedMessage.Content))
+                                            <!--wmm:ignore-->@Raw(FormatEmbedMarkdown(message.ReferencedMessage.Content))<!--/wmm:ignore-->
                                         }
                                         else if (message.ReferencedMessage.Attachments.Any() || message.ReferencedMessage.Embeds.Any())
                                         {
@@ -125,7 +135,7 @@
                         }
 
                         @{/* Timestamp */}
-                        <span class="chatlog__timestamp">@FormatDate(message.Timestamp)</span>
+                        <span class="chatlog__timestamp"><a href="#chatlog__message-container-@message.Id">@FormatDate(message.Timestamp)</a></span>
                     </div>
                 }
 
@@ -134,7 +144,10 @@
                 {
                     <div class="chatlog__content chatlog__markdown">
                         @{/* Text */}
-                        <span class="chatlog__markdown-preserve">@Raw(FormatMarkdown(message.Content))</span>
+                        @if (!isContentHidden)
+                        {
+                            <span class="chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatMarkdown(message.Content))<!--/wmm:ignore--></span>
+                        }
 
                         @{/* Edited timestamp */}
                         @if (message.EditedTimestamp is not null)
@@ -147,7 +160,7 @@
                 @{/* Attachments */}
                 @foreach (var attachment in message.Attachments)
                 {
-                    <div class="chatlog__attachment @(attachment.IsSpoiler ? "chatlog__attachment--hidden" : "")" onclick="@(attachment.IsSpoiler ? "showSpoiler(event, this)" : "")">
+                    <div class="chatlog__attachment @(attachment.IsSpoiler ? "chatlog__attachment--hidden" : null)" onclick="@(attachment.IsSpoiler ? "showSpoiler(event, this)" : null)">
                         @{/* Spoiler caption */}
                         @if (attachment.IsSpoiler)
                         {
@@ -262,12 +275,12 @@
                                                 @if (!string.IsNullOrWhiteSpace(embed.Url))
                                                 {
                                                     <a class="chatlog__embed-title-link" href="@embed.Url">
-                                                        <div class="chatlog__markdown chatlog__markdown-preserve">@Raw(FormatEmbedMarkdown(embed.Title))</div>
+                                                        <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Title))<!--/wmm:ignore--></div>
                                                     </a>
                                                 }
                                                 else
                                                 {
-                                                    <div class="chatlog__markdown chatlog__markdown-preserve">@Raw(FormatEmbedMarkdown(embed.Title))</div>
+                                                    <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Title))<!--/wmm:ignore--></div>
                                                 }
                                             </div>
                                         }
@@ -330,12 +343,12 @@
                                                 @if (!string.IsNullOrWhiteSpace(embed.Url))
                                                 {
                                                     <a class="chatlog__embed-title-link" href="@embed.Url">
-                                                        <div class="chatlog__markdown chatlog__markdown-preserve">@Raw(FormatEmbedMarkdown(embed.Title))</div>
+                                                        <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Title))<!--/wmm:ignore--></div>
                                                     </a>
                                                 }
                                                 else
                                                 {
-                                                    <div class="chatlog__markdown chatlog__markdown-preserve">@Raw(FormatEmbedMarkdown(embed.Title))</div>
+                                                    <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Title))<!--/wmm:ignore--></div>
                                                 }
                                             </div>
                                         }
@@ -344,7 +357,7 @@
                                         @if (!string.IsNullOrWhiteSpace(embed.Description))
                                         {
                                             <div class="chatlog__embed-description">
-                                                <div class="chatlog__markdown chatlog__markdown-preserve">@Raw(FormatEmbedMarkdown(embed.Description))</div>
+                                                <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Description))<!--/wmm:ignore--></div>
                                             </div>
                                         }
 
@@ -358,14 +371,14 @@
                                                         @if (!string.IsNullOrWhiteSpace(field.Name))
                                                         {
                                                             <div class="chatlog__embed-field-name">
-                                                                <div class="chatlog__markdown chatlog__markdown-preserve">@Raw(FormatEmbedMarkdown(field.Name))</div>
+                                                                <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(field.Name))<!--/wmm:ignore--></div>
                                                             </div>
                                                         }
 
                                                         @if (!string.IsNullOrWhiteSpace(field.Value))
                                                         {
                                                             <div class="chatlog__embed-field-value">
-                                                                <div class="chatlog__markdown chatlog__markdown-preserve">@Raw(FormatEmbedMarkdown(field.Value))</div>
+                                                                <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(field.Value))<!--/wmm:ignore--></div>
                                                             </div>
                                                         }
                                                     </div>
@@ -385,13 +398,21 @@
                                     }
                                 </div>
 
-                                @{/* Embed image */}
+                                @{/* Embed images */}
-                                @if (embed.Image is not null && !string.IsNullOrWhiteSpace(embed.Image.Url))
+                                @if (embed.Images.Any())
                                 {
-                                    <div class="chatlog__embed-image-container">
+                                    <div class="chatlog__embed-images @(embed.Images.Count == 1 ? "chatlog__embed-images--single" : null)">
-                                        <a class="chatlog__embed-image-link" href="@await ResolveUrlAsync(embed.Image.ProxyUrl ?? embed.Image.Url)">
+                                        @foreach (var image in embed.Images)
-                                            <img class="chatlog__embed-image" src="@await ResolveUrlAsync(embed.Image.ProxyUrl ?? embed.Image.Url)" alt="Image" loading="lazy">
+                                        {
-                                        </a>
+                                            if (!string.IsNullOrWhiteSpace(image.Url))
+                                            {
+                                                <div class="chatlog__embed-image-container">
+                                                    <a class="chatlog__embed-image-link" href="@await ResolveUrlAsync(image.ProxyUrl ?? image.Url)">
+                                                        <img class="chatlog__embed-image" src="@await ResolveUrlAsync(image.ProxyUrl ?? image.Url)" alt="Image" loading="lazy">
+                                                    </a>
+                                                </div>
+                                            }
+                                        }
                                     </div>
                                 }
 

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

@@ -4,7 +4,9 @@
 @inherits MiniRazor.TemplateBase<PostambleTemplateContext>
 
 @{/* Close elements opened by preamble */}
+<!--wmm:ignore-->
 </div>
+<!--/wmm:ignore-->
 
 <div class="postamble">
     <div class="postamble__entry">Exported @Model.MessagesWritten.ToString("N0") message(s)</div>

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

@@ -229,7 +229,11 @@
             pointer-events: none;
         }
 
-        .chatlog__reference-link .hljs {
+        .chatlog__reference-link .chatlog__markdown-quote {
+            display: inline;
+        }
+
+        .chatlog__reference-link .chatlog__markdown-pre {
             display: inline;
         }
 
@@ -281,6 +285,10 @@
             unicode-bidi: bidi-override;
         }
 
+        .chatlog__timestamp a {
+            color: @Themed("#a3a6aa", "#5e6772");
+        }
+
         .chatlog__content {
             padding-right: 1rem;
             font-size: 0.95rem;
@@ -492,13 +500,24 @@
             border-radius: 3px;
         }
 
-        .chatlog__embed-image-container {
+        .chatlog__embed-images {
+            display: grid;
             margin-top: 0.6rem;
+            grid-template-columns: repeat(2, 1fr);
+            gap: 0.25rem;
+        }
+
+        .chatlog__embed-images--single {
+            display: block;
         }
 
         .chatlog__embed-image {
+            object-fit: cover;
+            object-position: center;
             max-width: 500px;
             max-height: 400px;
+            width: 100%;
+            height: 100%;
             border-radius: 3px;
         }
 
@@ -624,9 +643,11 @@
         .chatlog__markdown-pre {
             background-color: @Themed("#2f3136", "#f9f9f9");
             font-family: "Consolas", "Courier New", Courier, monospace;
+            font-size: 0.85rem;
         }
 
         .chatlog__markdown-pre--multiline {
+            display: block;
             margin-top: 0.25rem;
             padding: 0.5rem;
             border: 2px solid @Themed("#282b30", "#f3f3f3");
@@ -635,14 +656,14 @@
         }
 
         .chatlog__markdown-pre--multiline.hljs {
-            background-color: inherit;
+            background-color: @Themed("#2f3136", "#f9f9f9");
-            color: inherit;
+            color: @Themed("#b9bbbe", "#657b83");
         }
 
         .chatlog__markdown-pre--inline {
+            display: inline-block;
             padding: 2px;
             border-radius: 3px;
-            font-size: 0.85rem;
         }
 
         .chatlog__markdown-mention {
@@ -803,4 +824,6 @@
 </div>
 
 @{/* Preamble cuts off at this point */}
-<div class="chatlog">
+<!--wmm:ignore-->
+<div class="chatlog">
+<!--/wmm:ignore-->

DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs

@@ -6,6 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Writers.Html;
+using WebMarkupMin.Core;
 
 namespace DiscordChatExporter.Core.Exporting.Writers;
 
@@ -14,6 +15,7 @@ internal class HtmlMessageWriter : MessageWriter
     private readonly TextWriter _writer;
     private readonly string _themeName;
 
+    private readonly HtmlMinifier _minifier = new();
     private readonly List<Message> _messageGroup = new();
 
     public HtmlMessageWriter(Stream stream, ExportContext context, string themeName)
@@ -23,22 +25,22 @@ internal class HtmlMessageWriter : MessageWriter
         _themeName = themeName;
     }
 
-    private bool CanJoinGroup(Message message)
+    private bool CanJoinGroup(Message message) =>
-    {
+        // First message in the group can always join
-        var lastMessage = _messageGroup.LastOrDefault();
+        _messageGroup.LastOrDefault() is not { } lastMessage ||
-        if (lastMessage is null)
+        // Must be from the same author
-            return true;
+        lastMessage.Author.Id == message.Author.Id &&
+        // Author's name must not have changed between messages
+        string.Equals(lastMessage.Author.FullName, message.Author.FullName, StringComparison.Ordinal) &&
+        // Duration between messages must be 7 minutes or less
+        (message.Timestamp - lastMessage.Timestamp).Duration().TotalMinutes <= 7 &&
+        // Other message must not be a reply
+        message.Reference is null;
 
-        return
+    // Use <!--wmm:ignore--> to preserve blocks of code inside the templates
-            // Must be from the same author
+    private string Minify(string html) => _minifier
-            lastMessage.Author.Id == message.Author.Id &&
+        .Minify(html, false)
-            // Author's name must not have changed between messages
+        .MinifiedContent;
-            string.Equals(lastMessage.Author.FullName, message.Author.FullName, StringComparison.Ordinal) &&
-            // Duration between messages must be 7 minutes or less
-            (message.Timestamp - lastMessage.Timestamp).Duration().TotalMinutes <= 7 &&
-            // Other message must not be a reply
-            message.Reference is null;
-    }
 
     public override async ValueTask WritePreambleAsync(CancellationToken cancellationToken = default)
     {
@@ -47,7 +49,9 @@ internal class HtmlMessageWriter : MessageWriter
         // We are not writing directly to output because Razor
         // does not actually do asynchronous writes to stream.
         await _writer.WriteLineAsync(
-            await PreambleTemplate.RenderAsync(templateContext, cancellationToken)
+            Minify(
+                await PreambleTemplate.RenderAsync(templateContext, cancellationToken)
+            )
         );
     }
 
@@ -60,7 +64,9 @@ internal class HtmlMessageWriter : MessageWriter
         // We are not writing directly to output because Razor
         // does not actually do asynchronous writes to stream.
         await _writer.WriteLineAsync(
-            await MessageGroupTemplate.RenderAsync(templateContext, cancellationToken)
+            Minify(
+                await MessageGroupTemplate.RenderAsync(templateContext, cancellationToken)
+            )
         );
     }
 
@@ -96,7 +102,9 @@ internal class HtmlMessageWriter : MessageWriter
         // We are not writing directly to output because Razor
         // does not actually do asynchronous writes to stream.
         await _writer.WriteLineAsync(
-            await PostambleTemplate.RenderAsync(templateContext, cancellationToken)
+            Minify(
+                await PostambleTemplate.RenderAsync(templateContext, cancellationToken)
+            )
         );
     }
 

DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs

@@ -20,6 +20,7 @@ internal class JsonMessageWriter : MessageWriter
     {
         _writer = new Utf8JsonWriter(stream, new JsonWriterOptions
         {
+            // https://github.com/Tyrrrz/DiscordChatExporter/issues/450
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
             Indented = true,
             // Validation errors may mask actual failures
@@ -50,7 +51,7 @@ internal class JsonMessageWriter : MessageWriter
         EmbedAuthor embedAuthor,
         CancellationToken cancellationToken = default)
     {
-        _writer.WriteStartObject("author");
+        _writer.WriteStartObject();
 
         _writer.WriteString("name", embedAuthor.Name);
         _writer.WriteString("url", embedAuthor.Url);
@@ -62,27 +63,11 @@ internal class JsonMessageWriter : MessageWriter
         await _writer.FlushAsync(cancellationToken);
     }
 
-    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, cancellationToken));
-
-        _writer.WriteNumber("width", embedThumbnail.Width);
-        _writer.WriteNumber("height", embedThumbnail.Height);
-
-        _writer.WriteEndObject();
-        await _writer.FlushAsync(cancellationToken);
-    }
-
     private async ValueTask WriteEmbedImageAsync(
         EmbedImage embedImage,
         CancellationToken cancellationToken = default)
     {
-        _writer.WriteStartObject("image");
+        _writer.WriteStartObject();
 
         if (!string.IsNullOrWhiteSpace(embedImage.Url))
             _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedImage.ProxyUrl ?? embedImage.Url, cancellationToken));
@@ -98,7 +83,7 @@ internal class JsonMessageWriter : MessageWriter
         EmbedFooter embedFooter,
         CancellationToken cancellationToken = default)
     {
-        _writer.WriteStartObject("footer");
+        _writer.WriteStartObject();
 
         _writer.WriteString("text", embedFooter.Text);
 
@@ -138,16 +123,37 @@ internal class JsonMessageWriter : MessageWriter
             _writer.WriteString("color", embed.Color.Value.ToHex());
 
         if (embed.Author is not null)
+        {
+            _writer.WritePropertyName("author");
             await WriteEmbedAuthorAsync(embed.Author, cancellationToken);
+        }
 
         if (embed.Thumbnail is not null)
-            await WriteEmbedThumbnailAsync(embed.Thumbnail, cancellationToken);
+        {
+            _writer.WritePropertyName("thumbnail");
+            await WriteEmbedImageAsync(embed.Thumbnail, cancellationToken);
+        }
 
-        if (embed.Image is not null)
+        // Legacy: backwards-compatibility for old embeds with a single image
-            await WriteEmbedImageAsync(embed.Image, cancellationToken);
+        if (embed.Images.Count > 0)
+        {
+            _writer.WritePropertyName("image");
+            await WriteEmbedImageAsync(embed.Images[0], cancellationToken);
+        }
 
         if (embed.Footer is not null)
+        {
+            _writer.WritePropertyName("footer");
             await WriteEmbedFooterAsync(embed.Footer, cancellationToken);
+        }
+
+        // Images
+        _writer.WriteStartArray("images");
+
+        foreach (var image in embed.Images)
+            await WriteEmbedImageAsync(image, cancellationToken);
+
+        _writer.WriteEndArray();
 
         // Fields
         _writer.WriteStartArray("fields");

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

@@ -76,9 +76,9 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
     protected override MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock)
     {
         _buffer
-            .Append("<span class=\"chatlog__markdown-pre chatlog__markdown-pre--inline\">")
+            .Append("<code class=\"chatlog__markdown-pre chatlog__markdown-pre--inline\">")
             .Append(HtmlEncode(inlineCodeBlock.Code))
-            .Append("</span>");
+            .Append("</code>");
 
         return base.VisitInlineCodeBlock(inlineCodeBlock);
     }
@@ -90,9 +90,9 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
             : "nohighlight";
 
         _buffer
-            .Append($"<div class=\"chatlog__markdown-pre chatlog__markdown-pre--multiline {highlightCssClass}\">")
+            .Append($"<code class=\"chatlog__markdown-pre chatlog__markdown-pre--multiline {highlightCssClass}\">")
             .Append(HtmlEncode(multiLineCodeBlock.Code))
-            .Append("</div>");
+            .Append("</code>");
 
         return base.VisitMultiLineCodeBlock(multiLineCodeBlock);
     }
@@ -158,7 +158,7 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
         else if (mention.Kind == MentionKind.Channel)
         {
             var channel = mention.TargetId?.Pipe(_context.TryGetChannel);
-            var symbol = channel?.IsVoiceChannel == true ? "🔊" : "#";
+            var symbol = channel?.SupportsVoice == true ? "🔊" : "#";
             var name = channel?.Name ?? "deleted-channel";
 
             _buffer

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

@@ -52,13 +52,13 @@ internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
         }
         else if (mention.Kind == MentionKind.Channel)
         {
-            var channel =mention.TargetId?.Pipe(_context.TryGetChannel);
+            var channel = mention.TargetId?.Pipe(_context.TryGetChannel);
             var name = channel?.Name ?? "deleted-channel";
 
             _buffer.Append($"#{name}");
 
             // Voice channel marker
-            if (channel?.IsVoiceChannel == true)
+            if (channel?.SupportsVoice == true)
                 _buffer.Append(" [voice]");
         }
         else if (mention.Kind == MentionKind.Role)

DiscordChatExporter.Core/Exporting/Writers/PlainTextMessageWriter.cs

@@ -88,8 +88,11 @@ internal class PlainTextMessageWriter : MessageWriter
             if (!string.IsNullOrWhiteSpace(embed.Thumbnail?.Url))
                 await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url, cancellationToken));
 
-            if (!string.IsNullOrWhiteSpace(embed.Image?.Url))
+            foreach (var image in embed.Images)
-                await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Image.ProxyUrl ?? embed.Image.Url, cancellationToken));
+            {
+                if (!string.IsNullOrWhiteSpace(image.Url))
+                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(image.ProxyUrl ?? image.Url, cancellationToken));
+            }
 
             if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
                 await _writer.WriteLineAsync(embed.Footer.Text);

DiscordChatExporter.Core/Utils/Extensions/CollectionExtensions.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+
+namespace DiscordChatExporter.Core.Utils.Extensions;
+
+public static class CollectionExtensions
+{
+    public static IEnumerable<T> Enumerate<T>(this T obj)
+    {
+        yield return obj;
+    }
+
+    public static IEnumerable<(T value, int index)> WithIndex<T>(this IEnumerable<T> source)
+    {
+        var i = 0;
+        foreach (var o in source)
+            yield return (o, i++);
+    }
+}

DiscordChatExporter.Gui/Converters/SnowflakeToDateTimeOffsetConverter.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using DiscordChatExporter.Core.Discord;
+
+namespace DiscordChatExporter.Gui.Converters;
+
+[ValueConversion(typeof(Snowflake?), typeof(DateTimeOffset?))]
+public class SnowflakeToDateTimeOffsetConverter : IValueConverter
+{
+    public static SnowflakeToDateTimeOffsetConverter Instance { get; } = new();
+
+    public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+        value is Snowflake snowflake
+            ? snowflake.ToDate()
+            : null;
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
+        throw new NotSupportedException();
+}

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -22,7 +22,7 @@
     <PackageReference Include="Stylet" Version="1.3.6" />
     <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.1" PrivateAssets="all" />
-    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.2.0" PrivateAssets="all" />
+    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.3.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Gui/Services/SettingsService.cs

@@ -45,7 +45,8 @@ public partial class SettingsService
         try
         {
             return Registry.CurrentUser.OpenSubKey(
-                "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", false
+                "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                false
             )?.GetValue("AppsUseLightTheme") is 0;
         }
         catch

DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs

@@ -44,6 +44,8 @@ public class DashboardViewModel : PropertyChangedBase
 
     public Guild? SelectedGuild { get; set; }
 
+    public bool IsDirectMessageGuildSelected => SelectedGuild?.Id == Guild.DirectMessages.Id;
+
     public IReadOnlyList<Channel>? AvailableChannels => SelectedGuild is not null
         ? GuildChannelMap?[SelectedGuild]
         : null;
@@ -103,10 +105,7 @@ public class DashboardViewModel : PropertyChangedBase
 
             var guildChannelMap = new Dictionary<Guild, IReadOnlyList<Channel>>();
             await foreach (var guild in discord.GetUserGuildsAsync())
-            {
+                guildChannelMap[guild] = await discord.GetGuildChannelsAsync(guild.Id);
-                var channels = await discord.GetGuildChannelsAsync(guild.Id);
-                guildChannelMap[guild] = channels.Where(c => c.IsTextChannel).ToArray();
-            }
 
             _discord = discord;
             GuildChannelMap = guildChannelMap;

DiscordChatExporter.Gui/Views/Components/DashboardView.xaml

@@ -8,6 +8,8 @@
     xmlns:components="clr-namespace:DiscordChatExporter.Gui.ViewModels.Components"
     xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="clr-namespace:DiscordChatExporter.Core.Discord.Data;assembly=DiscordChatExporter.Core"
+    xmlns:globalization="clr-namespace:System.Globalization;assembly=System.Runtime"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
@@ -16,6 +18,14 @@
     Loaded="{s:Action OnViewLoaded}"
     mc:Ignorable="d">
     <UserControl.Resources>
+        <!--  Sort DMs by last message  -->
+        <CollectionViewSource x:Key="AvailableDirectMessageChannelsViewSource" Source="{Binding AvailableChannels, Mode=OneWay}">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription Direction="Descending" PropertyName="LastMessageId" />
+                <componentModel:SortDescription Direction="Ascending" PropertyName="Name" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
+        <!--  Sort guild channels by position  -->
         <CollectionViewSource x:Key="AvailableChannelsViewSource" Source="{Binding AvailableChannels, Mode=OneWay}">
             <CollectionViewSource.GroupDescriptions>
                 <PropertyGroupDescription PropertyName="Category.Name" />
@@ -144,11 +154,14 @@
                         <!--  User token  -->
                         <InlineUIContainer>
                             <materialDesign:PackIcon
-                                Margin="1,0,0,-2"
+                                Margin="0,0,2,-2"
                                 Foreground="{DynamicResource PrimaryHueMidBrush}"
                                 Kind="Account" />
                         </InlineUIContainer>
-                        <Run FontSize="16" Text="Authenticate using your personal account" />
+                        <Run FontSize="16" Text="To get token for your personal account:" />
+                        <LineBreak />
+                        <Run Text="*  Automating user accounts is technically against TOS —" />
+                        <Run FontWeight="SemiBold" Text="use at your own risk" /><Run Text="!" />
                         <LineBreak />
                         <Run Text="1. Open Discord in your" />
                         <Hyperlink Command="{s:Action OpenDiscord}">
@@ -160,45 +173,40 @@
                         <Run FontWeight="SemiBold" Text="Ctrl+Shift+I" />
                         <Run Text="to show developer tools" />
                         <LineBreak />
-                        <Run Text="3. Press" />
+                        <Run Text="3. Navigate to the" />
-                        <Run FontWeight="SemiBold" Text="Ctrl+Shift+M" />
+                        <Run FontWeight="SemiBold" Text="Network" />
-                        <Run Text="to toggle device toolbar" />
-                        <LineBreak />
-                        <Run Text="4. Navigate to the" />
-                        <Run FontWeight="SemiBold" Text="Application" />
                         <Run Text="tab" />
                         <LineBreak />
-                        <Run Text="5. On the left, expand" />
+                        <Run Text="4. Press" />
-                        <Run FontWeight="SemiBold" Text="Local Storage" />
-                        <Run Text="and select" />
-                        <Run FontWeight="SemiBold" Text="https://discord.com" />
-                        <LineBreak />
-                        <Run Text="6. Type" />
-                        <Run FontWeight="SemiBold" Text="token" />
-                        <Run Text="into the" />
-                        <Run FontWeight="SemiBold" Text="Filter" />
-                        <Run Text="box" />
-                        <LineBreak />
-                        <Run Text="7. If the token key does not appear, press" />
                         <Run FontWeight="SemiBold" Text="Ctrl+R" />
                         <Run Text="to reload" />
                         <LineBreak />
-                        <Run Text="8. Copy the value of the" />
+                        <Run Text="5. Search for a request containing" />
-                        <Run FontWeight="SemiBold" Text="token" />
+                        <Run FontWeight="SemiBold" Text="messages?limit=50" />
-                        <Run Text="key" />
+                        <Run Text="or similar" />
                         <LineBreak />
-                        <Run Text="*  Automating user accounts is technically against TOS, use at your own risk!" />
+                        <Run Text="6. Select the" />
+                        <Run FontWeight="SemiBold" Text="Headers" />
+                        <Run Text=" tab on the right" />
+                        <LineBreak />
+                        <Run Text="7. Scroll down to the" />
+                        <Run FontWeight="SemiBold" Text="Request Headers" />
+                        <Run Text="section" />
+                        <LineBreak />
+                        <Run Text="8. Copy the value of the" />
+                        <Run FontWeight="SemiBold" Text="authorization" />
+                        <Run Text="header" />
                         <LineBreak />
                         <LineBreak />
 
                         <!--  Bot token  -->
                         <InlineUIContainer>
                             <materialDesign:PackIcon
-                                Margin="1,0,0,-2"
+                                Margin="0,0,2,-2"
                                 Foreground="{DynamicResource PrimaryHueMidBrush}"
                                 Kind="Robot" />
                         </InlineUIContainer>
-                        <Run FontSize="16" Text="Authenticate using a bot account" />
+                        <Run FontSize="16" Text="To get token for a bot account:" />
                         <LineBreak />
                         <Run Text="1. Open Discord" />
                         <Hyperlink Command="{s:Action OpenDiscordDeveloperPortal}">
@@ -276,13 +284,24 @@
                 <Border Grid.Column="1">
                     <ListBox
                         HorizontalContentAlignment="Stretch"
-                        ItemsSource="{Binding Source={StaticResource AvailableChannelsViewSource}}"
                         SelectionMode="Extended"
                         TextSearch.TextPath="Model.Name"
                         VirtualizingPanel.IsVirtualizingWhenGrouping="True">
                         <b:Interaction.Behaviors>
                             <behaviors:ChannelMultiSelectionListBoxBehavior SelectedItems="{Binding SelectedChannels}" />
                         </b:Interaction.Behaviors>
+                        <ListBox.Style>
+                            <Style BasedOn="{StaticResource {x:Type ListBox}}" TargetType="{x:Type ListBox}">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsDirectMessageGuildSelected}" Value="True">
+                                        <Setter Property="ItemsSource" Value="{Binding Source={StaticResource AvailableDirectMessageChannelsViewSource}}" />
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding IsDirectMessageGuildSelected}" Value="False">
+                                        <Setter Property="ItemsSource" Value="{Binding Source={StaticResource AvailableChannelsViewSource}}" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ListBox.Style>
                         <ListBox.GroupStyle>
                             <GroupStyle>
                                 <GroupStyle.ContainerStyle>
@@ -308,7 +327,7 @@
                             </GroupStyle>
                         </ListBox.GroupStyle>
                         <ListBox.ItemTemplate>
-                            <DataTemplate>
+                            <DataTemplate DataType="{x:Type data:Channel}">
                                 <Grid Margin="-8" Background="Transparent">
                                     <Grid.InputBindings>
                                         <MouseBinding Command="{s:Action ExportChannels}" MouseAction="LeftDoubleClick" />
@@ -318,13 +337,31 @@
                                         <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
+                                    <Grid.ToolTip>
+                                        <TextBlock>
+                                            <Run Text="Last message sent on:" />
+                                            <Run FontWeight="SemiBold" Text="{Binding LastMessageId, Converter={x:Static converters:SnowflakeToDateTimeOffsetConverter.Instance}, ConverterCulture={x:Static globalization:CultureInfo.CurrentCulture}, TargetNullValue=never}" />
+                                        </TextBlock>
+                                    </Grid.ToolTip>
 
                                     <!--  Channel icon  -->
                                     <materialDesign:PackIcon
                                         Grid.Column="0"
                                         Margin="16,7,0,6"
-                                        VerticalAlignment="Center"
+                                        VerticalAlignment="Center">
-                                        Kind="Pound" />
+                                        <materialDesign:PackIcon.Style>
+                                            <Style TargetType="{x:Type materialDesign:PackIcon}">
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding SupportsVoice}" Value="True">
+                                                        <Setter Property="Kind" Value="VolumeHigh" />
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding SupportsVoice}" Value="False">
+                                                        <Setter Property="Kind" Value="Pound" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </materialDesign:PackIcon.Style>
+                                    </materialDesign:PackIcon>
 
                                     <!--  Channel name  -->
                                     <TextBlock

DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml

@@ -5,6 +5,7 @@
     xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
+    xmlns:globalization="clr-namespace:System.Globalization;assembly=System.Runtime"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
@@ -86,7 +87,7 @@
                         Style="{DynamicResource MaterialDesignOutlinedComboBox}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Converter={x:Static converters:ExportFormatToStringConverter.Instance}}" />
+                                <TextBlock Text="{Binding Converter={x:Static converters:ExportFormatToStringConverter.Instance}, ConverterCulture={x:Static globalization:CultureInfo.CurrentCulture}}" />
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
@@ -110,8 +111,8 @@
                                 Margin="16,8,16,4"
                                 materialDesign:HintAssist.Hint="After (date)"
                                 materialDesign:HintAssist.IsFloating="True"
-                                DisplayDateEnd="{Binding BeforeDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
+                                DisplayDateEnd="{Binding BeforeDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}, ConverterCulture={x:Static globalization:CultureInfo.CurrentCulture}}"
-                                SelectedDate="{Binding AfterDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
+                                SelectedDate="{Binding AfterDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}, ConverterCulture={x:Static globalization:CultureInfo.CurrentCulture}}"
                                 Style="{DynamicResource MaterialDesignOutlinedDatePicker}"
                                 ToolTip="Only include messages sent after this date" />
                             <DatePicker
@@ -120,8 +121,8 @@
                                 Margin="16,8,16,4"
                                 materialDesign:HintAssist.Hint="Before (date)"
                                 materialDesign:HintAssist.IsFloating="True"
-                                DisplayDateStart="{Binding AfterDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
+                                DisplayDateStart="{Binding AfterDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}, ConverterCulture={x:Static globalization:CultureInfo.CurrentCulture}}"
-                                SelectedDate="{Binding BeforeDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
+                                SelectedDate="{Binding BeforeDate, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}, ConverterCulture={x:Static globalization:CultureInfo.CurrentCulture}}"
                                 Style="{DynamicResource MaterialDesignOutlinedDatePicker}"
                                 ToolTip="Only include messages sent before this date" />
                             <materialDesign:TimePicker
@@ -132,7 +133,7 @@
                                 materialDesign:HintAssist.IsFloating="True"
                                 Is24Hours="{x:Static utils:Internationalization.Is24Hours}"
                                 IsEnabled="{Binding IsAfterDateSet}"
-                                SelectedTime="{Binding AfterTime, Converter={x:Static converters:TimeSpanToDateTimeConverter.Instance}}"
+                                SelectedTime="{Binding AfterTime, Converter={x:Static converters:TimeSpanToDateTimeConverter.Instance}, ConverterCulture={x:Static globalization:CultureInfo.CurrentCulture}}"
                                 Style="{DynamicResource MaterialDesignOutlinedTimePicker}"
                                 ToolTip="Only include messages sent after this time" />
                             <materialDesign:TimePicker
@@ -143,7 +144,7 @@
                                 materialDesign:HintAssist.IsFloating="True"
                                 Is24Hours="{x:Static utils:Internationalization.Is24Hours}"
                                 IsEnabled="{Binding IsBeforeDateSet}"
-                                SelectedTime="{Binding BeforeTime, Converter={x:Static converters:TimeSpanToDateTimeConverter.Instance}}"
+                                SelectedTime="{Binding BeforeTime, Converter={x:Static converters:TimeSpanToDateTimeConverter.Instance}, ConverterCulture={x:Static globalization:CultureInfo.CurrentCulture}}"
                                 Style="{DynamicResource MaterialDesignOutlinedTimePicker}"
                                 ToolTip="Only include messages sent before this time" />
                         </Grid>

DiscordChatExporter.sln

@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		License.txt = License.txt
 		Readme.md = Readme.md
 		Directory.Build.props = Directory.Build.props
-		Dockerfile = Dockerfile
+		DiscordChatExporter.Cli.dockerfile = DiscordChatExporter.Cli.dockerfile
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Gui", "DiscordChatExporter.Gui\DiscordChatExporter.Gui.csproj", "{732A67AF-93DE-49DF-B10F-FD74710B7863}"

Dockerfile

@@ -1,20 +0,0 @@
-# Build
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-COPY favicon.ico ./
-COPY NuGet.config ./
-COPY Directory.Build.props ./
-COPY DiscordChatExporter.Core DiscordChatExporter.Core
-COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
-
-RUN dotnet publish DiscordChatExporter.Cli -o DiscordChatExporter.Cli/publish -c Release
-
-# Run
-FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run
-WORKDIR /app
-
-COPY --from=build /src/DiscordChatExporter.Cli/publish ./
-
-WORKDIR /app/out
-ENTRYPOINT ["dotnet", "/app/DiscordChatExporter.Cli.dll"]