Replace YouTube iframe embeds with clickable thumbnails (#1474)

* Initial plan

* Replace YouTube iframe with clickable thumbnail

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

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

* Address code review feedback

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

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

* Simplify YouTube embed test to focus on data not structure

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

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

* Fix data-canonical-url and improve test specificity

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

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

* Inline thumbnail URL logic directly into attributes

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

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

---------

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

.docs/Docker.md

@@ -10,7 +10,7 @@ Docker distribution of DiscordChatExporter provides a way to run the app in a vi
 This will download the [Docker image from the registry](https://hub.docker.com/r/tyrrrz/discordchatexporter) to your computer. You can run this command again to update when a new version is released.
 
 ```console
-docker pull tyrrrz/discordchatexporter:stable
+$ docker pull tyrrrz/discordchatexporter:stable
 ```
 
 Note the `:stable` tag. DiscordChatExporter images are tagged according to the following patterns:
@@ -26,19 +26,19 @@ You can see all available tags [here](https://hub.docker.com/r/tyrrrz/discordcha
 To run the CLI in Docker and render help text:
 
 ```console
-docker run --rm tyrrrz/discordchatexporter:stable
+$ docker run --rm tyrrrz/discordchatexporter:stable
 ```
 
 To export a channel:
 
 ```console
-docker run --rm -v /path/on/machine:/out tyrrrz/discordchatexporter:stable export -t TOKEN -c CHANNELID
+$ docker run --rm -v /path/on/machine:/out tyrrrz/discordchatexporter:stable export -t TOKEN -c CHANNELID
 ```
 
 If you want colored output and real-time progress reporting, pass the `-it` (interactive + pseudo-terminal) option:
 
 ```console
-docker run --rm -it -v /path/on/machine:/out tyrrrz/discordchatexporter:stable export -t TOKEN -c CHANNELID
+$ docker run --rm -it -v /path/on/machine:/out tyrrrz/discordchatexporter:stable export -t TOKEN -c CHANNELID
 ```
 
 The `-v /path/on/machine:/out` option instructs Docker to bind the `/out` directory inside the container to a path on your host machine. Replace `/path/on/machine` with the directory you want the files to be saved at.
@@ -47,7 +47,7 @@ The `-v /path/on/machine:/out` option instructs Docker to bind the `/out` direct
 > If you are running SELinux, you will need to add the `:z` option after `/out`, e.g.:
 >
 > ```console
-> docker run --rm -v /path/on/machine:/out:z tyrrrz/discordchatexporter:stable export -t TOKEN -c CHANNELID
+> $ docker run --rm -v /path/on/machine:/out:z tyrrrz/discordchatexporter:stable export -t TOKEN -c CHANNELID
 > ```
 >
 > For more information, refer to the [Docker docs SELinux labels for bind mounts page](https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label).
@@ -61,6 +61,17 @@ For more information, please refer to the [Dockerfile](https://github.com/Tyrrrz
 
 To get your Token and Channel IDs, please refer to [this page](Token-and-IDs.md).
 
+## Unix permissions issues
+
+This image was designed with a user running as uid:gid of 1000:1000.
+
+If your current user has different IDs, and you want to generate files directly editable for your user, you might want to run the container like this:
+
+```console
+$ mkdir data # or chown -R $(id -u):$(id -g) data
+$ docker run -it --rm -v $PWD/data:/out --user $(id -u):$(id -g) tyrrrz/discordchatexporter:stable export -t TOKEN -g CHANNELID
+```
+
 ## Environment variables
 
 DiscordChatExpoter CLI accepts the `DISCORD_TOKEN` environment variable as a fallback for the `--token` option. You can set this variable either with the `--env` Docker option or with a combination of the `--env-file` Docker option and a `.env` file.

.docs/Dotnet.md

@@ -1,55 +0,0 @@
-# Install .NET runtime
-
-**.NET 8.0 Runtime** is required by **DiscordChatExporter**.
-
-> **Note**:
-> Installing the **.NET Runtime** is not required if you running **DiscordChatExporter** using [Docker](Docker.md).
-
-## Windows
-
-Both the GUI and the CLI flavors of **DiscordChatExporter** for Windows come with a bootstrapper that should automatically install all the required prerequisites. Simply run the application and follow the presented instructions.
-
-If, for some reason, you need to install the runtime manually, use one of the download links below:
-
-- [.NET 8.0 Runtime for **Windows x64**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.0-windows-x86-installer)
-- [.NET 8.0 Runtime for **Windows x86**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.0-windows-x64-installer)
-- [.NET 8.0 Runtime for **Windows arm64**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.0-windows-arm64-installer)
-
-> **Note**:
-> [How can I tell if my computer is running a 32-bit (x86) or a 64-bit (x64) version of Windows?](https://support.microsoft.com/help/15056/windows-32-64-bit-faq)
-
-## macOS
-
-Use one of the download links below:
-
-- [.NET 8.0 Runtime for **macOS x64**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.0-macos-x64-installer)
-- [.NET 8.0 Runtime for **macOS arm64**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.0-macos-arm64-installer)
-
-> **Note**:
-> [Is my Mac using an Intel processor (x64) or Apple Silicon (arm64)?](https://support.apple.com/HT211814)
-
-## Linux
-
-Installing the .NET Runtime works differently depending on which Linux distribution you use. Check out the instructions for your distro:
-
-- [Ubuntu](https://docs.microsoft.com/dotnet/core/install/linux-ubuntu)
-- [Debian](https://docs.microsoft.com/dotnet/core/install/linux-debian)
-- [Fedora](https://docs.microsoft.com/dotnet/core/install/linux-fedora)
-
-For other distros, please check the _'Install on Linux'_ menu on the left of [this page](https://docs.microsoft.com/dotnet/core/install/linux).
-
-## Verify installation (optional)
-
-You can check which version of **.NET Runtime** is installed by running the following command in a terminal:
-
-```console
-dotnet --info
-```
-
-If the **.NET Runtime** is correctly installed, the command will output something similar to the following:
-
-```console
-.NET runtimes installed:
-  Microsoft.NETCore.App 7.0.x [C:\path\to\dotnet\shared\Microsoft.NETCore.App]
-  Microsoft.WindowsDesktop.App 7.0.x [C:\path\to\dotnet\shared\Microsoft.WindowsDesktop.App]
-```

.docs/Getting-started.md

@@ -15,12 +15,9 @@ The information presented on this page is valid for **all** platforms.
 **DCE** has two different versions:
 
 - **Graphical User Interface** (**GUI**) - it's the preferred version for newcomers as it is easy to use.
-  You can get it by [downloading](https://github.com/Tyrrrz/DiscordChatExporter/releases/latest) the `DiscordChatExporter.zip` file.
+  You can get it by [downloading](https://github.com/Tyrrrz/DiscordChatExporter/releases/latest) the `DiscordChatExporter.*.zip` file.
 - **Command-line Interface** (**CLI**) - offers greater flexibility and more features for advanced users, such as export scheduling, ID lists, and more specific date ranges.
-  You can get it by [downloading](https://github.com/Tyrrrz/DiscordChatExporter/releases/latest) the `DiscordChatExporter.CLI.zip` file.
-
-If you're not comfortable with **Windows'** Command-line (cmd), please choose the GUI.
-[**macOS**](MacOS.md), [**Linux**](Linux.md) and [**Docker**](Docker.md) users can only use the CLI version.
+  You can get it by [downloading](https://github.com/Tyrrrz/DiscordChatExporter/releases/latest) the `DiscordChatExporter.Cli.*.zip` file.
 
 There are dedicated guides for each version:
 
@@ -36,15 +33,15 @@ 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 referenced assets" (`--media`) option to avoid this.
+> Export using the "Download assets" (`--media`) option to avoid this.
 
 ### Plain Text
 
 <img src="https://i.imgur.com/PbUyRXD.png" height="400"/>
 
-The Plain Text format is the best option for archiving due to its small size.
+The Plain Text format formats messages as plain text, and has the smallest size.
 You can open `.txt` files with a text editor, such as Notepad.
 
 ### JSON

.docs/Linux.md

@@ -1,26 +0,0 @@
-# Linux usage instructions
-
-## Installing .NET Runtime
-
-Please follow the [instructions provided here](Dotnet.md).
-
-## Downloading and using DiscordChatExporter.Cli
-
-1. Download [DiscordChatExporter.CLI.zip](https://github.com/Tyrrrz/DiscordChatExporter/releases/latest) and extract it to a folder.
-2. Open Terminal.
-3. `cd` into the extracted folder. You can do this in Terminal by typing `cd`, then press the SPACE key, drag and drop the extracted folder into the Terminal window, and press the ENTER key.
-4. Replace `TOKEN` and `CHANNEL`, then execute this command to export:
-
-```console
-dotnet DiscordChatExporter.Cli.dll export -t TOKEN -c CHANNEL
-```
-
-If the above command throws a "Permission denied" error, execute this command to fix the permissions:
-
-```console
-chmod 644 *.dll DiscordChatExporter.*
-```
-
-> [How to get Token and Channel IDs](Token-and-IDs.md).
-
-There's much more you can do with DCE.CLI! Read the [CLI explained](Using-the-CLI.md) page to get started.

.docs/MacOS.md

@@ -1,22 +0,0 @@
-# macOS usage instructions
-
-![Might look different depending on your macOS version](https://i.imgur.com/gA8jFjJ.png)
-
-## Installing .NET Runtime
-
-Please follow the [instructions provided here](Dotnet.md).
-
-## Downloading and using DiscordChatExporter.Cli
-
-1. Download [DiscordChatExporter.CLI.zip](https://github.com/Tyrrrz/DiscordChatExporter/releases/latest) and extract it to a folder.
-2. Search for `Terminal.app` in Spotlight (⌘+SPACE), then open it.
-3. In the Terminal window, type `cd` , press the SPACE key, then drag and drop the extracted folder into the window, then press the RETURN key.
-4. Execute the following command to export, replacing `TOKEN` and `CHANNEL` with your own values:
-
-```console
-dotnet DiscordChatExporter.Cli.dll export -t TOKEN -c CHANNEL
-```
-
-> [How to get Token and Channel IDs](Token-and-IDs.md).
-
-There's much more you can do with DCE.CLI! Read the [CLI explained](Using-the-CLI.md) page to get started.

.docs/Message-filters.md

@@ -89,17 +89,17 @@ from:96\-LB
 In most cases, you will need to enclose your filter in quotes (`"`) to escape characters that may have special meaning in your shell:
 
 ```console
-DiscordChatExporter.Cli export [...] --filter "from:Tyrrrz has:image"
+$ ./DiscordChatExporter.Cli export [...] --filter "from:Tyrrrz has:image"
 ```
 
 If you need to include quotes inside the filter itself as well, use single quotes (`'`) for those instead:
 
 ```console
-DiscordChatExporter.Cli export [...] --filter "from:Tyrrrz 'hello world'"
+$ ./DiscordChatExporter.Cli export [...] --filter "from:Tyrrrz 'hello world'"
 ```
 
 Additionally, negated filters (those that start with `-`) may cause parsing issues even when enclosed in quotes. To avoid this, use the tilde (`~`) character instead of the dash (`-`):
 
 ```console
-DiscordChatExporter.Cli export [...] --filter ~from:Tyrrrz
+$ ./DiscordChatExporter.Cli export [...] --filter ~from:Tyrrrz
 ```

.docs/Readme.md

@@ -2,10 +2,8 @@
 
 ## Installation & Usage
 
-- [Get .NET Core Runtime](Dotnet.md) (Required for CLI; Installed automatically for GUI; Not required in Docker)
-- [Windows](Getting-started.md#gui-or-cli) | [macOS](MacOS.md) | [Linux](Linux.md) | [Docker](Docker.md)
 - Getting started:
-  - [Using the GUI](Using-the-CLI.md)
+  - [Using the GUI](Using-the-GUI.md)
   - [Using the CLI](Using-the-CLI.md)
   - [File formats](Getting-started.md#file-formats)
 
@@ -29,6 +27,5 @@
 - [General questions](Troubleshooting.md#general)
 - [First steps help](Troubleshooting.md#first-steps)
 - [It's crashing/failing](Troubleshooting.md#DCE-is-crashingfailing)
-- [.NET Core Runtime is required](Troubleshooting.md#net-core-runtime-is-required)
 - [Errors](Troubleshooting.md#errors)
 - [**More help**](Troubleshooting.md)

.docs/Scheduling-Linux.md

@@ -1,7 +1,5 @@
 # Scheduling exports with Cron
 
-Make sure you already have **DiscordChatExporter.CLI** and **.NET Core** properly installed ([instructions here](Linux.md)).
-
 ## Creating the script
 
 1. Open Terminal and create a new text file with `nano /path/to/DiscordChatExporter/cron.sh`
@@ -45,7 +43,7 @@ fi
 cd $DLLFOLDER || exit 1
 
 # This will export your chat
-dotnet DiscordChatExporter.Cli.dll export -t $TOKEN -c $CHANNELID -f $EXPORTFORMAT -o $FILENAME.tmp
+./DiscordChatExporter.Cli export -t $TOKEN -c $CHANNELID -f $EXPORTFORMAT -o $FILENAME.tmp
 
 # This sets the current time to a variable
 CURRENTTIME=$(date +"%Y-%m-%d-%H-%M-%S")

.docs/Scheduling-MacOS.md

@@ -1,9 +1,5 @@
 # Scheduling exports on macOS
 
-Scheduling on macOS is a bit tricky, but it should work if you follow the instructions accordingly.
-
-Make sure you already have **DiscordChatExporter.CLI** and **.NET Core** properly installed ([instructions here](MacOS.md)).
-
 ## Creating the script
 
 1. Open TextEdit.app and create a new file
@@ -51,7 +47,7 @@ fi
 cd $DLLFOLDER || exit 1
 
 # This will export your chat
-dotnet DiscordChatExporter.Cli.dll export -t $TOKEN -c $CHANNELID -f $EXPORTFORMAT -o $FILENAME.tmp
+./DiscordChatExporter.Cli export -t $TOKEN -c $CHANNELID -f $EXPORTFORMAT -o $FILENAME.tmp
 
 # This sets the current time to a variable
 CURRENTTIME=$(date +"%Y-%m-%d-%H-%M-%S")

.docs/Scheduling-Windows.md

@@ -1,7 +1,5 @@
 # Scheduling exports on Windows
 
-We'll be using [DiscordChatExporter CLI](https://github.com/Tyrrrz/DiscordChatExporter/releases/latest), PowerShell, and Task Scheduler.
-
 ## Creating the script
 
 1. Open a text editor such as Notepad and paste:
@@ -19,7 +17,7 @@ $EXPORTFORMAT = "formathere"
 
 cd $EXEPATH
 
-.\DiscordChatExporter.Cli.exe export -t $TOKEN -c $CHANNEL -f $EXPORTFORMAT -o "$FILENAME.tmp"
+./DiscordChatExporter.Cli export -t $TOKEN -c $CHANNEL -f $EXPORTFORMAT -o "$FILENAME.tmp"
 
 $Date = Get-Date -Format "yyyy-MM-dd-HH-mm"
 

.docs/Token-and-IDs.md

@@ -1,10 +1,11 @@
 # Obtaining Token and Channel IDs
 
-> **Warning**:
-> **Do not share your token!**
-> A token gives full access to an account. To reset a user token, change your account password. To reset a bot token, click on [Regenerate](#how-to-get-a-bot-token) in the bot settings.
+> [!WARNING]
+> **Do not share your token!** A token gives full access to an account.  
+> To reset a user token, change your account password.  
+> To reset a bot token, click on [Reset Token](#how-to-export-with-a-bot-token) in the bot settings.
 
-## How to get a User Token
+## How to get a user token
 
 **Caution:** [Automating user accounts violates Discord's terms of service](https://support.discord.com/hc/en-us/articles/115002192352-Automated-user-accounts-self-bots-) and may result in account termination. Use at your own risk.
 
@@ -25,8 +26,8 @@ Prerequisite step: Navigate to [discord.com](https://discord.com) and login.
 
 3. Type
 
-    ```console
-    (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()
+    ```js
+    let m;webpackChunkdiscord_app.push([[Math.random()],{},e=>{for(let i in e.c){let x=e.c[i];if(x?.exports?.$8&&x.exports.LP&&x.exports.gK){m=x;break}}}]);m&&console.log("Token:",m.exports.LP());
     ```
 
     into the console and press <kbd>Enter</kbd>. The console will display your user token.
@@ -118,8 +119,8 @@ Prerequisite step: Navigate to [discord.com](https://discord.com) and login.
 
 1. Type
 
-    ```console
-    (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()
+    ```js
+    let m;webpackChunkdiscord_app.push([[Math.random()],{},e=>{for(let i in e.c){let x=e.c[i];if(x?.exports?.$8&&x.exports.LP&&x.exports.gK){m=x;break}}}]);m&&console.log("Token:",m.exports.LP());
     ```
 
     into the console and press <kbd>Enter</kbd>. The console will display your user token.
@@ -254,17 +255,61 @@ Prerequisite step: Navigate to [discord.com](https://discord.com) and login.
 4. Press <kbd>Esc</kbd>. The settings page will close.
 5. To find your user token, continue [here](#in-chrome).
 
-## How to get a Bot Token
+## How to export with a bot token
+
+### Step 1 - Create an application
+
+You can create a new application or use an existing one. If you want to create a new one:
+
+1. Go to [Discord developer portal](https://discord.com/developers/applications)
+2. Click on **New Application** in the top right corner
+3. Enter a name for your application and click **Create**
+
+### Step 2 - Invite the bot to your server
+
+The bot needs to be invited to the server you'd like to export from.
+
+1. Go to [Discord developer portal](https://discord.com/developers/applications)
+2. Navigate to **General Information** on the left
+3. Copy the **Application ID**
+4. Open the following URL in your browser, replacing `YOUR_APP_ID` with the copied Client ID:
+
+<!-- Permission code 66560 corresponds to "View Channels" and "Read Message History" permissions.
+      User can uncheck these when adding the bot to their server. -->
+
+```
+https://discord.com/oauth2/authorize?scope=bot&permissions=66560&client_id=YOUR_APP_ID
+```
+
+### Step 3 - Ensure message content intent is enabled
+
+If this option is not enabled, the exported files will be empty.
 
 1. Go to [Discord developer portal](https://discord.com/developers/applications)
 2. Open your Application's settings
 3. Navigate to the **Bot** section on the left
-4. Under **Token** click **Copy**
+4. Scroll down to the **Privileged Gateway Intents** section
+5. Enable **Message Content Intent** by toggling the switch
 
-> **Warning**:
-> Your bot needs to have **Message Content Intent** enabled for it to be able to read messages!
+<img width="500" align="right" src="https://i.imgur.com/PPm2KKn.png" />
 
-![https://discord.com/developers/applications/](https://i.imgur.com/BdrrxlY.png)
+### Step 4 - Copy the bot token
+
+If you don't have a bot token yet or if you've lost it, follow these steps to reset it:
+
+1. Go to [Discord developer portal](https://discord.com/developers/applications)
+2. Open your Application's settings
+3. Navigate to the **Bot** section on the left
+4. Under **Token** click **Reset Token**
+5. Click **Yes, do it!** and authenticate to confirm
+
+> **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]
+> Resetting the token will invalidate the old one. Any integrations relying on the old token will cease to function until they are updated.
+
+![https://discord.com/developers/applications/](https://i.imgur.com/soiB8Qc.png)
 
 ---
 

.docs/Troubleshooting.md

@@ -24,7 +24,7 @@ Follow the [instructions here](Token-and-IDs.md).
 
 ### Will I get banned if I use this?
 
-Automating user accounts is technically against [TOS](https://discord.com/terms), use at your discretion. [Bot accounts](https://discord.com/developers/docs/topics/oauth2#bots) don't have this restriction.
+Automating user accounts is technically against [TOS](https://discord.com/terms), use at your discretion. [Bot accounts](https://discord.com/developers/docs/topics/oauth2#bot-users) don't have this restriction.
 
 ### Will the messages disappear from the exported file if I delete a message, delete my account or block a person?
 
@@ -70,14 +70,7 @@ Check the following page: [Obtaining token](Token-and-IDs.md)
 
 ### When I open DCE a black window pops up quickly or nothing shows up
 
-If you have [.NET Core Runtime correctly installed](Dotnet.md), you might have downloaded the CLi flavor, try [downloading the GUI](Getting-started.md#gui-or-cli) instead.
-
-### How do I run DCE on macOS or Linux?
-
-Check the following pages:
-
-- [macOS usage instructions](MacOS.md)
-- [Linux usage instructions](Linux.md)
+You might have downloaded the CLI flavor of the app, which is meant to be run in a terminal. Try [downloading the GUI](Getting-started.md#gui-or-cli) instead if that's what you want.
 
 ### How can I set DCE to export automatically at certain times?
 
@@ -91,16 +84,6 @@ Check the following pages to learn how to schedule **DiscordChatExporter.CLI** r
 
 Try opening it with a different program, try partitioning or use a different file format, like `PlainText`.
 
-### DCE is crashing/failing
-
-Check the following page: [Installing .NET Core Runtime](Dotnet.md)
-
-If you already have .NET Core installed, please check if your problem is a [known issue](https://github.com/Tyrrrz/DiscordChatExporter/issues?q=is%3Aissue) before [opening a bug report](https://github.com/Tyrrrz/DiscordChatExporter/issues/new).
-
-### .NET Core Runtime is required
-
-Check the following page: [Installing .NET Core Runtime](Dotnet.md)
-
 ### I see messages in the export, but they have no content
 
 Your bot is missing the 'Message Content Intent'. Go to the [Discord Developer Portal](https://discord.com/developers/applications), navigate to the 'Bot' section and enable it.
@@ -133,34 +116,26 @@ Make sure you're [copying the DM Channel ID](Token-and-IDs.md#how-to-get-a-direc
 
 ## Errors
 
-```console
+```yml
 DiscordChatExporter.Domain.Exceptions.DiscordChatExporterException: Authentication token is invalid.
-...
 ```
 
 ↳ Make sure the provided token is correct.
 
-```console
+```yml
 DiscordChatExporter.Domain.Exceptions.DiscordChatExporterException: Requested resource does not exist.
 ```
 
 ↳ Check your channel ID, it might be invalid. [Read this if you need help](Token-and-IDs.md).
 
-```console
+```yml
 DiscordChatExporter.Domain.Exceptions.DiscordChatExporterException: Access is forbidden.
 ```
 
 ↳ This means you don't have access to the channel.
 
-```console
-The application to execute does not exist:
-```
-
-↳ The `DiscordChatExporter.Cli.dll` file is missing. Keep the `.exe` and all the `.dll` files together. If you didn't move the files, try unzipping again.
-
-```console
+```yml
 System.Net.WebException: Error: TrustFailure ... Invalid certificate received from server.
-...
 ```
 
 ↳ Try running cert-sync.
@@ -171,6 +146,12 @@ Red Hat: `cert-sync --user /etc/pki/tls/certs/ca-bundle.crt`
 
 If it still doesn't work, try mozroots: `mozroots --import --ask-remove`
 
+## macOS-specific
+
+### DiscordChatExporter is damaged and can’t be opened. You should move it to the Trash.
+
+Check the [Using the GUI page](Using-the-GUI.md#step-1) for instructions on how to run the app.
+
 ---
 
 > ❓ If you still have unanswered questions, feel free to [create a new discussion](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new).

.docs/Using-the-CLI.md

@@ -1,66 +1,62 @@
 # Using the CLI
 
-## Guide
-
-> **Note**:
-> Make sure you have [.NET Core installed](Dotnet.md) before attempting to run the commands below.
-> **Docker** users, please refer to the [Docker usage instructions](Docker.md).
-
 ## Step 1
 
-After extracting the `.zip`, open Command Prompt, aka `cmd` (`Terminal` on **macOS** and **Linux**).
+After extracting the `.zip` archive, open your preferred terminal.
 
 ## Step 2
 
-Change the current directory to DCE's folder with `cd C:\path\to\directory`, then press ENTER to run the command.
+Change the current directory to DCE's folder with `cd C:\path\to\DiscordChatExporter` (`cd /path/to/DiscordChatExporter` on **MacOS** and **Linux**), then press ENTER to run the command.
 
-**Windows** users can quickly get the directory's path by clicking the address bar while inside the folder.
+**Windows** users can quickly get the folder's path by clicking the address bar while inside the folder.
 ![Copy path from Explorer](https://i.imgur.com/XncnhC2.gif)
 
-**macOS** users can select the `.exe`, hit Command+I (⌘I), and copy what's after `Where:` to get the directory
-![Mac info panel](https://camo.githubusercontent.com/3c51a904b0099c9f68a4797461d4a7914902fc04/68747470733a2f2f692e696d6775722e636f6d2f323975364e79782e706e67)
+**macOS** users can press Command+Option+C (⌘⌥C) while inside the folder (or selecting it) to copy its path to the clipboard.
 
 You can also drag and drop the folder on **every platform**.
 ![Drag and drop folder](https://i.imgur.com/sOpZQAb.gif)
 
 ## Step 3
 
-Now we're ready to run the commands. The examples on this page follow the Windows file path format, change the file
-paths according to your system.
+Now we're ready to run the commands.
 
-Type the following in Command Prompt (Terminal), then press ENTER to run it. This will list DCE's options.
+Type the following command in your terminal of choice, then press ENTER to run it. This will list all available subcommands and options.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll
+./DiscordChatExporter.Cli
 ```
 
+> **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, guild, 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 `dotnet DiscordChatExporter.Cli.dll guide`.
+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`.
 
 To get help with a specific command, run:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll command --help
+./DiscordChatExporter.Cli command --help
 ```
 
 For example, to figure out how to use the `export` command, run:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export --help
+./DiscordChatExporter.Cli export --help
 ```
 
 ## Export a specific channel
@@ -68,7 +64,7 @@ dotnet DiscordChatExporter.Cli.dll export --help
 You can quickly export with DCE's default settings by using just `-t token` and `-c channelid`.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555
 ```
 
 #### Changing the format
@@ -77,7 +73,7 @@ You can change the export format to `HtmlDark`, `HtmlLight`, `PlainText` `Json`
 format is `HtmlDark`.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 -f Json
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -f Json
 ```
 
 #### Changing the output filename
@@ -85,7 +81,7 @@ dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 -f Json
 You can change the filename by using `-o name.ext`. e.g. for the `HTML` format:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 -o myserver.html
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o myserver.html
 ```
 
 #### Changing the output directory
@@ -95,7 +91,7 @@ extension.
 If any of the folders in the path have a space in its name, escape them with quotes (").
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports"
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports"
 ```
 
 #### Changing the filename and output directory
@@ -105,15 +101,15 @@ Note that the filename must have an extension, otherwise it will be considered a
 If any of the folders in the path have a space in its name, escape them with quotes (").
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports\myserver.html"
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports\myserver.html"
 ```
 
 #### Generating the filename and output directory dynamically
 
-You can use template tokens to generate the output file path based on the guild and channel metadata.
+You can use template tokens to generate the output file path based on the server and channel metadata.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports\%G\%T\%C.html"
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports\%G\%T\%C.html"
 ```
 
 Assuming you are exporting a channel named `"my-channel"` in the `"Text channels"` category from a server
@@ -122,8 +118,8 @@ path: `C:\Discord Exports\My server\Text channels\my-channel.html`
 
 Here is the full list of supported template tokens:
 
-- `%g` - guild ID
-- `%G` - guild name
+- `%g` - server ID
+- `%G` - server name
 - `%t` - category ID
 - `%T` - category name
 - `%c` - channel ID
@@ -132,6 +128,7 @@ Here is the full list of supported template tokens:
 - `%P` - category position
 - `%a` - the "after" date
 - `%b` - the "before" date
+- `%d` - the current date
 - `%%` - escapes `%`
 
 #### Partitioning
@@ -140,13 +137,13 @@ You can use partitioning to split files after a given number of messages or file
 For example, a channel with 36 messages set to be partitioned every 10 messages will output 4 files.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 -p 10
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -p 10
 ```
 
 A 45 MB channel set to be partitioned every 20 MB will output 3 files.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 -p 20mb
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -p 20mb
 ```
 
 #### Downloading assets
@@ -157,7 +154,7 @@ downloaded when using the plain text (TXT) export format.
 A folder containing the assets will be created along with the exported chat. They must be kept together.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 --media
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media
 ```
 
 #### Reusing assets
@@ -166,7 +163,7 @@ Previously downloaded assets can be reused to skip redundant downloads as long a
 same folder. Using this option can speed up future exports. This option requires the `--media` option.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 --media --reuse-media
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media --reuse-media
 ```
 
 #### Changing the media directory
@@ -175,7 +172,7 @@ By default, the media directory is created alongside the exported chat. You can
 providing a path that ends with a slash. All of the exported media will be stored in this directory.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 --media --media-dir "C:\Discord Media"
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media --media-dir "C:\Discord Media"
 ```
 
 #### Changing the date format
@@ -184,7 +181,7 @@ You can customize how dates are formatted in the exported files by using `--loca
 locales. The default locale is `en-US`.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 --locale "de-DE"
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --locale "de-DE"
 ```
 
 #### Date ranges
@@ -193,14 +190,14 @@ dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 --locale "de-DE
 Use `--before` to export messages sent before the provided date. E.g. messages sent before September 18th, 2019:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 --before 2019-09-18
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --before 2019-09-18
 ```
 
 **Messages sent after a date**
 Use `--after` to export messages sent after the provided date. E.g. messages sent after September 17th, 2019 11:34 PM:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 --after "2019-09-17 23:34"
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --after "2019-09-17 23:34"
 ```
 
 **Messages sent in a date range**
@@ -208,7 +205,7 @@ Use `--before` and `--after` to export messages sent during the provided date ra
 September 17th, 2019 11:34 PM and September 18th:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll export -t "mfa.Ifrn" -c 53555 --after "2019-09-17 23:34" --before "2019-09-18"
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --after "2019-09-17 23:34" --before "2019-09-18"
 ```
 
 You can try different formats like `17-SEP-2019 11:34 PM` or even refine your ranges down to
@@ -217,12 +214,22 @@ Don't forget to quote (") the date if it has spaces!
 More info about .NET date
 formats [here](https://docs.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings).
 
-### Export channels from a specific guild (server)
+#### Filtering messages
 
-To export all channels in a specific guild, use the `exportguild` command and provide the guild ID through the `-g|--guild` option:
+Use `--filter` to filter what messages are included in the export.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll exportguild -t "mfa.Ifrn" -g 21814
+./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).
+
+### Export channels from a specific server
+
+To export all channels in a specific server, use the `exportguild` command and provide the server ID through the `-g|--guild` option:
+
+```console
+./DiscordChatExporter.Cli exportguild -t "mfa.Ifrn" -g 21814
 ```
 
 #### Including threads
@@ -232,7 +239,7 @@ specifying which threads should be included. It has possible values of `none`, `
 threads should be included. To include both active and archived threads, use `--include-threads all`.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll exportguild -t "mfa.Ifrn" -g 21814 --include-threads all
+./DiscordChatExporter.Cli exportguild -t "mfa.Ifrn" -g 21814 --include-threads all
 ```
 
 #### Including voice channels
@@ -242,7 +249,7 @@ specifying whether to include voice channels in the export. It has possible valu
 voice channels, use `--include-vc false`.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll exportguild -t "mfa.Ifrn" -g 21814 --include-vc false
+./DiscordChatExporter.Cli exportguild -t "mfa.Ifrn" -g 21814 --include-vc false
 ```
 
 ### Export all channels
@@ -250,7 +257,7 @@ dotnet DiscordChatExporter.Cli.dll exportguild -t "mfa.Ifrn" -g 21814 --include-
 To export all accessible channels, use the `exportall` command:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll exportall -t "mfa.Ifrn"
+./DiscordChatExporter.Cli exportall -t "mfa.Ifrn"
 ```
 
 #### Excluding DMs
@@ -258,15 +265,15 @@ dotnet DiscordChatExporter.Cli.dll exportall -t "mfa.Ifrn"
 To exclude DMs, add the `--include-dm false` option.
 
 ```console
-dotnet DiscordChatExporter.Cli.dll exportall -t "mfa.Ifrn" --include-dm false
+./DiscordChatExporter.Cli exportall -t "mfa.Ifrn" --include-dm false
 ```
 
-### List channels in a guild (server)
+### List channels in a server
 
-To list the channels available in a specific guild, use the `channels` command and provide the guild ID through the `-g|--guild` option:
+To list the channels available in a specific server, use the `channels` command and provide the server ID through the `-g|--guild` option:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll channels -t "mfa.Ifrn" -g 21814
+./DiscordChatExporter.Cli channels -t "mfa.Ifrn" -g 21814
 ```
 
 ### List direct message channels
@@ -274,13 +281,13 @@ dotnet DiscordChatExporter.Cli.dll channels -t "mfa.Ifrn" -g 21814
 To list all DM channels accessible to the current account, use the `dm` command:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll dm -t "mfa.Ifrn"
+./DiscordChatExporter.Cli dm -t "mfa.Ifrn"
 ```
 
-### List guilds (servers)
+### List servers
 
-To list all guilds accessible by the current account, use the `guilds` command:
+To list all servers accessible by the current account, use the `guilds` command:
 
 ```console
-dotnet DiscordChatExporter.Cli.dll guilds -t "mfa.Ifrn" > C:\path\to\output.txt
-```
+./DiscordChatExporter.Cli guilds -t "mfa.Ifrn" > C:\path\to\output.txt
+```

.docs/Using-the-GUI.md

@@ -10,13 +10,28 @@
 
 ### Step 1
 
-After extracting the `.zip`, open `DiscordChatExporter.exe`
+After extracting the `.zip`, run `DiscordChatExporter.exe` **(Windows)**, or `DiscordChatExporter` **(Linux)**.
+
+If you're using **macOS**, you'll need to manually grant permission for the app to run.  
+If you skip these steps, the "DiscordChatExporter is damaged and can’t be opened" error will be shown.
+
+1. Open Terminal.app. You can search for it in Spotlight (press <kbd>⌘</kbd> + <kbd>Space</kbd> and type "Terminal").
+2. Paste the following into the terminal window:
+   ```bash
+   xattr -rd com.apple.quarantine
+   ```
+3. Hit <kbd>Space</kbd> once to add a space after the command
+4. Drag and drop DiscordChatExporter.app into the terminal window
+5. Press <kbd>Return</kbd> to run the command
+6. Open DiscordChatExporter.app normally
+
+> Apple requires apps to be notarized and signed in order to run on macOS without warnings, which in turn requires an Apple Developer membership ($99/year). This open-source project is distributed for free and without commercial intent.
 
 ### Step 2
 
 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.
 
@@ -61,37 +76,30 @@ In this screen you can customize the following:
 
 ## Settings
 
-- **Auto-update**
-Perform automatic updates on every launch.
+- **Auto-update** - Perform automatic updates on every launch.
 Default: Enabled
 
   > **Note**:
   > Keep this option enabled to receive the latest features and bug fixes!
 
-- **Dark mode**
-Use darker colors in the UI (User Interface).
+- **Dark mode** - Use darker colors in the UI (User Interface).
 Default: Disabled
 
-- **Persist token**
-Persist last used token between sessions.
+- **Persist token** - Persist last used token between sessions.
 Default: Enabled
 
-- **Show threads**
-Controls whether threads are shown in the channel list.
+- **Show threads** - Controls whether threads are shown in the channel list.
 Default: none
 
-- **Locale**
-Customize how dates are formatted in the exported files.
+- **Locale** - Customize how dates are formatted in the exported files.
 
-- **Date format**
-Customize how dates are formatted in the exported files in the settings menu ().
+- **Date format** - Customize how dates are formatted in the exported files in the settings menu ().
 
-- **Parallel limit**
-The number of channels that will be exported at the same time.
+- **Parallel limit** - The number of channels that will be exported at the same time.
 Default: 1
 
-- **Normalize to UTC**
-Convert all dates to UTC before exporting.
-
   > **Note**:
   > Try to keep this number low so that your account doesn't get flagged.
+
+- **Normalize to UTC** - Convert all dates to UTC before exporting.
+

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -94,12 +94,14 @@ body:
           required: true
         - label: I have provided a descriptive title for this issue
           required: true
-        - label: I have made sure that that this bug is reproducible on the latest version of the application
+        - label: I have made sure that this bug is reproducible on the latest version of the application
           required: true
         - label: I have provided all the information needed to reproduce this bug as efficiently as possible
           required: true
         - label: I have sponsored this project
           required: false
+        - label: I have not read any of the above and just checked all the boxes to submit the issue
+          required: false
 
   - type: markdown
     attributes:

.github/dependabot.yml

@@ -0,0 +1,32 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: monthly
+    labels:
+      - enhancement
+    groups:
+      actions:
+        patterns:
+          - "*"
+  - package-ecosystem: docker
+    directory: "/"
+    schedule:
+      interval: monthly
+    labels:
+      - enhancement
+    groups:
+      docker:
+        patterns:
+          - "*"
+  - package-ecosystem: nuget
+    directory: "/"
+    schedule:
+      interval: monthly
+    labels:
+      - enhancement
+    groups:
+      nuget:
+        patterns:
+          - "*"

.github/workflows/docker.yml

@@ -12,8 +12,7 @@ on:
       - master
 
 jobs:
-  # Outputs from this job aren't really used, but it's here to verify that
-  # the Dockerfile builds correctly on pull requests.
+  # Outputs from this job aren't really used, but it's here to verify that the Dockerfile builds correctly
   pack:
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -24,10 +23,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 4.1.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # 3.0.0
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
 
       - name: Build image
         run: >
@@ -37,8 +36,8 @@ jobs:
           --build-arg VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('999.9.9-ci-{0}', github.sha) }}
           --output type=tar,dest=DiscordChatExporter.Cli.Docker.tar
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
+      - name: Upload image
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: DiscordChatExporter.Cli.Docker
           path: DiscordChatExporter.Cli.Docker.tar
@@ -56,10 +55,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 4.1.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # 3.0.0
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
 
       - name: Login to DockerHub
         run: >

.github/workflows/main.yml

@@ -18,7 +18,7 @@ env:
 
 jobs:
   format:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 10
 
     permissions:
@@ -26,24 +26,35 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 4.1.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install .NET
-        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # 3.2.0
-        with:
-          dotnet-version: 8.0.x
+        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+
+      # Build the project separately to discern between build and format errors
+      - name: Build
+        run: >
+          dotnet build
+          -p:CSharpier_Bypass=true
+          --configuration Release
 
       - name: Verify formatting
+        id: verify
         run: >
           dotnet build
           -t:CSharpierFormat
           --configuration Release
+          --no-restore
+
+      - name: Report issues
+        if: ${{ failure() && steps.verify.outcome == 'failure' }}
+        run: echo "::error title=Bad formatting::Formatting issues detected. Please build the solution locally to fix them."
 
   test:
     # Tests need access to secrets, so we can't run them against PRs because of limited trust
     if: ${{ github.event_name != 'pull_request' }}
 
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 10
 
     permissions:
@@ -51,12 +62,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 4.1.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install .NET
-        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # 3.2.0
-        with:
-          dotnet-version: 8.0.x
+        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
 
       - name: Run tests
         env:
@@ -72,7 +81,7 @@ jobs:
           DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
 
       - name: Upload coverage
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # 3.1.4
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -82,8 +91,24 @@ jobs:
         app:
           - DiscordChatExporter.Cli
           - DiscordChatExporter.Gui
+        rid:
+          - win-arm64
+          - win-x86
+          - win-x64
+          - linux-arm
+          - linux-arm64
+          - linux-musl-x64
+          - linux-x64
+          - osx-arm64
+          - osx-x64
+        include:
+          - app: DiscordChatExporter.Cli
+            asset: DiscordChatExporter.Cli
+          - app: DiscordChatExporter.Gui
+            # GUI assets aren't suffixed, unlike the CLI assets
+            asset: DiscordChatExporter
 
-    runs-on: windows-latest
+    runs-on: ${{ startsWith(matrix.rid, 'win-') && 'windows-latest' || startsWith(matrix.rid, 'osx-') && 'macos-latest' || 'ubuntu-latest' }}
     timeout-minutes: 10
 
     permissions:
@@ -92,25 +117,26 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 4.1.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Install .NET
-        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # 3.2.0
-        with:
-          dotnet-version: 8.0.x
+        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.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:PublishMacOSBundle=${{ startsWith(matrix.rid, 'osx-') }}
           --output ${{ matrix.app }}/bin/publish/
           --configuration Release
+          --runtime ${{ matrix.rid }}
+          --self-contained
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
+      - name: Upload app binaries
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
-          name: ${{ matrix.app }}
+          name: ${{ matrix.asset }}.${{ matrix.rid }}
           path: ${{ matrix.app }}/bin/publish/
           if-no-files-found: error
 
@@ -147,11 +173,21 @@ jobs:
         app:
           - DiscordChatExporter.Cli
           - DiscordChatExporter.Gui
+        rid:
+          - win-arm64
+          - win-x86
+          - win-x64
+          - linux-arm
+          - linux-arm64
+          - linux-musl-x64
+          - linux-x64
+          - osx-arm64
+          - osx-x64
         include:
           - app: DiscordChatExporter.Cli
             asset: DiscordChatExporter.Cli
           - app: DiscordChatExporter.Gui
-            # GUI asset isn't suffixed, unlike the CLI asset
+            # GUI assets aren't suffixed, unlike the CLI assets
             asset: DiscordChatExporter
 
     runs-on: ubuntu-latest
@@ -162,23 +198,31 @@ jobs:
       contents: write
 
     steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # 3.0.2
+      - name: Download app binaries
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
-          name: ${{ matrix.app }}
+          name: ${{ matrix.asset }}.${{ matrix.rid }}
           path: ${{ matrix.app }}/
 
+      - name: Set permissions
+        if: ${{ !startsWith(matrix.rid, 'win-') }}
+        run: |
+          [ -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
         working-directory: ${{ matrix.app }}/
-        run: zip -r ../${{ matrix.asset }}.zip .
+        run: zip -r ../${{ matrix.asset }}.${{ matrix.rid }}.zip .
 
       - name: Upload release asset
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: >
           gh release upload ${{ github.ref_name }}
-          ${{ matrix.asset }}.zip
+          ${{ matrix.asset }}.${{ matrix.rid }}.zip
           --repo ${{ github.event.repository.full_name }}
 
   notify:
@@ -191,7 +235,7 @@ jobs:
 
     steps:
       - name: Notify Discord
-        uses: tyrrrz/action-http-request@64c70c67f5ebc54d4c7ea09cbe3553322778afd5 # 1.1.2
+        uses: tyrrrz/action-http-request@1dd7ad841a34b9299f3741f7c7399f9feefdfb08 # 1.1.3
         with:
           url: ${{ secrets.DISCORD_WEBHOOK }}
           method: POST

.gitignore

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

Directory.Build.props

@@ -1,12 +1,14 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net8.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>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
   </PropertyGroup>
 
 </Project>

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

@@ -1,5 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
@@ -11,23 +10,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.0.7" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.2" PrivateAssets="all" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="all" />
+    <PackageReference Include="AngleSharp" Version="1.4.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="1.2.5" PrivateAssets="all" />
+    <PackageReference Include="FluentAssertions" Version="8.8.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="3.0.1" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="ReflectionMagic" Version="5.0.0" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
+    <PackageReference
+      Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
+      Version="10.0.2"
+    />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>

DiscordChatExporter.Cli.Tests/Infra/ChannelIds.cs

@@ -10,6 +10,8 @@ public static class ChannelIds
 
     public static Snowflake EmbedTestCases { get; } = Snowflake.Parse("866472452459462687");
 
+    public static Snowflake EmojiTestCases { get; } = Snowflake.Parse("866768438290415636");
+
     public static Snowflake GroupingTestCases { get; } = Snowflake.Parse("992092091545034842");
 
     public static Snowflake FilterTestCases { get; } = Snowflake.Parse("866744075033641020");

DiscordChatExporter.Cli.Tests/Infra/ExportWrapper.cs

@@ -19,12 +19,7 @@ namespace DiscordChatExporter.Cli.Tests.Infra;
 
 public static class ExportWrapper
 {
-    private static readonly AsyncKeyedLocker<string> Locker =
-        new(o =>
-        {
-            o.PoolSize = 20;
-            o.PoolInitialFill = 1;
-        });
+    private static readonly AsyncKeyedLocker<string> Locker = new();
 
     private static readonly string DirPath = Path.Combine(
         Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
@@ -57,11 +52,11 @@ public static class ExportWrapper
             await new ExportChannelsCommand
             {
                 Token = Secrets.DiscordToken,
-                ChannelIds = new[] { channelId },
+                ChannelIds = [channelId],
                 ExportFormat = format,
                 OutputPath = filePath,
                 Locale = "en-US",
-                IsUtcNormalizationEnabled = true
+                IsUtcNormalizationEnabled = true,
             }.ExecuteAsync(console);
         }
 
@@ -93,13 +88,12 @@ public static class ExportWrapper
         Snowflake messageId
     )
     {
-        var message = (await GetMessagesAsHtmlAsync(channelId)).SingleOrDefault(
-            e =>
-                string.Equals(
-                    e.GetAttribute("data-message-id"),
-                    messageId.ToString(),
-                    StringComparison.OrdinalIgnoreCase
-                )
+        var message = (await GetMessagesAsHtmlAsync(channelId)).SingleOrDefault(e =>
+            string.Equals(
+                e.GetAttribute("data-message-id"),
+                messageId.ToString(),
+                StringComparison.OrdinalIgnoreCase
+            )
         );
 
         if (message is null)
@@ -117,13 +111,12 @@ public static class ExportWrapper
         Snowflake messageId
     )
     {
-        var message = (await GetMessagesAsJsonAsync(channelId)).SingleOrDefault(
-            j =>
-                string.Equals(
-                    j.GetProperty("id").GetString(),
-                    messageId.ToString(),
-                    StringComparison.OrdinalIgnoreCase
-                )
+        var message = (await GetMessagesAsJsonAsync(channelId)).SingleOrDefault(j =>
+            string.Equals(
+                j.GetProperty("id").GetString(),
+                messageId.ToString(),
+                StringComparison.OrdinalIgnoreCase
+            )
         );
 
         if (message.ValueKind == JsonValueKind.Undefined)

DiscordChatExporter.Cli.Tests/Readme.md

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

DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs

@@ -27,10 +27,10 @@ public class DateRangeSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ChannelIds = [ChannelIds.DateRangeTestCases],
             ExportFormat = ExportFormat.Json,
             OutputPath = file.Path,
-            After = Snowflake.FromDate(after)
+            After = Snowflake.FromDate(after),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -45,24 +45,18 @@ public class DateRangeSpecs
         timestamps
             .Should()
             .BeEquivalentTo(
-                new[]
-                {
+                [
                     new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
                     new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
                     new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
                     new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero),
-                    new DateTimeOffset(2021, 09, 08, 14, 26, 35, TimeSpan.Zero)
-                },
+                    new DateTimeOffset(2021, 09, 08, 14, 26, 35, TimeSpan.Zero),
+                ],
                 o =>
-                {
-                    return o.Using<DateTimeOffset>(
-                            ctx =>
-                                ctx.Subject
-                                    .Should()
-                                    .BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
                         )
-                        .WhenTypeIs<DateTimeOffset>();
-                }
+                        .WhenTypeIs<DateTimeOffset>()
             );
     }
 
@@ -77,10 +71,10 @@ public class DateRangeSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ChannelIds = [ChannelIds.DateRangeTestCases],
             ExportFormat = ExportFormat.Json,
             OutputPath = file.Path,
-            Before = Snowflake.FromDate(before)
+            Before = Snowflake.FromDate(before),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -95,22 +89,16 @@ public class DateRangeSpecs
         timestamps
             .Should()
             .BeEquivalentTo(
-                new[]
-                {
+                [
                     new DateTimeOffset(2021, 07, 19, 13, 34, 18, TimeSpan.Zero),
                     new DateTimeOffset(2021, 07, 19, 15, 58, 48, TimeSpan.Zero),
-                    new DateTimeOffset(2021, 07, 19, 17, 23, 58, TimeSpan.Zero)
-                },
+                    new DateTimeOffset(2021, 07, 19, 17, 23, 58, TimeSpan.Zero),
+                ],
                 o =>
-                {
-                    return o.Using<DateTimeOffset>(
-                            ctx =>
-                                ctx.Subject
-                                    .Should()
-                                    .BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
                         )
-                        .WhenTypeIs<DateTimeOffset>();
-                }
+                        .WhenTypeIs<DateTimeOffset>()
             );
     }
 
@@ -126,11 +114,11 @@ public class DateRangeSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ChannelIds = [ChannelIds.DateRangeTestCases],
             ExportFormat = ExportFormat.Json,
             OutputPath = file.Path,
             Before = Snowflake.FromDate(before),
-            After = Snowflake.FromDate(after)
+            After = Snowflake.FromDate(after),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -145,23 +133,44 @@ public class DateRangeSpecs
         timestamps
             .Should()
             .BeEquivalentTo(
-                new[]
-                {
+                [
                     new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
                     new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
                     new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
-                    new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero)
-                },
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero),
+                ],
                 o =>
-                {
-                    return o.Using<DateTimeOffset>(
-                            ctx =>
-                                ctx.Subject
-                                    .Should()
-                                    .BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
                         )
-                        .WhenTypeIs<DateTimeOffset>();
-                }
+                        .WhenTypeIs<DateTimeOffset>()
             );
     }
+
+    [Fact]
+    public async Task I_can_filter_the_export_to_not_include_any_messages()
+    {
+        // Arrange
+        var before = new DateTimeOffset(2020, 08, 01, 0, 0, 0, TimeSpan.Zero);
+        using var file = TempFile.Create();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = [ChannelIds.DateRangeTestCases],
+            ExportFormat = ExportFormat.Json,
+            OutputPath = file.Path,
+            Before = Snowflake.FromDate(before),
+        }.ExecuteAsync(new FakeConsole());
+
+        // Assert
+        var timestamps = Json.Parse(await File.ReadAllTextAsync(file.Path))
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("timestamp").GetDateTimeOffset())
+            .ToArray();
+
+        timestamps.Should().BeEmpty();
+    }
 }

DiscordChatExporter.Cli.Tests/Specs/FilterSpecs.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
@@ -25,10 +26,10 @@ public class FilterSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
             OutputPath = file.Path,
-            MessageFilter = MessageFilter.Parse("some text")
+            MessageFilter = MessageFilter.Parse("some text"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -37,7 +38,7 @@ public class FilterSpecs
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
             .Should()
-            .ContainSingle("Some random text");
+            .AllSatisfy(c => c.Contains("Some random text", StringComparison.Ordinal));
     }
 
     [Fact]
@@ -50,10 +51,10 @@ public class FilterSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
             OutputPath = file.Path,
-            MessageFilter = MessageFilter.Parse("from:Tyrrrz")
+            MessageFilter = MessageFilter.Parse("from:Tyrrrz"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -66,7 +67,7 @@ public class FilterSpecs
     }
 
     [Fact]
-    public async Task I_can_filter_the_export_to_only_include_messages_that_contain_the_specified_content()
+    public async Task I_can_filter_the_export_to_only_include_messages_that_contain_images()
     {
         // Arrange
         using var file = TempFile.Create();
@@ -75,10 +76,10 @@ public class FilterSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
             OutputPath = file.Path,
-            MessageFilter = MessageFilter.Parse("has:image")
+            MessageFilter = MessageFilter.Parse("has:image"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -87,7 +88,7 @@ public class FilterSpecs
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
             .Should()
-            .ContainSingle("This has image");
+            .AllSatisfy(c => c.Contains("This has image", StringComparison.Ordinal));
     }
 
     [Fact]
@@ -100,10 +101,10 @@ public class FilterSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
             OutputPath = file.Path,
-            MessageFilter = MessageFilter.Parse("has:pin")
+            MessageFilter = MessageFilter.Parse("has:pin"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -112,7 +113,32 @@ public class FilterSpecs
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
             .Should()
-            .ContainSingle("This is pinned");
+            .AllSatisfy(c => c.Contains("This is pinned", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task I_can_filter_the_export_to_only_include_messages_that_contain_guild_invites()
+    {
+        // Arrange
+        using var file = TempFile.Create();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = [ChannelIds.FilterTestCases],
+            ExportFormat = ExportFormat.Json,
+            OutputPath = file.Path,
+            MessageFilter = MessageFilter.Parse("has:invite"),
+        }.ExecuteAsync(new FakeConsole());
+
+        // Assert
+        Json.Parse(await File.ReadAllTextAsync(file.Path))
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("content").GetString())
+            .Should()
+            .AllSatisfy(c => c.Contains("This has invite", StringComparison.Ordinal));
     }
 
     [Fact]
@@ -125,10 +151,10 @@ public class FilterSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
             OutputPath = file.Path,
-            MessageFilter = MessageFilter.Parse("mentions:Tyrrrz")
+            MessageFilter = MessageFilter.Parse("mentions:Tyrrrz"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -137,6 +163,6 @@ public class FilterSpecs
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
             .Should()
-            .ContainSingle("This has mention");
+            .AllSatisfy(c => c.Contains("This has mention", StringComparison.Ordinal));
     }
 }

DiscordChatExporter.Cli.Tests/Specs/HtmlAttachmentSpecs.cs

@@ -27,13 +27,7 @@ public class HtmlAttachmentSpecs
             .QuerySelectorAll("a")
             .Select(e => e.GetAttribute("href"))
             .Should()
-            .Contain(
-                u =>
-                    u.StartsWith(
-                        "https://cdn.discordapp.com/attachments/885587741654536192/885587844964417596/Test.txt",
-                        StringComparison.Ordinal
-                    )
-            );
+            .Contain(u => u.Contains("Test.txt", StringComparison.Ordinal));
     }
 
     [Fact]
@@ -52,13 +46,7 @@ public class HtmlAttachmentSpecs
             .QuerySelectorAll("img")
             .Select(e => e.GetAttribute("src"))
             .Should()
-            .Contain(
-                u =>
-                    u.StartsWith(
-                        "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png",
-                        StringComparison.Ordinal
-                    )
-            );
+            .Contain(u => u.Contains("bird-thumbnail.png", StringComparison.Ordinal));
     }
 
     [Fact]

DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
@@ -54,7 +55,7 @@ public class HtmlEmbedSpecs
             .QuerySelectorAll("img")
             .Select(e => e.GetAttribute("src"))
             .WhereNotNull()
-            .Where(s => s.EndsWith("f8w05ja8s4e61.png"))
+            .Where(s => s.Contains("f8w05ja8s4e61.png", StringComparison.Ordinal))
             .Should()
             .ContainSingle();
     }
@@ -89,11 +90,11 @@ public class HtmlEmbedSpecs
             .QuerySelectorAll("source")
             .Select(e => e.GetAttribute("src"))
             .WhereNotNull()
-            .Where(
-                s =>
-                    s.EndsWith(
-                        "i_am_currently_feeling_slight_displeasure_of_what_you_have_just_sent_lqrem.mp4"
-                    )
+            .Where(s =>
+                s.Contains(
+                    "i_am_currently_feeling_slight_displeasure_of_what_you_have_just_sent_lqrem.mp4",
+                    StringComparison.Ordinal
+                )
             )
             .Should()
             .ContainSingle();
@@ -113,7 +114,7 @@ public class HtmlEmbedSpecs
             .QuerySelectorAll("source")
             .Select(e => e.GetAttribute("src"))
             .WhereNotNull()
-            .Where(s => s.EndsWith("tooncasm-test-copy.mp4"))
+            .Where(s => s.Contains("tooncasm-test-copy.mp4", StringComparison.Ordinal))
             .Should()
             .ContainSingle();
     }
@@ -148,6 +149,26 @@ public class HtmlEmbedSpecs
         iframeUrl.Should().StartWith("https://open.spotify.com/embed/track/1LHZMWefF9502NPfArRfvP");
     }
 
+    [Fact(Skip = "Twitch does not allow embeds from inside local HTML files")]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_Twitch_clip_embed()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1196
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("1207002986128216074")
+        );
+
+        // Assert
+        var iframeUrl = message.QuerySelector("iframe")?.GetAttribute("src");
+        iframeUrl
+            .Should()
+            .StartWith(
+                "https://clips.twitch.tv/embed?clip=SpicyMildCiderThisIsSparta--PQhbllrvej_Ee7v"
+            );
+    }
+
     [Fact]
     public async Task I_can_export_a_channel_that_contains_a_message_with_a_YouTube_video_embed()
     {
@@ -160,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]
@@ -176,15 +203,45 @@ public class HtmlEmbedSpecs
         );
 
         // Assert
-        message
+        var imageUrls = message
             .QuerySelectorAll("img")
             .Select(e => e.GetAttribute("src"))
+            .ToArray();
+
+        imageUrls
             .Should()
-            .ContainInOrder(
-                "https://images-ext-1.discordapp.net/external/-n--xW3EHH_3jlrheVkMXHCM7T86b5Ty4-MzXCT4m1Q/https/pbs.twimg.com/media/FVYIzYPWAAAMBqZ.png",
-                "https://images-ext-2.discordapp.net/external/z5nEmGeEldV-kswydGLhqUsFHbb5AWHtdvc9XT6N5rE/https/pbs.twimg.com/media/FVYJBWJWAAMNAx2.png",
-                "https://images-ext-2.discordapp.net/external/gnip03SawMB6uZLagN5sRDpA_1Ap1CcEhMbJfK1z6WQ/https/pbs.twimg.com/media/FVYJHiRX0AANZcz.png",
-                "https://images-ext-2.discordapp.net/external/jl1v6cCbLaGmiwmKU-ZkXnF4cFsJ39f9A3-oEdqPdZs/https/pbs.twimg.com/media/FVYJNZNXwAAPnVG.png"
+            .Contain(u =>
+                u.EndsWith(
+                    "https/pbs.twimg.com/media/FVYIzYPWAAAMBqZ.png",
+                    StringComparison.Ordinal
+                )
+            );
+
+        imageUrls
+            .Should()
+            .Contain(u =>
+                u.EndsWith(
+                    "https/pbs.twimg.com/media/FVYJBWJWAAMNAx2.png",
+                    StringComparison.Ordinal
+                )
+            );
+
+        imageUrls
+            .Should()
+            .Contain(u =>
+                u.EndsWith(
+                    "https/pbs.twimg.com/media/FVYJHiRX0AANZcz.png",
+                    StringComparison.Ordinal
+                )
+            );
+
+        imageUrls
+            .Should()
+            .Contain(u =>
+                u.EndsWith(
+                    "https/pbs.twimg.com/media/FVYJNZNXwAAPnVG.png",
+                    StringComparison.Ordinal
+                )
             );
 
         message.QuerySelectorAll(".chatlog__embed").Should().ContainSingle();
@@ -202,6 +259,6 @@ public class HtmlEmbedSpecs
         );
 
         // Assert
-        message.Text().Should().Contain("DiscordChatExporter TestServer");
+        message.Text().Should().Contain("DiscordChatExporter Test Server");
     }
 }

DiscordChatExporter.Cli.Tests/Specs/HtmlGroupingSpecs.cs

@@ -26,9 +26,9 @@ public class HtmlGroupingSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.GroupingTestCases },
+            ChannelIds = [ChannelIds.GroupingTestCases],
             ExportFormat = ExportFormat.HtmlDark,
-            OutputPath = file.Path
+            OutputPath = file.Path,
         }.ExecuteAsync(new FakeConsole());
 
         // Assert

DiscordChatExporter.Cli.Tests/Specs/HtmlMarkdownSpecs.cs

@@ -1,6 +1,7 @@
 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 Xunit;
@@ -19,8 +20,13 @@ public class HtmlMarkdownSpecs
         );
 
         // Assert
-        message.Text().Should().Contain("Default timestamp: 2/12/2023 1:36 PM");
-        message.InnerHtml.Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .Text()
+            .ReplaceWhiteSpace()
+            .Should()
+            .Contain("Default timestamp: 2/12/2023 1:36 PM");
+
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
     }
 
     [Fact]
@@ -33,8 +39,8 @@ public class HtmlMarkdownSpecs
         );
 
         // Assert
-        message.Text().Should().Contain("Short time timestamp: 1:36 PM");
-        message.InnerHtml.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]
@@ -47,8 +53,8 @@ public class HtmlMarkdownSpecs
         );
 
         // Assert
-        message.Text().Should().Contain("Long time timestamp: 1:36:12 PM");
-        message.InnerHtml.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]
@@ -61,8 +67,8 @@ public class HtmlMarkdownSpecs
         );
 
         // Assert
-        message.Text().Should().Contain("Short date timestamp: 2/12/2023");
-        message.InnerHtml.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]
@@ -75,8 +81,13 @@ public class HtmlMarkdownSpecs
         );
 
         // Assert
-        message.Text().Should().Contain("Long date timestamp: Sunday, February 12, 2023");
-        message.InnerHtml.Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .Text()
+            .ReplaceWhiteSpace()
+            .Should()
+            .Contain("Long date timestamp: Sunday, February 12, 2023");
+
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
     }
 
     [Fact]
@@ -89,8 +100,13 @@ public class HtmlMarkdownSpecs
         );
 
         // Assert
-        message.Text().Should().Contain("Full timestamp: Sunday, February 12, 2023 1:36 PM");
-        message.InnerHtml.Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .Text()
+            .ReplaceWhiteSpace()
+            .Should()
+            .Contain("Full timestamp: Sunday, February 12, 2023 1:36 PM");
+
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
     }
 
     [Fact]
@@ -105,9 +121,11 @@ public class HtmlMarkdownSpecs
         // Assert
         message
             .Text()
+            .ReplaceWhiteSpace()
             .Should()
             .Contain("Full long timestamp: Sunday, February 12, 2023 1:36:12 PM");
-        message.InnerHtml.Should().Contain("Sunday, February 12, 2023 1:36 PM");
+
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
     }
 
     [Fact]
@@ -120,8 +138,13 @@ public class HtmlMarkdownSpecs
         );
 
         // Assert
-        message.Text().Should().Contain("Relative timestamp: 2/12/2023 1:36 PM");
-        message.InnerHtml.Should().Contain("Sunday, February 12, 2023 1:36 PM");
+        message
+            .Text()
+            .ReplaceWhiteSpace()
+            .Should()
+            .Contain("Relative timestamp: 2/12/2023 1:36 PM");
+
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
     }
 
     [Fact]

DiscordChatExporter.Cli.Tests/Specs/JsonEmojiSpecs.cs

@@ -0,0 +1,69 @@
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class JsonEmojiSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_inline_emoji_and_have_them_listed_separately()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.EmojiTestCases,
+            Snowflake.Parse("866768521052553216")
+        );
+
+        // Assert
+        var inlineEmojis = message.GetProperty("inlineEmojis").EnumerateArray().ToArray();
+        inlineEmojis.Should().HaveCount(4);
+
+        inlineEmojis[0].GetProperty("id").GetString().Should().BeNullOrEmpty();
+        inlineEmojis[0].GetProperty("name").GetString().Should().Be("🙂");
+        inlineEmojis[0].GetProperty("code").GetString().Should().Be("slight_smile");
+        inlineEmojis[0].GetProperty("isAnimated").GetBoolean().Should().BeFalse();
+        inlineEmojis[0].GetProperty("imageUrl").GetString().Should().NotBeNullOrWhiteSpace();
+
+        inlineEmojis[1].GetProperty("id").GetString().Should().BeNullOrEmpty();
+        inlineEmojis[1].GetProperty("name").GetString().Should().Be("😦");
+        inlineEmojis[1].GetProperty("code").GetString().Should().Be("frowning");
+        inlineEmojis[1].GetProperty("isAnimated").GetBoolean().Should().BeFalse();
+        inlineEmojis[1].GetProperty("imageUrl").GetString().Should().NotBeNullOrWhiteSpace();
+
+        inlineEmojis[2].GetProperty("id").GetString().Should().BeNullOrEmpty();
+        inlineEmojis[2].GetProperty("name").GetString().Should().Be("😔");
+        inlineEmojis[2].GetProperty("code").GetString().Should().Be("pensive");
+        inlineEmojis[2].GetProperty("isAnimated").GetBoolean().Should().BeFalse();
+        inlineEmojis[2].GetProperty("imageUrl").GetString().Should().NotBeNullOrWhiteSpace();
+
+        inlineEmojis[3].GetProperty("id").GetString().Should().BeNullOrEmpty();
+        inlineEmojis[3].GetProperty("name").GetString().Should().Be("😂");
+        inlineEmojis[3].GetProperty("code").GetString().Should().Be("joy");
+        inlineEmojis[3].GetProperty("isAnimated").GetBoolean().Should().BeFalse();
+        inlineEmojis[3].GetProperty("imageUrl").GetString().Should().NotBeNullOrWhiteSpace();
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_custom_inline_emoji_and_have_them_listed_separately()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.EmojiTestCases,
+            Snowflake.Parse("1299804867447230594")
+        );
+
+        // Assert
+        var inlineEmojis = message.GetProperty("inlineEmojis").EnumerateArray().ToArray();
+        inlineEmojis.Should().HaveCount(1);
+
+        inlineEmojis[0].GetProperty("id").GetString().Should().Be("754441880066064584");
+        inlineEmojis[0].GetProperty("name").GetString().Should().Be("lemon_blush");
+        inlineEmojis[0].GetProperty("code").GetString().Should().Be("lemon_blush");
+        inlineEmojis[0].GetProperty("isAnimated").GetBoolean().Should().BeFalse();
+        inlineEmojis[0].GetProperty("imageUrl").GetString().Should().NotBeNullOrWhiteSpace();
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/PartitioningSpecs.cs

@@ -24,10 +24,10 @@ public class PartitioningSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ChannelIds = [ChannelIds.DateRangeTestCases],
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
-            PartitionLimit = PartitionLimit.Parse("3")
+            PartitionLimit = PartitionLimit.Parse("3"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
@@ -45,10 +45,10 @@ public class PartitioningSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ChannelIds = [ChannelIds.DateRangeTestCases],
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
-            PartitionLimit = PartitionLimit.Parse("1kb")
+            PartitionLimit = PartitionLimit.Parse("1kb"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert

DiscordChatExporter.Cli.Tests/Specs/SelfContainedSpecs.cs

@@ -24,10 +24,10 @@ public class SelfContainedSpecs
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.SelfContainedTestCases },
+            ChannelIds = [ChannelIds.SelfContainedTestCases],
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
-            ShouldDownloadAssets = true
+            ShouldDownloadAssets = true,
         }.ExecuteAsync(new FakeConsole());
 
         // Assert

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

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

DiscordChatExporter.Cli.Tests/Utils/TempDir.cs

@@ -1,15 +1,12 @@
 using System;
 using System.IO;
 using System.Reflection;
-using PathEx = System.IO.Path;
 
 namespace DiscordChatExporter.Cli.Tests.Utils;
 
-internal partial class TempDir : IDisposable
+internal partial class TempDir(string path) : IDisposable
 {
-    public string Path { get; }
-
-    public TempDir(string path) => Path = path;
+    public string Path { get; } = path;
 
     public void Dispose()
     {
@@ -25,8 +22,8 @@ internal partial class TempDir
 {
     public static TempDir Create()
     {
-        var dirPath = PathEx.Combine(
-            PathEx.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+        var dirPath = System.IO.Path.Combine(
+            System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
                 ?? Directory.GetCurrentDirectory(),
             "Temp",
             Guid.NewGuid().ToString()

DiscordChatExporter.Cli.Tests/Utils/TempFile.cs

@@ -1,15 +1,12 @@
 using System;
 using System.IO;
 using System.Reflection;
-using PathEx = System.IO.Path;
 
 namespace DiscordChatExporter.Cli.Tests.Utils;
 
-internal partial class TempFile : IDisposable
+internal partial class TempFile(string path) : IDisposable
 {
-    public string Path { get; }
-
-    public TempFile(string path) => Path = path;
+    public string Path { get; } = path;
 
     public void Dispose()
     {
@@ -25,15 +22,15 @@ internal partial class TempFile
 {
     public static TempFile Create()
     {
-        var dirPath = PathEx.Combine(
-            PathEx.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+        var dirPath = System.IO.Path.Combine(
+            System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
                 ?? Directory.GetCurrentDirectory(),
             "Temp"
         );
 
         Directory.CreateDirectory(dirPath);
 
-        var filePath = PathEx.Combine(dirPath, Guid.NewGuid() + ".tmp");
+        var filePath = System.IO.Path.Combine(dirPath, Guid.NewGuid() + ".tmp");
 
         return new TempFile(filePath);
     }

DiscordChatExporter.Cli.dockerfile

@@ -1,7 +1,7 @@
 # -- Build
 # Specify the platform here so that we pull the SDK image matching the host platform,
 # instead of the target platform specified during build by the `--platform` option.
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 
 # Expose the target architecture set by the `docker build --platform` option, so that
 # we can build the assembly for the correct platform.
@@ -30,7 +30,7 @@ RUN dotnet publish DiscordChatExporter.Cli \
 
 # -- Run
 # Use `runtime-deps` instead of `runtime` because we have a self-contained assembly
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime-deps:8.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."
@@ -40,20 +40,24 @@ LABEL org.opencontainers.image.licenses="MIT"
 
 # Alpine image doesn't come with the ICU libraries pre-installed, so we need to install them manually.
 # We need the full ICU data because we allow the user to specify any locale for formatting purposes.
-RUN apk add --no-cache icu-libs
-RUN apk add --no-cache icu-data-full
+RUN apk add --no-cache icu-libs icu-data-full
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 
-# Use a non-root user to ensure that the files shared with the host are accessible by the host user.
-# We can use the default user provided by the base image for this purpose.
+# Alpine is missing tzdata, which we need to support timezones
+RUN apk add --no-cache tzdata
+
+# Use a non-root user to ensure that the files shared with the host are accessible by the host user
 # https://github.com/Tyrrrz/DiscordChatExporter/issues/851
-USER $APP_UID
+# https://github.com/Tyrrrz/DiscordChatExporter/issues/1174
+RUN apk add --no-cache su-exec
+RUN addgroup -S -g 1000 dce && adduser -S -H -G dce -u 1000 dce
 
 # This directory is exposed to the user for mounting purposes, so it's important that it always
 # stays the same for backwards compatibility.
 WORKDIR /out
 
 COPY --from=build /tmp/app/DiscordChatExporter.Cli/bin/publish /opt/app
-ENTRYPOINT ["/opt/app/DiscordChatExporter.Cli"]
+COPY docker-entrypoint.sh /opt/app
+ENTRYPOINT ["/opt/app/docker-entrypoint.sh"]

DiscordChatExporter.Cli/Commands/Base/DiscordCommandBase.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Utils;
 
 namespace DiscordChatExporter.Cli.Commands.Base;
 
@@ -26,8 +28,19 @@ public abstract class DiscordCommandBase : ICommand
     )]
     public bool IsBotToken { get; init; } = false;
 
-    private DiscordClient? _discordClient;
-    protected DiscordClient Discord => _discordClient ??= new DiscordClient(Token);
+    [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;
+
+    [field: AllowNull, MaybeNull]
+    protected DiscordClient Discord =>
+        field ??= new DiscordClient(
+            Token,
+            ShouldRespectRateLimits ? RateLimitPreference.RespectAll : RateLimitPreference.IgnoreAll
+        );
 
     public virtual ValueTask ExecuteAsync(IConsole console)
     {
@@ -37,26 +50,22 @@ public abstract class DiscordCommandBase : ICommand
         {
             using (console.WithForegroundColor(ConsoleColor.DarkYellow))
             {
-                console
-                    .Error
-                    .WriteLine(
-                        "Warning: Option --bot is deprecated and should not be used. "
-                            + "The type of the provided token is now inferred automatically. "
-                            + "Please update your workflows as this option may be completely removed in a future version."
-                    );
+                console.Error.WriteLine(
+                    "Warning: The --bot option is deprecated and should not be used. "
+                        + "The token type is now inferred automatically. "
+                        + "Please update your workflows as this option may be completely removed in a future version."
+                );
             }
         }
 #pragma warning restore CS0618
 
-        // Note about interactivity
-        if (console.IsOutputRedirected)
+        // Note about interactivity for Docker
+        if (console.IsOutputRedirected && Docker.IsRunningInContainer)
         {
-            console
-                .Output
-                .WriteLine(
-                    "Note: Output streams are redirected, rich console interactions are disabled. "
-                        + "If you are running this command in Docker, consider allocating a pseudo-terminal for better user experience (docker run -it ...)."
-                );
+            console.Error.WriteLine(
+                "Note: Output streams are redirected, rich console interactions are disabled. "
+                    + "If you are running this command in Docker, consider allocating a pseudo-terminal for better user experience (docker run -it ...)."
+            );
         }
 
         return default;

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Globalization;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -9,6 +9,7 @@ using CliFx.Attributes;
 using CliFx.Exceptions;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Converters;
+using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Cli.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
@@ -16,7 +17,6 @@ using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
-using DiscordChatExporter.Core.Utils.Extensions;
 using Gress;
 using Spectre.Console;
 
@@ -24,23 +24,21 @@ namespace DiscordChatExporter.Cli.Commands.Base;
 
 public abstract class ExportCommandBase : DiscordCommandBase
 {
-    private readonly string _outputPath = Directory.GetCurrentDirectory();
-
     [CommandOption(
         "output",
         'o',
         Description = "Output file or directory path. "
-            + "Directory path must end with a slash to avoid ambiguity. "
-            + "If a directory is specified, file names will be generated automatically. "
+            + "If a directory is specified, file names will be generated automatically based on the channel names and export parameters. "
+            + "Directory paths must end with a slash to avoid ambiguity. "
             + "Supports template tokens, see the documentation for more info."
     )]
     public string OutputPath
     {
-        get => _outputPath;
+        get;
         // Handle ~/ in paths on Unix systems
         // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
-        init => _outputPath = Path.GetFullPath(value);
-    }
+        init => field = Path.GetFullPath(value);
+    } = Directory.GetCurrentDirectory();
 
     [CommandOption("format", 'f', Description = "Export format.")]
     public ExportFormat ExportFormat { get; init; } = ExportFormat.HtmlDark;
@@ -65,6 +63,13 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public PartitionLimit PartitionLimit { get; init; } = PartitionLimit.Null;
 
+    [CommandOption(
+        "include-threads",
+        Description = "Which types of threads should be included.",
+        Converter = typeof(ThreadInclusionModeBindingConverter)
+    )]
+    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
+
     [CommandOption(
         "filter",
         Description = "Only include messages that satisfy this filter. "
@@ -96,8 +101,6 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public bool ShouldReuseAssets { get; init; } = false;
 
-    private readonly string? _assetsDirPath;
-
     [CommandOption(
         "media-dir",
         Description = "Download assets to this directory. "
@@ -105,10 +108,10 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public string? AssetsDirPath
     {
-        get => _assetsDirPath;
+        get;
         // Handle ~/ in paths on Unix systems
         // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
-        init => _assetsDirPath = value is not null ? Path.GetFullPath(value) : null;
+        init => field = value is not null ? Path.GetFullPath(value) : null;
     }
 
     [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
@@ -118,8 +121,12 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public string DateFormat { get; init; } = "MM/dd/yyyy h:mm tt";
 
-    [CommandOption("locale", Description = "Locale to use when formatting dates and numbers.")]
-    public string Locale { get; init; } = CultureInfo.CurrentCulture.Name;
+    [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; }
 
     [CommandOption("utc", Description = "Normalize all timestamps to UTC+0.")]
     public bool IsUtcNormalizationEnabled { get; init; } = false;
@@ -133,11 +140,13 @@ public abstract class ExportCommandBase : DiscordCommandBase
     )]
     public bool IsUkraineSupportMessageDisabled { get; init; } = false;
 
-    private ChannelExporter? _channelExporter;
-    protected ChannelExporter Exporter => _channelExporter ??= new ChannelExporter(Discord);
+    [field: AllowNull, MaybeNull]
+    protected ChannelExporter Exporter => field ??= new ChannelExporter(Discord);
 
     protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Channel> channels)
     {
+        var cancellationToken = console.RegisterCancellationHandler();
+
         // Asset reuse can only be enabled if the download assets option is set
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/425
         if (ShouldReuseAssets && !ShouldDownloadAssets)
@@ -151,13 +160,53 @@ public abstract class ExportCommandBase : DiscordCommandBase
             throw new CommandException("Option --media-dir cannot be used without --media.");
         }
 
+        var unwrappedChannels = new List<Channel>(channels);
+
+        // Unwrap threads
+        if (ThreadInclusionMode != ThreadInclusionMode.None)
+        {
+            await console.Output.WriteLineAsync("Fetching threads...");
+
+            var fetchedThreadsCount = 0;
+            await console
+                .CreateStatusTicker()
+                .StartAsync(
+                    "...",
+                    async ctx =>
+                    {
+                        await foreach (
+                            var thread in Discord.GetChannelThreadsAsync(
+                                channels,
+                                ThreadInclusionMode == ThreadInclusionMode.All,
+                                Before,
+                                After,
+                                cancellationToken
+                            )
+                        )
+                        {
+                            unwrappedChannels.Add(thread);
+
+                            ctx.Status(Markup.Escape($"Fetched '{thread.GetHierarchicalName()}'."));
+
+                            fetchedThreadsCount++;
+                        }
+                    }
+                );
+
+            // Remove forums, as they cannot be exported directly and their constituent threads
+            // have already been fetched.
+            unwrappedChannels.RemoveAll(channel => channel.Kind == ChannelKind.GuildForum);
+
+            await console.Output.WriteLineAsync($"Fetched {fetchedThreadsCount} thread(s).");
+        }
+
         // Make sure the user does not try to export multiple channels into one file.
         // Output path must either be a directory or contain template tokens for this to work.
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/799
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/917
         var isValidOutputPath =
             // Anything is valid when exporting a single channel
-            channels.Count <= 1
+            unwrappedChannels.Count <= 1
             // When using template tokens, assume the user knows what they're doing
             || OutputPath.Contains('%')
             // Otherwise, require an existing directory or an unambiguous directory path
@@ -174,10 +223,10 @@ public abstract class ExportCommandBase : DiscordCommandBase
         }
 
         // Export
-        var cancellationToken = console.RegisterCancellationHandler();
         var errorsByChannel = new ConcurrentDictionary<Channel, string>();
+        var warningsByChannel = new ConcurrentDictionary<Channel, string>();
 
-        await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
+        await console.Output.WriteLineAsync($"Exporting {unwrappedChannels.Count} channel(s)...");
         await console
             .CreateProgressTicker()
             .HideCompleted(
@@ -189,11 +238,11 @@ public abstract class ExportCommandBase : DiscordCommandBase
             .StartAsync(async ctx =>
             {
                 await Parallel.ForEachAsync(
-                    channels,
+                    unwrappedChannels,
                     new ParallelOptions
                     {
                         MaxDegreeOfParallelism = Math.Max(1, ParallelLimit),
-                        CancellationToken = cancellationToken
+                        CancellationToken = cancellationToken,
                     },
                     async (channel, innerCancellationToken) =>
                     {
@@ -233,6 +282,10 @@ public abstract class ExportCommandBase : DiscordCommandBase
                                 }
                             );
                         }
+                        catch (ChannelEmptyException ex)
+                        {
+                            warningsByChannel[channel] = ex.Message;
+                        }
                         catch (DiscordChatExporterException ex) when (!ex.IsFatal)
                         {
                             errorsByChannel[channel] = ex.Message;
@@ -244,11 +297,31 @@ public abstract class ExportCommandBase : DiscordCommandBase
         // Print the result
         using (console.WithForegroundColor(ConsoleColor.White))
         {
-            await console
-                .Output
-                .WriteLineAsync(
-                    $"Successfully exported {channels.Count - errorsByChannel.Count} channel(s)."
+            await console.Output.WriteLineAsync(
+                $"Successfully exported {unwrappedChannels.Count - errorsByChannel.Count} channel(s)."
+            );
+        }
+
+        // Print warnings
+        if (warningsByChannel.Any())
+        {
+            await console.Output.WriteLineAsync();
+
+            using (console.WithForegroundColor(ConsoleColor.Yellow))
+            {
+                await console.Error.WriteLineAsync(
+                    "Warnings reported for the following channel(s):"
                 );
+            }
+
+            foreach (var (channel, message) in warningsByChannel)
+            {
+                await console.Error.WriteAsync($"{channel.GetHierarchicalName()}: ");
+                using (console.WithForegroundColor(ConsoleColor.Yellow))
+                    await console.Error.WriteLineAsync(message);
+            }
+
+            await console.Error.WriteLineAsync();
         }
 
         // Print errors
@@ -258,18 +331,14 @@ public abstract class ExportCommandBase : DiscordCommandBase
 
             using (console.WithForegroundColor(ConsoleColor.Red))
             {
-                await console
-                    .Error
-                    .WriteLineAsync(
-                        $"Failed to export {errorsByChannel.Count} the following channel(s):"
-                    );
+                await console.Error.WriteLineAsync("Failed to export the following channel(s):");
             }
 
-            foreach (var (channel, error) in errorsByChannel)
+            foreach (var (channel, message) in errorsByChannel)
             {
                 await console.Error.WriteAsync($"{channel.GetHierarchicalName()}: ");
                 using (console.WithForegroundColor(ConsoleColor.Red))
-                    await console.Error.WriteLineAsync(error);
+                    await console.Error.WriteLineAsync(message);
             }
 
             await console.Error.WriteLineAsync();
@@ -277,98 +346,42 @@ public abstract class ExportCommandBase : DiscordCommandBase
 
         // Fail the command only if ALL channels failed to export.
         // If only some channels failed to export, it's okay.
-        if (errorsByChannel.Count >= channels.Count)
+        if (errorsByChannel.Count >= unwrappedChannels.Count)
             throw new CommandException("Export failed.");
     }
 
-    protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Snowflake> channelIds)
-    {
-        var cancellationToken = console.RegisterCancellationHandler();
-
-        await console.Output.WriteLineAsync("Resolving channel(s)...");
-
-        var channels = new List<Channel>();
-        var channelsByGuild = new Dictionary<Snowflake, IReadOnlyList<Channel>>();
-
-        foreach (var channelId in channelIds)
-        {
-            var channel = await Discord.GetChannelAsync(channelId, cancellationToken);
-
-            // Unwrap categories
-            if (channel.IsCategory)
-            {
-                var guildChannels =
-                    channelsByGuild.GetValueOrDefault(channel.GuildId)
-                    ?? await Discord.GetGuildChannelsAsync(channel.GuildId, cancellationToken);
-
-                foreach (var guildChannel in guildChannels)
-                {
-                    if (guildChannel.Parent?.Id == channel.Id)
-                        channels.Add(guildChannel);
-                }
-
-                // Cache the guild channels to avoid redundant work
-                channelsByGuild[channel.GuildId] = guildChannels;
-            }
-            else
-            {
-                channels.Add(channel);
-            }
-        }
-
-        await ExportAsync(console, channels);
-    }
-
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         // Support Ukraine callout
         if (!IsUkraineSupportMessageDisabled)
         {
-            console
-                .Output
-                .WriteLine(
-                    "┌────────────────────────────────────────────────────────────────────┐"
-                );
-            console
-                .Output
-                .WriteLine(
-                    "│   Thank you for supporting Ukraine <3                              │"
-                );
-            console
-                .Output
-                .WriteLine(
-                    "│                                                                    │"
-                );
-            console
-                .Output
-                .WriteLine(
-                    "│   As Russia wages a genocidal war against my country,              │"
-                );
-            console
-                .Output
-                .WriteLine(
-                    "│   I'm grateful to everyone who continues to                        │"
-                );
-            console
-                .Output
-                .WriteLine(
-                    "│   stand with Ukraine in our fight for freedom.                     │"
-                );
-            console
-                .Output
-                .WriteLine(
-                    "│                                                                    │"
-                );
-            console
-                .Output
-                .WriteLine(
-                    "│   Learn more: https://tyrrrz.me/ukraine                            │"
-                );
-            console
-                .Output
-                .WriteLine(
-                    "└────────────────────────────────────────────────────────────────────┘"
-                );
+            console.Output.WriteLine(
+                "┌────────────────────────────────────────────────────────────────────┐"
+            );
+            console.Output.WriteLine(
+                "│   Thank you for supporting Ukraine <3                              │"
+            );
+            console.Output.WriteLine(
+                "│                                                                    │"
+            );
+            console.Output.WriteLine(
+                "│   As Russia wages a genocidal war against my country,              │"
+            );
+            console.Output.WriteLine(
+                "│   I'm grateful to everyone who continues to                        │"
+            );
+            console.Output.WriteLine(
+                "│   stand with Ukraine in our fight for freedom.                     │"
+            );
+            console.Output.WriteLine(
+                "│                                                                    │"
+            );
+            console.Output.WriteLine(
+                "│   Learn more: https://tyrrrz.me/ukraine                            │"
+            );
+            console.Output.WriteLine(
+                "└────────────────────────────────────────────────────────────────────┘"
+            );
             console.Output.WriteLine("");
         }
 

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

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

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

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

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -1,11 +1,8 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Cli.Commands.Converters;
-using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Cli.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
@@ -13,22 +10,15 @@ using Spectre.Console;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("exportguild", Description = "Exports all channels within the specified guild.")]
+[Command("exportguild", Description = "Exports all channels within the specified server.")]
 public class ExportGuildCommand : ExportCommandBase
 {
-    [CommandOption("guild", 'g', Description = "Guild ID.")]
+    [CommandOption("guild", 'g', Description = "Server ID.")]
     public required Snowflake GuildId { get; init; }
 
     [CommandOption("include-vc", Description = "Include voice channels.")]
     public bool IncludeVoiceChannels { get; init; } = true;
 
-    [CommandOption(
-        "include-threads",
-        Description = "Which types of threads should be included.",
-        Converter = typeof(ThreadInclusionModeBindingConverter)
-    )]
-    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
-
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
@@ -36,7 +26,6 @@ public class ExportGuildCommand : ExportCommandBase
         var cancellationToken = console.RegisterCancellationHandler();
         var channels = new List<Channel>();
 
-        // Regular channels
         await console.Output.WriteLineAsync("Fetching channels...");
 
         var fetchedChannelsCount = 0;
@@ -67,40 +56,6 @@ public class ExportGuildCommand : ExportCommandBase
 
         await console.Output.WriteLineAsync($"Fetched {fetchedChannelsCount} channel(s).");
 
-        // Threads
-        if (ThreadInclusionMode != ThreadInclusionMode.None)
-        {
-            await console.Output.WriteLineAsync("Fetching threads...");
-
-            var fetchedThreadsCount = 0;
-            await console
-                .CreateStatusTicker()
-                .StartAsync(
-                    "...",
-                    async ctx =>
-                    {
-                        await foreach (
-                            var thread in Discord.GetGuildThreadsAsync(
-                                GuildId,
-                                ThreadInclusionMode == ThreadInclusionMode.All,
-                                Before,
-                                After,
-                                cancellationToken
-                            )
-                        )
-                        {
-                            channels.Add(thread);
-
-                            ctx.Status(Markup.Escape($"Fetched '{thread.GetHierarchicalName()}'."));
-
-                            fetchedThreadsCount++;
-                        }
-                    }
-                );
-
-            await console.Output.WriteLineAsync($"Fetched {fetchedThreadsCount} thread(s).");
-        }
-
         await ExportAsync(console, channels);
     }
 }

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -7,15 +7,14 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Cli.Commands.Converters;
 using DiscordChatExporter.Cli.Commands.Shared;
 using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("channels", Description = "Get the list of channels in a guild.")]
+[Command("channels", Description = "Get the list of channels in a server.")]
 public class GetChannelsCommand : DiscordCommandBase
 {
-    [CommandOption("guild", 'g', Description = "Guild ID.")]
+    [CommandOption("guild", 'g', Description = "Server ID.")]
     public required Snowflake GuildId { get; init; }
 
     [CommandOption("include-vc", Description = "Include voice channels.")]
@@ -59,14 +58,14 @@ public class GetChannelsCommand : DiscordCommandBase
                 )
                     .OrderBy(c => c.Name)
                     .ToArray()
-                : Array.Empty<Channel>();
+                : [];
 
         foreach (var channel in channels)
         {
             // Channel ID
-            await console
-                .Output
-                .WriteAsync(channel.Id.ToString().PadRight(channelIdMaxLength, ' '));
+            await console.Output.WriteAsync(
+                channel.Id.ToString().PadRight(channelIdMaxLength, ' ')
+            );
 
             // Separator
             using (console.WithForegroundColor(ConsoleColor.DarkGray))
@@ -88,11 +87,9 @@ public class GetChannelsCommand : DiscordCommandBase
                 await console.Output.WriteAsync(" * ");
 
                 // Thread ID
-                await console
-                    .Output
-                    .WriteAsync(
-                        channelThread.Id.ToString().PadRight(channelThreadIdMaxLength, ' ')
-                    );
+                await console.Output.WriteAsync(
+                    channelThread.Id.ToString().PadRight(channelThreadIdMaxLength, ' ')
+                );
 
                 // Separator
                 using (console.WithForegroundColor(ConsoleColor.DarkGray))
@@ -108,9 +105,9 @@ public class GetChannelsCommand : DiscordCommandBase
 
                 // Thread status
                 using (console.WithForegroundColor(ConsoleColor.White))
-                    await console
-                        .Output
-                        .WriteLineAsync(channelThread.IsArchived ? "Archived" : "Active");
+                    await console.Output.WriteLineAsync(
+                        channelThread.IsArchived ? "Archived" : "Active"
+                    );
             }
         }
     }

DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs

@@ -33,9 +33,9 @@ public class GetDirectChannelsCommand : DiscordCommandBase
         foreach (var channel in channels)
         {
             // Channel ID
-            await console
-                .Output
-                .WriteAsync(channel.Id.ToString().PadRight(channelIdMaxLength, ' '));
+            await console.Output.WriteAsync(
+                channel.Id.ToString().PadRight(channelIdMaxLength, ' ')
+            );
 
             // Separator
             using (console.WithForegroundColor(ConsoleColor.DarkGray))

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -9,7 +9,7 @@ using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("guilds", Description = "Gets the list of accessible guilds.")]
+[Command("guilds", Description = "Gets the list of accessible servers.")]
 public class GetGuildsCommand : DiscordCommandBase
 {
     public override async ValueTask ExecuteAsync(IConsole console)

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -6,20 +6,18 @@ using CliFx.Infrastructure;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("guide", Description = "Explains how to obtain the token, guild or channel ID.")]
+[Command("guide", Description = "Explains how to obtain the token, server or channel ID.")]
 public class GuideCommand : ICommand
 {
     public ValueTask ExecuteAsync(IConsole console)
     {
         // User token
         using (console.WithForegroundColor(ConsoleColor.White))
-            console.Output.WriteLine("To get user token:");
+            console.Output.WriteLine("To get the token for your personal account:");
 
-        console
-            .Output
-            .WriteLine(
-                " *  Automating user accounts is technically against TOS — USE AT YOUR OWN RISK!"
-            );
+        console.Output.WriteLine(
+            " *  Automating user accounts is technically against TOS — USE AT YOUR OWN RISK!"
+        );
         console.Output.WriteLine(" 1. Open Discord in your web browser and login");
         console.Output.WriteLine(" 2. Open any server or direct message channel");
         console.Output.WriteLine(" 3. Press Ctrl+Shift+I to show developer tools");
@@ -34,43 +32,51 @@ public class GuideCommand : ICommand
 
         // Bot token
         using (console.WithForegroundColor(ConsoleColor.White))
-            console.Output.WriteLine("To get bot token:");
+            console.Output.WriteLine("To get the token for your bot:");
 
+        console.Output.WriteLine(
+            " The token is generated during bot creation. If you lost it, generate a new one:"
+        );
         console.Output.WriteLine(" 1. Go to Discord developer portal");
         console.Output.WriteLine(" 2. Open your application's settings");
         console.Output.WriteLine(" 3. Navigate to the Bot section on the left");
-        console.Output.WriteLine(" 4. Under Token click Copy");
-        console
-            .Output
-            .WriteLine(
-                " *  Your bot needs to have Message Content Intent enabled to read messages"
-            );
+        console.Output.WriteLine(" 4. Under Token click Reset Token");
+        console.Output.WriteLine(" 5. Click Yes, do it! and authenticate to confirm");
+        console.Output.WriteLine(
+            " *  Integrations using the previous token will stop working until updated"
+        );
+        console.Output.WriteLine(
+            " *  Your bot needs to have the Message Content Intent enabled to read messages"
+        );
         console.Output.WriteLine();
 
         // Guild or channel ID
         using (console.WithForegroundColor(ConsoleColor.White))
-            console.Output.WriteLine("To get guild ID or channel ID:");
+            console.Output.WriteLine("To get the ID of a server or a channel:");
 
         console.Output.WriteLine(" 1. Open Discord");
         console.Output.WriteLine(" 2. Open Settings");
         console.Output.WriteLine(" 3. Go to Advanced section");
         console.Output.WriteLine(" 4. Enable Developer Mode");
-        console
-            .Output
-            .WriteLine(
-                " 5. Right-click on the desired guild or channel and click Copy Server ID or Copy Channel ID"
-            );
+        console.Output.WriteLine(
+            " 5. Right-click on the desired server or channel and click Copy Server ID or Copy Channel ID"
+        );
         console.Output.WriteLine();
 
         // Docs link
         using (console.WithForegroundColor(ConsoleColor.White))
-            console
-                .Output
-                .WriteLine("If you have questions or issues, please refer to the documentation:");
+        {
+            console.Output.WriteLine(
+                "If you have questions or issues, please refer to the documentation:"
+            );
+        }
+
         using (console.WithForegroundColor(ConsoleColor.DarkCyan))
-            console
-                .Output
-                .WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs");
+        {
+            console.Output.WriteLine(
+                "https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs"
+            );
+        }
 
         return default;
     }

DiscordChatExporter.Cli/Commands/Shared/ThreadInclusionMode.cs

@@ -4,5 +4,5 @@ public enum ThreadInclusionMode
 {
     None,
     Active,
-    All
+    All,
 }

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

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

DiscordChatExporter.Cli/Program.cs

@@ -1,3 +1,41 @@
-using CliFx;
+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;
 
-return await new CliApplicationBuilder().AddCommandsFromThisAssembly().Build().RunAsync(args);
+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>()
+            .Build()
+            .RunAsync(args);
+}

DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs

@@ -7,32 +7,35 @@ namespace DiscordChatExporter.Cli.Utils.Extensions;
 
 internal static class ConsoleExtensions
 {
-    public static IAnsiConsole CreateAnsiConsole(this IConsole console) =>
-        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,

DiscordChatExporter.Core/Discord/Data/Application.cs

@@ -7,7 +7,7 @@ namespace DiscordChatExporter.Core.Discord.Data;
 // https://discord.com/developers/docs/resources/application#application-object
 public partial record Application(Snowflake Id, string Name, ApplicationFlags Flags)
 {
-    public bool IsMessageContentIntentEnabled =>
+    public bool IsMessageContentIntentEnabled { get; } =
         Flags.HasFlag(ApplicationFlags.GatewayMessageContent)
         || Flags.HasFlag(ApplicationFlags.GatewayMessageContentLimited);
 }

DiscordChatExporter.Core/Discord/Data/ApplicationFlags.cs

@@ -16,5 +16,5 @@ public enum ApplicationFlags
     Embedded = 131072,
     GatewayMessageContent = 262144,
     GatewayMessageContentLimited = 524288,
-    ApplicationCommandBadge = 8388608
+    ApplicationCommandBadge = 8388608,
 }

DiscordChatExporter.Core/Discord/Data/Attachment.cs

@@ -18,7 +18,7 @@ public partial record Attachment(
     FileSize FileSize
 ) : IHasId
 {
-    public string FileExtension => Path.GetExtension(FileName);
+    public string FileExtension { get; } = Path.GetExtension(FileName);
 
     public bool IsImage =>
         string.Equals(FileExtension, ".jpg", StringComparison.OrdinalIgnoreCase)
@@ -41,7 +41,7 @@ public partial record Attachment(
         || string.Equals(FileExtension, ".flac", StringComparison.OrdinalIgnoreCase)
         || string.Equals(FileExtension, ".m4a", StringComparison.OrdinalIgnoreCase);
 
-    public bool IsSpoiler => FileName.StartsWith("SPOILER_", StringComparison.Ordinal);
+    public bool IsSpoiler { get; } = FileName.StartsWith("SPOILER_", StringComparison.Ordinal);
 }
 
 public partial record Attachment

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -21,21 +21,23 @@ public partial record Channel(
     Snowflake? LastMessageId
 ) : IHasId
 {
-    public bool IsDirect => Kind is ChannelKind.DirectTextChat or ChannelKind.DirectGroupTextChat;
+    public bool IsDirect { get; } =
+        Kind is ChannelKind.DirectTextChat or ChannelKind.DirectGroupTextChat;
 
     public bool IsGuild => !IsDirect;
 
-    public bool IsCategory => Kind == ChannelKind.GuildCategory;
+    public bool IsCategory { get; } = Kind == ChannelKind.GuildCategory;
 
-    public bool IsVoice => Kind is ChannelKind.GuildVoiceChat or ChannelKind.GuildStageVoice;
+    public bool IsVoice { get; } =
+        Kind is ChannelKind.GuildVoiceChat or ChannelKind.GuildStageVoice;
 
-    public bool IsThread =>
+    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 => LastMessageId is null;
+    public bool IsEmpty { get; } = LastMessageId is null;
 
     public IEnumerable<Channel> GetParents()
     {
@@ -67,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
@@ -76,6 +79,7 @@ public partial record Channel
             ?? json.GetPropertyOrNull("recipients")
                 ?.EnumerateArrayOrNull()
                 ?.Select(User.Parse)
+                .OrderBy(u => u.Id)
                 .Select(u => u.DisplayName)
                 .Pipe(s => string.Join(", ", s))
             // Fallback
@@ -93,7 +97,8 @@ public partial record Channel
         var isArchived =
             json.GetPropertyOrNull("thread_metadata")
                 ?.GetPropertyOrNull("archived")
-                ?.GetBooleanOrNull() ?? false;
+                ?.GetBooleanOrNull()
+            ?? false;
 
         var lastMessageId = json.GetPropertyOrNull("last_message_id")
             ?.GetNonWhiteSpaceStringOrNull()

DiscordChatExporter.Core/Discord/Data/ChannelConnection.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DiscordChatExporter.Core.Discord.Data;
+
+public record ChannelConnection(Channel Channel, IReadOnlyList<ChannelConnection> Children)
+{
+    public static IReadOnlyList<ChannelConnection> BuildTree(IReadOnlyList<Channel> channels)
+    {
+        IReadOnlyList<ChannelConnection> GetChildren(Channel parent) =>
+            channels
+                .Where(c => c.Parent?.Id == parent.Id)
+                .Select(c => new ChannelConnection(c, GetChildren(c)))
+                .ToArray();
+
+        return channels
+            .Where(c => c.Parent is null)
+            .Select(c => new ChannelConnection(c, GetChildren(c)))
+            .ToArray();
+    }
+}

DiscordChatExporter.Core/Discord/Data/ChannelKind.cs

@@ -14,5 +14,5 @@ public enum ChannelKind
     GuildPrivateThread = 12,
     GuildStageVoice = 13,
     GuildDirectory = 14,
-    GuildForum = 15
+    GuildForum = 15,
 }

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

@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.Linq;
-using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Core.Discord.Data.Common;
 
@@ -11,7 +10,7 @@ public static class ImageCdn
     // Standard emoji are rendered through Twemoji
     public static string GetStandardEmojiUrl(string emojiName)
     {
-        var runes = emojiName.GetRunes().ToArray();
+        var runes = emojiName.EnumerateRunes().ToArray();
 
         // Variant selector rune is skipped in Twemoji IDs,
         // except when the emoji also contains a zero-width joiner.

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

@@ -31,6 +31,9 @@ public partial record Embed(
     public SpotifyTrackEmbedProjection? TryGetSpotifyTrack() =>
         SpotifyTrackEmbedProjection.TryResolve(this);
 
+    public TwitchClipEmbedProjection? TryGetTwitchClip() =>
+        TwitchClipEmbedProjection.TryResolve(this);
+
     public YouTubeVideoEmbedProjection? TryGetYouTubeVideo() =>
         YouTubeVideoEmbedProjection.TryResolve(this);
 }
@@ -42,7 +45,11 @@ public partial record Embed
         var title = json.GetPropertyOrNull("title")?.GetStringOrNull();
 
         var kind =
-            json.GetPropertyOrNull("type")?.GetStringOrNull()?.ParseEnumOrNull<EmbedKind>()
+            json.GetPropertyOrNull("type")
+                ?.GetStringOrNull()
+                ?.Pipe(s =>
+                    Enum.TryParse<EmbedKind>(s, true, out var result) ? result : (EmbedKind?)null
+                )
             ?? EmbedKind.Rich;
 
         var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
@@ -60,7 +67,8 @@ public partial record Embed
             json.GetPropertyOrNull("fields")
                 ?.EnumerateArrayOrNull()
                 ?.Select(EmbedField.Parse)
-                .ToArray() ?? Array.Empty<EmbedField>();
+                .ToArray()
+            ?? [];
 
         var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);
 
@@ -75,7 +83,8 @@ public partial record Embed
             json.GetPropertyOrNull("image")
                 ?.Pipe(EmbedImage.Parse)
                 .ToSingletonEnumerable()
-                .ToArray() ?? Array.Empty<EmbedImage>();
+                .ToArray()
+            ?? [];
 
         var video = json.GetPropertyOrNull("video")?.Pipe(EmbedVideo.Parse);
 

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

@@ -7,5 +7,5 @@ public enum EmbedKind
     Image,
     Video,
     Gifv,
-    Link
+    Link,
 }

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

@@ -4,7 +4,7 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds;
 
 public partial record SpotifyTrackEmbedProjection(string TrackId)
 {
-    public string Url => $"https://open.spotify.com/embed/track/{TrackId}";
+    public string Url { get; } = $"https://open.spotify.com/embed/track/{TrackId}";
 }
 
 public partial record SpotifyTrackEmbedProjection

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

@@ -0,0 +1,53 @@
+using System.Text.RegularExpressions;
+
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+
+public partial record TwitchClipEmbedProjection(string ClipId)
+{
+    public string Url { get; } = $"https://clips.twitch.tv/embed?clip={ClipId}&parent=localhost";
+}
+
+public partial record TwitchClipEmbedProjection
+{
+    private static string? TryParseClipId(string embedUrl)
+    {
+        // https://clips.twitch.tv/SpookyTenuousPidgeonPanicVis
+        {
+            var clipId = Regex
+                .Match(embedUrl, @"clips\.twitch\.tv/(.*?)(?:\?|&|/|$)")
+                .Groups[1]
+                .Value;
+
+            if (!string.IsNullOrWhiteSpace(clipId))
+                return clipId;
+        }
+
+        // https://twitch.tv/clip/SpookyTenuousPidgeonPanicVis
+        {
+            var clipId = Regex
+                .Match(embedUrl, @"twitch\.tv/clip/(.*?)(?:\?|&|/|$)")
+                .Groups[1]
+                .Value;
+
+            if (!string.IsNullOrWhiteSpace(clipId))
+                return clipId;
+        }
+
+        return null;
+    }
+
+    public static TwitchClipEmbedProjection? TryResolve(Embed embed)
+    {
+        if (embed.Kind != EmbedKind.Video)
+            return null;
+
+        if (string.IsNullOrWhiteSpace(embed.Url))
+            return null;
+
+        var clipId = TryParseClipId(embed.Url);
+        if (string.IsNullOrWhiteSpace(clipId))
+            return null;
+
+        return new TwitchClipEmbedProjection(clipId);
+    }
+}

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

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

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
@@ -13,29 +12,22 @@ public partial record Emoji(
     Snowflake? Id,
     // Name of a custom emoji (e.g. LUL) or actual representation of a standard emoji (e.g. 🙂)
     string Name,
-    bool IsAnimated,
-    string ImageUrl
+    bool IsAnimated
 )
 {
+    public bool IsCustomEmoji { get; } = Id is not null;
+
     // Name of a custom emoji (e.g. LUL) or name of a standard emoji (e.g. slight_smile)
-    public string Code => Id is not null ? Name : EmojiIndex.TryGetCode(Name) ?? Name;
+    public string Code { get; } = Id is not null ? Name : EmojiIndex.TryGetCode(Name) ?? Name;
+
+    public string ImageUrl { get; } =
+        Id is not null
+            ? ImageCdn.GetCustomEmojiUrl(Id.Value, IsAnimated)
+            : ImageCdn.GetStandardEmojiUrl(Name);
 }
 
 public partial record Emoji
 {
-    public static string GetImageUrl(Snowflake? id, string? name, bool isAnimated)
-    {
-        // Custom emoji
-        if (id is not null)
-            return ImageCdn.GetCustomEmojiUrl(id.Value, isAnimated);
-
-        // Standard emoji
-        if (!string.IsNullOrWhiteSpace(name))
-            return ImageCdn.GetStandardEmojiUrl(name);
-
-        throw new InvalidOperationException("Either the emoji ID or name should be provided.");
-    }
-
     public static Emoji Parse(JsonElement json)
     {
         var id = json.GetPropertyOrNull("id")
@@ -47,8 +39,7 @@ public partial record Emoji
             json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ?? "Unknown Emoji";
 
         var isAnimated = json.GetPropertyOrNull("animated")?.GetBooleanOrNull() ?? false;
-        var imageUrl = GetImageUrl(id, name, isAnimated);
 
-        return new Emoji(id, name, isAnimated, imageUrl);
+        return new Emoji(id, name, isAnimated);
     }
 }

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -8,7 +8,7 @@ namespace DiscordChatExporter.Core.Discord.Data;
 // https://discord.com/developers/docs/resources/guild#guild-object
 public partial record Guild(Snowflake Id, string Name, string IconUrl) : IHasId
 {
-    public bool IsDirect => Id == DirectMessages.Id;
+    public bool IsDirect { get; } = Id == Snowflake.Zero;
 }
 
 public partial record Guild
@@ -25,7 +25,8 @@ public partial record Guild
         var iconUrl =
             json.GetPropertyOrNull("icon")
                 ?.GetNonWhiteSpaceStringOrNull()
-                ?.Pipe(h => ImageCdn.GetGuildIconUrl(id, h)) ?? ImageCdn.GetFallbackUserAvatarUrl();
+                ?.Pipe(h => ImageCdn.GetGuildIconUrl(id, h))
+            ?? ImageCdn.GetFallbackUserAvatarUrl();
 
         return new Guild(id, name, iconUrl);
     }

DiscordChatExporter.Core/Discord/Data/Member.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
@@ -16,13 +15,12 @@ public partial record Member(
     IReadOnlyList<Snowflake> RoleIds
 ) : IHasId
 {
-    public Snowflake Id => User.Id;
+    public Snowflake Id { get; } = User.Id;
 }
 
 public partial record Member
 {
-    public static Member CreateFallback(User user) =>
-        new(user, null, null, Array.Empty<Snowflake>());
+    public static Member CreateFallback(User user) => new(user, null, null, []);
 
     public static Member Parse(JsonElement json, Snowflake? guildId = null)
     {
@@ -34,7 +32,8 @@ public partial record Member
                 ?.EnumerateArray()
                 .Select(j => j.GetNonWhiteSpaceString())
                 .Select(Snowflake.Parse)
-                .ToArray() ?? Array.Empty<Snowflake>();
+                .ToArray()
+            ?? [];
 
         var avatarUrl = guildId is not null
             ? json.GetPropertyOrNull("avatar")

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -30,15 +30,15 @@ public partial record Message(
     Interaction? Interaction
 ) : IHasId
 {
-    public bool IsSystemNotification =>
+    public bool IsSystemNotification { get; } =
         Kind is >= MessageKind.RecipientAdd and <= MessageKind.ThreadCreated;
 
-    public bool IsReply => Kind == MessageKind.Reply;
+    public bool IsReply { get; } = Kind == MessageKind.Reply;
 
     // 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 =>
+    public bool IsEmpty { get; } =
         string.IsNullOrWhiteSpace(Content)
         && !Attachments.Any()
         && !Embeds.Any()
@@ -83,16 +83,15 @@ public partial record Message
                 // Find embeds with the same URL that only contain a single image and nothing else
                 var trailingEmbeds = embeds
                     .Skip(i + 1)
-                    .TakeWhile(
-                        e =>
-                            e.Url == embed.Url
-                            && e.Timestamp is null
-                            && e.Author is null
-                            && e.Color is null
-                            && string.IsNullOrWhiteSpace(e.Description)
-                            && !e.Fields.Any()
-                            && e.Images.Count == 1
-                            && e.Footer is null
+                    .TakeWhile(e =>
+                        e.Url == embed.Url
+                        && e.Timestamp is null
+                        && e.Author is null
+                        && e.Color is null
+                        && string.IsNullOrWhiteSpace(e.Description)
+                        && !e.Fields.Any()
+                        && e.Images.Count == 1
+                        && e.Footer is null
                     )
                     .ToArray();
 
@@ -100,8 +99,7 @@ public partial record Message
                 {
                     // Concatenate all images into one embed
                     var images = embed
-                        .Images
-                        .Concat(trailingEmbeds.SelectMany(e => e.Images))
+                        .Images.Concat(trailingEmbeds.SelectMany(e => e.Images))
                         .ToArray();
 
                     normalizedEmbeds.Add(embed with { Images = images });
@@ -145,28 +143,31 @@ public partial record Message
             json.GetPropertyOrNull("attachments")
                 ?.EnumerateArrayOrNull()
                 ?.Select(Attachment.Parse)
-                .ToArray() ?? Array.Empty<Attachment>();
+                .ToArray()
+            ?? [];
 
         var embeds = NormalizeEmbeds(
             json.GetPropertyOrNull("embeds")?.EnumerateArrayOrNull()?.Select(Embed.Parse).ToArray()
-                ?? Array.Empty<Embed>()
+                ?? []
         );
 
         var stickers =
             json.GetPropertyOrNull("sticker_items")
                 ?.EnumerateArrayOrNull()
                 ?.Select(Sticker.Parse)
-                .ToArray() ?? Array.Empty<Sticker>();
+                .ToArray()
+            ?? [];
 
         var reactions =
             json.GetPropertyOrNull("reactions")
                 ?.EnumerateArrayOrNull()
                 ?.Select(Reaction.Parse)
-                .ToArray() ?? Array.Empty<Reaction>();
+                .ToArray()
+            ?? [];
 
         var mentionedUsers =
             json.GetPropertyOrNull("mentions")?.EnumerateArrayOrNull()?.Select(User.Parse).ToArray()
-            ?? Array.Empty<User>();
+            ?? [];
 
         var messageReference = json.GetPropertyOrNull("message_reference")
             ?.Pipe(MessageReference.Parse);

DiscordChatExporter.Core/Discord/Data/MessageFlags.cs

@@ -14,5 +14,5 @@ public enum MessageFlags
     Urgent = 16,
     HasThread = 32,
     Ephemeral = 64,
-    Loading = 128
+    Loading = 128,
 }

DiscordChatExporter.Core/Discord/Data/MessageKind.cs

@@ -12,5 +12,5 @@ public enum MessageKind
     ChannelPinnedMessage = 6,
     GuildMemberJoin = 7,
     ThreadCreated = 18,
-    Reply = 19
+    Reply = 19,
 }

DiscordChatExporter.Core/Discord/Data/Sticker.cs

@@ -9,7 +9,7 @@ namespace DiscordChatExporter.Core.Discord.Data;
 // https://discord.com/developers/docs/resources/sticker#sticker-resource
 public partial record Sticker(Snowflake Id, string Name, StickerFormat Format, string SourceUrl)
 {
-    public bool IsImage => Format != StickerFormat.Lottie;
+    public bool IsImage { get; } = Format != StickerFormat.Lottie;
 }
 
 public partial record Sticker
@@ -28,7 +28,7 @@ public partial record Sticker
                 StickerFormat.Apng => "png",
                 StickerFormat.Lottie => "json",
                 StickerFormat.Gif => "gif",
-                _ => throw new InvalidOperationException($"Unknown sticker format '{format}'.")
+                _ => throw new InvalidOperationException($"Unknown sticker format '{format}'."),
             }
         );
 

DiscordChatExporter.Core/Discord/Data/StickerFormat.cs

@@ -5,5 +5,5 @@ public enum StickerFormat
     Png = 1,
     Apng = 2,
     Lottie = 3,
-    Gif = 4
+    Gif = 4,
 }

DiscordChatExporter.Core/Discord/Data/User.cs

@@ -18,7 +18,7 @@ public partial record User(
     string AvatarUrl
 ) : IHasId
 {
-    public string DiscriminatorFormatted =>
+    public string DiscriminatorFormatted { get; } =
         Discriminator is not null ? $"{Discriminator:0000}" : "0000";
 
     // This effectively represents the user's true identity.

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -18,15 +18,14 @@ using JsonExtensions.Reading;
 
 namespace DiscordChatExporter.Core.Discord;
 
-public class DiscordClient
+public class DiscordClient(
+    string token,
+    RateLimitPreference rateLimitPreference = RateLimitPreference.RespectAll
+)
 {
-    private readonly string _token;
     private readonly Uri _baseUri = new("https://discord.com/api/v10/", UriKind.Absolute);
-
     private TokenKind? _resolvedTokenKind;
 
-    public DiscordClient(string token) => _token = token;
-
     private async ValueTask<HttpResponseMessage> GetResponseAsync(
         string url,
         TokenKind tokenKind,
@@ -40,12 +39,10 @@ public class DiscordClient
 
                 // Don't validate because the token can have special characters
                 // https://github.com/Tyrrrz/DiscordChatExporter/issues/828
-                request
-                    .Headers
-                    .TryAddWithoutValidation(
-                        "Authorization",
-                        tokenKind == TokenKind.Bot ? $"Bot {_token}" : _token
-                    );
+                request.Headers.TryAddWithoutValidation(
+                    "Authorization",
+                    tokenKind == TokenKind.Bot ? $"Bot {token}" : token
+                );
 
                 var response = await Http.Client.SendAsync(
                     request,
@@ -53,35 +50,41 @@ public class DiscordClient
                     innerCancellationToken
                 );
 
-                // If this was the last request available before hitting the rate limit,
-                // wait out the reset time so that future requests can succeed.
-                // This may add an unnecessary delay in case the user doesn't intend to
-                // make any more requests, but implementing a smarter solution would
-                // require properly keeping track of Discord's global/per-route/per-resource
-                // rate limits and that's just way too much effort.
-                // https://discord.com/developers/docs/topics/rate-limits
-                var remainingRequestCount = response
-                    .Headers
-                    .TryGetValue("X-RateLimit-Remaining")
-                    ?.Pipe(s => int.Parse(s, CultureInfo.InvariantCulture));
-
-                var resetAfterDelay = response
-                    .Headers
-                    .TryGetValue("X-RateLimit-Reset-After")
-                    ?.Pipe(s => double.Parse(s, CultureInfo.InvariantCulture))
-                    .Pipe(TimeSpan.FromSeconds);
-
-                if (remainingRequestCount <= 0 && resetAfterDelay is not null)
+                // Discord has advisory rate limits (communicated via response headers), but they are typically
+                // way stricter than the actual rate limits enforced by the server.
+                // The user may choose to ignore the advisory rate limits and only retry on hard rate limits,
+                // if they want to prioritize speed over compliance (and safety of their account/bot).
+                // https://github.com/Tyrrrz/DiscordChatExporter/issues/1021
+                if (rateLimitPreference.IsRespectedFor(tokenKind))
                 {
-                    var delay =
-                    // Adding a small buffer to the reset time reduces the chance of getting
-                    // rate limited again, because it allows for more requests to be released.
-                    (resetAfterDelay.Value + TimeSpan.FromSeconds(1))
-                    // Sometimes Discord returns an absurdly high value for the reset time, which
-                    // is not actually enforced by the server. So we cap it at a reasonable value.
-                    .Clamp(TimeSpan.Zero, TimeSpan.FromSeconds(60));
+                    var remainingRequestCount = response
+                        .Headers.TryGetValue("X-RateLimit-Remaining")
+                        ?.Pipe(s => int.Parse(s, CultureInfo.InvariantCulture));
 
-                    await Task.Delay(delay, innerCancellationToken);
+                    var resetAfterDelay = response
+                        .Headers.TryGetValue("X-RateLimit-Reset-After")
+                        ?.Pipe(s => double.Parse(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.
+                    // This may add an unnecessary delay in case the user doesn't intend to
+                    // make any more requests, but implementing a smarter solution would
+                    // require properly keeping track of Discord's global/per-route/per-resource
+                    // rate limits and that's just way too much effort.
+                    // https://discord.com/developers/docs/topics/rate-limits
+                    if (remainingRequestCount <= 0 && resetAfterDelay is not null)
+                    {
+                        var delay =
+                            // Adding a small buffer to the reset time reduces the chance of getting
+                            // rate limited again, because it allows for more requests to be released.
+                            (resetAfterDelay.Value + TimeSpan.FromSeconds(1))
+                            // Sometimes Discord returns an absurdly high value for the reset time, which
+                            // is not actually enforced by the server. So we cap it at a reasonable value.
+                            .Clamp(TimeSpan.Zero, TimeSpan.FromSeconds(60));
+
+                        await Task.Delay(delay, innerCancellationToken);
+                    }
                 }
 
                 return response;
@@ -141,30 +144,31 @@ public class DiscordClient
         {
             throw response.StatusCode switch
             {
-                HttpStatusCode.Unauthorized
-                    => throw new DiscordChatExporterException(
-                        "Authentication token is invalid.",
-                        true
-                    ),
+                HttpStatusCode.Unauthorized => throw new DiscordChatExporterException(
+                    "Authentication token is invalid.",
+                    true
+                ),
 
-                HttpStatusCode.Forbidden
-                    => throw new DiscordChatExporterException(
-                        $"Request to '{url}' failed: forbidden."
-                    ),
+                HttpStatusCode.Forbidden => throw new DiscordChatExporterException(
+                    $"Request to '{url}' failed: forbidden."
+                ),
 
-                HttpStatusCode.NotFound
-                    => throw new DiscordChatExporterException(
-                        $"Request to '{url}' failed: not found."
-                    ),
+                HttpStatusCode.NotFound => throw new DiscordChatExporterException(
+                    $"Request to '{url}' failed: not found."
+                ),
 
-                _
-                    => throw new DiscordChatExporterException(
-                        $"""
-                        Request to '{url}' failed: {response.StatusCode.ToString().ToSpaceSeparatedWords().ToLowerInvariant()}.
-                        Response content: {await response.Content.ReadAsStringAsync(cancellationToken)}
-                        """,
-                        true
-                    )
+                _ => throw new DiscordChatExporterException(
+                    $"""
+                    Request to '{url}' failed: {response
+                        .StatusCode.ToString()
+                        .ToSpaceSeparatedWords()
+                        .ToLowerInvariant()}.
+                    Response content: {await response.Content.ReadAsStringAsync(
+                        cancellationToken
+                    )}
+                    """,
+                    true
+                ),
             };
         }
 
@@ -301,184 +305,19 @@ public class DiscordClient
         if (guildId == Guild.DirectMessages.Id)
             yield break;
 
-        var channels = (await GetGuildChannelsAsync(guildId, cancellationToken))
-            // Categories cannot have threads
-            .Where(c => !c.IsCategory)
-            // Voice channels cannot have threads
-            .Where(c => !c.IsVoice)
-            // Empty channels cannot have threads
-            .Where(c => !c.IsEmpty)
-            // If the 'before' boundary is specified, skip channels that don't have messages
-            // for that range, because thread-start event should always be accompanied by a message.
-            // Note that we don't perform a similar check for the 'after' boundary, because
-            // threads may have messages in range, even if the parent channel doesn't.
-            .Where(c => before is null || c.MayHaveMessagesBefore(before.Value))
-            .ToArray();
+        var channels = await GetGuildChannelsAsync(guildId, cancellationToken);
 
-        // User accounts can only fetch threads using the search endpoint
-        if (await ResolveTokenKindAsync(cancellationToken) == TokenKind.User)
+        foreach (
+            var channel in await GetChannelThreadsAsync(
+                channels,
+                includeArchived,
+                before,
+                after,
+                cancellationToken
+            )
+        )
         {
-            // Active threads
-            foreach (var channel in channels)
-            {
-                var currentOffset = 0;
-                while (true)
-                {
-                    var url = new UrlBuilder()
-                        .SetPath($"channels/{channel.Id}/threads/search")
-                        .SetQueryParameter("sort_by", "last_message_time")
-                        .SetQueryParameter("sort_order", "desc")
-                        .SetQueryParameter("archived", "false")
-                        .SetQueryParameter("offset", currentOffset.ToString())
-                        .Build();
-
-                    // Can be null on channels that the user cannot access or channels without threads
-                    var response = await TryGetJsonResponseAsync(url, cancellationToken);
-                    if (response is null)
-                        break;
-
-                    var breakOuter = false;
-
-                    foreach (
-                        var threadJson in response.Value.GetProperty("threads").EnumerateArray()
-                    )
-                    {
-                        var thread = Channel.Parse(threadJson, channel);
-
-                        // If the 'after' boundary is specified, we can break early,
-                        // because threads are sorted by last message time.
-                        if (after is not null && !thread.MayHaveMessagesAfter(after.Value))
-                        {
-                            breakOuter = true;
-                            break;
-                        }
-
-                        yield return thread;
-                        currentOffset++;
-                    }
-
-                    if (breakOuter)
-                        break;
-
-                    if (!response.Value.GetProperty("has_more").GetBoolean())
-                        break;
-                }
-            }
-
-            // Archived threads
-            if (includeArchived)
-            {
-                foreach (var channel in channels)
-                {
-                    var currentOffset = 0;
-                    while (true)
-                    {
-                        var url = new UrlBuilder()
-                            .SetPath($"channels/{channel.Id}/threads/search")
-                            .SetQueryParameter("sort_by", "last_message_time")
-                            .SetQueryParameter("sort_order", "desc")
-                            .SetQueryParameter("archived", "true")
-                            .SetQueryParameter("offset", currentOffset.ToString())
-                            .Build();
-
-                        // Can be null on channels that the user cannot access or channels without threads
-                        var response = await TryGetJsonResponseAsync(url, cancellationToken);
-                        if (response is null)
-                            break;
-
-                        var breakOuter = false;
-
-                        foreach (
-                            var threadJson in response.Value.GetProperty("threads").EnumerateArray()
-                        )
-                        {
-                            var thread = Channel.Parse(threadJson, channel);
-
-                            // If the 'after' boundary is specified, we can break early,
-                            // because threads are sorted by last message time.
-                            if (after is not null && !thread.MayHaveMessagesAfter(after.Value))
-                            {
-                                breakOuter = true;
-                                break;
-                            }
-
-                            yield return thread;
-                            currentOffset++;
-                        }
-
-                        if (breakOuter)
-                            break;
-
-                        if (!response.Value.GetProperty("has_more").GetBoolean())
-                            break;
-                    }
-                }
-            }
-        }
-        // Bot accounts can only fetch threads using the threads endpoint
-        else
-        {
-            // Active threads
-            {
-                var parentsById = channels.ToDictionary(c => c.Id);
-
-                var response = await GetJsonResponseAsync(
-                    $"guilds/{guildId}/threads/active",
-                    cancellationToken
-                );
-
-                foreach (var threadJson in response.GetProperty("threads").EnumerateArray())
-                {
-                    var parent = threadJson
-                        .GetPropertyOrNull("parent_id")
-                        ?.GetNonWhiteSpaceStringOrNull()
-                        ?.Pipe(Snowflake.Parse)
-                        .Pipe(parentsById.GetValueOrDefault);
-
-                    yield return Channel.Parse(threadJson, parent);
-                }
-            }
-
-            // Archived threads
-            if (includeArchived)
-            {
-                foreach (var channel in channels)
-                {
-                    // Public archived threads
-                    {
-                        // Can be null on certain channels
-                        var response = await TryGetJsonResponseAsync(
-                            $"channels/{channel.Id}/threads/archived/public",
-                            cancellationToken
-                        );
-
-                        if (response is null)
-                            continue;
-
-                        foreach (
-                            var threadJson in response.Value.GetProperty("threads").EnumerateArray()
-                        )
-                            yield return Channel.Parse(threadJson, channel);
-                    }
-
-                    // Private archived threads
-                    {
-                        // Can be null on certain channels
-                        var response = await TryGetJsonResponseAsync(
-                            $"channels/{channel.Id}/threads/archived/private",
-                            cancellationToken
-                        );
-
-                        if (response is null)
-                            continue;
-
-                        foreach (
-                            var threadJson in response.Value.GetProperty("threads").EnumerateArray()
-                        )
-                            yield return Channel.Parse(threadJson, channel);
-                    }
-                }
-            }
+            yield return channel;
         }
     }
 
@@ -549,6 +388,163 @@ public class DiscordClient
         }
     }
 
+    public async IAsyncEnumerable<Channel> GetChannelThreadsAsync(
+        IReadOnlyList<Channel> channels,
+        bool includeArchived = false,
+        Snowflake? before = null,
+        Snowflake? after = null,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default
+    )
+    {
+        var filteredChannels = channels
+            // Categories cannot have threads
+            .Where(c => !c.IsCategory)
+            // Voice channels cannot have threads
+            .Where(c => !c.IsVoice)
+            // Empty channels cannot have threads
+            .Where(c => !c.IsEmpty)
+            // If the 'before' boundary is specified, skip channels that don't have messages
+            // for that range, because thread-start event should always be accompanied by a message.
+            // Note that we don't perform a similar check for the 'after' boundary, because
+            // threads may have messages in range, even if the parent channel doesn't.
+            .Where(c => before is null || c.MayHaveMessagesBefore(before.Value))
+            .ToArray();
+
+        // User accounts can only fetch threads using the search endpoint
+        if (await ResolveTokenKindAsync(cancellationToken) == TokenKind.User)
+        {
+            foreach (var channel in filteredChannels)
+            {
+                // Either include both active and archived threads, or only active threads
+                foreach (
+                    var isArchived in includeArchived ? new[] { false, true } : new[] { false }
+                )
+                {
+                    // Offset is just the index of the last thread in the previous batch
+                    var currentOffset = 0;
+                    while (true)
+                    {
+                        var url = new UrlBuilder()
+                            .SetPath($"channels/{channel.Id}/threads/search")
+                            .SetQueryParameter("sort_by", "last_message_time")
+                            .SetQueryParameter("sort_order", "desc")
+                            .SetQueryParameter("archived", isArchived.ToString().ToLowerInvariant())
+                            .SetQueryParameter("offset", currentOffset.ToString())
+                            .Build();
+
+                        // Can be null on channels that the user cannot access or channels without threads
+                        var response = await TryGetJsonResponseAsync(url, cancellationToken);
+                        if (response is null)
+                            break;
+
+                        var breakOuter = false;
+
+                        foreach (
+                            var threadJson in response.Value.GetProperty("threads").EnumerateArray()
+                        )
+                        {
+                            var thread = Channel.Parse(threadJson, channel);
+
+                            // If the 'after' boundary is specified, we can break early,
+                            // because threads are sorted by last message timestamp.
+                            if (after is not null && !thread.MayHaveMessagesAfter(after.Value))
+                            {
+                                breakOuter = true;
+                                break;
+                            }
+
+                            yield return thread;
+                            currentOffset++;
+                        }
+
+                        if (breakOuter)
+                            break;
+
+                        if (!response.Value.GetProperty("has_more").GetBoolean())
+                            break;
+                    }
+                }
+            }
+        }
+        // Bot accounts can only fetch threads using the threads endpoint
+        else
+        {
+            var guilds = new HashSet<Snowflake>();
+            foreach (var channel in filteredChannels)
+                guilds.Add(channel.GuildId);
+
+            // Active threads
+            foreach (var guildId in guilds)
+            {
+                var parentsById = filteredChannels.ToDictionary(c => c.Id);
+
+                var response = await GetJsonResponseAsync(
+                    $"guilds/{guildId}/threads/active",
+                    cancellationToken
+                );
+
+                foreach (var threadJson in response.GetProperty("threads").EnumerateArray())
+                {
+                    var parent = threadJson
+                        .GetPropertyOrNull("parent_id")
+                        ?.GetNonWhiteSpaceStringOrNull()
+                        ?.Pipe(Snowflake.Parse)
+                        .Pipe(parentsById.GetValueOrDefault);
+
+                    if (filteredChannels.Contains(parent))
+                        yield return Channel.Parse(threadJson, parent);
+                }
+            }
+
+            // Archived threads
+            if (includeArchived)
+            {
+                foreach (var channel in filteredChannels)
+                {
+                    foreach (var archiveType in new[] { "public", "private" })
+                    {
+                        // This endpoint parameter expects an ISO8601 timestamp, not a snowflake
+                        var currentBefore = before
+                            ?.ToDate()
+                            .ToString("O", CultureInfo.InvariantCulture);
+
+                        while (true)
+                        {
+                            // Threads are sorted by archive timestamp, not by last message timestamp
+                            var url = new UrlBuilder()
+                                .SetPath($"channels/{channel.Id}/threads/archived/{archiveType}")
+                                .SetQueryParameter("before", currentBefore)
+                                .Build();
+
+                            // Can be null on certain channels
+                            var response = await TryGetJsonResponseAsync(url, cancellationToken);
+                            if (response is null)
+                                break;
+
+                            foreach (
+                                var threadJson in response
+                                    .Value.GetProperty("threads")
+                                    .EnumerateArray()
+                            )
+                            {
+                                var thread = Channel.Parse(threadJson, channel);
+                                yield return thread;
+
+                                currentBefore = threadJson
+                                    .GetProperty("thread_metadata")
+                                    .GetProperty("archive_timestamp")
+                                    .GetString();
+                            }
+
+                            if (!response.Value.GetProperty("has_more").GetBoolean())
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private async ValueTask<Message?> TryGetLastMessageAsync(
         Snowflake channelId,
         Snowflake? before = null,
@@ -679,10 +675,14 @@ public class DiscordClient
                 .SetQueryParameter("after", currentAfter.ToString())
                 .Build();
 
-            var response = await GetJsonResponseAsync(url, cancellationToken);
+            // Can be null on reactions with an emoji that has been deleted (?)
+            // https://github.com/Tyrrrz/DiscordChatExporter/issues/1226
+            var response = await TryGetJsonResponseAsync(url, cancellationToken);
+            if (response is null)
+                yield break;
 
             var count = 0;
-            foreach (var userJson in response.EnumerateArray())
+            foreach (var userJson in response.Value.EnumerateArray())
             {
                 var user = User.Parse(userJson);
                 yield return user;
@@ -691,9 +691,7 @@ public class DiscordClient
                 count++;
             }
 
-            // Each batch can contain up to 100 users.
-            // If we got fewer, then it's definitely the last batch.
-            if (count < 100)
+            if (count <= 0)
                 yield break;
         }
     }

DiscordChatExporter.Core/Discord/Dump/DataDump.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO.Compression;
+using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -8,11 +9,9 @@ using JsonExtensions.Reading;
 
 namespace DiscordChatExporter.Core.Discord.Dump;
 
-public partial class DataDump
+public partial class DataDump(IReadOnlyList<DataDumpChannel> channels)
 {
-    public IReadOnlyList<DataDumpChannel> Channels { get; }
-
-    public DataDump(IReadOnlyList<DataDumpChannel> channels) => Channels = channels;
+    public IReadOnlyList<DataDumpChannel> Channels { get; } = channels;
 }
 
 public partial class DataDump
@@ -42,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(
-                "Could not find the channel index inside the data package."
+        // 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);

DiscordChatExporter.Core/Discord/RateLimitPreference.cs

@@ -0,0 +1,38 @@
+using System;
+
+namespace DiscordChatExporter.Core.Discord;
+
+[Flags]
+public enum RateLimitPreference
+{
+    IgnoreAll = 0,
+    RespectForUserTokens = 0b1,
+    RespectForBotTokens = 0b10,
+    RespectAll = RespectForUserTokens | RespectForBotTokens,
+}
+
+public static class RateLimitPreferenceExtensions
+{
+    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 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)),
+            };
+    }
+}

DiscordChatExporter.Core/Discord/TokenKind.cs

@@ -3,5 +3,5 @@
 public enum TokenKind
 {
     User,
-    Bot
+    Bot,
 }

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <ItemGroup>
-    <PackageReference Include="AsyncKeyedLock" Version="6.2.2" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.2" PrivateAssets="all" />
+    <PackageReference Include="AngleSharp" Version="1.4.0" />
+    <PackageReference Include="AsyncKeyedLock" Version="8.0.1" />
+    <PackageReference Include="CSharpier.MsBuild" Version="1.2.5" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Polly" Version="8.2.0" />
-    <PackageReference Include="RazorBlade" Version="0.4.4" />
-    <PackageReference Include="Superpower" Version="3.0.0" />
-    <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.7" />
+    <PackageReference Include="Polly" Version="8.6.5" />
+    <PackageReference Include="RazorBlade" Version="0.11.0" />
+    <PackageReference Include="Superpower" Version="3.1.0" />
+    <PackageReference Include="WebMarkupMin.Core" Version="2.20.1" />
+    <PackageReference Include="YoutubeExplode" Version="6.5.6" />
   </ItemGroup>
-
-</Project>
+</Project>

DiscordChatExporter.Core/Exceptions/ChannelEmptyException.cs

@@ -0,0 +1,3 @@
+namespace DiscordChatExporter.Core.Exceptions;
+
+public class ChannelEmptyException(string message) : DiscordChatExporterException(message);

DiscordChatExporter.Core/Exceptions/DiscordChatExporterException.cs

@@ -2,17 +2,11 @@
 
 namespace DiscordChatExporter.Core.Exceptions;
 
-public class DiscordChatExporterException : Exception
+public class DiscordChatExporterException(
+    string message,
+    bool isFatal = false,
+    Exception? innerException = null
+) : Exception(message, innerException)
 {
-    public bool IsFatal { get; }
-
-    public DiscordChatExporterException(
-        string message,
-        bool isFatal = false,
-        Exception? innerException = null
-    )
-        : base(message, innerException)
-    {
-        IsFatal = isFatal;
-    }
+    public bool IsFatal { get; } = isFatal;
 }

DiscordChatExporter.Core/Exporting/ChannelExporter.cs

@@ -10,8 +10,6 @@ namespace DiscordChatExporter.Core.Exporting;
 
 public class ChannelExporter(DiscordClient discord)
 {
-    private readonly DiscordClient _discord = discord;
-
     public async ValueTask ExportChannelAsync(
         ExportRequest request,
         IProgress<Percentage>? progress = null,
@@ -22,54 +20,52 @@ public class ChannelExporter(DiscordClient discord)
         if (request.Channel.Kind == ChannelKind.GuildForum)
         {
             throw new DiscordChatExporterException(
-                $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
-                    + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
+                $"Channel '{request.Channel.Name}' "
+                    + $"of guild '{request.Guild.Name}' "
                     + $"is a forum and cannot be exported directly. "
                     + "You need to pull its threads and export them individually."
             );
         }
 
+        // Build context
+        var context = new ExportContext(discord, request);
+        await context.PopulateChannelsAndRolesAsync(cancellationToken);
+
+        // Initialize the exporter before further checks to ensure the file is created even if
+        // an exception is thrown after this point.
+        await using var messageExporter = new MessageExporter(context);
+
         // Check if the channel is empty
         if (request.Channel.IsEmpty)
         {
-            throw new DiscordChatExporterException(
-                $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
-                    + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
-                    + $"does not contain any messages."
+            throw new ChannelEmptyException(
+                $"Channel '{request.Channel.Name}' "
+                    + $"of guild '{request.Guild.Name}' "
+                    + $"does not contain any messages; an empty file will be created."
             );
         }
 
-        // Check if the 'after' boundary is valid
-        if (request.After is not null && !request.Channel.MayHaveMessagesAfter(request.After.Value))
-        {
-            throw new DiscordChatExporterException(
-                $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
-                    + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
-                    + $"does not contain any messages within the specified period."
-            );
-        }
-
-        // Check if the 'before' boundary is valid
+        // Check if the 'before' and 'after' boundaries are valid
         if (
-            request.Before is not null
-            && !request.Channel.MayHaveMessagesBefore(request.Before.Value)
+            (
+                request.Before is not null
+                && !request.Channel.MayHaveMessagesBefore(request.Before.Value)
+            )
+            || (
+                request.After is not null
+                && !request.Channel.MayHaveMessagesAfter(request.After.Value)
+            )
         )
         {
-            throw new DiscordChatExporterException(
-                $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
-                    + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
-                    + $"does not contain any messages within the specified period."
+            throw new ChannelEmptyException(
+                $"Channel '{request.Channel.Name}' "
+                    + $"of guild '{request.Guild.Name}' "
+                    + $"does not contain any messages within the specified period; an empty file will be created."
             );
         }
 
-        // Build context
-        var context = new ExportContext(_discord, request);
-        await context.PopulateChannelsAndRolesAsync(cancellationToken);
-
-        // Export messages
-        await using var messageExporter = new MessageExporter(context);
         await foreach (
-            var message in _discord.GetMessagesAsync(
+            var message in discord.GetMessagesAsync(
                 request.Channel.Id,
                 request.After,
                 request.Before,
@@ -100,15 +96,5 @@ public class ChannelExporter(DiscordClient discord)
                 );
             }
         }
-
-        // Throw if no messages were exported
-        if (messageExporter.MessagesExported <= 0)
-        {
-            throw new DiscordChatExporterException(
-                $"Channel '{request.Channel.Name}' (#{request.Channel.Id}) "
-                    + $"of guild '{request.Guild.Name}' (#{request.Guild.Id}) "
-                    + $"does not contain any matching messages within the specified period."
-            );
-        }
     }
 }

DiscordChatExporter.Core/Exporting/CsvMessageWriter.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading;
@@ -122,7 +123,7 @@ internal partial class CsvMessageWriter
 {
     private static string CsvEncode(string value)
     {
-        value = value.Replace("\"", "\"\"");
+        value = value.Replace("\"", "\"\"", StringComparison.Ordinal);
         return $"\"{value}\"";
     }
 }

DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
@@ -16,15 +15,7 @@ namespace DiscordChatExporter.Core.Exporting;
 
 internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
 {
-    private static readonly AsyncKeyedLocker<string> Locker =
-        new(o =>
-        {
-            o.PoolSize = 20;
-            o.PoolInitialFill = 1;
-        });
-
-    private readonly string _workingDirPath = workingDirPath;
-    private readonly bool _reuse = reuse;
+    private static readonly AsyncKeyedLocker<string> Locker = new();
 
     // File paths of the previously downloaded assets
     private readonly Dictionary<string, string> _previousPathsByUrl = new(StringComparer.Ordinal);
@@ -35,7 +26,7 @@ internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
     )
     {
         var fileName = GetFileNameFromUrl(url);
-        var filePath = Path.Combine(_workingDirPath, fileName);
+        var filePath = Path.Combine(workingDirPath, fileName);
 
         using var _ = await Locker.LockAsync(filePath, cancellationToken);
 
@@ -43,51 +34,18 @@ internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
             return cachedFilePath;
 
         // Reuse existing files if we're allowed to
-        if (_reuse && File.Exists(filePath))
+        if (reuse && File.Exists(filePath))
             return _previousPathsByUrl[url] = filePath;
 
-        Directory.CreateDirectory(_workingDirPath);
+        Directory.CreateDirectory(workingDirPath);
 
         await Http.ResiliencePipeline.ExecuteAsync(
             async innerCancellationToken =>
             {
                 // Download the file
                 using var response = await Http.Client.GetAsync(url, innerCancellationToken);
-                await using (var output = File.Create(filePath))
-                    await response.Content.CopyToAsync(output, innerCancellationToken);
-
-                // Try to set the file date according to the last-modified header
-                try
-                {
-                    var lastModified = response
-                        .Content
-                        .Headers
-                        .TryGetValue("Last-Modified")
-                        ?.Pipe(
-                            s =>
-                                DateTimeOffset.TryParse(
-                                    s,
-                                    CultureInfo.InvariantCulture,
-                                    DateTimeStyles.None,
-                                    out var instant
-                                )
-                                    ? instant
-                                    : (DateTimeOffset?)null
-                        );
-
-                    if (lastModified is not null)
-                    {
-                        File.SetCreationTimeUtc(filePath, lastModified.Value.UtcDateTime);
-                        File.SetLastWriteTimeUtc(filePath, lastModified.Value.UtcDateTime);
-                        File.SetLastAccessTimeUtc(filePath, lastModified.Value.UtcDateTime);
-                    }
-                }
-                catch
-                {
-                    // This can apparently fail for some reason.
-                    // Updating the file date is not a critical task, so we'll just ignore exceptions thrown here.
-                    // https://github.com/Tyrrrz/DiscordChatExporter/issues/585
-                }
+                await using var output = File.Create(filePath);
+                await response.Content.CopyToAsync(output, innerCancellationToken);
             },
             cancellationToken
         );
@@ -117,7 +75,7 @@ internal partial class ExportAssetDownloader
 
         return SHA256
             .HashData(Encoding.UTF8.GetBytes(NormalizeUrl(url)))
-            .ToHex()
+            .Pipe(Convert.ToHexStringLower)
             // 5 chars ought to be enough for anybody
             .Truncate(5);
     }
@@ -145,7 +103,7 @@ internal partial class ExportAssetDownloader
             fileExtension = "";
         }
 
-        return PathEx.EscapeFileName(
+        return Path.EscapeFileName(
             fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension
         );
     }

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -8,6 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Core.Exporting;
@@ -18,8 +19,10 @@ internal class ExportContext(DiscordClient discord, ExportRequest request)
     private readonly Dictionary<Snowflake, Channel> _channelsById = new();
     private readonly Dictionary<Snowflake, Role> _rolesById = new();
 
-    private readonly ExportAssetDownloader _assetDownloader =
-        new(request.AssetsDirPath, request.ShouldReuseAssets);
+    private readonly ExportAssetDownloader _assetDownloader = new(
+        request.AssetsDirPath,
+        request.ShouldReuseAssets
+    );
 
     public DiscordClient Discord { get; } = discord;
 
@@ -93,11 +96,11 @@ internal class ExportContext(DiscordClient discord, ExportRequest request)
 
     public IReadOnlyList<Role> GetUserRoles(Snowflake id) =>
         TryGetMember(id)
-            ?.RoleIds
-            .Select(TryGetRole)
+            ?.RoleIds.Select(TryGetRole)
             .WhereNotNull()
             .OrderByDescending(r => r.Position)
-            .ToArray() ?? Array.Empty<Role>();
+            .ToArray()
+        ?? [];
 
     public Color? TryGetUserColor(Snowflake id) =>
         GetUserRoles(id).Where(r => r.Color is not null).Select(r => r.Color).FirstOrDefault();
@@ -116,7 +119,7 @@ internal class ExportContext(DiscordClient discord, ExportRequest request)
             var relativeFilePath = Path.GetRelativePath(Request.OutputDirPath, filePath);
 
             // Prefer the relative path so that the export package can be copied around without breaking references.
-            // However, if the assets directory lies outside of the export directory, use the absolute path instead.
+            // However, if the assets directory lies outside the export directory, use the absolute path instead.
             var shouldUseAbsoluteFilePath =
                 relativeFilePath.StartsWith(
                     ".." + Path.DirectorySeparatorChar,
@@ -131,14 +134,7 @@ internal class ExportContext(DiscordClient discord, ExportRequest request)
 
             // For HTML, the path needs to be properly formatted
             if (Request.Format is ExportFormat.HtmlDark or ExportFormat.HtmlLight)
-            {
-                // Format the path into a valid file URI
-                var href = new Uri(new Uri("file:///"), optimalFilePath).ToString();
-
-                // File schema does not support relative paths, so strip it if that's the case
-                // https://github.com/Tyrrrz/DiscordChatExporter/issues/1155
-                return shouldUseAbsoluteFilePath ? href : href[8..];
-            }
+                return Url.EncodeFilePath(optimalFilePath);
 
             return optimalFilePath;
         }

DiscordChatExporter.Core/Exporting/ExportFormat.cs

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

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -7,7 +7,7 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
-using DiscordChatExporter.Core.Utils;
+using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Core.Exporting;
 
@@ -39,9 +39,9 @@ public partial class ExportRequest
 
     public bool ShouldReuseAssets { get; }
 
-    public string Locale { get; }
+    public string? Locale { get; }
 
-    public CultureInfo CultureInfo { get; }
+    public CultureInfo? CultureInfo { get; }
 
     public bool IsUtcNormalizationEnabled { get; }
 
@@ -58,7 +58,7 @@ public partial class ExportRequest
         bool shouldFormatMarkdown,
         bool shouldDownloadAssets,
         bool shouldReuseAssets,
-        string locale,
+        string? locale,
         bool isUtcNormalizationEnabled
     )
     {
@@ -83,7 +83,7 @@ public partial class ExportRequest
             ? FormatPath(assetsDirPath, Guild, Channel, After, Before)
             : $"{OutputFilePath}_Files{Path.DirectorySeparatorChar}";
 
-        CultureInfo = CultureInfo.GetCultureInfo(Locale);
+        CultureInfo = Locale?.Pipe(CultureInfo.GetCultureInfo);
     }
 }
 
@@ -144,7 +144,7 @@ public partial class ExportRequest
         // File extension
         buffer.Append('.').Append(format.GetFileExtension());
 
-        return PathEx.EscapeFileName(buffer.ToString());
+        return Path.EscapeFileName(buffer.ToString());
     }
 
     private static string FormatPath(
@@ -158,7 +158,7 @@ public partial class ExportRequest
             path,
             "%.",
             m =>
-                PathEx.EscapeFileName(
+                Path.EscapeFileName(
                     m.Value switch
                     {
                         "%g" => guild.Id.ToString(),
@@ -171,23 +171,22 @@ public partial class ExportRequest
                         "%C" => channel.Name,
 
                         "%p" => channel.Position?.ToString(CultureInfo.InvariantCulture) ?? "0",
-                        "%P"
-                            => channel.Parent?.Position?.ToString(CultureInfo.InvariantCulture)
-                                ?? "0",
+                        "%P" => channel.Parent?.Position?.ToString(CultureInfo.InvariantCulture)
+                            ?? "0",
 
-                        "%a"
-                            => after?.ToDate().ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)
-                                ?? "",
-                        "%b"
-                            => before?.ToDate().ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)
-                                ?? "",
-                        "%d"
-                            => DateTimeOffset
-                                .Now
-                                .ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
+                        "%a" => after?.ToDate().ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)
+                            ?? "",
+                        "%b" => before
+                            ?.ToDate()
+                            .ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)
+                            ?? "",
+                        "%d" => DateTimeOffset.Now.ToString(
+                            "yyyy-MM-dd",
+                            CultureInfo.InvariantCulture
+                        ),
 
                         "%%" => "%",
-                        _ => m.Value
+                        _ => m.Value,
                     }
                 )
         );

DiscordChatExporter.Core/Exporting/Filtering/BinaryExpressionKind.cs

@@ -3,5 +3,5 @@
 internal enum BinaryExpressionKind
 {
     Or,
-    And
+    And,
 }

DiscordChatExporter.Core/Exporting/Filtering/BinaryExpressionMessageFilter.cs

@@ -3,28 +3,17 @@ using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Core.Exporting.Filtering;
 
-internal class BinaryExpressionMessageFilter : MessageFilter
+internal class BinaryExpressionMessageFilter(
+    MessageFilter first,
+    MessageFilter second,
+    BinaryExpressionKind kind
+) : MessageFilter
 {
-    private readonly MessageFilter _first;
-    private readonly MessageFilter _second;
-    private readonly BinaryExpressionKind _kind;
-
-    public BinaryExpressionMessageFilter(
-        MessageFilter first,
-        MessageFilter second,
-        BinaryExpressionKind kind
-    )
-    {
-        _first = first;
-        _second = second;
-        _kind = kind;
-    }
-
     public override bool IsMatch(Message message) =>
-        _kind switch
+        kind switch
         {
-            BinaryExpressionKind.Or => _first.IsMatch(message) || _second.IsMatch(message),
-            BinaryExpressionKind.And => _first.IsMatch(message) && _second.IsMatch(message),
-            _ => throw new InvalidOperationException($"Unknown binary expression kind '{_kind}'.")
+            BinaryExpressionKind.Or => first.IsMatch(message) || second.IsMatch(message),
+            BinaryExpressionKind.And => first.IsMatch(message) && second.IsMatch(message),
+            _ => throw new InvalidOperationException($"Unknown binary expression kind '{kind}'."),
         };
 }

DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs

@@ -4,12 +4,8 @@ using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Core.Exporting.Filtering;
 
-internal class ContainsMessageFilter : MessageFilter
+internal class ContainsMessageFilter(string text) : MessageFilter
 {
-    private readonly string _text;
-
-    public ContainsMessageFilter(string text) => _text = text;
-
     // Match content within word boundaries, between spaces, or as the whole input.
     // For example, "max" shouldn't match on content "our maximum effort",
     // but should match on content "our max effort".
@@ -20,20 +16,17 @@ internal class ContainsMessageFilter : MessageFilter
         !string.IsNullOrWhiteSpace(content)
         && Regex.IsMatch(
             content,
-            @"(?:\b|\s|^)" + Regex.Escape(_text) + @"(?:\b|\s|$)",
+            @"(?:\b|\s|^)" + Regex.Escape(text) + @"(?:\b|\s|$)",
             RegexOptions.IgnoreCase | RegexOptions.CultureInvariant
         );
 
     public override bool IsMatch(Message message) =>
         IsMatch(message.Content)
-        || message
-            .Embeds
-            .Any(
-                e =>
-                    IsMatch(e.Title)
-                    || IsMatch(e.Author?.Name)
-                    || IsMatch(e.Description)
-                    || IsMatch(e.Footer?.Text)
-                    || e.Fields.Any(f => IsMatch(f.Name) || IsMatch(f.Value))
-            );
+        || message.Embeds.Any(e =>
+            IsMatch(e.Title)
+            || IsMatch(e.Author?.Name)
+            || IsMatch(e.Description)
+            || IsMatch(e.Footer?.Text)
+            || e.Fields.Any(f => IsMatch(f.Name) || IsMatch(f.Value))
+        );
 }

DiscordChatExporter.Core/Exporting/Filtering/FromMessageFilter.cs

@@ -3,15 +3,11 @@ using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Core.Exporting.Filtering;
 
-internal class FromMessageFilter : MessageFilter
+internal class FromMessageFilter(string value) : MessageFilter
 {
-    private readonly string _value;
-
-    public FromMessageFilter(string value) => _value = value;
-
     public override bool IsMatch(Message message) =>
-        string.Equals(_value, message.Author.Name, StringComparison.OrdinalIgnoreCase)
-        || string.Equals(_value, message.Author.DisplayName, StringComparison.OrdinalIgnoreCase)
-        || string.Equals(_value, message.Author.FullName, StringComparison.OrdinalIgnoreCase)
-        || string.Equals(_value, message.Author.Id.ToString(), StringComparison.OrdinalIgnoreCase);
+        string.Equals(value, message.Author.Name, StringComparison.OrdinalIgnoreCase)
+        || string.Equals(value, message.Author.DisplayName, StringComparison.OrdinalIgnoreCase)
+        || string.Equals(value, message.Author.FullName, StringComparison.OrdinalIgnoreCase)
+        || string.Equals(value, message.Author.Id.ToString(), StringComparison.OrdinalIgnoreCase);
 }

DiscordChatExporter.Core/Exporting/Filtering/HasMessageFilter.cs

@@ -1,30 +1,29 @@
 using System;
 using System.Linq;
-using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Markdown.Parsing;
 
 namespace DiscordChatExporter.Core.Exporting.Filtering;
 
-internal class HasMessageFilter : MessageFilter
+internal class HasMessageFilter(MessageContentMatchKind kind) : MessageFilter
 {
-    private readonly MessageContentMatchKind _kind;
-
-    public HasMessageFilter(MessageContentMatchKind kind) => _kind = kind;
-
     public override bool IsMatch(Message message) =>
-        _kind switch
+        kind switch
         {
-            MessageContentMatchKind.Link
-                => Regex.IsMatch(message.Content, "https?://\\S*[^\\.,:;\"\'\\s]"),
+            MessageContentMatchKind.Link => MarkdownParser.ExtractLinks(message.Content).Any(),
             MessageContentMatchKind.Embed => message.Embeds.Any(),
             MessageContentMatchKind.File => message.Attachments.Any(),
             MessageContentMatchKind.Video => message.Attachments.Any(file => file.IsVideo),
             MessageContentMatchKind.Image => message.Attachments.Any(file => file.IsImage),
             MessageContentMatchKind.Sound => message.Attachments.Any(file => file.IsAudio),
             MessageContentMatchKind.Pin => message.IsPinned,
-            _
-                => throw new InvalidOperationException(
-                    $"Unknown message content match kind '{_kind}'."
-                )
+            MessageContentMatchKind.Invite => MarkdownParser
+                .ExtractLinks(message.Content)
+                .Select(l => l.Url)
+                .Select(Invite.TryGetCodeFromUrl)
+                .Any(c => !string.IsNullOrWhiteSpace(c)),
+            _ => throw new InvalidOperationException(
+                $"Unknown message content match kind '{kind}'."
+            ),
         };
 }

DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs

@@ -4,20 +4,13 @@ using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Core.Exporting.Filtering;
 
-internal class MentionsMessageFilter : MessageFilter
+internal class MentionsMessageFilter(string value) : MessageFilter
 {
-    private readonly string _value;
-
-    public MentionsMessageFilter(string value) => _value = value;
-
     public override bool IsMatch(Message message) =>
-        message
-            .MentionedUsers
-            .Any(
-                user =>
-                    string.Equals(_value, user.Name, StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(_value, user.DisplayName, StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(_value, user.FullName, StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(_value, user.Id.ToString(), StringComparison.OrdinalIgnoreCase)
-            );
+        message.MentionedUsers.Any(user =>
+            string.Equals(value, user.Name, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(value, user.DisplayName, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(value, user.FullName, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(value, user.Id.ToString(), StringComparison.OrdinalIgnoreCase)
+        );
 }

DiscordChatExporter.Core/Exporting/Filtering/MessageContentMatchKind.cs

@@ -8,5 +8,6 @@ internal enum MessageContentMatchKind
     Video,
     Image,
     Sound,
-    Pin
+    Pin,
+    Invite,
 }

DiscordChatExporter.Core/Exporting/Filtering/NegatedMessageFilter.cs

@@ -2,11 +2,7 @@
 
 namespace DiscordChatExporter.Core.Exporting.Filtering;
 
-internal class NegatedMessageFilter : MessageFilter
+internal class NegatedMessageFilter(MessageFilter filter) : MessageFilter
 {
-    private readonly MessageFilter _filter;
-
-    public NegatedMessageFilter(MessageFilter filter) => _filter = filter;
-
-    public override bool IsMatch(Message message) => !_filter.IsMatch(message);
+    public override bool IsMatch(Message message) => !filter.IsMatch(message);
 }

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

@@ -30,8 +30,8 @@ internal static class FilterGrammar
         .OneOf(QuotedString, UnquotedString)
         .Named("text string");
 
-    private static readonly TextParser<MessageFilter> ContainsFilter = String.Select(
-        v => (MessageFilter)new ContainsMessageFilter(v)
+    private static readonly TextParser<MessageFilter> ContainsFilter = String.Select(v =>
+        (MessageFilter)new ContainsMessageFilter(v)
     );
 
     private static readonly TextParser<MessageFilter> FromFilter = Span.EqualToIgnoreCase("from:")
@@ -61,18 +61,28 @@ internal static class FilterGrammar
         .IgnoreThen(
             Parse.OneOf(
                 Span.EqualToIgnoreCase("link")
-                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Link)),
+                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Link))
+                    .Try(),
                 Span.EqualToIgnoreCase("embed")
-                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Embed)),
+                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Embed))
+                    .Try(),
                 Span.EqualToIgnoreCase("file")
-                    .IgnoreThen(Parse.Return(MessageContentMatchKind.File)),
+                    .IgnoreThen(Parse.Return(MessageContentMatchKind.File))
+                    .Try(),
                 Span.EqualToIgnoreCase("video")
-                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Video)),
+                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Video))
+                    .Try(),
                 Span.EqualToIgnoreCase("image")
-                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Image)),
+                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Image))
+                    .Try(),
                 Span.EqualToIgnoreCase("sound")
                     .IgnoreThen(Parse.Return(MessageContentMatchKind.Sound)),
-                Span.EqualToIgnoreCase("pin").IgnoreThen(Parse.Return(MessageContentMatchKind.Pin))
+                Span.EqualToIgnoreCase("pin")
+                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Pin))
+                    .Try(),
+                Span.EqualToIgnoreCase("invite")
+                    .IgnoreThen(Parse.Return(MessageContentMatchKind.Invite))
+                    .Try()
             )
         )
         .Select(k => (MessageFilter)new HasMessageFilter(k))
@@ -115,7 +125,7 @@ internal static class FilterGrammar
             op switch
             {
                 '|' => new BinaryExpressionMessageFilter(left, right, BinaryExpressionKind.Or),
-                _ => new BinaryExpressionMessageFilter(left, right, BinaryExpressionKind.And)
+                _ => new BinaryExpressionMessageFilter(left, right, BinaryExpressionKind.And),
             }
     );
 

DiscordChatExporter.Core/Exporting/Filtering/ReactionMessageFilter.cs

@@ -4,23 +4,12 @@ using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Core.Exporting.Filtering;
 
-internal class ReactionMessageFilter : MessageFilter
+internal class ReactionMessageFilter(string value) : MessageFilter
 {
-    private readonly string _value;
-
-    public ReactionMessageFilter(string value) => _value = value;
-
     public override bool IsMatch(Message message) =>
-        message
-            .Reactions
-            .Any(
-                r =>
-                    string.Equals(
-                        _value,
-                        r.Emoji.Id?.ToString(),
-                        StringComparison.OrdinalIgnoreCase
-                    )
-                    || string.Equals(_value, r.Emoji.Name, StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(_value, r.Emoji.Code, StringComparison.OrdinalIgnoreCase)
-            );
+        message.Reactions.Any(r =>
+            string.Equals(value, r.Emoji.Id?.ToString(), StringComparison.OrdinalIgnoreCase)
+            || string.Equals(value, r.Emoji.Name, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(value, r.Emoji.Code, StringComparison.OrdinalIgnoreCase)
+        );
 }

DiscordChatExporter.Core/Exporting/HtmlMarkdownVisitor.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
@@ -18,16 +17,12 @@ internal partial class HtmlMarkdownVisitor(
     bool isJumbo
 ) : MarkdownVisitor
 {
-    private readonly ExportContext _context = context;
-    private readonly StringBuilder _buffer = buffer;
-    private readonly bool _isJumbo = isJumbo;
-
     protected override ValueTask VisitTextAsync(
         TextNode text,
         CancellationToken cancellationToken = default
     )
     {
-        _buffer.Append(HtmlEncode(text.Text));
+        buffer.Append(HtmlEncode(text.Text));
         return default;
     }
 
@@ -38,63 +33,56 @@ internal partial class HtmlMarkdownVisitor(
     {
         var (openingTag, closingTag) = formatting.Kind switch
         {
-            FormattingKind.Bold
-                => (
-                    // lang=html
-                    "<strong>",
-                    // lang=html
-                    "</strong>"
-                ),
+            FormattingKind.Bold => (
+                // lang=html
+                "<strong>",
+                // lang=html
+                "</strong>"
+            ),
 
-            FormattingKind.Italic
-                => (
-                    // lang=html
-                    "<em>",
-                    // lang=html
-                    "</em>"
-                ),
+            FormattingKind.Italic => (
+                // lang=html
+                "<em>",
+                // lang=html
+                "</em>"
+            ),
 
-            FormattingKind.Underline
-                => (
-                    // lang=html
-                    "<u>",
-                    // lang=html
-                    "</u>"
-                ),
+            FormattingKind.Underline => (
+                // lang=html
+                "<u>",
+                // lang=html
+                "</u>"
+            ),
 
-            FormattingKind.Strikethrough
-                => (
-                    // lang=html
-                    "<s>",
-                    // lang=html
-                    "</s>"
-                ),
+            FormattingKind.Strikethrough => (
+                // lang=html
+                "<s>",
+                // lang=html
+                "</s>"
+            ),
 
-            FormattingKind.Spoiler
-                => (
-                    // lang=html
-                    """<span class="chatlog__markdown-spoiler chatlog__markdown-spoiler--hidden" onclick="showSpoiler(event, this)">""",
-                    // lang=html
-                    """</span>"""
-                ),
+            FormattingKind.Spoiler => (
+                // lang=html
+                """<span class="chatlog__markdown-spoiler chatlog__markdown-spoiler--hidden" onclick="showSpoiler(event, this)">""",
+                // lang=html
+                """</span>"""
+            ),
 
-            FormattingKind.Quote
-                => (
-                    // lang=html
-                    """<div class="chatlog__markdown-quote"><div class="chatlog__markdown-quote-border"></div><div class="chatlog__markdown-quote-content">""",
-                    // lang=html
-                    """</div></div>"""
-                ),
+            FormattingKind.Quote => (
+                // lang=html
+                """<div class="chatlog__markdown-quote"><div class="chatlog__markdown-quote-border"></div><div class="chatlog__markdown-quote-content">""",
+                // lang=html
+                """</div></div>"""
+            ),
 
-            _
-                => throw new InvalidOperationException(
-                    $"Unknown formatting kind '{formatting.Kind}'."
-                )
+            _ => throw new InvalidOperationException(
+                $"Unknown formatting kind '{formatting.Kind}'."
+            ),
         };
 
-        _buffer.Append(openingTag);
+        buffer.Append(openingTag);
         await VisitAsync(formatting.Children, cancellationToken);
-        _buffer.Append(closingTag);
+        buffer.Append(closingTag);
     }
 
     protected override async ValueTask VisitHeadingAsync(
@@ -102,14 +90,14 @@ internal partial class HtmlMarkdownVisitor(
         CancellationToken cancellationToken = default
     )
     {
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             $"<h{heading.Level}>"
         );
 
         await VisitAsync(heading.Children, cancellationToken);
 
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             $"</h{heading.Level}>"
         );
@@ -120,14 +108,14 @@ internal partial class HtmlMarkdownVisitor(
         CancellationToken cancellationToken = default
     )
     {
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             "<ul>"
         );
 
         await VisitAsync(list.Items, cancellationToken);
 
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             "</ul>"
         );
@@ -138,14 +126,14 @@ internal partial class HtmlMarkdownVisitor(
         CancellationToken cancellationToken = default
     )
     {
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             "<li>"
         );
 
         await VisitAsync(listItem.Children, cancellationToken);
 
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             "</li>"
         );
@@ -156,10 +144,12 @@ internal partial class HtmlMarkdownVisitor(
         CancellationToken cancellationToken = default
     )
     {
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             $"""
-            <code class="chatlog__markdown-pre chatlog__markdown-pre--inline">{HtmlEncode(inlineCodeBlock.Code)}</code>
+            <code class="chatlog__markdown-pre chatlog__markdown-pre--inline">{HtmlEncode(
+                inlineCodeBlock.Code
+            )}</code>
             """
         );
 
@@ -175,10 +165,12 @@ internal partial class HtmlMarkdownVisitor(
             ? $"language-{multiLineCodeBlock.Language}"
             : "nohighlight";
 
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             $"""
-            <code class="chatlog__markdown-pre chatlog__markdown-pre--multiline {highlightClass}">{HtmlEncode(multiLineCodeBlock.Code)}</code>
+            <code class="chatlog__markdown-pre chatlog__markdown-pre--multiline {highlightClass}">{HtmlEncode(
+                multiLineCodeBlock.Code
+            )}</code>
             """
         );
 
@@ -196,7 +188,7 @@ internal partial class HtmlMarkdownVisitor(
             .Groups[1]
             .Value;
 
-        _buffer.Append(
+        buffer.Append(
             !string.IsNullOrWhiteSpace(linkedMessageId)
                 // lang=html
                 ? $"""<a href="{HtmlEncode(link.Url)}" onclick="scrollToMessage(event, '{linkedMessageId}')">"""
@@ -206,7 +198,7 @@ internal partial class HtmlMarkdownVisitor(
 
         await VisitAsync(link.Children, cancellationToken);
 
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             "</a>"
         );
@@ -217,10 +209,9 @@ internal partial class HtmlMarkdownVisitor(
         CancellationToken cancellationToken = default
     )
     {
-        var emojiImageUrl = Emoji.GetImageUrl(emoji.Id, emoji.Name, emoji.IsAnimated);
-        var jumboClass = _isJumbo ? "chatlog__emoji--large" : "";
+        var jumboClass = isJumbo ? "chatlog__emoji--large" : "";
 
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             $"""
             <img
@@ -228,7 +219,7 @@ internal partial class HtmlMarkdownVisitor(
                 class="chatlog__emoji {jumboClass}"
                 alt="{emoji.Name}"
                 title="{emoji.Code}"
-                src="{await _context.ResolveAssetUrlAsync(emojiImageUrl, cancellationToken)}">
+                src="{await context.ResolveAssetUrlAsync(emoji.ImageUrl, cancellationToken)}">
             """
         );
     }
@@ -240,7 +231,7 @@ internal partial class HtmlMarkdownVisitor(
     {
         if (mention.Kind == MentionKind.Everyone)
         {
-            _buffer.Append(
+            buffer.Append(
                 // lang=html
                 """
                 <span class="chatlog__markdown-mention">@everyone</span>
@@ -249,7 +240,7 @@ internal partial class HtmlMarkdownVisitor(
         }
         else if (mention.Kind == MentionKind.Here)
         {
-            _buffer.Append(
+            buffer.Append(
                 // lang=html
                 """
                 <span class="chatlog__markdown-mention">@here</span>
@@ -262,26 +253,28 @@ internal partial class HtmlMarkdownVisitor(
             // which means they need to be populated on demand.
             // https://github.com/Tyrrrz/DiscordChatExporter/issues/304
             if (mention.TargetId is not null)
-                await _context.PopulateMemberAsync(mention.TargetId.Value, cancellationToken);
+                await context.PopulateMemberAsync(mention.TargetId.Value, cancellationToken);
 
-            var member = mention.TargetId?.Pipe(_context.TryGetMember);
+            var member = mention.TargetId?.Pipe(context.TryGetMember);
             var fullName = member?.User.FullName ?? "Unknown";
             var displayName = member?.DisplayName ?? member?.User.DisplayName ?? "Unknown";
 
-            _buffer.Append(
+            buffer.Append(
                 // lang=html
                 $"""
-                <span class="chatlog__markdown-mention" title="{HtmlEncode(fullName)}">@{HtmlEncode(displayName)}</span>
+                <span class="chatlog__markdown-mention" title="{HtmlEncode(fullName)}">@{HtmlEncode(
+                    displayName
+                )}</span>
                 """
             );
         }
         else if (mention.Kind == MentionKind.Channel)
         {
-            var channel = mention.TargetId?.Pipe(_context.TryGetChannel);
+            var channel = mention.TargetId?.Pipe(context.TryGetChannel);
             var symbol = channel?.IsVoice == true ? "🔊" : "#";
             var name = channel?.Name ?? "deleted-channel";
 
-            _buffer.Append(
+            buffer.Append(
                 // lang=html
                 $"""
                 <span class="chatlog__markdown-mention">{symbol}{HtmlEncode(name)}</span>
@@ -290,17 +283,21 @@ internal partial class HtmlMarkdownVisitor(
         }
         else if (mention.Kind == MentionKind.Role)
         {
-            var role = mention.TargetId?.Pipe(_context.TryGetRole);
+            var role = mention.TargetId?.Pipe(context.TryGetRole);
             var name = role?.Name ?? "deleted-role";
             var color = role?.Color;
 
             var style = color is not null
                 ? $"""
-                  color: rgb({color.Value.R}, {color.Value.G}, {color.Value.B}); background-color: rgba({color.Value.R}, {color.Value.G}, {color.Value.B}, 0.1);
-                  """
+                    color: rgb({color.Value.R}, {color.Value.G}, {color
+                        .Value
+                        .B}); background-color: rgba({color.Value.R}, {color.Value.G}, {color
+                        .Value
+                        .B}, 0.1);
+                    """
                 : null;
 
-            _buffer.Append(
+            buffer.Append(
                 // lang=html
                 $"""
                 <span class="chatlog__markdown-mention" style="{style}">@{HtmlEncode(name)}</span>
@@ -315,17 +312,19 @@ internal partial class HtmlMarkdownVisitor(
     )
     {
         var formatted = timestamp.Instant is not null
-            ? _context.FormatDate(timestamp.Instant.Value, timestamp.Format ?? "g")
+            ? context.FormatDate(timestamp.Instant.Value, timestamp.Format ?? "g")
             : "Invalid date";
 
         var formattedLong = timestamp.Instant is not null
-            ? _context.FormatDate(timestamp.Instant.Value, "f")
+            ? context.FormatDate(timestamp.Instant.Value, "f")
             : "";
 
-        _buffer.Append(
+        buffer.Append(
             // lang=html
             $"""
-            <span class="chatlog__markdown-timestamp" title="{HtmlEncode(formattedLong)}">{HtmlEncode(formatted)}</span>
+            <span class="chatlog__markdown-timestamp" title="{HtmlEncode(
+                formattedLong
+            )}">{HtmlEncode(formatted)}</span>
             """
         );
 
@@ -348,10 +347,8 @@ internal partial class HtmlMarkdownVisitor
 
         var isJumbo =
             isJumboAllowed
-            && nodes.All(
-                n =>
-                    n is EmojiNode
-                    || n is TextNode textNode && string.IsNullOrWhiteSpace(textNode.Text)
+            && nodes.All(n =>
+                n is EmojiNode || n is TextNode textNode && string.IsNullOrWhiteSpace(textNode.Text)
             );
 
         var buffer = new StringBuilder();

DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs

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

DiscordChatExporter.Core/Exporting/HtmlMessageWriter.cs

@@ -13,10 +13,9 @@ internal class HtmlMessageWriter(Stream stream, ExportContext context, string th
     : MessageWriter(stream, context)
 {
     private readonly TextWriter _writer = new StreamWriter(stream);
-    private readonly string _themeName = themeName;
 
     private readonly HtmlMinifier _minifier = new();
-    private readonly List<Message> _messageGroup = new();
+    private readonly List<Message> _messageGroup = [];
 
     private bool CanJoinGroup(Message message)
     {
@@ -74,11 +73,9 @@ internal class HtmlMessageWriter(Stream stream, ExportContext context, string th
     {
         await _writer.WriteLineAsync(
             Minify(
-                await new PreambleTemplate
-                {
-                    Context = Context,
-                    ThemeName = _themeName
-                }.RenderAsync(cancellationToken)
+                await new PreambleTemplate { Context = Context, ThemeName = themeName }.RenderAsync(
+                    cancellationToken
+                )
             )
         );
     }
@@ -93,7 +90,7 @@ internal class HtmlMessageWriter(Stream stream, ExportContext context, string th
                 await new MessageGroupTemplate
                 {
                     Context = Context,
-                    Messages = messages
+                    Messages = messages,
                 }.RenderAsync(cancellationToken)
             )
         );
@@ -134,7 +131,7 @@ internal class HtmlMessageWriter(Stream stream, ExportContext context, string th
                 await new PostambleTemplate
                 {
                     Context = Context,
-                    MessagesWritten = MessagesWritten
+                    MessagesWritten = MessagesWritten,
                 }.RenderAsync(cancellationToken)
             )
         );

DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs

@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
+using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Writing;
 
@@ -15,7 +17,7 @@ namespace DiscordChatExporter.Core.Exporting;
 internal class JsonMessageWriter(Stream stream, ExportContext context)
     : MessageWriter(stream, context)
 {
-    private readonly Utf8JsonWriter _writer = new Utf8JsonWriter(
+    private readonly Utf8JsonWriter _writer = new(
         stream,
         new JsonWriterOptions
         {
@@ -24,7 +26,7 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
             Indented = true,
             // Validation errors may mask actual failures
             // https://github.com/Tyrrrz/DiscordChatExporter/issues/413
-            SkipValidation = true
+            SkipValidation = true,
         }
     );
 
@@ -36,22 +38,31 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
             ? await PlainTextMarkdownVisitor.FormatAsync(Context, markdown, cancellationToken)
             : markdown;
 
-    private async ValueTask WriteUserAsync(User user, CancellationToken cancellationToken = default)
+    private async ValueTask WriteUserAsync(
+        User user,
+        bool includeRoles = true,
+        CancellationToken cancellationToken = default
+    )
     {
         _writer.WriteStartObject();
 
         _writer.WriteString("id", user.Id.ToString());
         _writer.WriteString("name", user.Name);
         _writer.WriteString("discriminator", user.DiscriminatorFormatted);
+
         _writer.WriteString(
             "nickname",
             Context.TryGetMember(user.Id)?.DisplayName ?? user.DisplayName
         );
+
         _writer.WriteString("color", Context.TryGetUserColor(user.Id)?.ToHex());
         _writer.WriteBoolean("isBot", user.IsBot);
 
-        _writer.WritePropertyName("roles");
-        await WriteRolesAsync(Context.GetUserRoles(user.Id), cancellationToken);
+        if (includeRoles)
+        {
+            _writer.WritePropertyName("roles");
+            await WriteRolesAsync(Context.GetUserRoles(user.Id), cancellationToken);
+        }
 
         _writer.WriteString(
             "avatarUrl",
@@ -65,6 +76,26 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
         await _writer.FlushAsync(cancellationToken);
     }
 
+    private async ValueTask WriteEmojiAsync(
+        Emoji emoji,
+        CancellationToken cancellationToken = default
+    )
+    {
+        _writer.WriteStartObject();
+
+        _writer.WriteString("id", emoji.Id.ToString());
+        _writer.WriteString("name", emoji.Name);
+        _writer.WriteString("code", emoji.Code);
+        _writer.WriteBoolean("isAnimated", emoji.IsAnimated);
+        _writer.WriteString(
+            "imageUrl",
+            await Context.ResolveAssetUrlAsync(emoji.ImageUrl, cancellationToken)
+        );
+
+        _writer.WriteEndObject();
+        await _writer.FlushAsync(cancellationToken);
+    }
+
     private async ValueTask WriteRolesAsync(
         IReadOnlyList<Role> roles,
         CancellationToken cancellationToken = default
@@ -107,6 +138,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
                     cancellationToken
                 )
             );
+
+            _writer.WriteString("iconCanonicalUrl", embedAuthor.IconUrl);
         }
 
         _writer.WriteEndObject();
@@ -129,6 +162,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
                     cancellationToken
                 )
             );
+
+            _writer.WriteString("canonicalUrl", embedImage.Url);
         }
 
         _writer.WriteNumber("width", embedImage.Width);
@@ -154,6 +189,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
                     cancellationToken
                 )
             );
+
+            _writer.WriteString("canonicalUrl", embedVideo.Url);
         }
 
         _writer.WriteNumber("width", embedVideo.Width);
@@ -181,6 +218,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
                     cancellationToken
                 )
             );
+
+            _writer.WriteString("iconCanonicalUrl", embedFooter.IconUrl);
         }
 
         _writer.WriteEndObject();
@@ -272,6 +311,26 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
 
         _writer.WriteEndArray();
 
+        // Inline emoji
+        _writer.WriteStartArray("inlineEmojis");
+
+        if (!string.IsNullOrWhiteSpace(embed.Description))
+        {
+            foreach (
+                var emoji in MarkdownParser
+                    .ExtractEmojis(embed.Description)
+                    .DistinctBy(e => e.Name, StringComparer.Ordinal)
+            )
+            {
+                await WriteEmojiAsync(
+                    new Emoji(emoji.Id, emoji.Name, emoji.IsAnimated),
+                    cancellationToken
+                );
+            }
+        }
+
+        _writer.WriteEndArray();
+
         _writer.WriteEndObject();
         await _writer.FlushAsync(cancellationToken);
     }
@@ -372,7 +431,7 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
 
         // Author
         _writer.WritePropertyName("author");
-        await WriteUserAsync(message.Author, cancellationToken);
+        await WriteUserAsync(message.Author, true, cancellationToken);
 
         // Attachments
         _writer.WriteStartArray("attachments");
@@ -430,53 +489,24 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
             _writer.WriteStartObject();
 
             // Emoji
-            _writer.WriteStartObject("emoji");
-            _writer.WriteString("id", reaction.Emoji.Id.ToString());
-            _writer.WriteString("name", reaction.Emoji.Name);
-            _writer.WriteString("code", reaction.Emoji.Code);
-            _writer.WriteBoolean("isAnimated", reaction.Emoji.IsAnimated);
-            _writer.WriteString(
-                "imageUrl",
-                await Context.ResolveAssetUrlAsync(reaction.Emoji.ImageUrl, cancellationToken)
-            );
-            _writer.WriteEndObject();
+            _writer.WritePropertyName("emoji");
+            await WriteEmojiAsync(reaction.Emoji, cancellationToken);
 
             _writer.WriteNumber("count", reaction.Count);
 
+            // Reaction authors
             _writer.WriteStartArray("users");
+
             await foreach (
-                var user in Context
-                    .Discord
-                    .GetMessageReactionsAsync(
-                        Context.Request.Channel.Id,
-                        message.Id,
-                        reaction.Emoji,
-                        cancellationToken
-                    )
+                var user in Context.Discord.GetMessageReactionsAsync(
+                    Context.Request.Channel.Id,
+                    message.Id,
+                    reaction.Emoji,
+                    cancellationToken
+                )
             )
             {
-                _writer.WriteStartObject();
-
-                // Write limited user information without color and roles,
-                // so we can avoid fetching guild member information for each user.
-                _writer.WriteString("id", user.Id.ToString());
-                _writer.WriteString("name", user.Name);
-                _writer.WriteString("discriminator", user.DiscriminatorFormatted);
-                _writer.WriteString(
-                    "nickname",
-                    Context.TryGetMember(user.Id)?.DisplayName ?? user.DisplayName
-                );
-                _writer.WriteBoolean("isBot", user.IsBot);
-
-                _writer.WriteString(
-                    "avatarUrl",
-                    await Context.ResolveAssetUrlAsync(
-                        Context.TryGetMember(user.Id)?.AvatarUrl ?? user.AvatarUrl,
-                        cancellationToken
-                    )
-                );
-
-                _writer.WriteEndObject();
+                await WriteUserAsync(user, false, cancellationToken);
             }
 
             _writer.WriteEndArray();
@@ -488,9 +518,8 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
 
         // Mentions
         _writer.WriteStartArray("mentions");
-
         foreach (var user in message.MentionedUsers)
-            await WriteUserAsync(user, cancellationToken);
+            await WriteUserAsync(user, true, cancellationToken);
 
         _writer.WriteEndArray();
 
@@ -513,11 +542,28 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)
             _writer.WriteString("name", message.Interaction.Name);
 
             _writer.WritePropertyName("user");
-            await WriteUserAsync(message.Interaction.User, cancellationToken);
+            await WriteUserAsync(message.Interaction.User, true, cancellationToken);
 
             _writer.WriteEndObject();
         }
 
+        // Inline emoji
+        _writer.WriteStartArray("inlineEmojis");
+
+        foreach (
+            var emoji in MarkdownParser
+                .ExtractEmojis(message.Content)
+                .DistinctBy(e => e.Name, StringComparer.Ordinal)
+        )
+        {
+            await WriteEmojiAsync(
+                new Emoji(emoji.Id, emoji.Name, emoji.IsAnimated),
+                cancellationToken
+            );
+        }
+
+        _writer.WriteEndArray();
+
         _writer.WriteEndObject();
         await _writer.FlushAsync(cancellationToken);
     }

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -8,14 +8,42 @@ namespace DiscordChatExporter.Core.Exporting;
 
 internal partial class MessageExporter(ExportContext context) : IAsyncDisposable
 {
-    private readonly ExportContext _context = context;
-
     private int _partitionIndex;
     private MessageWriter? _writer;
 
     public long MessagesExported { get; private set; }
 
-    private async ValueTask ResetWriterAsync(CancellationToken cancellationToken = default)
+    private async ValueTask<MessageWriter> InitializeWriterAsync(
+        CancellationToken cancellationToken = default
+    )
+    {
+        // Ensure that the partition limit has not been reached
+        if (
+            _writer is not null
+            && context.Request.PartitionLimit.IsReached(
+                _writer.MessagesWritten,
+                _writer.BytesWritten
+            )
+        )
+        {
+            await UninitializeWriterAsync(cancellationToken);
+            _partitionIndex++;
+        }
+
+        // Writer is still valid, return
+        if (_writer is not null)
+            return _writer;
+
+        Directory.CreateDirectory(context.Request.OutputDirPath);
+        var filePath = GetPartitionFilePath(context.Request.OutputFilePath, _partitionIndex);
+
+        var writer = CreateMessageWriter(filePath, context.Request.Format, context);
+        await writer.WritePreambleAsync(cancellationToken);
+
+        return _writer = writer;
+    }
+
+    private async ValueTask UninitializeWriterAsync(CancellationToken cancellationToken = default)
     {
         if (_writer is not null)
         {
@@ -32,47 +60,24 @@ internal partial class MessageExporter(ExportContext context) : IAsyncDisposable
         }
     }
 
-    private async ValueTask<MessageWriter> GetWriterAsync(
-        CancellationToken cancellationToken = default
-    )
-    {
-        // Ensure that the partition limit has not been reached
-        if (
-            _writer is not null
-            && _context
-                .Request
-                .PartitionLimit
-                .IsReached(_writer.MessagesWritten, _writer.BytesWritten)
-        )
-        {
-            await ResetWriterAsync(cancellationToken);
-            _partitionIndex++;
-        }
-
-        // Writer is still valid, return
-        if (_writer is not null)
-            return _writer;
-
-        Directory.CreateDirectory(_context.Request.OutputDirPath);
-        var filePath = GetPartitionFilePath(_context.Request.OutputFilePath, _partitionIndex);
-
-        var writer = CreateMessageWriter(filePath, _context.Request.Format, _context);
-        await writer.WritePreambleAsync(cancellationToken);
-
-        return _writer = writer;
-    }
-
     public async ValueTask ExportMessageAsync(
         Message message,
         CancellationToken cancellationToken = default
     )
     {
-        var writer = await GetWriterAsync(cancellationToken);
+        var writer = await InitializeWriterAsync(cancellationToken);
         await writer.WriteMessageAsync(message, cancellationToken);
         MessagesExported++;
     }
 
-    public async ValueTask DisposeAsync() => await ResetWriterAsync();
+    public async ValueTask DisposeAsync()
+    {
+        // If not messages were written, force the creation of an empty file
+        if (MessagesExported <= 0)
+            _ = await InitializeWriterAsync();
+
+        await UninitializeWriterAsync();
+    }
 }
 
 internal partial class MessageExporter
@@ -102,13 +107,15 @@ internal partial class MessageExporter
             ExportFormat.PlainText => new PlainTextMessageWriter(File.Create(filePath), context),
             ExportFormat.Csv => new CsvMessageWriter(File.Create(filePath), context),
             ExportFormat.HtmlDark => new HtmlMessageWriter(File.Create(filePath), context, "Dark"),
-            ExportFormat.HtmlLight
-                => new HtmlMessageWriter(File.Create(filePath), context, "Light"),
+            ExportFormat.HtmlLight => new HtmlMessageWriter(
+                File.Create(filePath),
+                context,
+                "Light"
+            ),
             ExportFormat.Json => new JsonMessageWriter(File.Create(filePath), context),
-            _
-                => throw new ArgumentOutOfRangeException(
-                    nameof(format),
-                    $"Unknown export format '{format}'."
-                )
+            _ => throw new ArgumentOutOfRangeException(
+                nameof(format),
+                $"Unknown export format '{format}'."
+            ),
         };
 }