Refactor

Include starter message in thread exports and skip placeholder (#1557 )
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-07 14:44:39 +02:00 · 2026-06-26 13:31:15 +03:00 · 2026-06-26 12:59:20 +03:00 · 2026-06-20 14:33:04 +03:00 · 2026-06-20 14:30:34 +03:00 · 2026-06-20 14:16:48 +03:00
244 changed files with 3755 additions and 1985 deletions
@@ -17,7 +17,7 @@ Note the `:stable` tag. DiscordChatExporter images are tagged according to the f

 - `stable` — latest stable version release. This tag is updated with each release of a new project version. Recommended for personal use.
 - `x.y.z` (e.g. `2.30.1`) — specific stable version release. This tag is pushed when the corresponding version is released and never updated thereafter. Recommended for use in automation scenarios.
- `latest` — latest (potentially unstable) build. This tag is updated with each new commit to the `master` branch. Not recommended, unless you want to test a new feature that has not been released in a stable version yet.
+- `latest` — latest (potentially unstable) build. This tag is updated with each new commit to the `prime` branch. Not recommended, unless you want to test a new feature that has not been released in a stable version yet.

 You can see all available tags [here](https://hub.docker.com/r/tyrrrz/discordchatexporter/tags?ordering=name).

@@ -57,7 +57,7 @@ You can also use the current working directory as the output directory by specif
 - `-v $PWD:/out` in Bash
 - `-v $pwd.Path:/out` in PowerShell

-For more information, please refer to the [Dockerfile](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/DiscordChatExporter.Cli.dockerfile) and [Docker documentation](https://docs.docker.com/engine/reference/run).
+For more information, please refer to the [Dockerfile](https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/DiscordChatExporter.Cli.dockerfile) and [Docker documentation](https://docs.docker.com/engine/reference/run).

 To get your Token and Channel IDs, please refer to [this page](Token-and-IDs.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.

@@ -11,7 +11,7 @@

 ```bash
 #!/bin/bash
-# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs
+# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs

 TOKEN=tokenhere
 CHANNELID=channelhere
@@ -12,7 +12,7 @@

 ```bash
 #!/bin/bash
-# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs
+# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs

 TOKEN=tokenhere
 CHANNELID=channelhere
@@ -5,7 +5,7 @@
 1. Open a text editor such as Notepad and paste:

 ```console
-# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs
+# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs

 $TOKEN = "tokenhere"
 $CHANNEL = "channelhere"
@@ -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?.getToken){m=x;break}}}]);m&&console.log("Token:",m.exports.getToken());
    ```

    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?.getToken){m=x;break}}}]);m&&console.log("Token:",m.exports.getToken());
    ```

    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)
@@ -29,21 +29,20 @@ Type the following command in your terminal of choice, then press ENTER to run i
 > **Note**:
 > On Windows, if you're using the default Command Prompt (`cmd`), omit the leading `./` at the start of the command.

-
 > **Docker** users, please refer to the [Docker usage instructions](Docker.md).

 ## CLI commands

-| Command                 | Description                                          |
-|-------------------------|------------------------------------------------------|
-| export                  | Exports a channel                                    |
-| exportdm                | Exports all direct message channels                  |
-| exportguild             | Exports all channels within the specified server     |
-| exportall               | Exports all accessible channels                      |
-| channels                | Outputs the list of channels in the given server     |
-| dm                      | Outputs the list of direct message channels          |
-| guilds                  | Outputs the list of accessible servers               |
-| guide                   | Explains how to obtain token, server, and channel ID |
+| Command     | Description                                          |
+| ----------- | ---------------------------------------------------- |
+| export      | Exports a channel                                    |
+| exportdm    | Exports all direct message channels                  |
+| exportguild | Exports all channels within the specified server     |
+| exportall   | Exports all accessible channels                      |
+| channels    | Outputs the list of channels in the given server     |
+| dm          | Outputs the list of direct message channels          |
+| guilds      | Outputs the list of accessible servers               |
+| guide       | Explains how to obtain token, server, and channel ID |

 To use the commands, you'll need a token. For the instructions on how to get a token, please refer to [this page](Token-and-IDs.md), or run `./DiscordChatExporter.Cli guide`.

@@ -222,7 +221,7 @@ Use `--filter` to filter what messages are included in the export.
 ./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --filter "from:Tyrrrz has:image"
 ```

-Documentation on message filter syntax can be found [here](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs/Message-filters.md).
+Documentation on message filter syntax can be found [here](https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs/Message-filters.md).

 ### Export channels from a specific server

@@ -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.

@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
  - name: ⚠ Feature request
-    url: https://github.com/Tyrrrz/.github/blob/master/docs/project-status.md
-    about: Sorry, but this project is in maintenance mode and no longer accepts new feature requests.
+    url: https://github.com/Tyrrrz/.github/blob/prime/docs/project-status.md
+    about: Sorry, but this project is in maintenance mode and currently doesn't accept new feature requests.
  - name: 📖 Documentation
-    url: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs
+    url: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs
    about: Find usage guides and frequently asked questions.
  - name: 🗨 Discussions
    url: https://github.com/Tyrrrz/DiscordChatExporter/discussions/new
@@ -0,0 +1,18 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot
+      - dependabot[bot]
+
+  categories:
+    - title: Enhancements
+      labels:
+        - enhancement
+
+    - title: Bugs
+      labels:
+        - bug
+
+    - title: Other
+      labels:
+        - "*"
@@ -4,12 +4,12 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - master
+      - prime
    tags:
      - "*"
  pull_request:
    branches:
-      - master
+      - prime

 jobs:
  # Outputs from this job aren't really used, but it's here to verify that the Dockerfile builds correctly
@@ -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@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0

      - name: Build image
        run: >
@@ -36,16 +36,16 @@ 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
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - name: Upload image
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: DiscordChatExporter.Cli.Docker
          path: DiscordChatExporter.Cli.Docker.tar
          if-no-files-found: error

  deploy:
-    # Deploy to DockerHub only on tag push or master branch push
-    if: ${{ github.ref_type == 'tag' || github.ref_type == 'branch' && github.ref_name == 'master' }}
+    # Deploy to DockerHub only on tag push or prime branch push
+    if: ${{ github.ref_type == 'tag' || github.ref_type == 'branch' && github.ref_name == 'prime' }}

    runs-on: ubuntu-latest
    timeout-minutes: 10
@@ -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@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0

      - name: Login to DockerHub
        run: >
@@ -4,12 +4,12 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - master
+      - prime
    tags:
      - "*"
  pull_request:
    branches:
-      - master
+      - prime

 env:
  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -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
-        with:
-          dotnet-version: 9.0.x
+        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0

      # 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
-        with:
-          dotnet-version: 9.0.x
+        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0

      - name: Run tests
        env:
@@ -85,7 +81,7 @@ jobs:
          DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover

      - name: Upload coverage
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}

@@ -121,26 +117,25 @@ 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
-        with:
-          dotnet-version: 9.0.x
+        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0

      - name: Publish app
        run: >
          dotnet publish ${{ matrix.app }}
          -p:Version=${{ github.ref_type == 'tag' && github.ref_name || format('999.9.9-ci-{0}', github.sha) }}
          -p:CSharpier_Bypass=true
+          -p:EncryptionSalt=${{ secrets.ENCRYPTION_SALT || 'HimalayanPinkSalt' }}
          -p:PublishMacOSBundle=${{ startsWith(matrix.rid, 'osx-') }}
          --output ${{ matrix.app }}/bin/publish/
          --configuration Release
          --runtime ${{ matrix.rid }}
          --self-contained

-      - name: Upload artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - name: Upload app binaries
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: ${{ matrix.asset }}.${{ matrix.rid }}
          path: ${{ matrix.app }}/bin/publish/
@@ -204,8 +199,8 @@ jobs:
      contents: write

    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+      - name: Download app binaries
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
          name: ${{ matrix.asset }}.${{ matrix.rid }}
          path: ${{ matrix.app }}/
@@ -213,13 +208,10 @@ jobs:
      - name: Set permissions
        if: ${{ !startsWith(matrix.rid, 'win-') }}
        run: |
-          if [ -f ${{ matrix.app }}/${{ matrix.asset }} ]; then
-              chmod +x ${{ matrix.app }}/${{ matrix.asset }}
-          fi
-          
-          if [ -f ${{ matrix.app }}/${{ matrix.asset }}.app/Contents/MacOS/${{ matrix.asset }} ]; then
-              chmod +x ${{ matrix.app }}/${{ matrix.asset }}.app/Contents/MacOS/${{ matrix.asset }}
-          fi
+          [ -f ${{ matrix.app }}/${{ matrix.asset }} ] && chmod +x ${{ matrix.app }}/${{ matrix.asset }} || true
+
+          # macOS bundle
+          [ -f ${{ matrix.app }}/${{ matrix.asset }}.app/Contents/MacOS/${{ matrix.asset }} ] && chmod +x ${{ matrix.app }}/${{ matrix.asset }}.app/Contents/MacOS/${{ matrix.asset }} || true

      - name: Create package
        # Change into the artifacts directory to avoid including the directory itself in the zip archive
@@ -244,7 +236,7 @@ jobs:

    steps:
      - name: Notify Discord
-        uses: tyrrrz/action-http-request@1dd7ad841a34b9299f3741f7c7399f9feefdfb08 # 1.1.3
+        uses: tyrrrz/action-http-request@110f1a0f0f7e91c3b2de349539249f4573c243fa # 1.1.5
        with:
          url: ${{ secrets.DISCORD_WEBHOOK }}
          method: POST
@@ -9,4 +9,4 @@ bin/
 obj/

 # Test results
-TestResults/
+TestResults/
@@ -1,14 +1,12 @@
 <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>
-    <LangVersion>preview</LangVersion>
    <Nullable>enable</Nullable>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
  </PropertyGroup>
-
-</Project>
+</Project>
@@ -0,0 +1,46 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageVersion Include="AngleSharp" Version="1.4.0" />
+    <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.8.0" />
+    <PackageVersion Include="AsyncKeyedLock" Version="8.0.2" />
+    <PackageVersion Include="Avalonia" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
+    <PackageVersion Include="CliFx" Version="3.0.0" />
+    <PackageVersion Include="Cogwheel" Version="2.1.1" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
+    <PackageVersion Include="coverlet.collector" Version="10.0.1" />
+    <PackageVersion Include="CSharpier.MsBuild" Version="1.2.6" />
+    <PackageVersion Include="Deorcify" Version="2.0.1" />
+    <PackageVersion Include="DialogHost.Avalonia" Version="0.12.2" />
+    <PackageVersion Include="FluentAssertions" Version="8.10.0" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" />
+    <PackageVersion Include="Gress" Version="2.2.0" />
+    <PackageVersion Include="JsonExtensions" Version="1.2.0" />
+    <PackageVersion Include="Markdig" Version="1.2.0" />
+    <PackageVersion Include="Material.Avalonia" Version="3.16.1" />
+    <PackageVersion Include="Material.Icons.Avalonia" Version="3.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
+    <PackageVersion
+      Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
+      Version="10.0.8"
+    />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+    <PackageVersion Include="Onova" Version="2.6.13" />
+    <PackageVersion Include="Polly" Version="8.6.6" />
+    <PackageVersion Include="PowerKit" Version="2.0.1" />
+    <PackageVersion Include="RazorBlade" Version="1.0.0" />
+    <PackageVersion Include="Spectre.Console" Version="0.55.2" />
+    <PackageVersion Include="Superpower" Version="3.1.0" />
+    <PackageVersion Include="ThisAssembly.Project" Version="2.1.2" />
+    <PackageVersion Include="WebMarkupMin.Core" Version="2.21.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="YoutubeExplode" Version="6.6.0" />
+  </ItemGroup>
+</Project>
@@ -4,27 +4,28 @@
    <IsTestProject>true</IsTestProject>
    <UserSecretsId>d1fe5ae2-2a19-404d-a36e-81ba9eada1c1</UserSecretsId>
  </PropertyGroup>
+
  <ItemGroup>
    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
+
  <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.3.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" />
-    <PackageReference Include="CSharpier.MsBuild" Version="1.0.2" PrivateAssets="all" />
-    <PackageReference Include="FluentAssertions" Version="8.3.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="all" />
-    <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
-    <PackageReference
-      Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
-      Version="9.0.5"
-    />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0" PrivateAssets="all" />
+    <PackageReference Include="AngleSharp" />
+    <PackageReference Include="coverlet.collector" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="GitHubActionsTestLogger" />
+    <PackageReference Include="JsonExtensions" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="PowerKit" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
  </ItemGroup>
+
  <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj" />
+    <ProjectReference Include="../DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj" />
  </ItemGroup>
 </Project>
@@ -1,4 +1,4 @@
-using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord;

 namespace DiscordChatExporter.Cli.Tests.Infra;

@@ -16,6 +16,8 @@ public static class ChannelIds

    public static Snowflake FilterTestCases { get; } = Snowflake.Parse("866744075033641020");

+    public static Snowflake ForwardTestCases { get; } = Snowflake.Parse("1455202357204877477");
+
    public static Snowflake MarkdownTestCases { get; } = Snowflake.Parse("866459526819348521");

    public static Snowflake MentionTestCases { get; } = Snowflake.Parse("866458801389174794");
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using Microsoft.Extensions.Configuration;

@@ -1,4 +1,4 @@
-# DiscordChatExporter Tests
+# DiscordChatExporter Tests

 This test suite runs against a real Discord server, specifically created to exercise different behaviors required by the test scenarios.
 In order to run these tests locally, you need to join the test server and configure your authentication token.
@@ -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.
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using FluentAssertions;
 using Xunit;
@@ -1,15 +1,15 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using JsonExtensions;
+using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,15 +1,15 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using FluentAssertions;
 using JsonExtensions;
+using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
@@ -1,8 +1,14 @@
-using System.Linq;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils;
+using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
+using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -44,4 +50,41 @@ public class HtmlContentSpecs
                "Yeet"
            );
    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_in_the_HTML_format_in_the_reverse_order()
+    {
+        // Arrange
+        using var file = TempFile.Create();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = [ChannelIds.DateRangeTestCases],
+            ExportFormat = ExportFormat.HtmlDark,
+            OutputPath = file.Path,
+            Locale = "en-US",
+            IsUtcNormalizationEnabled = true,
+            IsReverseMessageOrder = true,
+        }.ExecuteAsync(new FakeConsole());
+
+        var document = Html.Parse(await File.ReadAllTextAsync(file.Path));
+        var messages = document.QuerySelectorAll("[data-message-id]").ToArray();
+
+        // Assert
+        messages
+            .Select(e => e.GetAttribute("data-message-id"))
+            .Should()
+            .Equal(
+                "885169254029213696",
+                "868505973294268457",
+                "868505969821364245",
+                "868505966528835604",
+                "868490009366396958",
+                "866732113319428096",
+                "866710679758045195",
+                "866674314627121232"
+            );
+    }
 }
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Utils.Extensions;
 using FluentAssertions;
+using PowerKit.Extensions;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -181,8 +181,14 @@ public class HtmlEmbedSpecs
        );

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

    [Fact]
@@ -0,0 +1,29 @@
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using PowerKit.Extensions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class HtmlForwardSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_forwarded_message()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ForwardTestCases,
+            Snowflake.Parse("1455202427115536514")
+        );
+
+        // Assert
+        message
+            .Text()
+            .ReplaceWhiteSpace(' ')
+            .Should()
+            .ContainAll("Forwarded", @"¯\_(ツ)_/¯", "12/29/2025 2:14 PM");
+    }
+}
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
@@ -8,6 +8,7 @@ using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
+using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
+using PowerKit.Extensions;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -22,11 +22,14 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace()
+            .ReplaceWhiteSpace(' ')
            .Should()
            .Contain("Default timestamp: 2/12/2023 1:36 PM");

-        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .InnerHtml.ReplaceWhiteSpace(' ')
+            .Should()
+            .Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -39,8 +42,11 @@ public class HtmlMarkdownSpecs
        );

        // Assert
-        message.Text().ReplaceWhiteSpace().Should().Contain("Short time timestamp: 1:36 PM");
-        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message.Text().ReplaceWhiteSpace(' ').Should().Contain("Short time timestamp: 1:36 PM");
+        message
+            .InnerHtml.ReplaceWhiteSpace(' ')
+            .Should()
+            .Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -53,8 +59,11 @@ public class HtmlMarkdownSpecs
        );

        // Assert
-        message.Text().ReplaceWhiteSpace().Should().Contain("Long time timestamp: 1:36:12 PM");
-        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message.Text().ReplaceWhiteSpace(' ').Should().Contain("Long time timestamp: 1:36:12 PM");
+        message
+            .InnerHtml.ReplaceWhiteSpace(' ')
+            .Should()
+            .Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -67,8 +76,11 @@ public class HtmlMarkdownSpecs
        );

        // Assert
-        message.Text().ReplaceWhiteSpace().Should().Contain("Short date timestamp: 2/12/2023");
-        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message.Text().ReplaceWhiteSpace(' ').Should().Contain("Short date timestamp: 2/12/2023");
+        message
+            .InnerHtml.ReplaceWhiteSpace(' ')
+            .Should()
+            .Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -83,11 +95,14 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace()
+            .ReplaceWhiteSpace(' ')
            .Should()
            .Contain("Long date timestamp: Sunday, February 12, 2023");

-        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .InnerHtml.ReplaceWhiteSpace(' ')
+            .Should()
+            .Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -102,11 +117,14 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace()
+            .ReplaceWhiteSpace(' ')
            .Should()
            .Contain("Full timestamp: Sunday, February 12, 2023 1:36 PM");

-        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .InnerHtml.ReplaceWhiteSpace(' ')
+            .Should()
+            .Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -121,11 +139,14 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace()
+            .ReplaceWhiteSpace(' ')
            .Should()
            .Contain("Full long timestamp: Sunday, February 12, 2023 1:36:12 PM");

-        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .InnerHtml.ReplaceWhiteSpace(' ')
+            .Should()
+            .Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -140,11 +161,14 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace()
+            .ReplaceWhiteSpace(' ')
            .Should()
            .Contain("Relative timestamp: 2/12/2023 1:36 PM");

-        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .InnerHtml.ReplaceWhiteSpace(' ')
+            .Should()
+            .Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -61,4 +61,17 @@ public class HtmlMentionSpecs
        // Assert
        message.Text().Should().Contain("Role mention: @Role 1");
    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_thread_mention()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("1474874276828938290")
+        );
+
+        // Assert
+        message.Text().Should().Contain("Thread mention: #Thread starting message");
+    }
 }
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,7 +1,13 @@
-using System.Linq;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
+using JsonExtensions;
+using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -43,4 +49,43 @@ public class JsonContentSpecs
                "Yeet"
            );
    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_in_the_JSON_format_in_the_reverse_order()
+    {
+        // Arrange
+        using var file = TempFile.Create();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = [ChannelIds.DateRangeTestCases],
+            ExportFormat = ExportFormat.Json,
+            OutputPath = file.Path,
+            Locale = "en-US",
+            IsUtcNormalizationEnabled = true,
+            IsReverseMessageOrder = true,
+        }.ExecuteAsync(new FakeConsole());
+
+        var messages = Json.Parse(await File.ReadAllTextAsync(file.Path))
+            .GetProperty("messages")
+            .EnumerateArray()
+            .ToArray();
+
+        // Assert
+        messages
+            .Select(j => j.GetProperty("id").GetString())
+            .Should()
+            .Equal(
+                "885169254029213696",
+                "868505973294268457",
+                "868505969821364245",
+                "868505966528835604",
+                "868490009366396958",
+                "866732113319428096",
+                "866710679758045195",
+                "866674314627121232"
+            );
+    }
 }
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -0,0 +1,33 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class JsonForwardSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_forwarded_message()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.ForwardTestCases,
+            Snowflake.Parse("1455202427115536514")
+        );
+
+        // Assert
+        var reference = message.GetProperty("reference");
+        reference.GetProperty("type").GetString().Should().Be("Forward");
+        reference.GetProperty("guildId").GetString().Should().Be("869237470565392384");
+
+        var forwardedMessage = message.GetProperty("forwardedMessage");
+        forwardedMessage.GetProperty("content").GetString().Should().Contain(@"¯\_(ツ)_/¯");
+        forwardedMessage
+            .GetProperty("timestamp")
+            .GetString()
+            .Should()
+            .StartWith("2025-12-28T22:52:42.175+00:00");
+    }
+}
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -75,4 +75,21 @@ public class JsonMentionSpecs
        // Assert
        message.GetProperty("content").GetString().Should().Be("Role mention: @Role 1");
    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_thread_mention()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.MentionTestCases,
+            Snowflake.Parse("1474874276828938290")
+        );
+
+        // Assert
+        message
+            .GetProperty("content")
+            .GetString()
+            .Should()
+            .Be("Thread mention: #Thread starting message");
+    }
 }
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,12 +1,12 @@
-using System.IO;
+using System.IO;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Partitioning;
 using FluentAssertions;
+using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -17,7 +17,7 @@ public class PartitioningSpecs
    public async Task I_can_export_a_channel_with_partitioning_based_on_message_count()
    {
        // Arrange
-        using var dir = TempDir.Create();
+        using var dir = TempDirectory.Create();
        var filePath = Path.Combine(dir.Path, "output.html");

        // Act
@@ -38,7 +38,7 @@ public class PartitioningSpecs
    public async Task I_can_export_a_channel_with_partitioning_based_on_file_size()
    {
        // Arrange
-        using var dir = TempDir.Create();
+        using var dir = TempDirectory.Create();
        var filePath = Path.Combine(dir.Path, "output.html");

        // Act
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using FluentAssertions;
 using Xunit;
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Infra;
+using FluentAssertions;
+using PowerKit.Extensions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class PlainTextForwardSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_forwarded_message()
+    {
+        // Act
+        var document = await ExportWrapper.ExportAsPlainTextAsync(ChannelIds.ForwardTestCases);
+
+        // Assert
+        document
+            .ReplaceWhiteSpace(' ')
+            .Should()
+            .ContainAll("{Forwarded Message}", @"¯\_(ツ)_/¯", "12/28/2025 10:52 PM");
+    }
+}
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
@@ -7,6 +7,7 @@ using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
+using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -17,7 +18,7 @@ public class SelfContainedSpecs
    public async Task I_can_export_a_channel_and_download_all_referenced_assets()
    {
        // Arrange
-        using var dir = TempDir.Create();
+        using var dir = TempDirectory.Create();
        var filePath = Path.Combine(dir.Path, "output.html");

        // Act
@@ -1,16 +0,0 @@
-using System.Text;
-
-namespace DiscordChatExporter.Cli.Tests.Utils.Extensions;
-
-internal static class StringExtensions
-{
-    public static string ReplaceWhiteSpace(this string str, string replacement = " ")
-    {
-        var buffer = new StringBuilder(str.Length);
-
-        foreach (var ch in str)
-            buffer.Append(char.IsWhiteSpace(ch) ? replacement : ch);
-
-        return buffer.ToString();
-    }
-}
@@ -1,4 +1,4 @@
-using AngleSharp.Html.Dom;
+using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;

 namespace DiscordChatExporter.Cli.Tests.Utils;
@@ -1,37 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-using PathEx = System.IO.Path;
-
-namespace DiscordChatExporter.Cli.Tests.Utils;
-
-internal partial class TempDir(string path) : IDisposable
-{
-    public string Path { get; } = path;
-
-    public void Dispose()
-    {
-        try
-        {
-            Directory.Delete(Path, true);
-        }
-        catch (DirectoryNotFoundException) { }
-    }
-}
-
-internal partial class TempDir
-{
-    public static TempDir Create()
-    {
-        var dirPath = PathEx.Combine(
-            PathEx.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
-                ?? Directory.GetCurrentDirectory(),
-            "Temp",
-            Guid.NewGuid().ToString()
-        );
-
-        Directory.CreateDirectory(dirPath);
-
-        return new TempDir(dirPath);
-    }
-}
@@ -1,38 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-using PathEx = System.IO.Path;
-
-namespace DiscordChatExporter.Cli.Tests.Utils;
-
-internal partial class TempFile(string path) : IDisposable
-{
-    public string Path { get; } = path;
-
-    public void Dispose()
-    {
-        try
-        {
-            File.Delete(Path);
-        }
-        catch (FileNotFoundException) { }
-    }
-}
-
-internal partial class TempFile
-{
-    public static TempFile Create()
-    {
-        var dirPath = PathEx.Combine(
-            PathEx.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
-                ?? Directory.GetCurrentDirectory(),
-            "Temp"
-        );
-
-        Directory.CreateDirectory(dirPath);
-
-        var filePath = PathEx.Combine(dirPath, Guid.NewGuid() + ".tmp");
-
-        return new TempFile(filePath);
-    }
-}
@@ -1,4 +1,4 @@
-{
+{
  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
  "methodDisplayOptions": "all",
  "methodDisplay": "method"
@@ -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.
@@ -15,6 +15,7 @@ WORKDIR /tmp/app
 COPY favicon.ico .
 COPY NuGet.config .
 COPY Directory.Build.props .
+COPY Directory.Packages.props .
 COPY DiscordChatExporter.Core DiscordChatExporter.Core
 COPY DiscordChatExporter.Cli DiscordChatExporter.Cli

@@ -30,7 +31,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."
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using CliFx;
-using CliFx.Attributes;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Utils;
@@ -17,23 +17,22 @@ public abstract class DiscordCommandBase : ICommand
        EnvironmentVariable = "DISCORD_TOKEN",
        Description = "Authentication token."
    )]
-    public required string Token { get; init; }
+    public required string Token { get; set; }

-    [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
    [CommandOption(
        "bot",
        'b',
        EnvironmentVariable = "DISCORD_TOKEN_BOT",
        Description = "This option doesn't do anything. Kept for backwards compatibility."
    )]
-    public bool IsBotToken { get; init; } = false;
+    public bool IsBotToken { get; set; } = false;

    [CommandOption(
        "respect-rate-limits",
        Description = "Whether to respect advisory rate limits. "
            + "If disabled, only hard rate limits (i.e. 429 responses) will be respected."
    )]
-    public bool ShouldRespectRateLimits { get; init; } = true;
+    public bool ShouldRespectRateLimits { get; set; } = true;

    [field: AllowNull, MaybeNull]
    protected DiscordClient Discord =>
@@ -1,12 +1,12 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using CliFx.Attributes;
-using CliFx.Exceptions;
+using CliFx;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Converters;
 using DiscordChatExporter.Cli.Commands.Shared;
@@ -37,23 +37,23 @@ public abstract class ExportCommandBase : DiscordCommandBase
        get;
        // Handle ~/ in paths on Unix systems
        // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
-        init => field = Path.GetFullPath(value);
+        set => field = Path.GetFullPath(value);
    } = Directory.GetCurrentDirectory();

    [CommandOption("format", 'f', Description = "Export format.")]
-    public ExportFormat ExportFormat { get; init; } = ExportFormat.HtmlDark;
+    public ExportFormat ExportFormat { get; set; } = ExportFormat.HtmlDark;

    [CommandOption(
        "after",
        Description = "Only include messages sent after this date or message ID."
    )]
-    public Snowflake? After { get; init; }
+    public Snowflake? After { get; set; }

    [CommandOption(
        "before",
        Description = "Only include messages sent before this date or message ID."
    )]
-    public Snowflake? Before { get; init; }
+    public Snowflake? Before { get; set; }

    [CommandOption(
        "partition",
@@ -61,45 +61,51 @@ public abstract class ExportCommandBase : DiscordCommandBase
        Description = "Split the output into partitions, each limited to the specified "
            + "number of messages (e.g. '100') or file size (e.g. '10mb')."
    )]
-    public PartitionLimit PartitionLimit { get; init; } = PartitionLimit.Null;
+    public PartitionLimit PartitionLimit { get; set; } = PartitionLimit.Null;

    [CommandOption(
        "include-threads",
        Description = "Which types of threads should be included.",
-        Converter = typeof(ThreadInclusionModeBindingConverter)
+        Converter = typeof(ThreadInclusionModeInputConverter)
    )]
-    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
+    public ThreadInclusionMode ThreadInclusionMode { get; set; } = ThreadInclusionMode.None;

    [CommandOption(
        "filter",
        Description = "Only include messages that satisfy this filter. "
            + "See the documentation for more info."
    )]
-    public MessageFilter MessageFilter { get; init; } = MessageFilter.Null;
+    public MessageFilter MessageFilter { get; set; } = MessageFilter.Null;

    [CommandOption(
        "parallel",
        Description = "Limits how many channels can be exported in parallel."
    )]
-    public int ParallelLimit { get; init; } = 1;
+    public int ParallelLimit { get; set; } = 1;
+
+    [CommandOption(
+        "reverse",
+        Description = "Export messages in reverse chronological order (newest first)."
+    )]
+    public bool IsReverseMessageOrder { get; set; }

    [CommandOption(
        "markdown",
        Description = "Process markdown, mentions, and other special tokens."
    )]
-    public bool ShouldFormatMarkdown { get; init; } = true;
+    public bool ShouldFormatMarkdown { get; set; } = true;

    [CommandOption(
        "media",
        Description = "Download assets referenced by the export (user avatars, attached files, embedded images, etc.)."
    )]
-    public bool ShouldDownloadAssets { get; init; }
+    public bool ShouldDownloadAssets { get; set; }

    [CommandOption(
        "reuse-media",
        Description = "Reuse previously downloaded assets to avoid redundant requests."
    )]
-    public bool ShouldReuseAssets { get; init; } = false;
+    public bool ShouldReuseAssets { get; set; } = false;

    [CommandOption(
        "media-dir",
@@ -111,34 +117,33 @@ public abstract class ExportCommandBase : DiscordCommandBase
        get;
        // Handle ~/ in paths on Unix systems
        // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
-        init => field = value is not null ? Path.GetFullPath(value) : null;
+        set => field = value is not null ? Path.GetFullPath(value) : null;
    }

-    [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
    [CommandOption(
        "dateformat",
        Description = "This option doesn't do anything. Kept for backwards compatibility."
    )]
-    public string DateFormat { get; init; } = "MM/dd/yyyy h:mm tt";
+    public string DateFormat { get; set; } = "MM/dd/yyyy h:mm tt";

    [CommandOption(
        "locale",
        Description = "Locale to use when formatting dates and numbers. "
            + "If not specified, the default system locale will be used."
    )]
-    public string? Locale { get; init; }
+    public string? Locale { get; set; }

    [CommandOption("utc", Description = "Normalize all timestamps to UTC+0.")]
-    public bool IsUtcNormalizationEnabled { get; init; } = false;
+    public bool IsUtcNormalizationEnabled { get; set; } = false;

    [CommandOption(
        "fuck-russia",
        EnvironmentVariable = "FUCK_RUSSIA",
        Description = "Don't print the Support Ukraine message to the console.",
        // Use a converter to accept '1' as 'true' to reuse the existing environment variable
-        Converter = typeof(TruthyBooleanBindingConverter)
+        Converter = typeof(TruthyBooleanInputConverter)
    )]
-    public bool IsUkraineSupportMessageDisabled { get; init; } = false;
+    public bool IsUkraineSupportMessageDisabled { get; set; } = false;

    [field: AllowNull, MaybeNull]
    protected ChannelExporter Exporter => field ??= new ChannelExporter(Discord);
@@ -160,6 +165,37 @@ public abstract class ExportCommandBase : DiscordCommandBase
            throw new CommandException("Option --media-dir cannot be used without --media.");
        }

+        // 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.
+        // Validate this up-front, before fetching threads, because thread fetching can take a
+        // long time and it's frustrating to fail only after it completes.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/799
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/917
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1549
+        var mayExportMultipleChannels =
+            // Multiple channels were provided explicitly
+            channels.Count > 1
+            // Thread inclusion can add more channels to the export
+            || ThreadInclusionMode != ThreadInclusionMode.None;
+
+        var isValidOutputPath =
+            // Anything is valid when exporting a single channel
+            !mayExportMultipleChannels
+            // When using template tokens, assume the user knows what they're doing
+            || OutputPath.Contains('%')
+            // Otherwise, require an existing directory or an unambiguous directory path
+            || Directory.Exists(OutputPath)
+            || Path.EndsInDirectorySeparator(OutputPath);
+
+        if (!isValidOutputPath)
+        {
+            throw new CommandException(
+                "Attempted to export multiple channels, but the output path is neither a directory nor a template. "
+                    + "If the provided output path is meant to be treated as a directory, make sure it ends with a slash. "
+                    + $"Provided output path: '{OutputPath}'."
+            );
+        }
+
        var unwrappedChannels = new List<Channel>(channels);

        // Unwrap threads
@@ -200,28 +236,6 @@ public abstract class ExportCommandBase : DiscordCommandBase
            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
-            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
-            || Directory.Exists(OutputPath)
-            || Path.EndsInDirectorySeparator(OutputPath);
-
-        if (!isValidOutputPath)
-        {
-            throw new CommandException(
-                "Attempted to export multiple channels, but the output path is neither a directory nor a template. "
-                    + "If the provided output path is meant to be treated as a directory, make sure it ends with a slash. "
-                    + $"Provided output path: '{OutputPath}'."
-            );
-        }
-
        // Export
        var errorsByChannel = new ConcurrentDictionary<Channel, string>();
        var warningsByChannel = new ConcurrentDictionary<Channel, string>();
@@ -267,6 +281,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
                                        Before,
                                        PartitionLimit,
                                        MessageFilter,
+                                        IsReverseMessageOrder,
                                        ShouldFormatMarkdown,
                                        ShouldDownloadAssets,
                                        ShouldReuseAssets,
@@ -1,10 +1,10 @@
-using System;
-using CliFx.Extensibility;
+using System;
+using CliFx.Activation;
 using DiscordChatExporter.Cli.Commands.Shared;

 namespace DiscordChatExporter.Cli.Commands.Converters;

-internal class ThreadInclusionModeBindingConverter : BindingConverter<ThreadInclusionMode>
+internal class ThreadInclusionModeInputConverter : ScalarInputConverter<ThreadInclusionMode>
 {
    public override ThreadInclusionMode Convert(string? rawValue)
    {
@@ -1,9 +1,9 @@
-using System.Globalization;
-using CliFx.Extensibility;
+using System.Globalization;
+using CliFx.Activation;

 namespace DiscordChatExporter.Cli.Commands.Converters;

-internal class TruthyBooleanBindingConverter : BindingConverter<bool>
+internal class TruthyBooleanInputConverter : ScalarInputConverter<bool>
 {
    public override bool Convert(string? rawValue)
    {
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using CliFx.Attributes;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Cli.Utils.Extensions;
@@ -14,23 +14,23 @@ using Spectre.Console;
 namespace DiscordChatExporter.Cli.Commands;

 [Command("exportall", Description = "Exports all accessible channels.")]
-public class ExportAllCommand : ExportCommandBase
+public partial class ExportAllCommand : ExportCommandBase
 {
    [CommandOption("include-dm", Description = "Include direct message channels.")]
-    public bool IncludeDirectChannels { get; init; } = true;
+    public bool IncludeDirectChannels { get; set; } = true;

    [CommandOption("include-guilds", Description = "Include server channels.")]
-    public bool IncludeGuildChannels { get; init; } = true;
+    public bool IncludeGuildChannels { get; set; } = true;

    [CommandOption("include-vc", Description = "Include voice channels.")]
-    public bool IncludeVoiceChannels { get; init; } = true;
+    public bool IncludeVoiceChannels { get; set; } = true;

    [CommandOption(
        "data-package",
        Description = "Path to the personal data package (ZIP file) requested from Discord. "
            + "If provided, only channels referenced in the dump will be exported."
    )]
-    public string? DataPackageFilePath { get; init; }
+    public string? DataPackageFilePath { get; set; }

    public override async ValueTask ExecuteAsync(IConsole console)
    {
@@ -1,16 +1,16 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using CliFx.Attributes;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Utils.Extensions;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

 [Command("export", Description = "Exports one or multiple channels.")]
-public class ExportChannelsCommand : ExportCommandBase
+public partial class ExportChannelsCommand : ExportCommandBase
 {
    // TODO: change this to plural (breaking change)
    [CommandOption(
@@ -19,7 +19,7 @@ public class ExportChannelsCommand : ExportCommandBase
        Description = "Channel ID(s). "
            + "If provided with category ID(s), all channels inside those categories will be exported."
    )]
-    public required IReadOnlyList<Snowflake> ChannelIds { get; init; }
+    public required IReadOnlyList<Snowflake> ChannelIds { get; set; }

    public override async ValueTask ExecuteAsync(IConsole console)
    {
@@ -1,14 +1,14 @@
-using System.Threading.Tasks;
-using CliFx.Attributes;
+using System.Threading.Tasks;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Utils.Extensions;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

 [Command("exportdm", Description = "Exports all direct message channels.")]
-public class ExportDirectMessagesCommand : ExportCommandBase
+public partial class ExportDirectMessagesCommand : ExportCommandBase
 {
    public override async ValueTask ExecuteAsync(IConsole console)
    {
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using CliFx.Attributes;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Cli.Utils.Extensions;
@@ -11,13 +11,13 @@ using Spectre.Console;
 namespace DiscordChatExporter.Cli.Commands;

 [Command("exportguild", Description = "Exports all channels within the specified server.")]
-public class ExportGuildCommand : ExportCommandBase
+public partial class ExportGuildCommand : ExportCommandBase
 {
    [CommandOption("guild", 'g', Description = "Server ID.")]
-    public required Snowflake GuildId { get; init; }
+    public required Snowflake GuildId { get; set; }

    [CommandOption("include-vc", Description = "Include voice channels.")]
-    public bool IncludeVoiceChannels { get; init; } = true;
+    public bool IncludeVoiceChannels { get; set; } = true;

    public override async ValueTask ExecuteAsync(IConsole console)
    {
@@ -1,31 +1,31 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
-using CliFx.Attributes;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Cli.Commands.Converters;
 using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Utils.Extensions;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

 [Command("channels", Description = "Get the list of channels in a server.")]
-public class GetChannelsCommand : DiscordCommandBase
+public partial class GetChannelsCommand : DiscordCommandBase
 {
    [CommandOption("guild", 'g', Description = "Server ID.")]
-    public required Snowflake GuildId { get; init; }
+    public required Snowflake GuildId { get; set; }

    [CommandOption("include-vc", Description = "Include voice channels.")]
-    public bool IncludeVoiceChannels { get; init; } = true;
+    public bool IncludeVoiceChannels { get; set; } = true;

    [CommandOption(
        "include-threads",
        Description = "Which types of threads should be included.",
-        Converter = typeof(ThreadInclusionModeBindingConverter)
+        Converter = typeof(ThreadInclusionModeInputConverter)
    )]
-    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
+    public ThreadInclusionMode ThreadInclusionMode { get; set; } = ThreadInclusionMode.None;

    public override async ValueTask ExecuteAsync(IConsole console)
    {
@@ -1,16 +1,16 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
-using CliFx.Attributes;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Utils.Extensions;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

 [Command("dm", Description = "Gets the list of all direct message channels.")]
-public class GetDirectChannelsCommand : DiscordCommandBase
+public partial class GetDirectChannelsCommand : DiscordCommandBase
 {
    public override async ValueTask ExecuteAsync(IConsole console)
    {
@@ -1,16 +1,16 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
-using CliFx.Attributes;
+using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Utils.Extensions;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

 [Command("guilds", Description = "Gets the list of accessible servers.")]
-public class GetGuildsCommand : DiscordCommandBase
+public partial class GetGuildsCommand : DiscordCommandBase
 {
    public override async ValueTask ExecuteAsync(IConsole console)
    {
@@ -1,13 +1,13 @@
 using System;
 using System.Threading.Tasks;
 using CliFx;
-using CliFx.Attributes;
+using CliFx.Binding;
 using CliFx.Infrastructure;

 namespace DiscordChatExporter.Cli.Commands;

 [Command("guide", Description = "Explains how to obtain the token, server or channel ID.")]
-public class GuideCommand : ICommand
+public partial class GuideCommand : ICommand
 {
    public ValueTask ExecuteAsync(IConsole console)
    {
@@ -74,7 +74,7 @@ public class GuideCommand : ICommand
        using (console.WithForegroundColor(ConsoleColor.DarkCyan))
        {
            console.Output.WriteLine(
-                "https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs"
+                "https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs"
            );
        }

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Cli.Commands.Shared;
+namespace DiscordChatExporter.Cli.Commands.Shared;

 public enum ThreadInclusionMode
 {
@@ -1,18 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <ApplicationIcon>..\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>../favicon.ico</ApplicationIcon>
    <PublishTrimmed>true</PublishTrimmed>
    <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
  </PropertyGroup>
+
  <ItemGroup>
-    <PackageReference Include="CliFx" Version="2.3.6" />
-    <PackageReference Include="CSharpier.MsBuild" Version="1.0.2" 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="CliFx" />
+    <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
+    <PackageReference Include="Deorcify" />
+    <PackageReference Include="Gress" />
+    <PackageReference Include="PowerKit" />
+    <PackageReference Include="Spectre.Console" />
  </ItemGroup>
+
  <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" />
+    <ProjectReference Include="../DiscordChatExporter.Core/DiscordChatExporter.Core.csproj" />
  </ItemGroup>
 </Project>
@@ -1,41 +1,13 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using CliFx;
-using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Commands.Converters;
-using DiscordChatExporter.Core.Exporting.Filtering;
-using DiscordChatExporter.Core.Exporting.Partitioning;

 namespace DiscordChatExporter.Cli;

 public static class Program
 {
-    // Explicit references because CliFx relies on reflection and we're publishing with trimming enabled
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ExportAllCommand))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ExportChannelsCommand))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ExportDirectMessagesCommand))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ExportGuildCommand))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(GetChannelsCommand))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(GetDirectChannelsCommand))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(GetGuildsCommand))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(GuideCommand))]
-    [DynamicDependency(
-        DynamicallyAccessedMemberTypes.All,
-        typeof(ThreadInclusionModeBindingConverter)
-    )]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(TruthyBooleanBindingConverter))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(PartitionLimit))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(MessageFilter))]
    public static async Task<int> Main(string[] args) =>
-        await new CliApplicationBuilder()
-            .AddCommand<ExportAllCommand>()
-            .AddCommand<ExportChannelsCommand>()
-            .AddCommand<ExportDirectMessagesCommand>()
-            .AddCommand<ExportGuildCommand>()
-            .AddCommand<GetChannelsCommand>()
-            .AddCommand<GetDirectChannelsCommand>()
-            .AddCommand<GetGuildsCommand>()
-            .AddCommand<GuideCommand>()
+        await new CommandLineApplicationBuilder()
+            .AddCommandsFromThisAssembly()
            .Build()
            .RunAsync(args);
 }
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using Spectre.Console;
@@ -7,32 +7,35 @@ namespace DiscordChatExporter.Cli.Utils.Extensions;

 internal static class ConsoleExtensions
 {
-    public static IAnsiConsole CreateAnsiConsole(this IConsole console) =>
-        AnsiConsole.Create(
-            new AnsiConsoleSettings
-            {
-                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()
+    extension(IConsole console)
+    {
+        public IAnsiConsole CreateAnsiConsole() =>
+            AnsiConsole.Create(
+                new AnsiConsoleSettings
+                {
+                    Ansi = AnsiSupport.Detect,
+                    ColorSystem = ColorSystemSupport.Detect,
+                    Out = new AnsiConsoleOutput(console.Output),
+                }
            );

+        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,
@@ -1,6 +1,6 @@
-using System.Text.Json;
-using DiscordChatExporter.Core.Utils.Extensions;
+using System.Text.Json;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.IO;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -33,9 +33,9 @@ public partial record Channel(

    public bool IsThread { get; } =
        Kind
-            is ChannelKind.GuildNewsThread
-                or ChannelKind.GuildPublicThread
-                or ChannelKind.GuildPrivateThread;
+        is ChannelKind.GuildNewsThread
+            or ChannelKind.GuildPublicThread
+            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
@@ -96,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()
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;

 namespace DiscordChatExporter.Core.Discord.Data;
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data;
+namespace DiscordChatExporter.Core.Discord.Data;

 // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 public enum ChannelKind
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data.Common;
+namespace DiscordChatExporter.Core.Discord.Data.Common;

 public interface IHasId
 {
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Linq;

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text.Json;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data.Embeds;

@@ -45,7 +45,9 @@ 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.ParseOrNull<EmbedKind>(s, true))
            ?? EmbedKind.Rich;

        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
@@ -54,7 +56,7 @@ public partial record Embed
        var color = json.GetPropertyOrNull("color")
            ?.GetInt32OrNull()
            ?.Pipe(System.Drawing.Color.FromArgb)
-            .ResetAlpha();
+            .WithFullAlpha();

        var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
        var description = json.GetPropertyOrNull("description")?.GetStringOrNull();
@@ -63,7 +65,8 @@ public partial record Embed
            json.GetPropertyOrNull("fields")
                ?.EnumerateArrayOrNull()
                ?.Select(EmbedField.Parse)
-                .ToArray() ?? [];
+                .ToArray()
+            ?? [];

        var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);

@@ -78,7 +81,8 @@ public partial record Embed
            json.GetPropertyOrNull("image")
                ?.Pipe(EmbedImage.Parse)
                .ToSingletonEnumerable()
-                .ToArray() ?? [];
+                .ToArray()
+            ?? [];

        var video = json.GetPropertyOrNull("video")?.Pipe(EmbedVideo.Parse);

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;

 namespace DiscordChatExporter.Core.Discord.Data.Embeds;

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;

 namespace DiscordChatExporter.Core.Discord.Data.Embeds;

@@ -1,8 +1,11 @@
-namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;

 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
@@ -1,8 +1,8 @@
-using System.Text.Json;
+using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;

@@ -8855,6 +8855,8 @@ internal static class EmojiIndex
        ["united_nations"] = "🇺🇳",
    };

+    public static IReadOnlyCollection<string> GetAllNames() => _toCodes.Keys;
+
    public static string? TryGetCode(string name) => _toCodes.GetValueOrDefault(name);

    public static string? TryGetName(string code) => _fromCodes.GetValueOrDefault(code);
@@ -1,7 +1,7 @@
-using System.Text.Json;
+using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -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);
    }
@@ -1,6 +1,6 @@
-using System.Text.Json;
-using DiscordChatExporter.Core.Utils.Extensions;
+using System.Text.Json;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,7 +1,7 @@
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.RegularExpressions;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -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")
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -27,9 +27,16 @@ public partial record Message(
    IReadOnlyList<User> MentionedUsers,
    MessageReference? Reference,
    Message? ReferencedMessage,
+    MessageSnapshot? ForwardedMessage,
    Interaction? Interaction
 ) : IHasId
 {
+    public bool IsEmpty { get; } =
+        string.IsNullOrWhiteSpace(Content)
+        && !Attachments.Any()
+        && !Embeds.Any()
+        && !Stickers.Any();
+
    public bool IsSystemNotification { get; } =
        Kind is >= MessageKind.RecipientAdd and <= MessageKind.ThreadCreated;

@@ -38,11 +45,7 @@ public partial record Message(
    // App interactions are rendered as replies in the Discord client, but they are not actually replies
    public bool IsReplyLike => IsReply || Interaction is not null;

-    public bool IsEmpty { get; } =
-        string.IsNullOrWhiteSpace(Content)
-        && !Attachments.Any()
-        && !Embeds.Any()
-        && !Stickers.Any();
+    public bool IsForwarded { get; } = Reference?.Kind == MessageReferenceKind.Forward;

    public IEnumerable<User> GetReferencedUsers()
    {
@@ -143,7 +146,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 +158,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()
@@ -168,7 +174,17 @@ public partial record Message

        var messageReference = json.GetPropertyOrNull("message_reference")
            ?.Pipe(MessageReference.Parse);
+
        var referencedMessage = json.GetPropertyOrNull("referenced_message")?.Pipe(Parse);
+
+        // Currently Discord only supports 1 snapshot per forward
+        var forwardedMessage = json.GetPropertyOrNull("message_snapshots")
+            ?.EnumerateArrayOrNull()
+            ?.Select(j => j.GetPropertyOrNull("message"))
+            .WhereNotNull()
+            .Select(MessageSnapshot.Parse)
+            .FirstOrDefault();
+
        var interaction = json.GetPropertyOrNull("interaction")?.Pipe(Interaction.Parse);

        return new Message(
@@ -188,6 +204,7 @@ public partial record Message
            mentionedUsers,
            messageReference,
            referencedMessage,
+            forwardedMessage,
            interaction
        );
    }
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data;
+namespace DiscordChatExporter.Core.Discord.Data;

 // https://discord.com/developers/docs/resources/channel#message-object-message-types
 public enum MessageKind
@@ -13,4 +13,5 @@ public enum MessageKind
    GuildMemberJoin = 7,
    ThreadCreated = 18,
    Reply = 19,
+    ThreadStarterMessage = 21,
 }
@@ -1,14 +1,23 @@
 using System.Text.Json;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

 // https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure
-public record MessageReference(Snowflake? MessageId, Snowflake? ChannelId, Snowflake? GuildId)
+public record MessageReference(
+    MessageReferenceKind Kind,
+    Snowflake? MessageId,
+    Snowflake? ChannelId,
+    Snowflake? GuildId
+)
 {
    public static MessageReference Parse(JsonElement json)
    {
+        var kind =
+            json.GetPropertyOrNull("type")?.GetInt32OrNull()?.Pipe(t => (MessageReferenceKind)t)
+            ?? MessageReferenceKind.Default;
+
        var messageId = json.GetPropertyOrNull("message_id")
            ?.GetNonWhiteSpaceStringOrNull()
            ?.Pipe(Snowflake.Parse);
@@ -21,6 +30,6 @@ public record MessageReference(Snowflake? MessageId, Snowflake? ChannelId, Snowf
            ?.GetNonWhiteSpaceStringOrNull()
            ?.Pipe(Snowflake.Parse);

-        return new MessageReference(messageId, channelId, guildId);
+        return new MessageReference(kind, messageId, channelId, guildId);
    }
 }
@@ -0,0 +1,8 @@
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/channel#message-reference-types
+public enum MessageReferenceKind
+{
+    Default = 0,
+    Forward = 1,
+}
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Core.Discord.Data.Embeds;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://docs.discord.com/developers/resources/message#message-snapshot-object
+public record MessageSnapshot(
+    DateTimeOffset Timestamp,
+    DateTimeOffset? EditedTimestamp,
+    string Content,
+    IReadOnlyList<Attachment> Attachments,
+    IReadOnlyList<Embed> Embeds,
+    IReadOnlyList<Sticker> Stickers
+)
+{
+    public static MessageSnapshot Parse(JsonElement json)
+    {
+        var timestamp =
+            json.GetPropertyOrNull("timestamp")?.GetDateTimeOffsetOrNull()
+            ?? DateTimeOffset.MinValue;
+
+        var editedTimestamp = json.GetPropertyOrNull("edited_timestamp")?.GetDateTimeOffsetOrNull();
+
+        var content = json.GetPropertyOrNull("content")?.GetStringOrNull() ?? "";
+
+        var attachments =
+            json.GetPropertyOrNull("attachments")
+                ?.EnumerateArrayOrNull()
+                ?.Select(Attachment.Parse)
+                .ToArray()
+            ?? [];
+
+        var embeds =
+            json.GetPropertyOrNull("embeds")?.EnumerateArrayOrNull()?.Select(Embed.Parse).ToArray()
+            ?? [];
+
+        var stickers =
+            json.GetPropertyOrNull("sticker_items")
+                ?.EnumerateArrayOrNull()
+                ?.Select(Sticker.Parse)
+                .ToArray()
+            ?? [];
+
+        return new MessageSnapshot(
+            timestamp,
+            editedTimestamp,
+            content,
+            attachments,
+            embeds,
+            stickers
+        );
+    }
+}
@@ -1,5 +1,5 @@
-using System.Text.Json;
-using DiscordChatExporter.Core.Utils.Extensions;
+using System.Text.Json;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,8 +1,8 @@
-using System.Drawing;
+using System.Drawing;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -18,7 +18,7 @@ public record Role(Snowflake Id, string Name, int Position, Color? Color) : IHas
        var color = json.GetPropertyOrNull("color")
            ?.GetInt32OrNull()
            ?.Pipe(System.Drawing.Color.FromArgb)
-            .ResetAlpha()
+            .WithFullAlpha()
            .NullIf(c => c.ToRgb() <= 0);

        return new Role(id, name, position, color);
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data;
+namespace DiscordChatExporter.Core.Discord.Data;

 public enum StickerFormat
 {
@@ -1,7 +1,7 @@
-using System.Text.Json;
+using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -11,10 +11,10 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Utils;
-using DiscordChatExporter.Core.Utils.Extensions;
 using Gress;
 using JsonExtensions.Http;
 using JsonExtensions.Reading;
+using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord;

@@ -30,9 +30,8 @@ public class DiscordClient(
        string url,
        TokenKind tokenKind,
        CancellationToken cancellationToken = default
-    )
-    {
-        return await Http.ResponseResiliencePipeline.ExecuteAsync(
+    ) =>
+        await Http.ResponseResiliencePipeline.ExecuteAsync(
            async innerCancellationToken =>
            {
                using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
@@ -59,12 +58,12 @@ public class DiscordClient(
                {
                    var remainingRequestCount = response
                        .Headers.TryGetValue("X-RateLimit-Remaining")
-                        ?.Pipe(s => int.Parse(s, CultureInfo.InvariantCulture));
+                        ?.Pipe(s => int.ParseOrNull(s, CultureInfo.InvariantCulture));

                    var resetAfterDelay = response
                        .Headers.TryGetValue("X-RateLimit-Reset-After")
-                        ?.Pipe(s => double.Parse(s, CultureInfo.InvariantCulture))
-                        .Pipe(TimeSpan.FromSeconds);
+                        ?.Pipe(s => double.ParseOrNull(s, CultureInfo.InvariantCulture))
+                        ?.Pipe(TimeSpan.FromSeconds);

                    // If this was the last request available before hitting the rate limit,
                    // wait out the reset time so that future requests can succeed.
@@ -91,7 +90,6 @@ public class DiscordClient(
            },
            cancellationToken
        );
-    }

    private async ValueTask<TokenKind> ResolveTokenKindAsync(
        CancellationToken cancellationToken = default
@@ -161,7 +159,7 @@ public class DiscordClient(
                    $"""
                    Request to '{url}' failed: {response
                        .StatusCode.ToString()
-                        .ToSpaceSeparatedWords()
+                        .SeparateWords(' ')
                        .ToLowerInvariant()}.
                    Response content: {await response.Content.ReadAsStringAsync(
                        cancellationToken
@@ -194,6 +192,23 @@ public class DiscordClient(
        return Application.Parse(response);
    }

+    private async ValueTask EnsureMessageContentIntentAsync(
+        CancellationToken cancellationToken = default
+    )
+    {
+        if (await ResolveTokenKindAsync(cancellationToken) != TokenKind.Bot)
+            return;
+
+        var application = await GetApplicationAsync(cancellationToken);
+        if (application.IsMessageContentIntentEnabled)
+            return;
+
+        throw new DiscordChatExporterException(
+            "Provided bot account is missing the MESSAGE_CONTENT privileged intent.",
+            true
+        );
+    }
+
    public async ValueTask<User?> TryGetUserAsync(
        Snowflake userId,
        CancellationToken cancellationToken = default
@@ -347,6 +362,7 @@ public class DiscordClient(
            $"guilds/{guildId}/members/{memberId}",
            cancellationToken
        );
+
        return response?.Pipe(j => Member.Parse(j, guildId));
    }

@@ -371,21 +387,38 @@ public class DiscordClient(
            ?.GetNonWhiteSpaceStringOrNull()
            ?.Pipe(Snowflake.Parse);

-        try
-        {
-            var parent = parentId is not null
-                ? await GetChannelAsync(parentId.Value, cancellationToken)
-                : null;
-
-            return Channel.Parse(response, parent);
-        }
        // It's possible for the parent channel to be inaccessible, despite the
        // child channel being accessible.
        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1108
-        catch (DiscordChatExporterException)
-        {
-            return Channel.Parse(response);
-        }
+        var parent = parentId is not null
+            ? await TryGetChannelAsync(parentId.Value, cancellationToken)
+            : null;
+
+        return Channel.Parse(response, parent);
+    }
+
+    public async ValueTask<Channel?> TryGetChannelAsync(
+        Snowflake channelId,
+        CancellationToken cancellationToken = default
+    )
+    {
+        var response = await TryGetJsonResponseAsync($"channels/{channelId}", cancellationToken);
+        if (response is null)
+            return null;
+
+        var parentId = response
+            .Value.GetPropertyOrNull("parent_id")
+            ?.GetNonWhiteSpaceStringOrNull()
+            ?.Pipe(Snowflake.Parse);
+
+        // It's possible for the parent channel to be inaccessible, despite the
+        // child channel being accessible.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1108
+        var parent = parentId is not null
+            ? await TryGetChannelAsync(parentId.Value, cancellationToken)
+            : null;
+
+        return Channel.Parse(response.Value, parent);
    }

    public async IAsyncEnumerable<Channel> GetChannelThreadsAsync(
@@ -410,6 +443,11 @@ public class DiscordClient(
            .Where(c => before is null || c.MayHaveMessagesBefore(before.Value))
            .ToArray();

+        // Track yielded thread IDs to avoid duplicates that can occur when a thread transitions
+        // from active to archived between the two separate API calls used to fetch threads.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1433
+        var seenThreadIds = new HashSet<Snowflake>();
+
        // User accounts can only fetch threads using the search endpoint
        if (await ResolveTokenKindAsync(cancellationToken) == TokenKind.User)
        {
@@ -453,7 +491,9 @@ public class DiscordClient(
                                break;
                            }

-                            yield return thread;
+                            if (seenThreadIds.Add(thread.Id))
+                                yield return thread;
+
                            currentOffset++;
                        }

@@ -492,7 +532,12 @@ public class DiscordClient(
                        .Pipe(parentsById.GetValueOrDefault);

                    if (filteredChannels.Contains(parent))
-                        yield return Channel.Parse(threadJson, parent);
+                    {
+                        var thread = Channel.Parse(threadJson, parent);
+
+                        if (seenThreadIds.Add(thread.Id))
+                            yield return thread;
+                    }
                }
            }

@@ -528,12 +573,14 @@ public class DiscordClient(
                            )
                            {
                                var thread = Channel.Parse(threadJson, channel);
-                                yield return thread;

                                currentBefore = threadJson
                                    .GetProperty("thread_metadata")
                                    .GetProperty("archive_timestamp")
                                    .GetString();
+
+                                if (seenThreadIds.Add(thread.Id))
+                                    yield return thread;
                            }

                            if (!response.Value.GetProperty("has_more").GetBoolean())
@@ -545,6 +592,28 @@ public class DiscordClient(
        }
    }

+    private async ValueTask<Message?> TryGetFirstMessageAsync(
+        Snowflake channelId,
+        Snowflake? after = null,
+        CancellationToken cancellationToken = default
+    )
+    {
+        var url = new UrlBuilder()
+            .SetPath($"channels/{channelId}/messages")
+            .SetQueryParameter("limit", "1")
+            .SetQueryParameter("after", (after ?? Snowflake.Zero).ToString())
+            .Build();
+
+        // Can be null on channels that the user cannot access
+        var response = await TryGetJsonResponseAsync(url, cancellationToken);
+        if (response is null)
+            return null;
+
+        var message = response.Value.EnumerateArray().Select(Message.Parse).FirstOrDefault();
+
+        return message;
+    }
+
    private async ValueTask<Message?> TryGetLastMessageAsync(
        Snowflake channelId,
        Snowflake? before = null,
@@ -557,8 +626,39 @@ public class DiscordClient(
            .SetQueryParameter("before", before?.ToString())
            .Build();

-        var response = await GetJsonResponseAsync(url, cancellationToken);
-        return response.EnumerateArray().Select(Message.Parse).LastOrDefault();
+        // Can be null on channels that the user cannot access
+        var response = await TryGetJsonResponseAsync(url, cancellationToken);
+        if (response is null)
+            return null;
+
+        return response.Value.EnumerateArray().Select(Message.Parse).LastOrDefault();
+    }
+
+    public async ValueTask<Message?> TryGetMessageAsync(
+        Snowflake channelId,
+        Snowflake messageId,
+        CancellationToken cancellationToken = default
+    )
+    {
+        // Use the regular message listing endpoint with the 'around' parameter instead of the
+        // dedicated single-message endpoint, because the latter is not accessible to user tokens.
+        var url = new UrlBuilder()
+            .SetPath($"channels/{channelId}/messages")
+            .SetQueryParameter("around", messageId.ToString())
+            .SetQueryParameter("limit", "1")
+            .Build();
+
+        // Can be null on channels that the user cannot access
+        var response = await TryGetJsonResponseAsync(url, cancellationToken);
+        if (response is null)
+            return null;
+
+        // The endpoint returns messages around the requested ID, so make sure to only return
+        // the message that exactly matches it (it may be absent if it has been deleted).
+        return response
+            .Value.EnumerateArray()
+            .Select(Message.Parse)
+            .FirstOrDefault(m => m.Id == messageId);
    }

    public async IAsyncEnumerable<Message> GetMessagesAsync(
@@ -603,22 +703,10 @@ public class DiscordClient(
                yield break;

            // If all messages are empty, make sure that it's not because the bot account doesn't
-            // have the Message Content Intent enabled.
+            // have the MESSAGE_CONTENT intent enabled.
            // https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959
-            if (
-                messages.All(m => m.IsEmpty)
-                && await ResolveTokenKindAsync(cancellationToken) == TokenKind.Bot
-            )
-            {
-                var application = await GetApplicationAsync(cancellationToken);
-                if (!application.IsMessageContentIntentEnabled)
-                {
-                    throw new DiscordChatExporterException(
-                        "Provided bot account does not have the Message Content Intent enabled.",
-                        true
-                    );
-                }
-            }
+            if (messages.All(m => m.IsEmpty))
+                await EnsureMessageContentIntentAsync(cancellationToken);

            foreach (var message in messages)
            {
@@ -645,12 +733,108 @@ public class DiscordClient(
                    );
                }

-                yield return message;
+                // Some messages, for example thread starter messages, are returned by the API as content-less references.
+                // Try to resolve them to the actual message so that they appear as they do in the Discord client.
+                var actualMessage =
+                    message.Kind == MessageKind.ThreadStarterMessage
+                    && message.Reference?.ChannelId is { } referencedChannelId
+                    && message.Reference?.MessageId is { } referencedMessageId
+                        ? await TryGetMessageAsync(
+                            referencedChannelId,
+                            referencedMessageId,
+                            cancellationToken
+                        )
+                        : null;
+
+                yield return actualMessage ?? message;
+
                currentAfter = message.Id;
            }
        }
    }

+    public async IAsyncEnumerable<Message> GetMessagesInReverseAsync(
+        Snowflake channelId,
+        Snowflake? after = null,
+        Snowflake? before = null,
+        IProgress<Percentage>? progress = null,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default
+    )
+    {
+        // Get the first message in the specified range, so we can later calculate the
+        // progress based on the difference between message timestamps.
+        // Snapshotting is not necessary here because new messages can't appear in the past.
+        var firstMessage = await TryGetFirstMessageAsync(channelId, after, cancellationToken);
+        if (firstMessage is null || firstMessage.Timestamp > before?.ToDate())
+            yield break;
+
+        // Keep track of the last message in range in order to calculate the progress
+        var lastMessage = default(Message);
+
+        var currentBefore = before;
+        while (true)
+        {
+            var url = new UrlBuilder()
+                .SetPath($"channels/{channelId}/messages")
+                .SetQueryParameter("limit", "100")
+                .SetQueryParameter("before", currentBefore?.ToString())
+                .Build();
+
+            var response = await GetJsonResponseAsync(url, cancellationToken);
+
+            var messages = response.EnumerateArray().Select(Message.Parse).ToArray();
+
+            // Break if there are no messages (can happen if messages are deleted during execution)
+            if (!messages.Any())
+                yield break;
+
+            // If all messages are empty, make sure that it's not because the bot account doesn't
+            // have the MESSAGE_CONTENT intent enabled.
+            // https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959
+            if (messages.All(m => m.IsEmpty))
+                await EnsureMessageContentIntentAsync(cancellationToken);
+
+            foreach (var message in messages)
+            {
+                lastMessage ??= message;
+
+                // Report progress based on timestamps
+                if (progress is not null)
+                {
+                    var exportedDuration = (lastMessage.Timestamp - message.Timestamp).Duration();
+                    var totalDuration = (lastMessage.Timestamp - firstMessage.Timestamp).Duration();
+
+                    progress.Report(
+                        Percentage.FromFraction(
+                            // Avoid division by zero if all messages have the exact same timestamp
+                            // (which happens when there's only one message in the channel)
+                            totalDuration > TimeSpan.Zero
+                                ? exportedDuration / totalDuration
+                                : 1
+                        )
+                    );
+                }
+
+                // Some messages, for example thread starter messages, are returned by the API as content-less references.
+                // Try to resolve them to the actual message so that they appear as they do in the Discord client.
+                var actualMessage =
+                    message.Kind == MessageKind.ThreadStarterMessage
+                    && message.Reference?.ChannelId is { } referencedChannelId
+                    && message.Reference?.MessageId is { } referencedMessageId
+                        ? await TryGetMessageAsync(
+                            referencedChannelId,
+                            referencedMessageId,
+                            cancellationToken
+                        )
+                        : null;
+
+                yield return actualMessage ?? message;
+            }
+
+            currentBefore = messages.Last().Id;
+        }
+    }
+
    public async IAsyncEnumerable<User> GetMessageReactionsAsync(
        Snowflake channelId,
        Snowflake messageId,
@@ -1,6 +1,7 @@
-using System;
+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");
-        if (entry is null)
-        {
-            throw new InvalidOperationException(
+        // Use case-insensitive search to accommodate for different data dump versions
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1459
+        var entry =
+            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);
@@ -1,3 +1,3 @@
-namespace DiscordChatExporter.Core.Discord.Dump;
+namespace DiscordChatExporter.Core.Discord.Dump;

 public record DataDumpChannel(Snowflake Id, string Name);
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace DiscordChatExporter.Core.Discord;

@@ -13,24 +13,26 @@ public enum RateLimitPreference

 public static class RateLimitPreferenceExtensions
 {
-    internal static bool IsRespectedFor(
-        this RateLimitPreference rateLimitPreference,
-        TokenKind tokenKind
-    ) =>
-        tokenKind switch
-        {
-            TokenKind.User => (rateLimitPreference & RateLimitPreference.RespectForUserTokens) != 0,
-            TokenKind.Bot => (rateLimitPreference & RateLimitPreference.RespectForBotTokens) != 0,
-            _ => throw new ArgumentOutOfRangeException(nameof(tokenKind)),
-        };
+    extension(RateLimitPreference rateLimitPreference)
+    {
+        internal bool IsRespectedFor(TokenKind tokenKind) =>
+            tokenKind switch
+            {
+                TokenKind.User => (rateLimitPreference & RateLimitPreference.RespectForUserTokens)
+                    != 0,
+                TokenKind.Bot => (rateLimitPreference & RateLimitPreference.RespectForBotTokens)
+                    != 0,
+                _ => throw new ArgumentOutOfRangeException(nameof(tokenKind)),
+            };

-    public static string GetDisplayName(this RateLimitPreference rateLimitPreference) =>
-        rateLimitPreference switch
-        {
-            RateLimitPreference.IgnoreAll => "Always ignore",
-            RateLimitPreference.RespectForUserTokens => "Respect for user tokens",
-            RateLimitPreference.RespectForBotTokens => "Respect for bot tokens",
-            RateLimitPreference.RespectAll => "Always respect",
-            _ => throw new ArgumentOutOfRangeException(nameof(rateLimitPreference)),
-        };
+        public string GetDisplayName() =>
+            rateLimitPreference switch
+            {
+                RateLimitPreference.IgnoreAll => "Always ignore",
+                RateLimitPreference.RespectForUserTokens => "Respect for user tokens",
+                RateLimitPreference.RespectForBotTokens => "Respect for bot tokens",
+                RateLimitPreference.RespectAll => "Always respect",
+                _ => throw new ArgumentOutOfRangeException(nameof(rateLimitPreference)),
+            };
+    }
 }
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;

--- a/Show More
+++ b/Show More