Replace YouTube iframe embeds with clickable thumbnails (#1474)

* Initial plan

* Replace YouTube iframe with clickable thumbnail

- Changed YouTube embed URL from embed format to watch format
- Added ThumbnailUrl property to YouTubeVideoEmbedProjection using YouTube's standard thumbnail URL
- Updated MessageGroupTemplate to render thumbnail image with link instead of iframe
- Updated CSS to style thumbnail appropriately
- Updated test to check for anchor link and thumbnail image instead of iframe

Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>

* Address code review feedback

- Use hqdefault.jpg instead of maxresdefault.jpg (guaranteed to exist for all videos)
- Extract thumbnail URL logic to GetThumbnailUrl method for better testability

Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>

* Simplify YouTube embed test to focus on data not structure

- Remove checks for HTML structure (class names, nested elements)
- Focus on verifying YouTube URL with correct video ID exists
- Follow same pattern as other embed tests (Spotify, Twitch)

Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>

* Fix data-canonical-url and improve test specificity

- Use canonical (non-proxy) URL for data-canonical-url attribute
- Extract thumbnailUrl to local variable to avoid duplicate calls
- Update test to check for img with video ID in src, avoiding false positives
- Test now verifies the actual thumbnail data rather than any link

Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>

* Inline thumbnail URL logic directly into attributes

- Remove GetThumbnailUrl method from YouTubeVideoEmbedProjection
- Remove local variables from template
- Put coalescing logic directly in src and data-canonical-url attributes

Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>

.docs/Getting-started.md

@@ -33,7 +33,7 @@ The HTML format replicates Discord's interface, making it the most user-friendly
 It's the best format for attachment preview and sharing.
 You can open `.html` files with a web browser, such as Google Chrome.
 
-> **Warning**:
+> [!WARNING]
 > If a picture is deleted, or if a user changes its avatar, the respective images will no longer be displayed.
 > Export using the "Download assets" (`--media`) option to avoid this.
 

.docs/Token-and-IDs.md

@@ -27,7 +27,7 @@ Prerequisite step: Navigate to [discord.com](https://discord.com) and login.
 3. Type
 
     ```js
-    (webpackChunkdiscord_app.push([[''],{},e=>{m=[];for(let c in e.c)m.push(e.c[c])}]),m).find(m=>m?.exports?.default?.getToken!==void 0).exports.default.getToken()
+    let m;webpackChunkdiscord_app.push([[Math.random()],{},e=>{for(let i in e.c){let x=e.c[i];if(x?.exports?.$8&&x.exports.LP&&x.exports.gK){m=x;break}}}]);m&&console.log("Token:",m.exports.LP());
     ```
 
     into the console and press <kbd>Enter</kbd>. The console will display your user token.
@@ -120,7 +120,7 @@ Prerequisite step: Navigate to [discord.com](https://discord.com) and login.
 1. Type
 
     ```js
-    (webpackChunkdiscord_app.push([[''],{},e=>{m=[];for(let c in e.c)m.push(e.c[c])}]),m).find(m=>m?.exports?.default?.getToken!==void 0).exports.default.getToken()
+    let m;webpackChunkdiscord_app.push([[Math.random()],{},e=>{for(let i in e.c){let x=e.c[i];if(x?.exports?.$8&&x.exports.LP&&x.exports.gK){m=x;break}}}]);m&&console.log("Token:",m.exports.LP());
     ```
 
     into the console and press <kbd>Enter</kbd>. The console will display your user token.
@@ -306,7 +306,7 @@ If you don't have a bot token yet or if you've lost it, follow these steps to re
 > **Tip**:
 > As the token is only shown once, make sure to store it in a safe place. If you lose the token, you will have to reset it again.
 
-> **Warning**:
+> [!WARNING]
 > Resetting the token will invalidate the old one. Any integrations relying on the old token will cease to function until they are updated.
 
 ![https://discord.com/developers/applications/](https://i.imgur.com/soiB8Qc.png)

.docs/Using-the-GUI.md

@@ -31,7 +31,7 @@ If you skip these steps, the "DiscordChatExporter is damaged and can’t be open
 
 Please refer to the on-screen instructions to get your token, then paste your token in the upper text box and hit ENTER or click the arrow (→).
 
-> **Warning**:
+> [!WARNING]
 > **Never share your token!**
 > A token gives full access to an account, treat it like a password.
 

.github/workflows/docker.yml

@@ -23,10 +23,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
 
       - name: Build image
         run: >
@@ -36,8 +36,8 @@ jobs:
           --build-arg VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('999.9.9-ci-{0}', github.sha) }}
           --output type=tar,dest=DiscordChatExporter.Cli.Docker.tar
 
-      - name: Upload artifacts
+      - name: Upload image
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: DiscordChatExporter.Cli.Docker
           path: DiscordChatExporter.Cli.Docker.tar
@@ -55,10 +55,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
 
       - name: Login to DockerHub
         run: >

.github/workflows/main.yml

@@ -26,12 +26,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
-        with:
-          dotnet-version: 9.0.x
 
       # Build the project separately to discern between build and format errors
       - name: Build
@@ -64,12 +62,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
-        with:
-          dotnet-version: 9.0.x
 
       - name: Run tests
         env:
@@ -85,7 +81,7 @@ jobs:
           DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
 
       - name: Upload coverage
-        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -121,12 +117,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
-        with:
-          dotnet-version: 9.0.x
 
       - name: Publish app
         run: >
@@ -139,8 +133,8 @@ jobs:
           --runtime ${{ matrix.rid }}
           --self-contained
 
-      - name: Upload artifacts
+      - name: Upload app binaries
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: ${{ matrix.asset }}.${{ matrix.rid }}
           path: ${{ matrix.app }}/bin/publish/
@@ -204,8 +198,8 @@ jobs:
       contents: write
 
     steps:
-      - name: Download artifacts
+      - name: Download app binaries
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: ${{ matrix.asset }}.${{ matrix.rid }}
           path: ${{ matrix.app }}/
@@ -213,13 +207,10 @@ jobs:
       - name: Set permissions
         if: ${{ !startsWith(matrix.rid, 'win-') }}
         run: |
-          if [ -f ${{ matrix.app }}/${{ matrix.asset }} ]; then
+          [ -f ${{ matrix.app }}/${{ matrix.asset }} ] && chmod +x ${{ matrix.app }}/${{ matrix.asset }} || true
-              chmod +x ${{ matrix.app }}/${{ matrix.asset }}
+
-          fi
+          # macOS bundle
-          
+          [ -f ${{ matrix.app }}/${{ matrix.asset }}.app/Contents/MacOS/${{ matrix.asset }} ] && chmod +x ${{ matrix.app }}/${{ matrix.asset }}.app/Contents/MacOS/${{ matrix.asset }} || true
-          if [ -f ${{ matrix.app }}/${{ matrix.asset }}.app/Contents/MacOS/${{ matrix.asset }} ]; then
-              chmod +x ${{ matrix.app }}/${{ matrix.asset }}.app/Contents/MacOS/${{ matrix.asset }}
-          fi
 
       - name: Create package
         # Change into the artifacts directory to avoid including the directory itself in the zip archive

.gitignore

@@ -9,4 +9,4 @@ bin/
 obj/
 
 # Test results
-TestResults/
+TestResults/

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Version>999.9.9-dev</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Oleksii Holub</Copyright>

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

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
@@ -11,22 +10,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.3.0" />
+    <PackageReference Include="AngleSharp" Version="1.4.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="1.2.5" PrivateAssets="all" />
-    <PackageReference Include="FluentAssertions" Version="8.2.0" />
+    <PackageReference Include="FluentAssertions" Version="8.8.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="all" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="3.0.1" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.4" />
+    <PackageReference
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.4" />
+      Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+      Version="10.0.2"
+    />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj" />
   </ItemGroup>
-
+</Project>
-</Project>

DiscordChatExporter.Cli.Tests/Readme.md

@@ -8,5 +8,5 @@ In order to run these tests locally, you need to join the test server and config
 3. Add your token to user secrets: `dotnet user-secrets set DISCORD_TOKEN <token>`
 4. Run the tests: `dotnet test`
 
-> **Note**:
+> [!NOTE]
 > If you want to add a new test case, please let me know and I will give you the required permissions on the server.

DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs

@@ -181,8 +181,14 @@ public class HtmlEmbedSpecs
         );
 
         // Assert
-        var iframeUrl = message.QuerySelector("iframe")?.GetAttribute("src");
+        // Check that the YouTube video thumbnail image exists with the correct video ID
-        iframeUrl.Should().StartWith("https://www.youtube.com/embed/qOWW4OlgbvE");
+        var youtubeThumbnailSrc = message
+            .QuerySelectorAll("img")
+            .Select(e => e.GetAttribute("src"))
+            .WhereNotNull()
+            .FirstOrDefault(s => s.Contains("qOWW4OlgbvE", StringComparison.Ordinal));
+
+        youtubeThumbnailSrc.Should().NotBeNull();
     }
 
     [Fact]

DiscordChatExporter.Cli.Tests/Utils/Extensions/StringExtensions.cs

@@ -4,13 +4,16 @@ namespace DiscordChatExporter.Cli.Tests.Utils.Extensions;
 
 internal static class StringExtensions
 {
-    public static string ReplaceWhiteSpace(this string str, string replacement = " ")
+    extension(string str)
     {
-        var buffer = new StringBuilder(str.Length);
+        public string ReplaceWhiteSpace(string replacement = " ")
+        {
+            var buffer = new StringBuilder(str.Length);
 
-        foreach (var ch in str)
+            foreach (var ch in str)
-            buffer.Append(char.IsWhiteSpace(ch) ? replacement : ch);
+                buffer.Append(char.IsWhiteSpace(ch) ? replacement : ch);
 
-        return buffer.ToString();
+            return buffer.ToString();
+        }
     }
 }

DiscordChatExporter.Cli.Tests/Utils/TempDir.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using PathEx = System.IO.Path;
 
 namespace DiscordChatExporter.Cli.Tests.Utils;
 
@@ -23,8 +22,8 @@ internal partial class TempDir
 {
     public static TempDir Create()
     {
-        var dirPath = PathEx.Combine(
+        var dirPath = System.IO.Path.Combine(
-            PathEx.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+            System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
                 ?? Directory.GetCurrentDirectory(),
             "Temp",
             Guid.NewGuid().ToString()

DiscordChatExporter.Cli.Tests/Utils/TempFile.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using PathEx = System.IO.Path;
 
 namespace DiscordChatExporter.Cli.Tests.Utils;
 
@@ -23,15 +22,15 @@ internal partial class TempFile
 {
     public static TempFile Create()
     {
-        var dirPath = PathEx.Combine(
+        var dirPath = System.IO.Path.Combine(
-            PathEx.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+            System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
                 ?? Directory.GetCurrentDirectory(),
             "Temp"
         );
 
         Directory.CreateDirectory(dirPath);
 
-        var filePath = PathEx.Combine(dirPath, Guid.NewGuid() + ".tmp");
+        var filePath = System.IO.Path.Combine(dirPath, Guid.NewGuid() + ".tmp");
 
         return new TempFile(filePath);
     }

DiscordChatExporter.Cli.dockerfile

@@ -1,7 +1,7 @@
 # -- Build
 # Specify the platform here so that we pull the SDK image matching the host platform,
 # instead of the target platform specified during build by the `--platform` option.
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 
 # Expose the target architecture set by the `docker build --platform` option, so that
 # we can build the assembly for the correct platform.
@@ -30,7 +30,7 @@ RUN dotnet publish DiscordChatExporter.Cli \
 
 # -- Run
 # Use `runtime-deps` instead of `runtime` because we have a self-contained assembly
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime-deps:9.0-alpine AS run
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime-deps:10.0-alpine AS run
 
 LABEL org.opencontainers.image.title="DiscordChatExporter.Cli"
 LABEL org.opencontainers.image.description="DiscordChatExporter is an application that can be used to export message history from any Discord channel to a file."

DiscordChatExporter.Cli/Commands/Base/DiscordCommandBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
@@ -34,9 +35,9 @@ public abstract class DiscordCommandBase : ICommand
     )]
     public bool ShouldRespectRateLimits { get; init; } = true;
 
-    private DiscordClient? _discordClient;
+    [field: AllowNull, MaybeNull]
     protected DiscordClient Discord =>
-        _discordClient ??= new DiscordClient(
+        field ??= new DiscordClient(
             Token,
             ShouldRespectRateLimits ? RateLimitPreference.RespectAll : RateLimitPreference.IgnoreAll
         );

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -8,6 +9,7 @@ using CliFx.Attributes;
 using CliFx.Exceptions;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Converters;
+using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Cli.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
@@ -15,7 +17,6 @@ using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
-using DiscordChatExporter.Core.Utils.Extensions;
 using Gress;
 using Spectre.Console;
 
@@ -23,8 +24,6 @@ namespace DiscordChatExporter.Cli.Commands.Base;
 
 public abstract class ExportCommandBase : DiscordCommandBase
 {
-    private readonly string _outputPath = Directory.GetCurrentDirectory();
-
     [CommandOption(
         "output",
         'o',
@@ -35,11 +34,11 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public string OutputPath
     {
-        get => _outputPath;
+        get;
         // Handle ~/ in paths on Unix systems
         // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
-        init => _outputPath = Path.GetFullPath(value);
+        init => field = Path.GetFullPath(value);
-    }
+    } = Directory.GetCurrentDirectory();
 
     [CommandOption("format", 'f', Description = "Export format.")]
     public ExportFormat ExportFormat { get; init; } = ExportFormat.HtmlDark;
@@ -64,6 +63,13 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public PartitionLimit PartitionLimit { get; init; } = PartitionLimit.Null;
 
+    [CommandOption(
+        "include-threads",
+        Description = "Which types of threads should be included.",
+        Converter = typeof(ThreadInclusionModeBindingConverter)
+    )]
+    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
+
     [CommandOption(
         "filter",
         Description = "Only include messages that satisfy this filter. "
@@ -95,8 +101,6 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public bool ShouldReuseAssets { get; init; } = false;
 
-    private readonly string? _assetsDirPath;
-
     [CommandOption(
         "media-dir",
         Description = "Download assets to this directory. "
@@ -104,10 +108,10 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public string? AssetsDirPath
     {
-        get => _assetsDirPath;
+        get;
         // Handle ~/ in paths on Unix systems
         // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
-        init => _assetsDirPath = value is not null ? Path.GetFullPath(value) : null;
+        init => field = value is not null ? Path.GetFullPath(value) : null;
     }
 
     [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
@@ -136,11 +140,13 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public bool IsUkraineSupportMessageDisabled { get; init; } = false;
 
-    private ChannelExporter? _channelExporter;
+    [field: AllowNull, MaybeNull]
-    protected ChannelExporter Exporter => _channelExporter ??= new ChannelExporter(Discord);
+    protected ChannelExporter Exporter => field ??= new ChannelExporter(Discord);
 
     protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Channel> channels)
     {
+        var cancellationToken = console.RegisterCancellationHandler();
+
         // Asset reuse can only be enabled if the download assets option is set
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/425
         if (ShouldReuseAssets && !ShouldDownloadAssets)
@@ -154,13 +160,53 @@ public abstract class ExportCommandBase : DiscordCommandBase
             throw new CommandException("Option --media-dir cannot be used without --media.");
         }
 
+        var unwrappedChannels = new List<Channel>(channels);
+
+        // Unwrap threads
+        if (ThreadInclusionMode != ThreadInclusionMode.None)
+        {
+            await console.Output.WriteLineAsync("Fetching threads...");
+
+            var fetchedThreadsCount = 0;
+            await console
+                .CreateStatusTicker()
+                .StartAsync(
+                    "...",
+                    async ctx =>
+                    {
+                        await foreach (
+                            var thread in Discord.GetChannelThreadsAsync(
+                                channels,
+                                ThreadInclusionMode == ThreadInclusionMode.All,
+                                Before,
+                                After,
+                                cancellationToken
+                            )
+                        )
+                        {
+                            unwrappedChannels.Add(thread);
+
+                            ctx.Status(Markup.Escape($"Fetched '{thread.GetHierarchicalName()}'."));
+
+                            fetchedThreadsCount++;
+                        }
+                    }
+                );
+
+            // Remove forums, as they cannot be exported directly and their constituent threads
+            // have already been fetched.
+            unwrappedChannels.RemoveAll(channel => channel.Kind == ChannelKind.GuildForum);
+
+            await console.Output.WriteLineAsync($"Fetched {fetchedThreadsCount} thread(s).");
+        }
+
         // Make sure the user does not try to export multiple channels into one file.
         // Output path must either be a directory or contain template tokens for this to work.
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/799
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/917
         var isValidOutputPath =
             // Anything is valid when exporting a single channel
-            channels.Count <= 1
+            unwrappedChannels.Count <= 1
             // When using template tokens, assume the user knows what they're doing
             || OutputPath.Contains('%')
             // Otherwise, require an existing directory or an unambiguous directory path
@@ -177,11 +223,10 @@ public abstract class ExportCommandBase : DiscordCommandBase
         }
 
         // Export
-        var cancellationToken = console.RegisterCancellationHandler();
         var errorsByChannel = new ConcurrentDictionary<Channel, string>();
         var warningsByChannel = new ConcurrentDictionary<Channel, string>();
 
-        await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
+        await console.Output.WriteLineAsync($"Exporting {unwrappedChannels.Count} channel(s)...");
         await console
             .CreateProgressTicker()
             .HideCompleted(
@@ -193,7 +238,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
             .StartAsync(async ctx =>
             {
                 await Parallel.ForEachAsync(
-                    channels,
+                    unwrappedChannels,
                     new ParallelOptions
                     {
                         MaxDegreeOfParallelism = Math.Max(1, ParallelLimit),
@@ -253,7 +298,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
         using (console.WithForegroundColor(ConsoleColor.White))
         {
             await console.Output.WriteLineAsync(
-                $"Successfully exported {channels.Count - errorsByChannel.Count} channel(s)."
+                $"Successfully exported {unwrappedChannels.Count - errorsByChannel.Count} channel(s)."
             );
         }
 
@@ -301,48 +346,10 @@ public abstract class ExportCommandBase : DiscordCommandBase
 
         // Fail the command only if ALL channels failed to export.
         // If only some channels failed to export, it's okay.
-        if (errorsByChannel.Count >= channels.Count)
+        if (errorsByChannel.Count >= unwrappedChannels.Count)
             throw new CommandException("Export failed.");
     }
 
-    protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Snowflake> channelIds)
-    {
-        var cancellationToken = console.RegisterCancellationHandler();
-
-        await console.Output.WriteLineAsync("Resolving channel(s)...");
-
-        var channels = new List<Channel>();
-        var channelsByGuild = new Dictionary<Snowflake, IReadOnlyList<Channel>>();
-
-        foreach (var channelId in channelIds)
-        {
-            var channel = await Discord.GetChannelAsync(channelId, cancellationToken);
-
-            // Unwrap categories
-            if (channel.IsCategory)
-            {
-                var guildChannels =
-                    channelsByGuild.GetValueOrDefault(channel.GuildId)
-                    ?? await Discord.GetGuildChannelsAsync(channel.GuildId, cancellationToken);
-
-                foreach (var guildChannel in guildChannels)
-                {
-                    if (guildChannel.Parent?.Id == channel.Id)
-                        channels.Add(guildChannel);
-                }
-
-                // Cache the guild channels to avoid redundant work
-                channelsByGuild[channel.GuildId] = guildChannels;
-            }
-            else
-            {
-                channels.Add(channel);
-            }
-        }
-
-        await ExportAsync(console, channels);
-    }
-
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         // Support Ukraine callout

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -5,8 +5,6 @@ using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Cli.Commands.Converters;
-using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Cli.Utils.Extensions;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Dump;
@@ -27,13 +25,6 @@ public class ExportAllCommand : ExportCommandBase
     [CommandOption("include-vc", Description = "Include voice channels.")]
     public bool IncludeVoiceChannels { get; init; } = true;
 
-    [CommandOption(
-        "include-threads",
-        Description = "Which types of threads should be included.",
-        Converter = typeof(ThreadInclusionModeBindingConverter)
-    )]
-    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
-
     [CommandOption(
         "data-package",
         Description = "Path to the personal data package (ZIP file) requested from Discord. "
@@ -90,46 +81,6 @@ public class ExportAllCommand : ExportCommandBase
                     );
 
                 await console.Output.WriteLineAsync($"Fetched {fetchedChannelsCount} channel(s).");
-
-                // Threads
-                if (ThreadInclusionMode != ThreadInclusionMode.None)
-                {
-                    await console.Output.WriteLineAsync(
-                        $"Fetching threads for server '{guild.Name}'..."
-                    );
-
-                    var fetchedThreadsCount = 0;
-                    await console
-                        .CreateStatusTicker()
-                        .StartAsync(
-                            "...",
-                            async ctx =>
-                            {
-                                await foreach (
-                                    var thread in Discord.GetGuildThreadsAsync(
-                                        guild.Id,
-                                        ThreadInclusionMode == ThreadInclusionMode.All,
-                                        Before,
-                                        After,
-                                        cancellationToken
-                                    )
-                                )
-                                {
-                                    channels.Add(thread);
-
-                                    ctx.Status(
-                                        Markup.Escape($"Fetched '{thread.GetHierarchicalName()}'.")
-                                    );
-
-                                    fetchedThreadsCount++;
-                                }
-                            }
-                        );
-
-                    await console.Output.WriteLineAsync(
-                        $"Fetched {fetchedThreadsCount} thread(s)."
-                    );
-                }
             }
         }
         // Pull from the data package
@@ -199,10 +150,6 @@ public class ExportAllCommand : ExportCommandBase
             channels.RemoveAll(c => c.IsGuild);
         if (!IncludeVoiceChannels)
             channels.RemoveAll(c => c.IsVoice);
-        if (ThreadInclusionMode == ThreadInclusionMode.None)
-            channels.RemoveAll(c => c.IsThread);
-        if (ThreadInclusionMode != ThreadInclusionMode.All)
-            channels.RemoveAll(c => c is { IsThread: true, IsArchived: true });
 
         await ExportAsync(console, channels);
     }

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

@@ -4,6 +4,8 @@ using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
 
@@ -22,6 +24,40 @@ public class ExportChannelsCommand : ExportCommandBase
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
-        await ExportAsync(console, ChannelIds);
+
+        var cancellationToken = console.RegisterCancellationHandler();
+
+        await console.Output.WriteLineAsync("Resolving channel(s)...");
+
+        var channels = new List<Channel>();
+        var channelsByGuild = new Dictionary<Snowflake, IReadOnlyList<Channel>>();
+
+        foreach (var channelId in ChannelIds)
+        {
+            var channel = await Discord.GetChannelAsync(channelId, cancellationToken);
+
+            // Unwrap categories
+            if (channel.IsCategory)
+            {
+                var guildChannels =
+                    channelsByGuild.GetValueOrDefault(channel.GuildId)
+                    ?? await Discord.GetGuildChannelsAsync(channel.GuildId, cancellationToken);
+
+                foreach (var guildChannel in guildChannels)
+                {
+                    if (guildChannel.Parent?.Id == channel.Id)
+                        channels.Add(guildChannel);
+                }
+
+                // Cache the guild channels to avoid redundant work
+                channelsByGuild[channel.GuildId] = guildChannels;
+            }
+            else
+            {
+                channels.Add(channel);
+            }
+        }
+
+        await ExportAsync(console, channels);
     }
 }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -3,8 +3,6 @@ using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Cli.Commands.Converters;
-using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Cli.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
@@ -21,13 +19,6 @@ public class ExportGuildCommand : ExportCommandBase
     [CommandOption("include-vc", Description = "Include voice channels.")]
     public bool IncludeVoiceChannels { get; init; } = true;
 
-    [CommandOption(
-        "include-threads",
-        Description = "Which types of threads should be included.",
-        Converter = typeof(ThreadInclusionModeBindingConverter)
-    )]
-    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
-
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
@@ -35,7 +26,6 @@ public class ExportGuildCommand : ExportCommandBase
         var cancellationToken = console.RegisterCancellationHandler();
         var channels = new List<Channel>();
 
-        // Regular channels
         await console.Output.WriteLineAsync("Fetching channels...");
 
         var fetchedChannelsCount = 0;
@@ -66,40 +56,6 @@ public class ExportGuildCommand : ExportCommandBase
 
         await console.Output.WriteLineAsync($"Fetched {fetchedChannelsCount} channel(s).");
 
-        // Threads
-        if (ThreadInclusionMode != ThreadInclusionMode.None)
-        {
-            await console.Output.WriteLineAsync("Fetching threads...");
-
-            var fetchedThreadsCount = 0;
-            await console
-                .CreateStatusTicker()
-                .StartAsync(
-                    "...",
-                    async ctx =>
-                    {
-                        await foreach (
-                            var thread in Discord.GetGuildThreadsAsync(
-                                GuildId,
-                                ThreadInclusionMode == ThreadInclusionMode.All,
-                                Before,
-                                After,
-                                cancellationToken
-                            )
-                        )
-                        {
-                            channels.Add(thread);
-
-                            ctx.Status(Markup.Escape($"Fetched '{thread.GetHierarchicalName()}'."));
-
-                            fetchedThreadsCount++;
-                        }
-                    }
-                );
-
-            await console.Output.WriteLineAsync($"Fetched {fetchedThreadsCount} thread(s).");
-        }
-
         await ExportAsync(console, channels);
     }
 }

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ApplicationIcon>..\favicon.ico</ApplicationIcon>
@@ -7,16 +6,21 @@
     <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
   </PropertyGroup>
 
+  <!-- HACK: Disable trim warnings because they seem to break when the code contains C# 14 extension blocks -->
+  <PropertyGroup>
+    <EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+    <EnableAotAnalyzer>false</EnableAotAnalyzer>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="2.3.5" />
+    <PackageReference Include="CliFx" Version="2.3.6" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="1.2.5" PrivateAssets="all" />
     <PackageReference Include="Deorcify" Version="1.1.0" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
-    <PackageReference Include="Spectre.Console" Version="0.50.0" />
+    <PackageReference Include="Spectre.Console" Version="0.54.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" />
   </ItemGroup>
-
+</Project>
-</Project>

DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs

@@ -7,32 +7,35 @@ namespace DiscordChatExporter.Cli.Utils.Extensions;
 
 internal static class ConsoleExtensions
 {
-    public static IAnsiConsole CreateAnsiConsole(this IConsole console) =>
+    extension(IConsole console)
-        AnsiConsole.Create(
+    {
-            new AnsiConsoleSettings
+        public IAnsiConsole CreateAnsiConsole() =>
-            {
+            AnsiConsole.Create(
-                Ansi = AnsiSupport.Detect,
+                new AnsiConsoleSettings
-                ColorSystem = ColorSystemSupport.Detect,
+                {
-                Out = new AnsiConsoleOutput(console.Output),
+                    Ansi = AnsiSupport.Detect,
-            }
+                    ColorSystem = ColorSystemSupport.Detect,
-        );
+                    Out = new AnsiConsoleOutput(console.Output),
-
+                }
-    public static Status CreateStatusTicker(this IConsole console) =>
-        console.CreateAnsiConsole().Status().AutoRefresh(true);
-
-    public static Progress CreateProgressTicker(this IConsole console) =>
-        console
-            .CreateAnsiConsole()
-            .Progress()
-            .AutoClear(false)
-            .AutoRefresh(true)
-            .HideCompleted(false)
-            .Columns(
-                new TaskDescriptionColumn { Alignment = Justify.Left },
-                new ProgressBarColumn(),
-                new PercentageColumn()
             );
 
+        public Status CreateStatusTicker() =>
+            console.CreateAnsiConsole().Status().AutoRefresh(true);
+
+        public Progress CreateProgressTicker() =>
+            console
+                .CreateAnsiConsole()
+                .Progress()
+                .AutoClear(false)
+                .AutoRefresh(true)
+                .HideCompleted(false)
+                .Columns(
+                    new TaskDescriptionColumn { Alignment = Justify.Left },
+                    new ProgressBarColumn(),
+                    new PercentageColumn()
+                );
+    }
+
     public static async ValueTask StartTaskAsync(
         this ProgressContext context,
         string description,

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -33,9 +33,9 @@ public partial record Channel(
 
     public bool IsThread { get; } =
         Kind
-            is ChannelKind.GuildNewsThread
+        is ChannelKind.GuildNewsThread
-                or ChannelKind.GuildPublicThread
+            or ChannelKind.GuildPublicThread
-                or ChannelKind.GuildPrivateThread;
+            or ChannelKind.GuildPrivateThread;
 
     public bool IsEmpty { get; } = LastMessageId is null;
 
@@ -69,7 +69,8 @@ public partial record Channel
         var guildId =
             json.GetPropertyOrNull("guild_id")
                 ?.GetNonWhiteSpaceStringOrNull()
-                ?.Pipe(Snowflake.Parse) ?? Guild.DirectMessages.Id;
+                ?.Pipe(Snowflake.Parse)
+            ?? Guild.DirectMessages.Id;
 
         var name =
             // Guild channel
@@ -78,6 +79,7 @@ public partial record Channel
             ?? json.GetPropertyOrNull("recipients")
                 ?.EnumerateArrayOrNull()
                 ?.Select(User.Parse)
+                .OrderBy(u => u.Id)
                 .Select(u => u.DisplayName)
                 .Pipe(s => string.Join(", ", s))
             // Fallback
@@ -95,7 +97,8 @@ public partial record Channel
         var isArchived =
             json.GetPropertyOrNull("thread_metadata")
                 ?.GetPropertyOrNull("archived")
-                ?.GetBooleanOrNull() ?? false;
+                ?.GetBooleanOrNull()
+            ?? false;
 
         var lastMessageId = json.GetPropertyOrNull("last_message_id")
             ?.GetNonWhiteSpaceStringOrNull()

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

@@ -45,7 +45,11 @@ public partial record Embed
         var title = json.GetPropertyOrNull("title")?.GetStringOrNull();
 
         var kind =
-            json.GetPropertyOrNull("type")?.GetStringOrNull()?.ParseEnumOrNull<EmbedKind>()
+            json.GetPropertyOrNull("type")
+                ?.GetStringOrNull()
+                ?.Pipe(s =>
+                    Enum.TryParse<EmbedKind>(s, true, out var result) ? result : (EmbedKind?)null
+                )
             ?? EmbedKind.Rich;
 
         var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
@@ -63,7 +67,8 @@ public partial record Embed
             json.GetPropertyOrNull("fields")
                 ?.EnumerateArrayOrNull()
                 ?.Select(EmbedField.Parse)
-                .ToArray() ?? [];
+                .ToArray()
+            ?? [];
 
         var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);
 
@@ -78,7 +83,8 @@ public partial record Embed
             json.GetPropertyOrNull("image")
                 ?.Pipe(EmbedImage.Parse)
                 .ToSingletonEnumerable()
-                .ToArray() ?? [];
+                .ToArray()
+            ?? [];
 
         var video = json.GetPropertyOrNull("video")?.Pipe(EmbedVideo.Parse);
 

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

@@ -2,7 +2,10 @@
 
 public partial record YouTubeVideoEmbedProjection(string VideoId)
 {
-    public string Url { get; } = $"https://www.youtube.com/embed/{VideoId}";
+    public string Url { get; } = $"https://www.youtube.com/watch?v={VideoId}";
+
+    // Using hqdefault.jpg which is guaranteed to exist for all YouTube videos
+    public string ThumbnailUrl { get; } = $"https://i.ytimg.com/vi/{VideoId}/hqdefault.jpg";
 }
 
 public partial record YouTubeVideoEmbedProjection

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -25,7 +25,8 @@ public partial record Guild
         var iconUrl =
             json.GetPropertyOrNull("icon")
                 ?.GetNonWhiteSpaceStringOrNull()
-                ?.Pipe(h => ImageCdn.GetGuildIconUrl(id, h)) ?? ImageCdn.GetFallbackUserAvatarUrl();
+                ?.Pipe(h => ImageCdn.GetGuildIconUrl(id, h))
+            ?? ImageCdn.GetFallbackUserAvatarUrl();
 
         return new Guild(id, name, iconUrl);
     }

DiscordChatExporter.Core/Discord/Data/Member.cs

@@ -32,7 +32,8 @@ public partial record Member
                 ?.EnumerateArray()
                 .Select(j => j.GetNonWhiteSpaceString())
                 .Select(Snowflake.Parse)
-                .ToArray() ?? [];
+                .ToArray()
+            ?? [];
 
         var avatarUrl = guildId is not null
             ? json.GetPropertyOrNull("avatar")

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -143,7 +143,8 @@ public partial record Message
             json.GetPropertyOrNull("attachments")
                 ?.EnumerateArrayOrNull()
                 ?.Select(Attachment.Parse)
-                .ToArray() ?? [];
+                .ToArray()
+            ?? [];
 
         var embeds = NormalizeEmbeds(
             json.GetPropertyOrNull("embeds")?.EnumerateArrayOrNull()?.Select(Embed.Parse).ToArray()
@@ -154,13 +155,15 @@ public partial record Message
             json.GetPropertyOrNull("sticker_items")
                 ?.EnumerateArrayOrNull()
                 ?.Select(Sticker.Parse)
-                .ToArray() ?? [];
+                .ToArray()
+            ?? [];
 
         var reactions =
             json.GetPropertyOrNull("reactions")
                 ?.EnumerateArrayOrNull()
                 ?.Select(Reaction.Parse)
-                .ToArray() ?? [];
+                .ToArray()
+            ?? [];
 
         var mentionedUsers =
             json.GetPropertyOrNull("mentions")?.EnumerateArrayOrNull()?.Select(User.Parse).ToArray()

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -305,146 +305,19 @@ public class DiscordClient(
         if (guildId == Guild.DirectMessages.Id)
             yield break;
 
-        var channels = (await GetGuildChannelsAsync(guildId, cancellationToken))
+        var channels = await GetGuildChannelsAsync(guildId, cancellationToken);
-            // Categories cannot have threads
-            .Where(c => !c.IsCategory)
-            // Voice channels cannot have threads
-            .Where(c => !c.IsVoice)
-            // Empty channels cannot have threads
-            .Where(c => !c.IsEmpty)
-            // If the 'before' boundary is specified, skip channels that don't have messages
-            // for that range, because thread-start event should always be accompanied by a message.
-            // Note that we don't perform a similar check for the 'after' boundary, because
-            // threads may have messages in range, even if the parent channel doesn't.
-            .Where(c => before is null || c.MayHaveMessagesBefore(before.Value))
-            .ToArray();
 
-        // User accounts can only fetch threads using the search endpoint
+        foreach (
-        if (await ResolveTokenKindAsync(cancellationToken) == TokenKind.User)
+            var channel in await GetChannelThreadsAsync(
+                channels,
+                includeArchived,
+                before,
+                after,
+                cancellationToken
+            )
+        )
         {
-            foreach (var channel in channels)
+            yield return channel;
-            {
-                // Either include both active and archived threads, or only active threads
-                foreach (
-                    var isArchived in includeArchived ? new[] { false, true } : new[] { false }
-                )
-                {
-                    // Offset is just the index of the last thread in the previous batch
-                    var currentOffset = 0;
-                    while (true)
-                    {
-                        var url = new UrlBuilder()
-                            .SetPath($"channels/{channel.Id}/threads/search")
-                            .SetQueryParameter("sort_by", "last_message_time")
-                            .SetQueryParameter("sort_order", "desc")
-                            .SetQueryParameter("archived", isArchived.ToString().ToLowerInvariant())
-                            .SetQueryParameter("offset", currentOffset.ToString())
-                            .Build();
-
-                        // Can be null on channels that the user cannot access or channels without threads
-                        var response = await TryGetJsonResponseAsync(url, cancellationToken);
-                        if (response is null)
-                            break;
-
-                        var breakOuter = false;
-
-                        foreach (
-                            var threadJson in response.Value.GetProperty("threads").EnumerateArray()
-                        )
-                        {
-                            var thread = Channel.Parse(threadJson, channel);
-
-                            // If the 'after' boundary is specified, we can break early,
-                            // because threads are sorted by last message timestamp.
-                            if (after is not null && !thread.MayHaveMessagesAfter(after.Value))
-                            {
-                                breakOuter = true;
-                                break;
-                            }
-
-                            yield return thread;
-                            currentOffset++;
-                        }
-
-                        if (breakOuter)
-                            break;
-
-                        if (!response.Value.GetProperty("has_more").GetBoolean())
-                            break;
-                    }
-                }
-            }
-        }
-        // Bot accounts can only fetch threads using the threads endpoint
-        else
-        {
-            // Active threads
-            {
-                var parentsById = channels.ToDictionary(c => c.Id);
-
-                var response = await GetJsonResponseAsync(
-                    $"guilds/{guildId}/threads/active",
-                    cancellationToken
-                );
-
-                foreach (var threadJson in response.GetProperty("threads").EnumerateArray())
-                {
-                    var parent = threadJson
-                        .GetPropertyOrNull("parent_id")
-                        ?.GetNonWhiteSpaceStringOrNull()
-                        ?.Pipe(Snowflake.Parse)
-                        .Pipe(parentsById.GetValueOrDefault);
-
-                    yield return Channel.Parse(threadJson, parent);
-                }
-            }
-
-            // Archived threads
-            if (includeArchived)
-            {
-                foreach (var channel in channels)
-                {
-                    foreach (var archiveType in new[] { "public", "private" })
-                    {
-                        // This endpoint parameter expects an ISO8601 timestamp, not a snowflake
-                        var currentBefore = before
-                            ?.ToDate()
-                            .ToString("O", CultureInfo.InvariantCulture);
-
-                        while (true)
-                        {
-                            // Threads are sorted by archive timestamp, not by last message timestamp
-                            var url = new UrlBuilder()
-                                .SetPath($"channels/{channel.Id}/threads/archived/{archiveType}")
-                                .SetQueryParameter("before", currentBefore)
-                                .Build();
-
-                            // Can be null on certain channels
-                            var response = await TryGetJsonResponseAsync(url, cancellationToken);
-                            if (response is null)
-                                break;
-
-                            foreach (
-                                var threadJson in response
-                                    .Value.GetProperty("threads")
-                                    .EnumerateArray()
-                            )
-                            {
-                                var thread = Channel.Parse(threadJson, channel);
-                                yield return thread;
-
-                                currentBefore = threadJson
-                                    .GetProperty("thread_metadata")
-                                    .GetProperty("archive_timestamp")
-                                    .GetString();
-                            }
-
-                            if (!response.Value.GetProperty("has_more").GetBoolean())
-                                break;
-                        }
-                    }
-                }
-            }
         }
     }
 
@@ -515,6 +388,163 @@ public class DiscordClient(
         }
     }
 
+    public async IAsyncEnumerable<Channel> GetChannelThreadsAsync(
+        IReadOnlyList<Channel> channels,
+        bool includeArchived = false,
+        Snowflake? before = null,
+        Snowflake? after = null,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default
+    )
+    {
+        var filteredChannels = channels
+            // Categories cannot have threads
+            .Where(c => !c.IsCategory)
+            // Voice channels cannot have threads
+            .Where(c => !c.IsVoice)
+            // Empty channels cannot have threads
+            .Where(c => !c.IsEmpty)
+            // If the 'before' boundary is specified, skip channels that don't have messages
+            // for that range, because thread-start event should always be accompanied by a message.
+            // Note that we don't perform a similar check for the 'after' boundary, because
+            // threads may have messages in range, even if the parent channel doesn't.
+            .Where(c => before is null || c.MayHaveMessagesBefore(before.Value))
+            .ToArray();
+
+        // User accounts can only fetch threads using the search endpoint
+        if (await ResolveTokenKindAsync(cancellationToken) == TokenKind.User)
+        {
+            foreach (var channel in filteredChannels)
+            {
+                // Either include both active and archived threads, or only active threads
+                foreach (
+                    var isArchived in includeArchived ? new[] { false, true } : new[] { false }
+                )
+                {
+                    // Offset is just the index of the last thread in the previous batch
+                    var currentOffset = 0;
+                    while (true)
+                    {
+                        var url = new UrlBuilder()
+                            .SetPath($"channels/{channel.Id}/threads/search")
+                            .SetQueryParameter("sort_by", "last_message_time")
+                            .SetQueryParameter("sort_order", "desc")
+                            .SetQueryParameter("archived", isArchived.ToString().ToLowerInvariant())
+                            .SetQueryParameter("offset", currentOffset.ToString())
+                            .Build();
+
+                        // Can be null on channels that the user cannot access or channels without threads
+                        var response = await TryGetJsonResponseAsync(url, cancellationToken);
+                        if (response is null)
+                            break;
+
+                        var breakOuter = false;
+
+                        foreach (
+                            var threadJson in response.Value.GetProperty("threads").EnumerateArray()
+                        )
+                        {
+                            var thread = Channel.Parse(threadJson, channel);
+
+                            // If the 'after' boundary is specified, we can break early,
+                            // because threads are sorted by last message timestamp.
+                            if (after is not null && !thread.MayHaveMessagesAfter(after.Value))
+                            {
+                                breakOuter = true;
+                                break;
+                            }
+
+                            yield return thread;
+                            currentOffset++;
+                        }
+
+                        if (breakOuter)
+                            break;
+
+                        if (!response.Value.GetProperty("has_more").GetBoolean())
+                            break;
+                    }
+                }
+            }
+        }
+        // Bot accounts can only fetch threads using the threads endpoint
+        else
+        {
+            var guilds = new HashSet<Snowflake>();
+            foreach (var channel in filteredChannels)
+                guilds.Add(channel.GuildId);
+
+            // Active threads
+            foreach (var guildId in guilds)
+            {
+                var parentsById = filteredChannels.ToDictionary(c => c.Id);
+
+                var response = await GetJsonResponseAsync(
+                    $"guilds/{guildId}/threads/active",
+                    cancellationToken
+                );
+
+                foreach (var threadJson in response.GetProperty("threads").EnumerateArray())
+                {
+                    var parent = threadJson
+                        .GetPropertyOrNull("parent_id")
+                        ?.GetNonWhiteSpaceStringOrNull()
+                        ?.Pipe(Snowflake.Parse)
+                        .Pipe(parentsById.GetValueOrDefault);
+
+                    if (filteredChannels.Contains(parent))
+                        yield return Channel.Parse(threadJson, parent);
+                }
+            }
+
+            // Archived threads
+            if (includeArchived)
+            {
+                foreach (var channel in filteredChannels)
+                {
+                    foreach (var archiveType in new[] { "public", "private" })
+                    {
+                        // This endpoint parameter expects an ISO8601 timestamp, not a snowflake
+                        var currentBefore = before
+                            ?.ToDate()
+                            .ToString("O", CultureInfo.InvariantCulture);
+
+                        while (true)
+                        {
+                            // Threads are sorted by archive timestamp, not by last message timestamp
+                            var url = new UrlBuilder()
+                                .SetPath($"channels/{channel.Id}/threads/archived/{archiveType}")
+                                .SetQueryParameter("before", currentBefore)
+                                .Build();
+
+                            // Can be null on certain channels
+                            var response = await TryGetJsonResponseAsync(url, cancellationToken);
+                            if (response is null)
+                                break;
+
+                            foreach (
+                                var threadJson in response
+                                    .Value.GetProperty("threads")
+                                    .EnumerateArray()
+                            )
+                            {
+                                var thread = Channel.Parse(threadJson, channel);
+                                yield return thread;
+
+                                currentBefore = threadJson
+                                    .GetProperty("thread_metadata")
+                                    .GetProperty("archive_timestamp")
+                                    .GetString();
+                            }
+
+                            if (!response.Value.GetProperty("has_more").GetBoolean())
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private async ValueTask<Message?> TryGetLastMessageAsync(
         Snowflake channelId,
         Snowflake? before = null,

DiscordChatExporter.Core/Discord/Dump/DataDump.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO.Compression;
+using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -40,17 +41,19 @@ public partial class DataDump
         CancellationToken cancellationToken = default
     )
     {
-        using var archive = ZipFile.OpenRead(zipFilePath);
+        await using var archive = await ZipFile.OpenReadAsync(zipFilePath, cancellationToken);
 
-        var entry = archive.GetEntry("messages/index.json");
+        // Use case-insensitive search to accommodate for different data dump versions
-        if (entry is null)
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1459
-        {
+        var entry =
-            throw new InvalidOperationException(
+            archive.Entries.FirstOrDefault(e =>
+                e.FullName.Equals("messages/index.json", StringComparison.OrdinalIgnoreCase)
+            )
+            ?? throw new InvalidOperationException(
                 "Failed to locate the channel index inside the data package."
             );
-        }
 
-        await using var stream = entry.Open();
+        await using var stream = await entry.OpenAsync(cancellationToken);
         using var document = await JsonDocument.ParseAsync(stream, default, cancellationToken);
 
         return Parse(document.RootElement);

DiscordChatExporter.Core/Discord/RateLimitPreference.cs

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

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <ItemGroup>
-    <PackageReference Include="AsyncKeyedLock" Version="7.1.6" />
+    <PackageReference Include="AngleSharp" Version="1.4.0" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
+    <PackageReference Include="AsyncKeyedLock" Version="8.0.1" />
+    <PackageReference Include="CSharpier.MsBuild" Version="1.2.5" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Polly" Version="8.5.2" />
+    <PackageReference Include="Polly" Version="8.6.5" />
-    <PackageReference Include="RazorBlade" Version="0.9.0" />
+    <PackageReference Include="RazorBlade" Version="0.11.0" />
-    <PackageReference Include="Superpower" Version="3.0.0" />
+    <PackageReference Include="Superpower" Version="3.1.0" />
-    <PackageReference Include="WebMarkupMin.Core" Version="2.17.0" />
+    <PackageReference Include="WebMarkupMin.Core" Version="2.20.1" />
-    <PackageReference Include="YoutubeExplode" Version="6.5.4" />
+    <PackageReference Include="YoutubeExplode" Version="6.5.6" />
   </ItemGroup>
-
 </Project>

DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs

@@ -75,7 +75,7 @@ internal partial class ExportAssetDownloader
 
         return SHA256
             .HashData(Encoding.UTF8.GetBytes(NormalizeUrl(url)))
-            .ToHex()
+            .Pipe(Convert.ToHexStringLower)
             // 5 chars ought to be enough for anybody
             .Truncate(5);
     }
@@ -103,7 +103,7 @@ internal partial class ExportAssetDownloader
             fileExtension = "";
         }
 
-        return PathEx.EscapeFileName(
+        return Path.EscapeFileName(
             fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension
         );
     }

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -99,7 +99,8 @@ internal class ExportContext(DiscordClient discord, ExportRequest request)
             ?.RoleIds.Select(TryGetRole)
             .WhereNotNull()
             .OrderByDescending(r => r.Position)
-            .ToArray() ?? [];
+            .ToArray()
+        ?? [];
 
     public Color? TryGetUserColor(Snowflake id) =>
         GetUserRoles(id).Where(r => r.Color is not null).Select(r => r.Color).FirstOrDefault();

DiscordChatExporter.Core/Exporting/ExportFormat.cs

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

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -7,7 +7,6 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
-using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Core.Exporting;
@@ -145,7 +144,7 @@ public partial class ExportRequest
         // File extension
         buffer.Append('.').Append(format.GetFileExtension());
 
-        return PathEx.EscapeFileName(buffer.ToString());
+        return Path.EscapeFileName(buffer.ToString());
     }
 
     private static string FormatPath(
@@ -159,7 +158,7 @@ public partial class ExportRequest
             path,
             "%.",
             m =>
-                PathEx.EscapeFileName(
+                Path.EscapeFileName(
                     m.Value switch
                     {
                         "%g" => guild.Id.ToString(),
@@ -179,7 +178,8 @@ public partial class ExportRequest
                             ?? "",
                         "%b" => before
                             ?.ToDate()
-                            .ToString("yyyy-MM-dd", CultureInfo.InvariantCulture) ?? "",
+                            .ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)
+                            ?? "",
                         "%d" => DateTimeOffset.Now.ToString(
                             "yyyy-MM-dd",
                             CultureInfo.InvariantCulture

DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs

@@ -8,14 +8,20 @@ internal static class HtmlMessageExtensions
 {
     // Message content is hidden if it's a link to an embedded media
     // https://github.com/Tyrrrz/DiscordChatExporter/issues/682
-    public static bool IsContentHidden(this Message message)
+    extension(Message message)
     {
-        if (message.Embeds.Count != 1)
+        public bool IsContentHidden()
-            return false;
+        {
+            if (message.Embeds.Count != 1)
+                return false;
 
-        var embed = message.Embeds[0];
+            var embed = message.Embeds[0];
 
-        return string.Equals(message.Content.Trim(), embed.Url, StringComparison.OrdinalIgnoreCase)
+            return string.Equals(
-            && embed.Kind is EmbedKind.Image or EmbedKind.Gifv;
+                    message.Content.Trim(),
+                    embed.Url,
+                    StringComparison.OrdinalIgnoreCase
+                ) && embed.Kind is EmbedKind.Image or EmbedKind.Gifv;
+        }
     }
 }

DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs

@@ -138,6 +138,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
                     cancellationToken
                 )
             );
+
+            _writer.WriteString("iconCanonicalUrl", embedAuthor.IconUrl);
         }
 
         _writer.WriteEndObject();
@@ -160,6 +162,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
                     cancellationToken
                 )
             );
+
+            _writer.WriteString("canonicalUrl", embedImage.Url);
         }
 
         _writer.WriteNumber("width", embedImage.Width);
@@ -185,6 +189,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
                     cancellationToken
                 )
             );
+
+            _writer.WriteString("canonicalUrl", embedVideo.Url);
         }
 
         _writer.WriteNumber("width", embedVideo.Width);
@@ -212,6 +218,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
                     cancellationToken
                 )
             );
+
+            _writer.WriteString("iconCanonicalUrl", embedFooter.IconUrl);
         }
 
         _writer.WriteEndObject();

DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml

@@ -388,7 +388,7 @@
                                                 <div class="chatlog__embed-author-container">
                                                     @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
                                                     {
-                                                        <img class="chatlog__embed-author-icon" src="@await ResolveAssetUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'">
+                                                        <img class="chatlog__embed-author-icon" src="@await ResolveAssetUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'" data-canonical-url="@embed.Author.IconUrl">
                                                     }
 
                                                     @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
@@ -424,9 +424,11 @@
                                                 </div>
                                             }
 
-                                            @* Video player *@
+                                            @* Video thumbnail *@
                                             <div class="chatlog__embed-youtube-container">
-                                                <iframe class="chatlog__embed-youtube" src="@youTubeVideoEmbed.Url" width="400" height="225"></iframe>
+                                                <a href="@youTubeVideoEmbed.Url">
+                                                    <img class="chatlog__embed-youtube-thumbnail" src="@await ResolveAssetUrlAsync(embed.Thumbnail?.ProxyUrl ?? embed.Thumbnail?.Url ?? youTubeVideoEmbed.ThumbnailUrl)" alt="YouTube video thumbnail" loading="lazy" onerror="this.style.visibility='hidden'" data-canonical-url="@(embed.Thumbnail?.Url ?? youTubeVideoEmbed.ThumbnailUrl)">
+                                                </a>
                                             </div>
                                         </div>
                                     </div>
@@ -441,9 +443,12 @@
                                 embed.Thumbnail?.ProxyUrl ?? embed.Thumbnail?.Url ??
                                 embed.Url;
 
+                            var embedImageCanonicalUrl =
+                                embed.Image?.Url ?? embed.Thumbnail?.Url ?? embed.Url;
+
                             <div class="chatlog__embed">
                                 <a href="@await ResolveAssetUrlAsync(embedImageUrl)">
-                                    <img class="chatlog__embed-generic-image" src="@await ResolveAssetUrlAsync(embedImageUrl)" alt="Embedded image" loading="lazy">
+                                    <img class="chatlog__embed-generic-image" src="@await ResolveAssetUrlAsync(embedImageUrl)" alt="Embedded image" loading="lazy" data-canonical-url="@embedImageCanonicalUrl">
                                 </a>
                             </div>
                         }
@@ -457,8 +462,10 @@
                                 embed.Video?.ProxyUrl ?? embed.Video?.Url ??
                                 embed.Url;
 
+                            var embedVideoCanonicalUrl = embed.Video?.Url ?? embed.Url;
+
                             <div class="chatlog__embed">
-                                <video class="chatlog__embed-generic-video" width="@embed.Video?.Width" height="@embed.Video?.Height" controls>
+                                <video class="chatlog__embed-generic-video" width="@embed.Video?.Width" height="@embed.Video?.Height" controls data-canonical-url="@embedVideoCanonicalUrl">
                                     <source src="@await ResolveAssetUrlAsync(embedVideoUrl)" alt="Embedded video">
                                 </video>
                             </div>
@@ -470,8 +477,10 @@
                                 embed.Video?.ProxyUrl ?? embed.Video?.Url ??
                                 embed.Url;
 
+                            var embedVideoCanonicalUrl = embed.Video?.Url ?? embed.Url;
+
                             <div class="chatlog__embed">
-                                <video class="chatlog__embed-generic-gifv" width="@embed.Video?.Width" height="@embed.Video?.Height" loop onmouseover="this.play()" onmouseout="this.pause()">
+                                <video class="chatlog__embed-generic-gifv" width="@embed.Video?.Width" height="@embed.Video?.Height" loop onmouseover="this.play()" onmouseout="this.pause()" data-canonical-url="@embedVideoCanonicalUrl">
                                     <source src="@await ResolveAssetUrlAsync(embedVideoUrl)" alt="Embedded gifv">
                                 </video>
                             </div>
@@ -499,7 +508,7 @@
                                                 <div class="chatlog__embed-author-container">
                                                     @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
                                                     {
-                                                        <img class="chatlog__embed-author-icon" src="@await ResolveAssetUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'">
+                                                        <img class="chatlog__embed-author-icon" src="@await ResolveAssetUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'" data-canonical-url="@embed.Author.IconUrl">
                                                     }
 
                                                     @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
@@ -574,7 +583,7 @@
                                         {
                                             <div class="chatlog__embed-thumbnail-container">
                                                 <a class="chatlog__embed-thumbnail-link" href="@await ResolveAssetUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)">
-                                                    <img class="chatlog__embed-thumbnail" src="@await ResolveAssetUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)" alt="Thumbnail" loading="lazy">
+                                                    <img class="chatlog__embed-thumbnail" src="@await ResolveAssetUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)" alt="Thumbnail" loading="lazy" data-canonical-url="@embed.Thumbnail.Url">
                                                 </a>
                                             </div>
                                         }
@@ -590,7 +599,7 @@
                                                 {
                                                     <div class="chatlog__embed-image-container">
                                                         <a class="chatlog__embed-image-link" href="@await ResolveAssetUrlAsync(image.ProxyUrl ?? image.Url)">
-                                                            <img class="chatlog__embed-image" src="@await ResolveAssetUrlAsync(image.ProxyUrl ?? image.Url)" alt="Image" loading="lazy">
+                                                            <img class="chatlog__embed-image" src="@await ResolveAssetUrlAsync(image.ProxyUrl ?? image.Url)" alt="Image" loading="lazy" data-canonical-url="@image.Url">
                                                         </a>
                                                     </div>
                                                 }
@@ -605,7 +614,7 @@
                                             @* Footer icon *@
                                             @if (!string.IsNullOrWhiteSpace(embed.Footer?.IconUrl))
                                             {
-                                                <img class="chatlog__embed-footer-icon" src="@await ResolveAssetUrlAsync(embed.Footer.IconProxyUrl ?? embed.Footer.IconUrl)" alt="Footer icon" loading="lazy">
+                                                <img class="chatlog__embed-footer-icon" src="@await ResolveAssetUrlAsync(embed.Footer.IconProxyUrl ?? embed.Footer.IconUrl)" alt="Footer icon" loading="lazy" data-canonical-url="@embed.Footer.IconUrl">
                                             }
 
                                             <span class="chatlog__embed-footer-text">

DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs

@@ -7,37 +7,40 @@ namespace DiscordChatExporter.Core.Exporting;
 
 internal static class PlainTextMessageExtensions
 {
-    public static string GetFallbackContent(this Message message) =>
+    extension(Message message)
-        message.Kind switch
+    {
-        {
+        public string GetFallbackContent() =>
-            MessageKind.RecipientAdd => message.MentionedUsers.Any()
+            message.Kind switch
-                ? $"Added {message.MentionedUsers.First().DisplayName} to the group."
+            {
-                : "Added a recipient.",
+                MessageKind.RecipientAdd => message.MentionedUsers.Any()
+                    ? $"Added {message.MentionedUsers.First().DisplayName} to the group."
+                    : "Added a recipient.",
 
-            MessageKind.RecipientRemove => message.MentionedUsers.Any()
+                MessageKind.RecipientRemove => message.MentionedUsers.Any()
-                ? message.Author.Id == message.MentionedUsers.First().Id
+                    ? message.Author.Id == message.MentionedUsers.First().Id
-                    ? "Left the group."
+                        ? "Left the group."
-                    : $"Removed {message.MentionedUsers.First().DisplayName} from the group."
+                        : $"Removed {message.MentionedUsers.First().DisplayName} from the group."
-                : "Removed a recipient.",
+                    : "Removed a recipient.",
 
-            MessageKind.Call =>
+                MessageKind.Call =>
-                $"Started a call that lasted {
+                    $"Started a call that lasted {
-                message
+                        message
-                    .CallEndedTimestamp?
+                            .CallEndedTimestamp?
-                    .Pipe(t => t - message.Timestamp)
+                            .Pipe(t => t - message.Timestamp)
-                    .Pipe(t => t.TotalMinutes)
+                            .Pipe(t => t.TotalMinutes)
-                    .ToString("n0", CultureInfo.InvariantCulture) ?? "0"
+                            .ToString("n0", CultureInfo.InvariantCulture) ?? "0"
-            } minutes.",
+                    } minutes.",
 
-            MessageKind.ChannelNameChange => !string.IsNullOrWhiteSpace(message.Content)
+                MessageKind.ChannelNameChange => !string.IsNullOrWhiteSpace(message.Content)
-                ? $"Changed the channel name: {message.Content}"
+                    ? $"Changed the channel name: {message.Content}"
-                : "Changed the channel name.",
+                    : "Changed the channel name.",
 
-            MessageKind.ChannelIconChange => "Changed the channel icon.",
+                MessageKind.ChannelIconChange => "Changed the channel icon.",
-            MessageKind.ChannelPinnedMessage => "Pinned a message.",
+                MessageKind.ChannelPinnedMessage => "Pinned a message.",
-            MessageKind.ThreadCreated => "Started a thread.",
+                MessageKind.ThreadCreated => "Started a thread.",
-            MessageKind.GuildMemberJoin => "Joined the server.",
+                MessageKind.GuildMemberJoin => "Joined the server.",
 
-            _ => message.Content,
+                _ => message.Content,
-        };
+            };
+    }
 }

DiscordChatExporter.Core/Exporting/PreambleTemplate.cshtml

@@ -711,9 +711,11 @@
             margin-top: 0.6rem;
         }
 
-        .chatlog__embed-youtube {
+        .chatlog__embed-youtube-thumbnail {
-            border: 0;
+            max-width: 400px;
+            max-height: 225px;
             border-radius: 3px;
+            cursor: pointer;
         }
 
         .chatlog__sticker {

DiscordChatExporter.Core/Utils/Extensions/AsyncCollectionExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/BinaryExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/CollectionExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/ColorExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/ExceptionExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/GenericExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/HttpExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/PathExtensions.cs

@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace DiscordChatExporter.Core.Utils.Extensions;
+
+public static class PathExtensions
+{
+    // This is a union of invalid characters from Windows (NTFS/FAT32), Linux (ext4/XFS), and macOS (HFS+/APFS).
+    // We use this instead of Path.GetInvalidFileNameChars() because that only returns OS-specific characters,
+    // not filesystem-specific characters. It's possible to use, for example, an NTFS drive on Linux,
+    // which would make some additional characters invalid that are otherwise valid on Linux.
+    // https://github.com/Tyrrrz/DiscordChatExporter/issues/1452
+    private static readonly char[] InvalidFileNameChars =
+    [
+        '\0', // Null character - invalid on all filesystems
+        '/', // Path separator on Unix and Windows
+        '\\', // Path separator on Windows
+        ':', // Reserved on Windows (drive letters, NTFS streams)
+        '*', // Wildcard on Windows
+        '?', // Wildcard on Windows
+        '"', // Reserved on Windows
+        '<', // Redirection on Windows
+        '>', // Redirection on Windows
+        '|', // Pipe on Windows
+    ];
+
+    extension(Path)
+    {
+        public static string EscapeFileName(string path)
+        {
+            var buffer = new StringBuilder(path.Length);
+
+            foreach (var c in path)
+                buffer.Append(!InvalidFileNameChars.Contains(c) ? c : '_');
+
+            // File names cannot end with a dot on Windows
+            // https://github.com/Tyrrrz/DiscordChatExporter/issues/977
+            if (OperatingSystem.IsWindows())
+            {
+                while (buffer.Length > 0 && buffer[^1] == '.')
+                    buffer.Remove(buffer.Length - 1, 1);
+            }
+
+            return buffer.ToString();
+        }
+    }
+}

DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/SuperpowerExtensions.cs

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

DiscordChatExporter.Core/Utils/Extensions/TimeSpanExtensions.cs

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

DiscordChatExporter.Core/Utils/PathEx.cs

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

DiscordChatExporter.Core/Utils/Url.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Text;
 
 namespace DiscordChatExporter.Core.Utils;
@@ -10,6 +11,19 @@ public static class Url
         var buffer = new StringBuilder();
         var position = 0;
 
+        // For absolute paths, prepend file:// protocol for proper browser handling
+        if (Path.IsPathFullyQualified(filePath))
+        {
+            buffer.Append("file://");
+
+            // On Windows, we need to add an extra slash before the drive letter
+            // e.g., file:///C:/path instead of file://C:/path
+            if (!filePath.StartsWith('/') && !filePath.StartsWith('\\'))
+            {
+                buffer.Append('/');
+            }
+        }
+
         while (true)
         {
             if (position >= filePath.Length)

DiscordChatExporter.Gui/App.axaml

@@ -8,6 +8,7 @@
     xmlns:materialControls="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
     xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles"
+    Name="DiscordChatExporter"
     ActualThemeVariantChanged="Application_OnActualThemeVariantChanged">
     <Application.DataTemplates>
         <framework:ViewManager />

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <AssemblyName>DiscordChatExporter</AssemblyName>
@@ -9,24 +8,38 @@
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <PublishMacOSBundle>false</PublishMacOSBundle>
+  </PropertyGroup>
+
+  <!-- HACK: Disable trim warnings because they seem to break when the code contains C# 14 extension blocks -->
+  <PropertyGroup>
+    <EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+    <EnableAotAnalyzer>false</EnableAotAnalyzer>
+  </PropertyGroup>
+
   <ItemGroup>
     <AvaloniaResource Include="..\favicon.ico" Link="favicon.ico" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.3.0" />
+    <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.5.0" />
-    <PackageReference Include="Avalonia" Version="11.3.0" />
+    <PackageReference Include="Avalonia" Version="11.3.11" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.11" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference
+      Include="Avalonia.Diagnostics"
+      Version="11.3.11"
+      Condition="'$(Configuration)' == 'Debug'"
+    />
     <PackageReference Include="Cogwheel" Version="2.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="1.2.5" PrivateAssets="all" />
     <PackageReference Include="Deorcify" Version="1.1.0" PrivateAssets="all" />
-    <PackageReference Include="DialogHost.Avalonia" Version="0.9.2" />
+    <PackageReference Include="DialogHost.Avalonia" Version="0.10.4" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="Material.Avalonia" Version="3.9.2" />
     <PackageReference Include="Material.Icons.Avalonia" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
     <PackageReference Include="Onova" Version="2.6.13" />
   </ItemGroup>
 
@@ -35,7 +48,9 @@
   </ItemGroup>
 
   <Target Name="PublishMacOSBundle" AfterTargets="Publish" Condition="$(PublishMacOSBundle)">
-    <Exec Command="pwsh -ExecutionPolicy Bypass -File $(ProjectDir)/Publish-MacOSBundle.ps1 -PublishDirPath $(PublishDir) -IconsFilePath $(ProjectDir)/../favicon.icns -FullVersion $(Version) -ShortVersion $(AssemblyVersion)" LogStandardErrorAsError="true" />
+    <Exec
+      Command="pwsh -ExecutionPolicy Bypass -File $(ProjectDir)/Publish-MacOSBundle.ps1 -PublishDirPath $(PublishDir) -IconsFilePath $(ProjectDir)/../favicon.icns -FullVersion $(Version) -ShortVersion $(AssemblyVersion)"
+      LogStandardErrorAsError="true"
+    />
   </Target>
-
+</Project>
-</Project>

DiscordChatExporter.Gui/Framework/DialogManager.cs

@@ -60,7 +60,7 @@ public class DialogManager : IDisposable
             }
         );
 
-        return file?.Path.LocalPath;
+        return file?.TryGetLocalPath() ?? file?.Path.ToString();
     }
 
     public async Task<string?> PromptDirectoryPathAsync(string defaultDirPath = "")
@@ -69,19 +69,21 @@ public class DialogManager : IDisposable
             Application.Current?.ApplicationLifetime?.TryGetTopLevel()
             ?? throw new ApplicationException("Could not find the top-level visual element.");
 
-        var startLocation = await topLevel.StorageProvider.TryGetFolderFromPathAsync(
+        var result = await topLevel.StorageProvider.OpenFolderPickerAsync(
-            defaultDirPath
-        );
-
-        var folderPickResult = await topLevel.StorageProvider.OpenFolderPickerAsync(
             new FolderPickerOpenOptions
             {
                 AllowMultiple = false,
-                SuggestedStartLocation = startLocation,
+                SuggestedStartLocation = await topLevel.StorageProvider.TryGetFolderFromPathAsync(
+                    defaultDirPath
+                ),
             }
         );
 
-        return folderPickResult.FirstOrDefault()?.Path.LocalPath;
+        var directory = result.FirstOrDefault();
+        if (directory is null)
+            return null;
+
+        return directory.TryGetLocalPath() ?? directory.Path.ToString();
     }
 
     public void Dispose() => _dialogLock.Dispose();

DiscordChatExporter.Gui/Utils/Extensions/AvaloniaExtensions.cs

@@ -6,28 +6,31 @@ namespace DiscordChatExporter.Gui.Utils.Extensions;
 
 internal static class AvaloniaExtensions
 {
-    public static Window? TryGetMainWindow(this IApplicationLifetime lifetime) =>
+    extension(IApplicationLifetime lifetime)
-        lifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime
-            ? desktopLifetime.MainWindow
-            : null;
-
-    public static TopLevel? TryGetTopLevel(this IApplicationLifetime lifetime) =>
-        lifetime.TryGetMainWindow()
-        ?? (lifetime as ISingleViewApplicationLifetime)?.MainView?.GetVisualRoot() as TopLevel;
-
-    public static bool TryShutdown(this IApplicationLifetime lifetime, int exitCode = 0)
     {
-        if (lifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
+        public Window? TryGetMainWindow() =>
-        {
+            lifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime
-            return desktopLifetime.TryShutdown(exitCode);
+                ? desktopLifetime.MainWindow
-        }
+                : null;
 
-        if (lifetime is IControlledApplicationLifetime controlledLifetime)
+        public TopLevel? TryGetTopLevel() =>
-        {
+            lifetime.TryGetMainWindow()
-            controlledLifetime.Shutdown(exitCode);
+            ?? (lifetime as ISingleViewApplicationLifetime)?.MainView?.GetVisualRoot() as TopLevel;
-            return true;
-        }
 
-        return false;
+        public bool TryShutdown(int exitCode = 0)
+        {
+            if (lifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
+            {
+                return desktopLifetime.TryShutdown(exitCode);
+            }
+
+            if (lifetime is IControlledApplicationLifetime controlledLifetime)
+            {
+                controlledLifetime.Shutdown(exitCode);
+                return true;
+            }
+
+            return false;
+        }
     }
 }

DiscordChatExporter.Gui/Utils/Extensions/DisposableExtensions.cs

@@ -6,23 +6,26 @@ namespace DiscordChatExporter.Gui.Utils.Extensions;
 
 internal static class DisposableExtensions
 {
-    public static void DisposeAll(this IEnumerable<IDisposable> disposables)
+    extension(IEnumerable<IDisposable> disposables)
     {
-        var exceptions = default(List<Exception>);
+        public void DisposeAll()
-
-        foreach (var disposable in disposables)
         {
-            try
+            var exceptions = default(List<Exception>);
-            {
-                disposable.Dispose();
-            }
-            catch (Exception ex)
-            {
-                (exceptions ??= []).Add(ex);
-            }
-        }
 
-        if (exceptions?.Any() == true)
+            foreach (var disposable in disposables)
-            throw new AggregateException(exceptions);
+            {
+                try
+                {
+                    disposable.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    (exceptions ??= []).Add(ex);
+                }
+            }
+
+            if (exceptions?.Any() == true)
+                throw new AggregateException(exceptions);
+        }
     }
 }

DiscordChatExporter.Gui/Utils/Extensions/NotifyPropertyChangedExtensions.cs

@@ -7,50 +7,47 @@ namespace DiscordChatExporter.Gui.Utils.Extensions;
 
 internal static class NotifyPropertyChangedExtensions
 {
-    public static IDisposable WatchProperty<TOwner, TProperty>(
+    extension<TOwner>(TOwner owner)
-        this TOwner owner,
-        Expression<Func<TOwner, TProperty>> propertyExpression,
-        Action callback,
-        bool watchInitialValue = false
-    )
         where TOwner : INotifyPropertyChanged
     {
-        var memberExpression = propertyExpression.Body as MemberExpression;
+        public IDisposable WatchProperty<TProperty>(
-        if (memberExpression?.Member is not PropertyInfo property)
+            Expression<Func<TOwner, TProperty>> propertyExpression,
-            throw new ArgumentException("Provided expression must reference a property.");
+            Action callback,
-
+            bool watchInitialValue = false
-        void OnPropertyChanged(object? sender, PropertyChangedEventArgs args)
+        )
         {
-            if (
+            var memberExpression = propertyExpression.Body as MemberExpression;
-                string.IsNullOrWhiteSpace(args.PropertyName)
+            if (memberExpression?.Member is not PropertyInfo property)
-                || string.Equals(args.PropertyName, property.Name, StringComparison.Ordinal)
+                throw new ArgumentException("Provided expression must reference a property.");
-            )
+
+            void OnPropertyChanged(object? sender, PropertyChangedEventArgs args)
             {
-                callback();
+                if (
+                    string.IsNullOrWhiteSpace(args.PropertyName)
+                    || string.Equals(args.PropertyName, property.Name, StringComparison.Ordinal)
+                )
+                {
+                    callback();
+                }
             }
+
+            owner.PropertyChanged += OnPropertyChanged;
+
+            if (watchInitialValue)
+                callback();
+
+            return Disposable.Create(() => owner.PropertyChanged -= OnPropertyChanged);
         }
 
-        owner.PropertyChanged += OnPropertyChanged;
+        public IDisposable WatchAllProperties(Action callback, bool watchInitialValues = false)
+        {
+            void OnPropertyChanged(object? sender, PropertyChangedEventArgs args) => callback();
+            owner.PropertyChanged += OnPropertyChanged;
 
-        if (watchInitialValue)
+            if (watchInitialValues)
-            callback();
+                callback();
 
-        return Disposable.Create(() => owner.PropertyChanged -= OnPropertyChanged);
+            return Disposable.Create(() => owner.PropertyChanged -= OnPropertyChanged);
-    }
+        }
-
-    public static IDisposable WatchAllProperties<TOwner>(
-        this TOwner owner,
-        Action callback,
-        bool watchInitialValues = false
-    )
-        where TOwner : INotifyPropertyChanged
-    {
-        void OnPropertyChanged(object? sender, PropertyChangedEventArgs args) => callback();
-        owner.PropertyChanged += OnPropertyChanged;
-
-        if (watchInitialValues)
-            callback();
-
-        return Disposable.Create(() => owner.PropertyChanged -= OnPropertyChanged);
     }
 }

DiscordChatExporter.Gui/Utils/Extensions/ProcessExtensions.cs

@@ -0,0 +1,17 @@
+using System.Diagnostics;
+
+namespace DiscordChatExporter.Gui.Utils.Extensions;
+
+internal static class ProcessExtensions
+{
+    extension(Process)
+    {
+        public static void StartShellExecute(string path)
+        {
+            using var process = new Process();
+            process.StartInfo = new ProcessStartInfo { FileName = path, UseShellExecute = true };
+
+            process.Start();
+        }
+    }
+}

DiscordChatExporter.Gui/Utils/ProcessEx.cs

@@ -1,14 +0,0 @@
-using System.Diagnostics;
-
-namespace DiscordChatExporter.Gui.Utils;
-
-internal static class ProcessEx
-{
-    public static void StartShellExecute(string path)
-    {
-        using var process = new Process();
-        process.StartInfo = new ProcessStartInfo { FileName = path, UseShellExecute = true };
-
-        process.Start();
-    }
-}

DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -102,7 +103,7 @@ public partial class DashboardViewModel : ViewModelBase
         await _dialogManager.ShowDialogAsync(_viewModelManager.CreateSettingsViewModel());
 
     [RelayCommand]
-    private void ShowHelp() => ProcessEx.StartShellExecute(Program.ProjectDocumentationUrl);
+    private void ShowHelp() => Process.StartShellExecute(Program.ProjectDocumentationUrl);
 
     private bool CanPullGuilds() => !IsBusy && !string.IsNullOrWhiteSpace(Token);
 
@@ -140,7 +141,7 @@ public partial class DashboardViewModel : ViewModelBase
         catch (Exception ex)
         {
             var dialog = _viewModelManager.CreateMessageBoxViewModel(
-                "Error pulling guilds",
+                "Error pulling servers",
                 ex.ToString()
             );
 
@@ -322,11 +323,11 @@ public partial class DashboardViewModel : ViewModelBase
     }
 
     [RelayCommand]
-    private void OpenDiscord() => ProcessEx.StartShellExecute("https://discord.com/app");
+    private void OpenDiscord() => Process.StartShellExecute("https://discord.com/app");
 
     [RelayCommand]
     private void OpenDiscordDeveloperPortal() =>
-        ProcessEx.StartShellExecute("https://discord.com/developers/applications");
+        Process.StartShellExecute("https://discord.com/developers/applications");
 
     protected override void Dispose(bool disposing)
     {

DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs

@@ -63,40 +63,40 @@ public class SettingsViewModel : DialogViewModelBase
 
     // These items have to be non-nullable because Avalonia ComboBox doesn't allow a null value to be selected
     public IReadOnlyList<string> AvailableLocales { get; } =
-        [
+    [
-            // Current locale (maps to null downstream)
+        // Current locale (maps to null downstream)
-            "",
+        "",
-            // Locales supported by the Discord app
+        // Locales supported by the Discord app
-            "da-DK",
+        "da-DK",
-            "de-DE",
+        "de-DE",
-            "en-GB",
+        "en-GB",
-            "en-US",
+        "en-US",
-            "es-ES",
+        "es-ES",
-            "fr-FR",
+        "fr-FR",
-            "hr-HR",
+        "hr-HR",
-            "it-IT",
+        "it-IT",
-            "lt-LT",
+        "lt-LT",
-            "hu-HU",
+        "hu-HU",
-            "nl-NL",
+        "nl-NL",
-            "no-NO",
+        "no-NO",
-            "pl-PL",
+        "pl-PL",
-            "pt-BR",
+        "pt-BR",
-            "ro-RO",
+        "ro-RO",
-            "fi-FI",
+        "fi-FI",
-            "sv-SE",
+        "sv-SE",
-            "vi-VN",
+        "vi-VN",
-            "tr-TR",
+        "tr-TR",
-            "cs-CZ",
+        "cs-CZ",
-            "el-GR",
+        "el-GR",
-            "bg-BG",
+        "bg-BG",
-            "ru-RU",
+        "ru-RU",
-            "uk-UA",
+        "uk-UA",
-            "th-TH",
+        "th-TH",
-            "zh-CN",
+        "zh-CN",
-            "ja-JP",
+        "ja-JP",
-            "zh-TW",
+        "zh-TW",
-            "ko-KR",
+        "ko-KR",
-        ];
+    ];
 
     // This has to be non-nullable because Avalonia ComboBox doesn't allow a null value to be selected
     public string Locale

DiscordChatExporter.Gui/ViewModels/MainViewModel.cs

@@ -5,7 +5,6 @@ using Avalonia;
 using CommunityToolkit.Mvvm.Input;
 using DiscordChatExporter.Gui.Framework;
 using DiscordChatExporter.Gui.Services;
-using DiscordChatExporter.Gui.Utils;
 using DiscordChatExporter.Gui.Utils.Extensions;
 using DiscordChatExporter.Gui.ViewModels.Components;
 
@@ -44,7 +43,7 @@ public partial class MainViewModel(
         settingsService.Save();
 
         if (await dialogManager.ShowDialogAsync(dialog) == true)
-            ProcessEx.StartShellExecute("https://tyrrrz.me/ukraine?source=discordchatexporter");
+            Process.StartShellExecute("https://tyrrrz.me/ukraine?source=discordchatexporter");
     }
 
     private async Task ShowDevelopmentBuildMessageAsync()
@@ -70,7 +69,7 @@ public partial class MainViewModel(
         );
 
         if (await dialogManager.ShowDialogAsync(dialog) == true)
-            ProcessEx.StartShellExecute(Program.ProjectReleasesUrl);
+            Process.StartShellExecute(Program.ProjectReleasesUrl);
     }
 
     private async Task CheckForUpdatesAsync()

DiscordChatExporter.sln

@@ -3,12 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA305DD5-1F98-415D-B6C4-65053A58F914}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{EA305DD5-1F98-415D-B6C4-65053A58F914}"
 	ProjectSection(SolutionItems) = preProject
 		License.txt = License.txt
 		Readme.md = Readme.md
 		Directory.Build.props = Directory.Build.props
 		DiscordChatExporter.Cli.dockerfile = DiscordChatExporter.Cli.dockerfile
+		global.json = global.json
+		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Gui", "DiscordChatExporter.Gui\DiscordChatExporter.Gui.csproj", "{732A67AF-93DE-49DF-B10F-FD74710B7863}"

License.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2025 Oleksii Holub
+Copyright (c) 2017-2026 Oleksii Holub
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Readme.md

@@ -50,10 +50,14 @@ To learn more about the war and how you can help, [click here](https://tyrrrz.me
   - 📦 [AUR](https://aur.archlinux.org/packages/discord-chat-exporter-cli): `discord-chat-exporter-cli`
   - 📦 [Nix](https://search.nixos.org/packages?query=discordchatexporter-cli): `discordchatexporter-cli`
 
-> **Note**:
+> [!IMPORTANT]
+> To launch the GUI version of the app on MacOS, you need to first remove the downloaded file from quarantine.
+> You can do that by running the following command in the terminal: `xattr -rd com.apple.quarantine DiscordChatExporter.app`.
+
+> [!NOTE]
 > If you're unsure which build is right for your system, consult with [this page](https://useragent.cc) to determine your OS and CPU architecture.
 
-> **Note**:
+> [!NOTE]
 > AUR and Nix packages linked above are maintained by the community.
 > If you have any issues with them, please contact the corresponding maintainers.
 
@@ -74,4 +78,4 @@ To learn more about the war and how you can help, [click here](https://tyrrrz.me
 ## See also
 
 - [**Chat Analytics**](https://github.com/mlomb/chat-analytics) — solution for analyzing chat patterns of Discord users, using exports produced by **DiscordChatExporter**.
-- [**DiscordChatExporter-frontend**](https://github.com/slatinsky/DiscordChatExporter-frontend) — convenient viewer for exports produced by **DiscordChatExporter**.
+- [**DiscordChatExporter-frontend**](https://github.com/slatinsky/DiscordChatExporter-frontend) — convenient viewer for exports produced by **DiscordChatExporter**.

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "10.0.100",
+    "rollForward": "latestFeature"
+  }
+}