Don't attempt to infer asset timestamp from message timestamp (#1352)

This is inaccurate and somewhat works only for attachments anyway. Not worth the overhead.

.docs/Docker.md

@@ -0,0 +1,79 @@
+# Docker usage instructions
+
+Docker distribution of DiscordChatExporter provides a way to run the app in a virtualized and isolated environment. Due to the nature of Docker, you also don't need to install any prerequisites otherwise required by DCE.
+
+> **Note**:
+> Only the CLI flavor of DiscordChatExporter is available for use with Docker.
+
+## Pulling
+
+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
+```
+
+Note the `:stable` tag. DiscordChatExporter images are tagged according to the following patterns:
+
+- `stable` — latest stable version release. This tag is updated with each release of a new project version. Recommended for personal use.
+- `x.y.z` (e.g. `2.30.1`) — specific stable version release. This tag is pushed when the corresponding version is released and never updated thereafter. Recommended for use in automation scenarios.
+- `latest` — latest (potentially unstable) build. This tag is updated with each new commit to the `master` branch. Not recommended, unless you want to test a new feature that has not been released in a stable version yet.
+
+You can see all available tags [here](https://hub.docker.com/r/tyrrrz/discordchatexporter/tags?ordering=name).
+
+## Usage
+
+To run the CLI in Docker and render help text:
+
+```console
+$ 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
+```
+
+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
+```
+
+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.
+
+> **Note**:
+> 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
+> ```
+>
+> 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).
+
+You can also use the current working directory as the output directory by specifying:
+
+- `-v $PWD:/out` in Bash
+- `-v $pwd.Path:/out` in PowerShell
+
+For more information, please refer to the [Dockerfile](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/DiscordChatExporter.Cli.dockerfile) and [Docker documentation](https://docs.docker.com/engine/reference/run).
+
+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.
+
+Please refer to the [Docker documentation](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file) for more information.

.docs/Getting-started.md

@@ -0,0 +1,60 @@
+# Getting started
+
+Welcome to the getting started page!
+Here you'll learn how to use every **DiscordChatExporter** (DCE for short) feature.
+For other things you can do with DCE, check out the [Guides](Readme.md#guides) section.
+
+If you still have unanswered questions after reading this page or if you have encountered a problem, please visit our [FAQ & Troubleshooting](Troubleshooting.md) section.
+
+The information presented on this page is valid for **all** platforms.
+
+## GUI or CLI?
+
+![GUI vs CLI](https://i.imgur.com/j9OTxRB.png)
+
+**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.
+- **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.
+
+There are dedicated guides for each version:
+
+- [Using the GUI](Using-the-GUI.md)
+- [Using the CLI](Using-the-CLI.md)
+
+## File formats
+
+### HTML
+
+![](https://i.imgur.com/S7lBTkV.png)
+The HTML format replicates Discord's interface, making it the most user-friendly option.
+It's the best format for attachment preview and sharing.
+You can open `.html` files with a web browser, such as Google Chrome.
+
+> **Warning**:
+> If a picture is deleted, or if a user changes its avatar, the respective images will no longer be displayed.
+> Export using the "Download assets" (`--media`) option to avoid this.
+
+### Plain Text
+
+<img src="https://i.imgur.com/PbUyRXD.png" height="400"/>
+
+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
+
+<img src="https://i.imgur.com/FAeSA4O.png" height="400"/>
+
+The JSON format contains more technical information and is easily parsable.
+You can open `.json` files with a text editor, such as Notepad.
+
+### CSV
+
+![](https://i.imgur.com/VEVUsKs.png)
+![](https://i.imgur.com/1vPmQqQ.png)
+
+The CSV format allows for easy parsing of the chat log. Depending on your needs, the JSON format might be better.
+You can open `.csv` files with a text editor, such as Notepad, or a spreadsheet app, like Microsoft Excel and Google Sheets.

.docs/Message-filters.md

@@ -0,0 +1,105 @@
+# Message filters
+
+You can use a special notation to filter messages that you want to have included in an export. The notation syntax is designed to mimic Discord's search query syntax, but with additional capabilities.
+
+To configure a filter, specify it in advanced export parameters when using the GUI or by passing the `--filter` option when using the CLI. For the CLI version, see also [caveats](#cli-caveats).
+
+## Examples
+
+- Filter by user
+
+```console
+from:Tyrrrz
+```
+
+- Filter by user (with discriminator)
+
+```console
+from:Tyrrrz#1234
+```
+
+- Filter by message content (allowed values: `link`, `embed`, `file`, `video`, `image`, `sound`)
+
+```console
+has:image
+```
+
+- Filter by mentioned user (same rules apply as with `from:` filter)
+
+```console
+mentions:Tyrrrz#1234
+```
+
+- Filter by contained text (has word "hello" and word "world" somewhere in the message text):
+
+```console
+hello world
+```
+
+- Filter by contained text (has the string "hello world" somewhere in the message text):
+
+```console
+"hello world"
+```
+
+- Combine multiple filters ('and'):
+
+```console
+from:Tyrrrz has:image
+```
+
+- Same thing but with an explicit operator:
+
+```console
+from:Tyrrrz & has:image
+```
+
+- Combine multiple filters ('or'):
+
+```console
+from:Tyrrrz | from:"96-LB"
+```
+
+- Combine multiple filters using groups:
+
+```console
+(from:Tyrrrz | from:"96-LB") has:image
+```
+
+- Negate a filter:
+
+```console
+-from:Tyrrrz | -has:image
+```
+
+- Negate a grouped filter:
+
+```console
+-(from:Tyrrrz has:image)
+```
+
+- Escape special characters (`-` is escaped below, so it's not parsed as negation operator):
+
+```console
+from:96\-LB
+```
+
+## CLI Caveats
+
+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"
+```
+
+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'"
+```
+
+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
+```

.docs/Readme.md

@@ -0,0 +1,31 @@
+# Home
+
+## Installation & Usage
+
+- Getting started:
+  - [Using the GUI](Using-the-GUI.md)
+  - [Using the CLI](Using-the-CLI.md)
+  - [File formats](Getting-started.md#file-formats)
+
+## Guides
+
+- [How to get Token and Channel IDs](Token-and-IDs.md)
+- [How to use message filters](Message-filters.md)
+- Export scheduling with CLI:
+  - [Windows](Scheduling-Windows.md)
+  - [macOS](Scheduling-MacOS.md)
+  - [Linux](Scheduling-Linux.md)
+
+## Video tutorial
+
+- Video by [NoIntro Tutorials](https://youtube.com/channel/UCFezKSxdNKJe77-hYiuXu3Q) (using DiscordChatExporter GUI)
+
+[![Video tutorial](https://i.ytimg.com/vi/jjtu0VQXV7I/hqdefault.jpg)](https://youtube.com/watch?v=jjtu0VQXV7I)
+
+## FAQ & Troubleshooting
+
+- [General questions](Troubleshooting.md#general)
+- [First steps help](Troubleshooting.md#first-steps)
+- [It's crashing/failing](Troubleshooting.md#DCE-is-crashingfailing)
+- [Errors](Troubleshooting.md#errors)
+- [**More help**](Troubleshooting.md)

.docs/Scheduling-Linux.md

@@ -0,0 +1,121 @@
+# Scheduling exports with Cron
+
+## Creating the script
+
+1. Open Terminal and create a new text file with `nano /path/to/DiscordChatExporter/cron.sh`
+
+> **Note**:
+> You can't use your mouse in nano, use the arrow keys to control the cursor (caret).
+
+2. Paste the following into the text file:
+
+```bash
+#!/bin/bash
+# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs
+
+TOKEN=tokenhere
+CHANNELID=channelhere
+DLLFOLDER=dceFOLDERpathhere
+FILENAME=filenamehere
+EXPORTDIRECTORY=dirhere
+EXPORTFORMAT=formathere
+# Available export formats: plaintext, htmldark, htmllight, json, csv
+# /\ CaSe-SeNsItIvE /\
+# You can edit the export command on line 40 if you'd like to include more options like date ranges and date format. You can't use partitioning (-p) with this script.
+
+# This will verify if EXPORTFORMAT is valid and will set the final file extension according to it. If the format is invalid, the script will display a message and exit.
+if [[ "$EXPORTFORMAT" == "plaintext" ]]; then
+FORMATEXT=.txt
+elif [[ "$EXPORTFORMAT" == "htmldark" ]] || [[ "$EXPORTFORMAT" == "htmllight" ]]; then
+FORMATEXT=.html
+elif [[ "$EXPORTFORMAT" == "json" ]]; then
+FORMATEXT=.json
+elif [[ "$EXPORTFORMAT" == "csv" ]]; then
+FORMATEXT=.csv
+else
+echo "$EXPORTFORMAT - Unknown export format"
+echo "Available export formats: plaintext, htmldark, htmllight, csv, json"
+echo "/\ CaSe-SeNsItIvE /\\"
+exit 1
+fi
+
+# This will change the script's directory to DLLPATH, if unable to do so, the script will exit.
+cd $DLLFOLDER || exit 1
+
+# This will export your chat
+./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")
+
+# This will move the .tmp file to the desired export location, if unable to do so, it will attempt to delete the .tmp file.
+if ! mv "$FILENAME.tmp" "${EXPORTDIRECTORY//\"}/$FILENAME-$CURRENTTIME$FORMATEXT" ; then
+echo "Unable to move $FILENAME.tmp to $EXPORTDIRECTORY/$FILENAME-$CURRENTTIME$FORMATEXT."
+echo "Cleaning up..."
+  if ! rm -Rf "$FILENAME.tmp" ; then
+  echo "Unable to remove $FILENAME.tmp."
+  fi
+exit 1
+fi
+exit 0
+```
+
+3. Replace:
+
+- `tokenhere` with your [Token](Token-and-IDs.md).
+- `channelhere` with a [Channel ID](Token-and-IDs.md).
+- `dceFOLDERpathhere` with DCE's **directory path** (e.g. `/path/to/folder`, NOT `/path/to/folder/DiscordChatExporter.dll`).
+- `filenamehere` with the exported channel's filename, without spaces.
+- `dirhere` with the export directory (e.g. /home/user/Documents/Discord\ Exports).
+- `formathere` with one of the available export formats.
+
+> **Note**:
+> Remember to escape spaces (add `\` before them) or to quote (") the paths (`"/home/my user"`)!
+
+> **Note**:
+> To save, hold down CTRL and then press O, if asked for a filename, type it and press ENTER. Hit CTRL+X to exit the text editor.
+> [Check out this page](https://wiki.gentoo.org/wiki/Nano/Basics_Guide) if you want to know more about nano.
+
+4. Make your script executable with `chmod +x /path/to/DiscordChatExporter/cron.sh`
+
+5. Let's edit the cron file. If you want to run the script with your user privileges, edit it by running `crontab -e`. If you want to run the script as root, edit it with `sudo crontab -e`. If this is your first time running this command, you might be asked to select a text editor. Nano is easier for beginners.
+
+6. Add the following to the end of the file `* * * * * /path/to/DiscordChatExporter/cron.sh >/tmp/discordchatexporter.log 2>/tmp/discordchatexportererror.log`. Don't forget to replace the `/path/to/DiscordChatExporter/cron.sh`!
+
+> **Note**:
+> If you don't want logs to be created, replace both `/tmp/discordchatexporter.log` with `/dev/null`.
+
+Then replace the \*s according to:
+
+![](https://i.imgur.com/RY7USM6.png)
+
+---
+
+**Examples**:
+
+- If you want to execute the script at minute 15 of every hour: `15 * * * *`
+- Every 30 minutes `*/30 * * * *`
+- Every day at midnight `0 0 * * *`
+- Every day at noon `0 12 * * *`
+- Every day at 3, 4 and 6 PM `0 15,16,18 * * *`
+- Every Wednesday at 9 AM `0 9 * * 3`
+
+Verify your cron time [here](https://crontab.guru).
+
+---
+
+**Additional information**
+
+The week starts on Sunday. 0 = SUN, 1 = MON ... 7 = SUN.
+
+Be aware that if you set the day to '31', the script will only run on months that have the 31st day.
+
+> [Learn more about running a cron job on the last day of the month here](https://stackoverflow.com/questions/6139189/cron-job-to-run-on-the-last-day-of-the-month) (expert).
+
+The default filename for the exported channel is `YYYY-MM-DD-hh-mm-ss-yourfilename`. You can change it if you'd like.
+
+Don't forget to update your token in the script after it has been reset!
+
+---
+
+Special thanks to [@Yudi](https://github.com/Yudi)

.docs/Scheduling-MacOS.md

@@ -0,0 +1,258 @@
+# Scheduling exports on macOS
+
+## Creating the script
+
+1. Open TextEdit.app and create a new file
+
+2. Convert the file to a plain text one in 'Format > Make Plain Text' (⇧⌘T)
+
+![](https://i.imgur.com/WXrTtXM.png)
+
+3. Paste the following into the text editor:
+
+```bash
+#!/bin/bash
+# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs
+
+TOKEN=tokenhere
+CHANNELID=channelhere
+DLLFOLDER=dceFOLDERpathhere
+FILENAME=filenamehere
+EXPORTDIRECTORY=dirhere
+EXPORTFORMAT=formathere
+# Available export formats: plaintext, htmldark, htmllight, json, csv
+# /\ CaSe-SeNsItIvE /\
+# You can edit the export command on line 43 if you'd like to include more options like date ranges and date format. You can't use partitioning (-p) with this script.
+
+# This variable specifies in which directories the executable programs are located. Don't change it.
+PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/share/dotnet
+
+# This will verify if EXPORTFORMAT is valid and will set the final file extension according to it. If the format is invalid, the script will display a message and exit.
+if [[ "$EXPORTFORMAT" == "plaintext" ]]; then
+FORMATEXT=.txt
+elif [[ "$EXPORTFORMAT" == "htmldark" ]] || [[ "$EXPORTFORMAT" == "htmllight" ]]; then
+FORMATEXT=.html
+elif [[ "$EXPORTFORMAT" == "json" ]]; then
+FORMATEXT=.json
+elif [[ "$EXPORTFORMAT" == "csv" ]]; then
+FORMATEXT=.csv
+else
+echo "$EXPORTFORMAT - Unknown export format"
+echo "Available export formats: plaintext, htmldark, htmllight, csv, json"
+echo "/\ CaSe-SeNsItIvE /\\"
+exit 1
+fi
+
+# This will change the script's directory to DLLPATH, if unable to do so, the script will exit.
+cd $DLLFOLDER || exit 1
+
+# This will export your chat
+./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")
+
+# This will move the .tmp file to the desired export location. If unable to do so, it will attempt to delete the .tmp file.
+if ! mv "$FILENAME.tmp" "${EXPORTDIRECTORY//\"}/$FILENAME-$CURRENTTIME$FORMATEXT" ; then
+echo "Unable to move $FILENAME.tmp to $EXPORTDIRECTORY/$FILENAME-$CURRENTTIME$FORMATEXT."
+echo "Cleaning up..."
+  if ! rm -Rf "$FILENAME.tmp" ; then
+  echo "Unable to remove $FILENAME.tmp."
+  fi
+exit 1
+fi
+exit 0
+```
+
+4. Replace:
+
+- `tokenhere` with your [Token](Token-and-IDs.md)
+- `channelhere` with a [Channel ID](Token-and-IDs.md)
+- `dceFOLDERpathhere` with DCE's **directory's path** (e.g. `/Users/user/Desktop/DiscordChatExporterFolder`, NOT `/Users/user/Desktop/DiscordChatExporterFolder/DiscordChatExporter.DLL`)
+- `filenamehere` with the exported channel's filename, without spaces
+- `dirhere` with the directory you want the files to be saved at (e.g. `/Users/user/Documents/Discord\ Exports`)
+- `formathere` with one of the available export formats
+
+To quickly get file or folder paths, select the file/folder, then hit Command+I (⌘I) and copy what's after `Where:`.
+After copying and pasting, make sure the file/folder name is not missing. If a folder has spaces in its name, add `\` before the spaces, like in the example below:
+
+- `Discord\ Exports` - Wrong ✗
+- `/Users/user/Documents` - Wrong ✗
+- `/Users/user/Documents/Discord Exports` - Wrong ✗
+- `/Users/user/Documents/Discord\ Exports/DCE.Cli.dll` - Wrong ✗
+- `/Users/user/Documents/Discord \Exports` - Wrong ✗
+- `/Users/user/Documents/Discord\ Exports` - Correct ✓
+- `/Users/user/Desktop/DiscordChatExporter` - Correct ✓
+
+![Screenshot of mac info window](https://i.imgur.com/29u6Nyx.png)
+
+5. Save the file as `filename.sh`, not `.txt`
+6. Open Terminal.app, type `chmod +x`, press the SPACE key, then drag & drop the `filename.sh` into the Terminal window and hit RETURN. You may be prompted for your password, and you won't be able to see it as you type.
+
+## Creating the .plist file
+
+Open TextEdit, make a Plain Text (⇧⌘T) and then paste the following into it:
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>local.discordchatexporter</string>
+    <key>Program</key>
+    <string>/path/to/filename.sh</string>
+    REPLACEME
+  </dict>
+</plist>
+```
+
+- The `Label` string is the name of the export job, it must be something unique. Replace the `local.discordchatexporter` between the `<string>` with another name if you'd like to run more than one script.
+- The `Program` string is the path to the script. Replace `/path/to/filename.sh` between the `<string>` with the path of the previously created script.
+- Replace the `REPLACEME` with the content presented in the following sections according to <u>when</u> you want to export.
+
+When you're done, save the file with the same name as the `Label` and with the `.plist` extension (not `.txt`), like `local.discordchatexporter.plist`.
+
+### Exporting on System Boot/User Login
+
+```xml
+<key>RunAtLoad</key>
+<true/>
+```
+
+### Export every _n_ seconds
+
+The following example is to export every 3600 seconds (1 hour), replace the integer value with your desired time:
+
+```xml
+<key>StartInterval</key>
+<integer>3600</integer>
+```
+
+### Export at a specific time and date
+
+```xml
+<key>StartCalendarInterval</key>
+<dict>
+  <key>Weekday</key>
+  <integer>0</integer>
+  <key>Month</key>
+  <integer>0</integer>
+  <key>Day</key>
+  <integer>0</integer>
+  <key>Hour</key>
+  <integer>0</integer>
+  <key>Minute</key>
+  <integer>0</integer>
+</dict>
+```
+
+| Key         | Integer           |
+| ----------- | ----------------- |
+| **Month**   | 1-12              |
+| **Day**     | 1-31              |
+| **Weekday** | 0-6 (0 is Sunday) |
+| **Hour**    | 0-23              |
+| **Minute**  | 0-59              |
+
+**Sunday** - 0; **Monday** - 1; **Tuesday** - 2; **Wednesday** - 3; **Thursday** - 4; **Friday** - 5; **Saturday** - 6
+
+Replace the template's `0`s according to the desired times.
+
+You can delete the `<key>`s you don't need, don't forget to remove the `<integer>0</integer>` under it.
+Omitted keys are interpreted as wildcards, for example, if you delete the Minute key, the script will run at every minute, delete the Weekday key and it'll run at every weekday, and so on.
+
+Be aware that if you set the day to '31', the script will only run on months that have the 31st day.
+
+**Check the examples below ([or skip to step 3 (loading the file)](#3-loading-the-plist-into-launchctl)):**
+
+Export everyday at 5:15 PM:
+
+```xml
+<key>StartCalendarInterval</key>
+<dict>
+  <key>Hour</key>
+  <integer>17</integer>
+  <key>Minute</key>
+  <integer>15</integer>
+</dict>
+
+```
+
+Every 15 minutes of an hour (xx:15):
+
+```xml
+<key>StartCalendarInterval</key>
+<dict>
+  <key>Minute</key>
+  <integer>15</integer>
+</dict>
+
+```
+
+Every Sunday at midnight and every Wednesday full hour (xx:00). Notice the inclusion of `<array>` and `</array>` to allow multiple values:
+
+```xml
+<key>StartCalendarInterval</key>
+<array>
+  <dict>
+    <key>Weekday</key>
+    <integer>0</integer>
+    <key>Hour</key>
+    <integer>00</integer>
+    <key>Minute</key>
+    <integer>00</integer>
+  </dict>
+  <dict>
+    <key>Weekday</key>
+    <integer>3</integer>
+    <key>Minute</key>
+    <integer>00</integer>
+  </dict>
+</array>
+```
+
+## Loading the .plist into launchctl
+
+1. Copy your `filename.plist` file to one of these folders according to how you want it to run:
+
+- `~/Library/LaunchAgents` runs as the current logged-in user.
+
+- `/Library/LaunchDaemons` runs as the system "_administrator_" (root).
+
+- If macOS has a single user:
+  - If you want to export only when the user is logged in, choose the first one.
+  - If you want the script to always run on System Startup, choose the second one.
+- If macOS has multiple users:
+  - If you want the script to run only when a certain user is logged in, choose the first one.
+  - If you want the script to always run on System Startup, choose the second one.
+
+To quickly go to these directories, open Finder and press Command+Shift+G (⌘⇧G), then paste the path into the text box.
+
+2. To load the job into launchctl, in Terminal, type `launchctl load`, press SPACE, drag and drop the `.plist` into the Terminal window, then hit RETURN. It won't output anything if it was successfully loaded.
+
+### Extra launchctl commands
+
+**Unloading a job**
+
+```
+launchctl unload /path/to/Library/LaunchAgents/local.discordchatexporter.plist
+```
+
+**List every loaded job**
+
+```
+launchctl list
+```
+
+**Check if a specific job is enabled**
+You can also see error codes (2nd number) by running this command.
+
+```
+launchctl list | grep local.discordchatexporter
+```
+
+---
+
+Further reading: [Script management with launchd in Terminal on Mac](https://support.apple.com/guide/terminal/script-management-with-launchd-apdc6c1077b-5d5d-4d35-9c19-60f2397b2369/mac) and [launchd.info](https://launchd.info/).
+Special thanks to [@Yudi](https://github.com/Yudi)

.docs/Scheduling-Windows.md

@@ -0,0 +1,77 @@
+# Scheduling exports on Windows
+
+## Creating the script
+
+1. Open a text editor such as Notepad and paste:
+
+```console
+# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs
+
+$TOKEN = "tokenhere"
+$CHANNEL = "channelhere"
+$EXEPATH = "exefolderhere"
+$FILENAME = "filenamehere"
+$EXPORTDIRECTORY = "dirhere"
+$EXPORTFORMAT = "formathere"
+# Available export formats: PlainText, HtmlDark, HtmlLight, Json, Csv
+
+cd $EXEPATH
+
+./DiscordChatExporter.Cli export -t $TOKEN -c $CHANNEL -f $EXPORTFORMAT -o "$FILENAME.tmp"
+
+$Date = Get-Date -Format "yyyy-MM-dd-HH-mm"
+
+If($EXPORTFORMAT -match "PlainText"){mv "$FILENAME.tmp" -Destination "$EXPORTDIRECTORY\$FILENAME-$Date.txt"}
+ElseIf($EXPORTFORMAT -match "HtmlDark"){mv "$FILENAME.tmp" -Destination "$EXPORTDIRECTORY\$FILENAME-$Date.html"}
+ElseIf($EXPORTFORMAT -match "HtmlLight"){mv "$FILENAME.tmp" -Destination "$EXPORTDIRECTORY\$FILENAME-$Date.html"}
+ElseIf($EXPORTFORMAT -match "Json"){mv "$FILENAME.tmp" -Destination "$EXPORTDIRECTORY\$FILENAME-$Date.json"}
+ElseIf($EXPORTFORMAT -match "Csv"){mv "$FILENAME.tmp" -Destination "$EXPORTDIRECTORY\$FILENAME-$Date.csv"}
+exit
+```
+
+2. Replace:
+
+- `tokenhere` with your [Token](Token-and-IDs.md)
+- `channelhere` with a [Channel ID](Token-and-IDs.md)
+- `exefolderhere` with the .exe **directory's path** (e.g. C:\Users\User\Desktop\DiscordChatExporter)
+- `filenamehere` with a filename without spaces
+- `dirhere` with the export directory (e.g. C:\Users\User\Documents\Exports)
+- `formathere` with one of the available export formats
+
+Make sure not to delete the quotes (")
+
+3. Save the file as `filename.ps1`, not as `.txt`
+
+> **Note**: You can also modify the script to use other options, such as `include-threads` or switch to a different command, e. g. `exportguild`.
+
+## Export at Startup
+
+1. Press Windows + R, type `shell:startup` and press ENTER
+2. Paste `filename.ps1` or a shortcut into this folder
+
+## Scheduling with Task Scheduler
+
+Please note that your computer must be turned on for the export to happen.
+
+1. Press Windows + R, type `taskschd.msc` and press ENTER
+2. Select `Task Scheduler Library`, create a Basic Task, and follow the instructions on-screen
+
+<img src="https://i.imgur.com/MHRVGDi.png" height="500"/>
+
+![Screenshot from Task Scheduler](https://i.imgur.com/m2DKhA8.png)
+
+3. At 'Start a Program', write `powershell -file -ExecutionPolicy ByPass -WindowStyle Hidden "C:\path\to\filename.ps1"` in the Program/script text box
+
+![](https://i.imgur.com/FGtWRod.png)
+
+4. Click 'Yes'
+
+![](https://i.imgur.com/DuaRBt3.png)
+
+5. Click 'Finish'
+
+![](https://i.imgur.com/LHgXp9Q.png)
+
+---
+
+Special thanks to [@Yudi](https://github.com/Yudi)

.docs/Token-and-IDs.md

@@ -0,0 +1,276 @@
+# 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.
+
+## 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.
+
+### Through your web browser
+
+Prerequisite step: Navigate to [discord.com](https://discord.com) and login.
+
+#### In Chrome
+
+##### Using the console
+
+1. <img width="500" align="right" src="https://i.imgur.com/zdDwIT5.jpg" />Press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>I</kbd> (<kbd>⌥</kbd>+<kbd>⌘</kbd>+<kbd>I</kbd> on macOS). Chrome's [DevTools](https://developer.chrome.com/docs/devtools/overview) tools will display.
+
+<br clear="right" />
+<br />
+
+2. Click the `Console` tab. The [console](https://developer.chrome.com/docs/devtools/console/) will open.
+
+3. Type
+
+    ```js
+    (webpackChunkdiscord_app.push([[''],{},e=>{m=[];for(let c in e.c)m.push(e.c[c])}]),m).find(m=>m?.exports?.default?.getToken!==void 0).exports.default.getToken()
+    ```
+
+    into the console and press <kbd>Enter</kbd>. The console will display your user token.
+
+##### Using the network monitor
+
+1. <img width="500" align="right" src="https://i.imgur.com/zdDwIT5.jpg" />Press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>I</kbd> (<kbd>⌥</kbd>+<kbd>⌘</kbd>+<kbd>I</kbd> on macOS). Chrome's [DevTools](https://developer.chrome.com/docs/devtools/overview) tools will display.
+
+<br clear="right" />
+<br />
+
+2. <img width="500" align="right" src="https://i.imgur.com/BDeG0zg.png" />Click the `Network` tab. The [network panel](https://developer.chrome.com/docs/devtools/overview/#network) will open
+
+<br clear="right" />
+<br />
+
+3. <img width="500" align="right" src="https://i.imgur.com/0Lgj0vk.png" />Press <kbd>F5</kbd>. The page will reload, and the network log (the lower half of the network panel) will display several entries.
+
+<br clear="right" />
+<br />
+
+4. <img width="500" align="right" src="https://i.imgur.com/rnZG8Id.png" />Click the text box labelled `Filter` and type `messages`. The entries will filter down to a single request named `messages`. If the request doesn't appear, switch to any other Discord channel to trigger it.
+
+<br clear="right" />
+<br />
+
+5. <img width="500" align="right" src="https://i.imgur.com/29dE3fR.png" />Click the entry named `messages`. A panel will open to the right and display details about the entry. Click the `Headers` tab if it isn't already active.
+
+<br clear="right" />
+<br />
+
+6. <img width="500" align="right" src="https://i.imgur.com/u7CxXAt.png" />Scroll through the contents of the `Headers` tab until you find an entry beginning with `authorization:`.
+
+<br clear="right" />
+<br />
+
+7. <img width="500" align="right" src="https://i.imgur.com/dXcXzma.png" />Right-click the entry and click `copy value`.
+
+<br clear="right" />
+<br />
+
+##### Using the storage inspector
+
+1. <img width="500" align="right" src="https://i.imgur.com/zdDwIT5.jpg" />Press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>I</kbd> (<kbd>⌥</kbd>+<kbd>⌘</kbd>+<kbd>I</kbd> on macOS). Chrome's [DevTools](https://developer.chrome.com/docs/devtools/overview/) will display.
+
+<br clear="right" />
+<br />
+
+2. <img width="500" align="right" src="https://i.imgur.com/biAUIop.png" />Press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>M</kbd> (<kbd>⌘</kbd>+<kbd>Shift</kbd>+<kbd>M</kbd>). Chrome will enter [Device Mode](https://developer.chrome.com/docs/devtools/device-mode/), and the webpage will display as if on a mobile device.
+
+<br clear="right" />
+<br />
+
+3. <img width="500" align="right" src="https://i.imgur.com/oUDRZoy.png" />If necessary, click the `»` at the right end of the tab bar, and click `Application`. The [application panel](https://developer.chrome.com/docs/devtools/overview/#application) will display.
+
+<br clear="right" />
+<br />
+
+4. <img width="500" align="right" src="https://i.imgur.com/sydNPia.png" />In the menu to the right, under `Storage`, expand `Local Storage` if necessary, then click `https://discord.com`. The pane to the right will display a list of key-value pairs.
+
+<br clear="right" />
+<br />
+
+5. <img width="500" align="right" src="https://i.imgur.com/qKo0ny9.png" />In the text box marked `Filter`, type `token`. The entries will filter down to those containing the string `token`.
+
+<br clear="right" />
+<br />
+
+6. <img width="500" align="right" src="https://i.imgur.com/caj3lQq.png" />Click the `token` entry. (Note: if the token doesn't display, try refreshing by pressing <kbd>F5</kbd> or <kbd>⌘</kbd>+<kbd>R</kbd> on macOS)
+
+<br clear="right" />
+<br />
+
+7. <img width="500" align="right" src="https://i.imgur.com/SwWFIH4.png" />Click the text box at the bottom, press <kbd>Ctrl</kbd>+<kbd>A</kbd> (<kbd>⌘</kbd>+<kbd>A</kbd> on macOS) then <kbd>Ctrl</kbd>+<kbd>C</kbd> (<kbd>⌘</kbd>+<kbd>C</kbd> on macOS) to copy the value to your clipboard.
+
+<br clear="right" />
+<br />
+
+#### In Firefox
+
+##### Using the console
+
+1. <img width="500" align="right" src="https://i.imgur.com/O34nwdG.png" />Press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>K</kbd> (<kbd>⌥</kbd>+<kbd>⌘</kbd>+<kbd>K</kbd> on macOS). Firefox’s [web developer tools](https://firefox-source-docs.mozilla.org/devtools-user/) will display at the bottom of the window, and the [web console](https://firefox-source-docs.mozilla.org/devtools-user/console/index.html) will display.
+
+<br clear="right" />
+<br />
+
+2. Click the `Console` tab. The [console](https://firefox-source-docs.mozilla.org/devtools-user/console/index.html) will open.
+
+1. Type
+
+    ```js
+    (webpackChunkdiscord_app.push([[''],{},e=>{m=[];for(let c in e.c)m.push(e.c[c])}]),m).find(m=>m?.exports?.default?.getToken!==void 0).exports.default.getToken()
+    ```
+
+    into the console and press <kbd>Enter</kbd>. The console will display your user token.
+
+##### Using the network monitor
+
+1. <img width="500" align="right" src="https://i.imgur.com/O34nwdG.png" />Press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>E</kbd> (<kbd>⌥</kbd>+<kbd>⌘</kbd>+<kbd>E</kbd> on macOS). Firefox’s [web developer tools](https://firefox-source-docs.mozilla.org/devtools-user/) will display at the bottom of the window, and the [network monitor](https://firefox-source-docs.mozilla.org/devtools-user/network_monitor/) will display.
+
+<br clear="right" />
+<br />
+
+2. <img width="500" align="right" src="https://i.imgur.com/j00QzhU.png" />Press <kbd>F5</kbd>. The page will reload, and the [network request list](https://firefox-source-docs.mozilla.org/devtools-user/network_monitor/request_list/index.html) will populate with entries.
+
+<br clear="right" />
+<br />
+
+3. <img width="500" align="right" src="https://i.imgur.com/efUCfBO.png" />Type `messages` into the filter. The network request list will filter out any entries not containing the string `messages`. If the request doesn't appear, switch to any other Discord channel to trigger it.
+
+<br clear="right" />
+<br />
+
+4. <img width="500" align="right" src="https://i.imgur.com/cdJZ7Q1.png" />Click `messages`. The [network request details pane](https://firefox-source-docs.mozilla.org/devtools-user/network_monitor/request_details/index.html) will display. The [headers tab](https://firefox-source-docs.mozilla.org/devtools-user/network_monitor/request_details/index.html#network-monitor-request-details-headers-tab) should be active by default. If it isn’t, click it.
+
+<br clear="right" />
+<br />
+
+5. <img width="500" align="right" src="https://i.imgur.com/zBmq1JW.png" />Type `authorization` into the text box labelled `Filter Headers`.
+
+<br clear="right" />
+<br />
+
+6. <img width="500" align="right" src="https://i.imgur.com/O3blcIS.png" />Scroll down until you see an entry labeled [authorization](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization) under `Request Headers`.
+
+<br clear="right" />
+<br />
+
+7. <img width="500" align="right" src="https://i.imgur.com/zHYEYoZ.png" />Right-click the entry labeled `authorization` and select `copy value`.
+
+<br clear="right" />
+<br />
+
+##### Using the storage inspector
+
+1. <img width="500" align="right" src="https://i.imgur.com/A8jqpkm.png" />Press <kbd>Shift</kbd>+<kbd>F9</kbd>. Firefox’s [web developer tools](https://firefox-source-docs.mozilla.org/devtools-user/) will display at the bottom of the window, and the [storage](https://firefox-source-docs.mozilla.org/devtools-user/storage_inspector/index.html) panel will be selected.
+
+<br clear="right" />
+<br />
+
+2. <img width="500" align="right" src="https://i.imgur.com/TGcbB7f.png" />Press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>M</kbd> (<kbd>⌥</kbd>+<kbd>⌘</kbd>+<kbd>M</kbd> on macOS). Firefox will toggle [responsive design mode](https://firefox-source-docs.mozilla.org/devtools-user/responsive_design_mode/), and the web page will display as if on a mobile device. (Note: Discord may steal focus and respond to the command by toggling mute. If this happens, return focus to Firefox’s web developer tools by clicking somewhere in it, then try the command again.)
+
+<br clear="right" />
+<br />
+
+3. <img width="500" align="right" src="https://i.imgur.com/2xWkep9.png" />In the [storage tree](https://firefox-source-docs.mozilla.org/devtools-user/storage_inspector/index.html#storage-inspector-storage-tree) (the list on the left side of the web developer tools panel), click [Local Storage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage). The entry will expand, and the entry `https://discord.com` will display beneath it.
+
+<br clear="right" />
+<br />
+
+4. <img width="500" align="right" src="https://i.imgur.com/tGlGuOL.png" />In the storage tree, click `https://discord.com`. The [table widget](https://firefox-source-docs.mozilla.org/devtools-user/storage_inspector/index.html#storage-inspector-table-widget) to the right of the storage tree will display several key-value pairs.
+
+<br clear="right" />
+<br />
+
+5. <img width="500" align="right" src="https://i.imgur.com/hDNsnZ5.png" />In the text box labelled `Filter items` at the top of the table widget, enter `token`. The table will now only display entries containing the string `token`.
+
+<br clear="right" />
+<br />
+
+6. <img width="500" align="right" src="https://i.imgur.com/8fKId1W.png" />Click the entry `token`. The [sidebar](https://firefox-source-docs.mozilla.org/devtools-user/storage_inspector/index.html#storage-inspector-sidebar) will display. (Note: If the token doesn’t display, try refreshing by pressing <kbd>F5</kbd>.)
+
+<br clear="right" />
+<br />
+
+7. <img width="500" align="right" src="https://i.imgur.com/yD1ZuR9.png" />Right-click the single entry in the sidebar and select `copy`.
+
+<br clear="right" />
+<br />
+
+### Through the desktop app / enabling web developer tools
+
+#### By editing the settings file
+
+1. If Discord is running, exit the application by right-clicking the icon in your taskbar tray and clicking `Quit Discord`.
+
+2. Open Discord's settings file in your preferred text editor. See the following table for help finding it:
+
+   | OS      | Stable                                                | Canary                                                      | Public Test Build (PTB)                                  |
+   | ------- | ----------------------------------------------------- | ----------------------------------------------------------- | -------------------------------------------------------- |
+   | Windows | `%APPDATA%\discord\settings.json`                     | `%APPDATA%\discordcanary\settings.json`                     | `%APPDATA%\discordptb\settings.json`                     |
+   | macOS   | `~/Library/Application Support/discord/settings.json` | `~/Library/Application Support/discordcanary/settings.json` | `~/Library/Application Support/discordptb/settings.json` |
+   | Linux   | `~/.config/discord/settings.json`                     | `~/.config/discordcanary/settings.json`                     | `~/.config/discordptb/settings.json`                     |
+
+   If you use BetterDiscord, use the following table instead:
+
+   | OS      | Stable                                                                  | Canary                                                                  | Public Test Build (PTB)                                              |
+   | ------- | ----------------------------------------------------------------------- | ----------------------------------------------------------------------- | -------------------------------------------------------------------- |
+   | Windows | `%APPDATA%\BetterDiscord\data\stable\settings.json`                     | `%APPDATA%\BetterDiscord\data\canary\settings.json`                     | `%APPDATA%\BetterDiscord\data\ptb\settings.json`                     |
+   | macOS   | `~/Library/Application Support/BetterDiscord/data/stable/settings.json` | `~/Library/Application Support/BetterDiscord/data/canary/settings.json` | `~/Library/Application Support/BetterDiscord/data/ptb/settings.json` |
+   | Linux   | `~/.config/BetterDiscord/data/stable/settings.json`                     | `~/.config/BetterDiscord/data/canary/settings.json`                     | `~/.config/BetterDiscord/data/ptb/settings.json`                     |
+
+3. Insert a blank line after the first curly bracket (`{`), add the text `"DANGEROUS_ENABLE_DEVTOOLS_ONLY_ENABLE_IF_YOU_KNOW_WHAT_YOURE_DOING": true,` to it, and save the file. Your file should resemble the following:
+
+```json
+{
+  "DANGEROUS_ENABLE_DEVTOOLS_ONLY_ENABLE_IF_YOU_KNOW_WHAT_YOURE_DOING": true,
+  "BACKGROUND_COLOR": "#202225",
+  "IS_MAXIMIZED": true
+}
+```
+
+4. Launch Discord.
+
+5. To find your user token, continue [here](#in-chrome).
+
+#### Via settings menu (BetterDiscord only)
+
+1. <img width="500" align="right" src="https://i.imgur.com/mu1g4OF.png" />Click the User Settings button (the gear icon to the right of your username). Discord’s settings page will open.
+
+<br clear="right" />
+<br />
+
+2. <img width="500" align="right" src="https://i.imgur.com/qFrIKON.png" />In the sidebar to the left, click `Settings` under the `BetterDiscord` group. BetterDiscord’s settings page will display.
+
+<br clear="right" />
+<br />
+
+3. <img width="500" align="right" src="https://i.imgur.com/48Re5kj.png" />In the main panel to the right, expand the `Developer Settings` group if necessary, and toggle `DevTools` to enabled.
+
+<br clear="right" />
+<br />
+
+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
+
+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**
+
+> **Warning**:
+> Your bot needs to have **Message Content Intent** enabled for it to be able to read messages!
+
+![https://discord.com/developers/applications/](https://i.imgur.com/BdrrxlY.png)
+
+---
+
+## How to get a Server ID or a Channel ID
+
+1. Open Discord Settings
+2. Go to the **Advanced** section
+3. Enable **Developer Mode**
+4. Right-click on the desired server or channel and click **Copy Server ID** or **Copy Channel ID**

.docs/Troubleshooting.md

@@ -0,0 +1,153 @@
+# Troubleshooting
+
+Welcome to the Frequently Asked Questions (FAQ) and Troubleshooting page!
+Here you'll find the answers to most of the questions related to **DiscordChatExporter** (DCE for short) and its core features.
+
+- ❓ If you still have unanswered questions _after_ reading this page, feel free to [create a new discussion](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new).
+- 🐞 If you have encountered a problem that's not described here, has not [been discussed before](https://github.com/Tyrrrz/DiscordChatExporter/discussions), and is not a [known issue](https://github.com/Tyrrrz/DiscordChatExporter/issues?q=is%3Aissue), please [create a new discussion](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) or [open a bug report](https://github.com/Tyrrrz/DiscordChatExporter/issues/new). Don't forget to include your platform (Windows, Mac, Linux, etc.) and a detailed description of your question/problem.
+
+## General questions
+
+### Token stealer?
+
+No. That's why this kind of software needs to be open-source, so the code can be audited by anyone.
+Your token is only used to connect to Discord's API, it's not sent anywhere else.
+If you're using the GUI, be aware that your token will be saved to a plain text file unless you disable it in the settings menu.
+
+### Why should I be worried about the safety of my token?
+
+A token can be used to log into your account, so treat it like a password and never share it.
+
+### How can I reset my token?
+
+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.
+
+### Will the messages disappear from the exported file if I delete a message, delete my account or block a person?
+
+Text messages will not be removed from the exported file, but if media, such as images and user avatars, is changed or deleted, it will no longer be displayed. To avoid this, export using the "Download media" (`--media`) option.
+
+### Can DCE export messages that have already been deleted?
+
+No, DCE cannot access them since they have been permanently deleted from Discord's servers.
+
+### Can DCE export private chats?
+
+Yes, if your account has access to them.
+
+### Can DCE download images?
+
+Yes, and other media too. Export using the "Download media" (`--media`) option.
+
+### Can the exported chats be shared?
+
+Yes.
+
+### Can DCE export multiple formats at once?
+
+No, you can only export one format at a time.
+
+### Can DCE recreate the exported chats in Discord?
+
+No, DCE is an exporter.
+
+### Can DCE reupload exported messages to another channel?
+
+No, DCE is an exporter.
+
+### Can DCE add new messages to an existing export?
+
+No.
+
+## First steps
+
+### How can I find my token?
+
+Check the following page: [Obtaining token](Token-and-IDs.md)
+
+### When I open DCE a black window pops up quickly or nothing shows up
+
+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?
+
+Check the following pages to learn how to schedule **DiscordChatExporter.CLI** runs (advanced):
+
+- [Windows scheduling](Scheduling-Windows.md)
+- [macOS scheduling](Scheduling-MacOS.md)
+- [Linux scheduling](Scheduling-Linux.md)
+
+### The exported file is too large, I can't open it
+
+Try opening it with a different program, try partitioning or use a different file format, like `PlainText`.
+
+### 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.
+
+## CLI
+
+### How do I use the CLI?
+
+Check the following page:
+
+- [Using the CLI](Using-the-CLI.md)
+
+If you're using **Docker**, please refer to the [Docker Usage Instructions](Docker.md) instead.
+
+### Where can I find the 'Channel IDs'?
+
+Check the following page:
+
+- [Obtaining Channel IDs](Token-and-IDs.md)
+
+### I can't find Docker exported chats
+
+Check the following page:
+
+- [Docker usage instructions](Docker.md)
+
+### I can't export Direct Messages
+
+Make sure you're [copying the DM Channel ID](Token-and-IDs.md#how-to-get-a-direct-message-channel-id), not the person's user ID.
+
+## Errors
+
+```yml
+DiscordChatExporter.Domain.Exceptions.DiscordChatExporterException: Authentication token is invalid.
+```
+
+↳ Make sure the provided token is correct.
+
+```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).
+
+```yml
+DiscordChatExporter.Domain.Exceptions.DiscordChatExporterException: Access is forbidden.
+```
+
+↳ This means you don't have access to the channel.
+
+```yml
+System.Net.WebException: Error: TrustFailure ... Invalid certificate received from server.
+```
+
+↳ Try running cert-sync.
+
+Debian/Ubuntu: `cert-sync /etc/ssl/certs/ca-certificates.crt`
+
+Red Hat: `cert-sync --user /etc/pki/tls/certs/ca-bundle.crt`
+
+If it still doesn't work, try mozroots: `mozroots --import --ask-remove`
+
+---
+
+> ❓ If you still have unanswered questions, feel free to [create a new discussion](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new).
+>
+> 🐞 If you have encountered a problem that's not described here, has not [been discussed before](https://github.com/Tyrrrz/DiscordChatExporter/discussions), and is not a [known issue](https://github.com/Tyrrrz/DiscordChatExporter/issues?q=is%3Aissue), please [create a new discussion](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) or [open a bug report](https://github.com/Tyrrrz/DiscordChatExporter/issues/new).

.docs/Using-the-CLI.md

@@ -0,0 +1,293 @@
+# Using the CLI
+
+## Step 1
+
+After extracting the `.zip` archive, open your preferred terminal.
+
+## Step 2
+
+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 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 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.
+
+Type the following command in your terminal of choice, then press ENTER to run it. This will list all available subcommands and options.
+
+```console
+./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, server, and channel ID |
+
+To use the commands, you'll need a token. For the instructions on how to get a token, please refer to [this page](Token-and-IDs.md), or run `./DiscordChatExporter.Cli guide`.
+
+To get help with a specific command, run:
+
+```console
+./DiscordChatExporter.Cli command --help
+```
+
+For example, to figure out how to use the `export` command, run:
+
+```console
+./DiscordChatExporter.Cli export --help
+```
+
+## Export a specific channel
+
+You can quickly export with DCE's default settings by using just `-t token` and `-c channelid`.
+
+```console
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555
+```
+
+#### Changing the format
+
+You can change the export format to `HtmlDark`, `HtmlLight`, `PlainText` `Json` or `Csv` with `-f format`. The default
+format is `HtmlDark`.
+
+```console
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -f Json
+```
+
+#### Changing the output filename
+
+You can change the filename by using `-o name.ext`. e.g. for the `HTML` format:
+
+```console
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o myserver.html
+```
+
+#### Changing the output directory
+
+You can change the export directory by using `-o` and providing a path that ends with a slash or does not have a file
+extension.
+If any of the folders in the path have a space in its name, escape them with quotes (").
+
+```console
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports"
+```
+
+#### Changing the filename and output directory
+
+You can change both the filename and export directory by using `-o directory\name.ext`.
+Note that the filename must have an extension, otherwise it will be considered a directory name.
+If any of the folders in the path have a space in its name, escape them with quotes (").
+
+```console
+./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 server and channel metadata.
+
+```console
+./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
+called `"My server"`, you will get the following output file
+path: `C:\Discord Exports\My server\Text channels\my-channel.html`
+
+Here is the full list of supported template tokens:
+
+- `%g` - server ID
+- `%G` - server name
+- `%t` - category ID
+- `%T` - category name
+- `%c` - channel ID
+- `%C` - channel name
+- `%p` - channel position
+- `%P` - category position
+- `%a` - the "after" date
+- `%b` - the "before" date
+- `%d` - the current date
+- `%%` - escapes `%`
+
+#### Partitioning
+
+You can use partitioning to split files after a given number of messages or file size.
+For example, a channel with 36 messages set to be partitioned every 10 messages will output 4 files.
+
+```console
+./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
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -p 20mb
+```
+
+#### Downloading assets
+
+If this option is set, the export will include additional files such as user avatars, attached files, images, etc.
+Only files that are referenced by the export are downloaded, which means that, for example, user avatars will not be
+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
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media
+```
+
+#### Reusing assets
+
+Previously downloaded assets can be reused to skip redundant downloads as long as the chat is always exported to the
+same folder. Using this option can speed up future exports. This option requires the `--media` option.
+
+```console
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media --reuse-media
+```
+
+#### Changing the media directory
+
+By default, the media directory is created alongside the exported chat. You can change this by using `--media-dir` and
+providing a path that ends with a slash. All of the exported media will be stored in this directory.
+
+```console
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media --media-dir "C:\Discord Media"
+```
+
+#### Changing the date format
+
+You can customize how dates are formatted in the exported files by using `--locale` and inserting one of Discord's
+locales. The default locale is `en-US`.
+
+```console
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --locale "de-DE"
+```
+
+#### Date ranges
+
+**Messages sent before a date**
+Use `--before` to export messages sent before the provided date. E.g. messages sent before September 18th, 2019:
+
+```console
+./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
+./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --after "2019-09-17 23:34"
+```
+
+**Messages sent in a date range**
+Use `--before` and `--after` to export messages sent during the provided date range. E.g. messages sent between
+September 17th, 2019 11:34 PM and September 18th:
+
+```console
+./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
+milliseconds `17-SEP-2019 23:45:30.6170`!
+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).
+
+#### Filtering messages
+
+Use `--filter` to filter what messages are included in the export.
+
+```console
+./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
+
+By default, threads are not included in the export. You can change this behavior by using `--include-threads` and
+specifying which threads should be included. It has possible values of `none`, `active`, or `all`, indicating which
+threads should be included. To include both active and archived threads, use `--include-threads all`.
+
+```console
+./DiscordChatExporter.Cli exportguild -t "mfa.Ifrn" -g 21814 --include-threads all
+```
+
+#### Including voice channels
+
+By default, voice channels are included in the export. You can change this behavior by using `--include-vc` and
+specifying whether to include voice channels in the export. It has possible values of `true` or `false`, to exclude
+voice channels, use `--include-vc false`.
+
+```console
+./DiscordChatExporter.Cli exportguild -t "mfa.Ifrn" -g 21814 --include-vc false
+```
+
+### Export all channels
+
+To export all accessible channels, use the `exportall` command:
+
+```console
+./DiscordChatExporter.Cli exportall -t "mfa.Ifrn"
+```
+
+#### Excluding DMs
+
+To exclude DMs, add the `--include-dm false` option.
+
+```console
+./DiscordChatExporter.Cli exportall -t "mfa.Ifrn" --include-dm false
+```
+
+### List channels in a server
+
+To list the channels available in a specific server, use the `channels` command and provide the server ID through the `-g|--guild` option:
+
+```console
+./DiscordChatExporter.Cli channels -t "mfa.Ifrn" -g 21814
+```
+
+### List direct message channels
+
+To list all DM channels accessible to the current account, use the `dm` command:
+
+```console
+./DiscordChatExporter.Cli dm -t "mfa.Ifrn"
+```
+
+### List servers
+
+To list all servers accessible by the current account, use the `guilds` command:
+
+```console
+./DiscordChatExporter.Cli guilds -t "mfa.Ifrn" > C:\path\to\output.txt
+```

.docs/Using-the-GUI.md

@@ -0,0 +1,90 @@
+# Using the GUI
+
+## Video tutorial
+
+[![Video tutorial](https://i.ytimg.com/vi/jjtu0VQXV7I/hqdefault.jpg)](https://youtube.com/watch?v=jjtu0VQXV7I)
+
+> Video by [NoIntro Tutorials](https://youtube.com/channel/UCFezKSxdNKJe77-hYiuXu3Q).
+
+## Guide
+
+### Step 1
+
+After extracting the `.zip`, run `DiscordChatExporter.exe` (Windows), or `DiscordChatExporter` (Mac OS and Linux).
+
+### 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**:
+> **Never share your token!**
+> A token gives full access to an account, treat it like a password.
+
+<img src="https://i.imgur.com/SuLQ5tZ.png" height="400"/>
+
+### Step 3
+
+DCE will display your Direct Messages and a sidebar with your server list. Select the channel you would like to export, then click the ![Screenshot](https://i.imgur.com/dnTOlDa.png) button to continue.
+
+> **Note**:
+> You can export multiple channels at once by holding `CTRL` or `SHIFT` while selecting.
+> You can also double-click a channel to export it without clicking the ![Screenshot](https://i.imgur.com/dnTOlDa.png) button.
+
+<img src="https://i.imgur.com/JHMFRh2.png" height="400"/>
+
+### Step 4
+
+In this screen you can customize the following:
+
+- **Output path** - The folder where the exported chat(s) will be saved.
+
+- **Export format** - HTML (Dark), HTML (Light), TXT, CSV and JSON
+
+- **Date range (after/before)** (Optional) - If set, only messages sent in the provided date range will be exported. Only one value (either after or before) is required if you want to use this option.
+  > **Note**:
+  > Please note that the time defaults to **12:00 AM** (midnight/00:00). This means that if you choose to export between Sep 17th and Sep 18th, messages from Sep 18th won't be exported.
+
+- **Partition limit** (Optional) - Split output into partitions, each limited to this number of messages (e.g. 100) or file size (e.g. 10mb). For example, a channel with 36 messages set to be partitioned every 10 messages will output 4 files.
+
+- **Message Filter** (Optional) - Special notation for filtering the messages that get included in the export. See [Message filters](Message-filters.md) for more info.
+
+- **Format markdown** (Optional) - Disable markdown processing when exporting. You can use this to produce JSON or plain text exports without unwrapping mentions, custom emoji, and certain other special tokens.
+
+- **Download assets** (Optional) - If this option is set, the export will include additional files such as user avatars, attached files, images, etc. Only files that are referenced by the export are downloaded, which means that, for example, user avatars will not be 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.
+
+- **Reuse assets** (Optional) - If this option is set, the export will reuse already downloaded assets to skip redundant requests. This option is only available when **Download assets** is enabled.
+
+- **Assets directory path** (Optional) - If this option is set, the export will use the specified directory to store assets from all exported channels in the same place.
+
+> **Note**:
+> You need to scroll down to see all available options.
+
+## Settings
+
+- **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).
+Default: Disabled
+
+- **Persist token** - Persist last used token between sessions.
+Default: Enabled
+
+- **Show threads** - Controls whether threads are shown in the channel list.
+Default: none
+
+- **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 ().
+
+- **Parallel limit** - The number of channels that will be exported at the same time.
+Default: 1
+
+  > **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

@@ -1,64 +1,109 @@
-name: 🐞 Bug report
+name: 🐛 Bug report
 description: Report broken functionality.
 labels: [bug]
 
 body:
-- type: markdown
-  attributes:
-    value: |
-      🧐 **Guidelines:**
+  - type: markdown
+    attributes:
+      value: |
+        - Avoid generic or vague titles such as "Something's not working" or "A couple of problems" — be as descriptive as possible.
+        - Keep your issue focused on one single problem. If you have multiple bug reports, please create a separate issue for each of them.
+        - Issues should represent **complete and actionable** work items. If you are unsure about something or have a question, please start a [discussion](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) instead.
+        - Remember that **DiscordChatExporter** is an open-source project funded by the community. If you find it useful, **please consider [donating](https://tyrrrz.me/donate) to support its development**.
 
-      - Search through [existing issues](https://github.com/Tyrrrz/DiscordChatExporter/issues?q=is%3Aissue) first to ensure that this bug has not been reported before.
-      - Write a descriptive title for your issue. Avoid generic or vague titles such as "Something's not working" or "A couple of problems".
-      - Keep your issue focused on one single problem. If you have multiple bug reports, please create separate issues for each of them.
-      - Provide as much context as possible in the details section. Include screenshots, screen recordings, links, references, or anything else you may consider relevant.
-      - If you want to ask a question instead of reporting a bug, please use [discussions](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) instead.
+        ___
 
-- type: input
-  attributes:
-    label: Version
-    description: Which version of DiscordChatExporter does this bug affect?
-    placeholder: ver X.Y.Z
-  validations:
-    required: true
+  - type: input
+    attributes:
+      label: Version
+      description: Which version of the application does this bug affect? Make sure you're not using an outdated version.
+      placeholder: v1.0.0
+    validations:
+      required: true
 
-- type: dropdown
-  attributes:
-    label: Flavor
-    description: Does this bug affect the GUI version, the CLI version, or both?
-    multiple: true
-    options:
-    - GUI (Graphical User Interface)
-    - CLI (Command Line Interface)
-  validations:
-    required: true
+  - type: dropdown
+    attributes:
+      label: Flavor
+      description: Which flavor(s) of the application does this bug affect?
+      multiple: true
+      options:
+        - GUI (Graphical User Interface)
+        - CLI (Command-Line Interface)
+    validations:
+      required: true
 
-- type: dropdown
-  attributes:
-    label: Export format
-    description: Does this bug affect specific export format(s)? If not applicable, leave this field blank.
-    multiple: true
-    options:
-    - HTML
-    - TXT
-    - JSON
-    - CSV
+  - type: input
+    attributes:
+      label: Platform
+      description: Which platform do you experience this bug on?
+      placeholder: Docker / Windows 11
+    validations:
+      required: true
 
-- type: textarea
-  attributes:
-    label: Details
-    description: Clear and thorough explanation of the bug.
-    placeholder: I was doing X expecting Y to happen, but Z happened instead.
-  validations:
-    required: true
+  - type: dropdown
+    attributes:
+      label: Export format
+      description: Which export format(s) do you experience this bug with, if applicable?
+      multiple: true
+      options:
+        - HTML
+        - TXT
+        - JSON
+        - CSV
 
-- type: textarea
-  attributes:
-    label: Steps to reproduce
-    description: Minimum steps required to reproduce the bug.
-    placeholder: |
-      - Step 1
-      - Step 2
-      - Step 3
-  validations:
-    required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: >
+        Minimum steps required to reproduce the bug, including prerequisites, export settings, or other relevant items.
+        The information provided in this field must be readily actionable, meaning that anyone should be able to reproduce the bug by following these steps.
+        If the bug depends on external factors (such as a specific server, channel, or message), then this field must include the server invite and the corresponding link.
+      placeholder: |
+        Server invite: https://discord.gg/...
+        Channel or message link: https://discord.com/channels/.../...
+
+        Export settings:
+        - ...
+
+        Application settings:
+        - ...
+
+        Steps:
+        - Step 1
+        - Step 2
+        - Step 3
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Details
+      description: Clear and thorough explanation of the bug, including any additional information you may find relevant.
+      placeholder: |
+        - Expected behavior: ...
+        - Actual behavior: ...
+    validations:
+      required: true
+
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Quick list of checks to ensure that everything is in order.
+      options:
+        - label: I have looked through existing issues to make sure that this bug has not been reported before
+          required: true
+        - label: I have provided a descriptive title for this issue
+          required: true
+        - 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:
+      value: |
+        If you are struggling to provide actionable reproduction steps, or if something else is preventing you from creating a complete bug report, please start a [discussion](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) instead.

.github/ISSUE_TEMPLATE/config.yml

@@ -3,12 +3,12 @@ contact_links:
   - name: ⚠ Feature request
     url: https://github.com/Tyrrrz/.github/blob/master/docs/project-status.md
     about: Sorry, but this project is in maintenance mode and no longer accepts new feature requests.
-  - name: 💬 Discord server
-    url: https://discord.gg/2SUWKFnHSm
-    about: Chat with the project community.
-  - name: 📖 Wiki
-    url: https://github.com/Tyrrrz/DiscordChatExporter/wiki
+  - name: 📖 Documentation
+    url: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs
     about: Find usage guides and frequently asked questions.
   - name: 🗨 Discussions
     url: https://github.com/Tyrrrz/DiscordChatExporter/discussions/new
-    about: Ask and answer questions.
+    about: Ask and answer questions.
+  - name: 💬 Discord server
+    url: https://discord.gg/2SUWKFnHSm
+    about: Chat with the project community.

.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

@@ -1,55 +1,77 @@
 name: docker
 
-on: [push, pull_request]
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+    tags:
+      - "*"
+  pull_request:
+    branches:
+      - master
 
 jobs:
-  build:
+  # 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
+
+    permissions:
+      actions: write
+      contents: read
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Build container
-        run: docker build -f DiscordChatExporter.Cli.dockerfile .
+      - name: Install Docker Buildx
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+
+      - name: Build image
+        run: >
+          docker buildx build .
+          --file DiscordChatExporter.Cli.dockerfile
+          --platform linux/amd64,linux/arm64
+          --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@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        with:
+          name: DiscordChatExporter.Cli.Docker
+          path: DiscordChatExporter.Cli.Docker.tar
+          if-no-files-found: error
+
+  deploy:
+    # Deploy to DockerHub only on tag push or master branch push
+    if: ${{ github.ref_type == 'tag' || github.ref_type == 'branch' && github.ref_name == 'master' }}
 
-  deploy-latest:
-    if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master' }}
     runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    permissions:
+      contents: read
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Install Docker Buildx
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Login to DockerHub
-        run: docker login -u tyrrrz -p ${{ secrets.DOCKER_TOKEN }}
+        run: >
+          echo ${{ secrets.DOCKER_TOKEN }} |
+          docker login --username tyrrrz --password-stdin
 
-      - name: Build container
-        run: docker build -f DiscordChatExporter.Cli.dockerfile -t tyrrrz/discordchatexporter:latest .
-
-      - name: Push container
-        run: docker push tyrrrz/discordchatexporter:latest
-
-  deploy-stable:
-    if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Get release version
-        id: get_version
-        uses: dawidd6/action-get-tag@v1
-
-      - name: Login to DockerHub
-        run: docker login -u tyrrrz -p ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build container
-        run: docker build -f DiscordChatExporter.Cli.dockerfile -t tyrrrz/discordchatexporter:stable -t tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }} .
-
-      - name: Push container (stable)
-        run: docker push tyrrrz/discordchatexporter:stable
-
-      - name: Push container (${{ steps.get_version.outputs.tag }})
-        run: docker push tyrrrz/discordchatexporter:${{ steps.get_version.outputs.tag }}
+      - name: Build & push image
+        run: >
+          docker buildx build .
+          --file DiscordChatExporter.Cli.dockerfile
+          --platform linux/amd64,linux/arm64
+          --build-arg VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('999.9.9-ci-{0}', github.sha) }}
+          --push
+          --tag tyrrrz/discordchatexporter:latest
+          ${{ github.ref_type == 'tag' && '--tag tyrrrz/discordchatexporter:$GITHUB_REF_NAME' || '' }}
+          ${{ github.ref_type == 'tag' && '--tag tyrrrz/discordchatexporter:stable' || '' }}

.github/workflows/main.yml

@@ -1,154 +1,250 @@
 name: main
 
-on: [push, pull_request]
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+    tags:
+      - "*"
+  pull_request:
+    branches:
+      - master
+
+env:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
 
 jobs:
-  test:
-    runs-on: windows-latest
+  format:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
 
-    env:
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-      DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
+    permissions:
+      contents: read
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
         with:
-          # Fixed version, workaround for https://github.com/dotnet/core/issues/7176
-          dotnet-version: 6.0.100
+          dotnet-version: 9.0.x
+
+      # 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: ubuntu-latest
+    timeout-minutes: 10
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Install .NET
+        uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
+        with:
+          dotnet-version: 9.0.x
 
       - name: Run tests
-        # Tests need access to secrets, so we can't run them against PRs because of limited trust
-        if: ${{ github.event_name != 'pull_request' }}
-        run: dotnet test --configuration Release --logger GitHubActions --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
         env:
           DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
-          DISCORD_TOKEN_BOT: true
+        run: >
+          dotnet test
+          -p:CSharpier_Bypass=true
+          --configuration Release
+          --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
+          --collect:"XPlat Code Coverage"
+          --
+          RunConfiguration.CollectSourceInformation=true
+          DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
-  package:
-    needs: test
-    runs-on: windows-latest
+  pack:
+    strategy:
+      matrix:
+        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
 
-    env:
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-      DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
+    runs-on: ${{ startsWith(matrix.rid, 'win-') && 'windows-latest' || startsWith(matrix.rid, 'osx-') && 'macos-latest' || 'ubuntu-latest' }}
+    timeout-minutes: 10
+
+    permissions:
+      actions: write
+      contents: read
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
         with:
-          # Fixed version, workaround for https://github.com/dotnet/core/issues/7176
-          dotnet-version: 6.0.100
+          dotnet-version: 9.0.x
 
-      - name: Publish (CLI)
-        run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
+      - 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
+          --output ${{ matrix.app }}/bin/publish/
+          --configuration Release
+          --runtime ${{ matrix.rid }}
+          --self-contained
 
-      - name: Publish (GUI)
-        run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release
-
-      - name: Upload artifacts (CLI)
-        uses: actions/upload-artifact@v3
+      - name: Upload artifacts
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
-          name: DiscordChatExporter.Cli
-          path: DiscordChatExporter.Cli/bin/Publish/
+          name: ${{ matrix.asset }}.${{ matrix.rid }}
+          path: ${{ matrix.app }}/bin/publish/
+          if-no-files-found: error
 
-      - name: Upload artifacts (GUI)
-        uses: actions/upload-artifact@v3
-        with:
-          name: DiscordChatExporter
-          path: DiscordChatExporter.Gui/bin/Publish/
+  release:
+    if: ${{ github.ref_type == 'tag' }}
+
+    needs:
+      - format
+      - test
+      - pack
 
-  deploy:
-    if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
-    needs: package
     runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    permissions:
+      contents: write
 
     steps:
-      - name: Download artifacts (CLI)
-        uses: actions/download-artifact@v3
-        with:
-          name: DiscordChatExporter.Cli
-          path: DiscordChatExporter.Cli
-
-      - name: Download artifacts (GUI)
-        uses: actions/download-artifact@v3
-        with:
-          name: DiscordChatExporter
-          path: DiscordChatExporter.Gui
-
-      - name: Create package (CLI)
-        run: Compress-Archive -Path DiscordChatExporter.Cli/* -DestinationPath DiscordChatExporter.Cli.zip -Force
-        shell: pwsh
-
-      - name: Create package (GUI)
-        run: Compress-Archive -Path DiscordChatExporter.Gui/* -DestinationPath DiscordChatExporter.Gui.zip -Force
-        shell: pwsh
-
       - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          body: |
-            [Changelog](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Changelog.md)
-          draft: false
-          prerelease: false
+        run: >
+          gh release create ${{ github.ref_name }}
+          --repo ${{ github.event.repository.full_name }}
+          --title ${{ github.ref_name }}
+          --generate-notes
+          --verify-tag
 
-      - name: Upload release asset (CLI)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_name: DiscordChatExporter.Cli.zip
-          asset_path: DiscordChatExporter.Cli.zip
-          asset_content_type: application/zip
+  deploy:
+    needs: release
 
-      - name: Upload release asset (GUI)
-        uses: actions/upload-release-asset@v1
+    strategy:
+      matrix:
+        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: ubuntu-latest
+    timeout-minutes: 10
+
+    permissions:
+      actions: read
+      contents: write
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        with:
+          name: ${{ matrix.asset }}.${{ matrix.rid }}
+          path: ${{ matrix.app }}/
+
+      - name: Set permissions
+        if: ${{ !startsWith(matrix.rid, 'win-') }}
+        run: chmod +x ${{ matrix.app }}/${{ matrix.asset }}
+
+      - 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 }}.${{ matrix.rid }}.zip .
+
+      - name: Upload release asset
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_name: DiscordChatExporter.zip
-          asset_path: DiscordChatExporter.Gui.zip
-          asset_content_type: application/zip
+        run: >
+          gh release upload ${{ github.ref_name }}
+          ${{ matrix.asset }}.${{ matrix.rid }}.zip
+          --repo ${{ github.event.repository.full_name }}
 
   notify:
     needs: deploy
     runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    permissions:
+      contents: read
 
     steps:
-      - name: Get release version
-        id: get_version
-        uses: dawidd6/action-get-tag@v1
-
       - name: Notify Discord
-        uses: satak/webrequest-action@v1.2.4
+        uses: tyrrrz/action-http-request@1dd7ad841a34b9299f3741f7c7399f9feefdfb08 # 1.1.3
         with:
           url: ${{ secrets.DISCORD_WEBHOOK }}
           method: POST
           headers: |
+            Content-Type: application/json; charset=UTF-8
+          body: |
             {
-              "ContentType": "application/json; charset=UTF-8"
-            }
-          payload: |
-            {
-              "content": "**DiscordChatExporter** new version released!\nVersion: `${{ steps.get_version.outputs.tag }}`\nChangelog: <https://github.com/Tyrrrz/DiscordChatExporter/blob/${{ steps.get_version.outputs.tag }}/Changelog.md>"
+              "avatar_url": "https://raw.githubusercontent.com/${{ github.event.repository.full_name }}/${{ github.ref_name }}/favicon.png",
+              "content": "[**${{ github.event.repository.name }}**](<${{ github.event.repository.html_url }}>) v${{ github.ref_name }} has been released!"
             }
+          retry-count: 5

.gitignore

@@ -1,25 +1,12 @@
 # User-specific files
+.vs/
+.idea/
 *.suo
 *.user
-*.userosscache
-*.sln.docstates
-.idea/
-.vs/
 
 # Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-[Xx]64/
-[Xx]86/
-[Bb]uild/
-bld/
-[Bb]in/
-[Oo]bj/
+bin/
+obj/
 
-# Coverage
-*.opencover.xml
-
-# Secrets
-*.secret
+# Test results
+TestResults/

Changelog.md

@@ -1,437 +0,0 @@
-### v2.35.2 (08-Sep-2022)
-
-- Updated usage guide to mention the need to enable "Message Content Intent" to use a bot as a medium for exporting messages.
-- [CLI] Fixed an issue where passing an existing directory as the output path failed when exporting multiple channels (for example, when running `exportdm`). An ambiguous output path will now always be treated as a directory path if that directory already exists. If it doesn't exist, it will be treated as a file path, matching the previous behavior.
-
-### v2.35.1 (26-Aug-2022)
-
-- Added `~` character as an alias for `-` when negating a message filter. This should make it easier to use negated filters from CLI where the dash character already has other meanings.
-- Extended retry logic to encompass all server-side errors from Discord API, instead of only `500 Internal Server Error`.
-- [CLI] Attempt to export multiple channels will now fail if provided with an output path that is neither a directory, nor a file name template. Previously, this resulted in all channels being exported to the same file, overwriting each other.
-- Fixed an issue where a text message filter didn't work if it started with a character that's also the first character in one of the named filters (e.g. `from` or `mentions`).
-- Fixed an issue where a text message filter didn't work correctly if it was enclosed in parentheses.
-- Fixed an issue where categories were displayed alongside regular channels in the channel list, both in GUI and in CLI (when using the `guild` command).
-- [CLI] Fixed an issue where an output path starting with a tilde on Linux was not expanded properly into a full path. (Thanks [@TSRBerry](https://github.com/TSRBerry))
-
-### v2.35 (02-Jul-2022)
-
-- Added support for exporting text chat in voice channels. These channels are now also displayed when browsing in the GUI and in the CLI when executing the `channels` command.
-- [GUI] Direct message channels are now sorted by the timestamp of their last message, similarly to how they appear in the Discord client.
-- [GUI] Removed artificial grouping of direct message channels into "Private" and "Group".
-- [CLI] Added runtime bootstrapper capabilities to the CLI flavor of DiscordChatExporter on Windows. Now, if you attempt to run the application without the required prerequisites installed, you will be provided with an option to install them automatically.
-- [CLI] Fixed outdated information in the usage guide. (Thanks [@Clint Herron](https://github.com/HanClinto))
-- [CLI] Added whitespace padding to the output of `guilds`, `channels`, and `dm` to make the tables look more uniform.
-- [HTML] Added hyperlinks to message timestamps, which allows you to quickly copy a link to a specific message in the export. (Thanks [@Philipp C. Heckel](https://github.com/binwiederhier))
-- [HTML] Added minification. Chat exports in HTML format are now 30-35% smaller than before.
-- [HTML] Added support for rendering embeds of Twitter posts that contain multiple images. Previously, this resulted in multiple separate embeds instead of one.
-- [HTML] Added support for rendering embeds of YouTube Shorts videos.
-- [HTML] Text content is now hidden if the message only contains a link to an image and nothing else. The link itself is resolved as an image embed.
-- [HTML] Fixed an issue where some emoji that included a zero-width-joiner rune were not rendered correctly due to a wrong Twemoji URL being generated. (Thanks [@Ethan](https://github.com/ethanndickson))
-- [HTML] Fixed an issue where replies to a message that contained a quote (i.e. `>`) were not rendered correctly.
-- [HTML] Fixed an issue where code blocks with language highlighting did not have the correct background color.
-- Added file name template token that resolves to the current date (`%d`). (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-- Updated the usage guide to replace the instructions for retrieving the user token with those that appear to work for more people.
-- Updated the usage guide to feature the TOS warning more prominently.
-- [Docker] Changed internal working directory from `/app/out` to `/out`. This was an unintended breaking change. Please update your volume binding configuration from `-v /path/on/machine:/app/out` to `-v /path/on/machine:/out`.
-
-### v2.34.1 (01-Jun-2022)
-
-- Improved retry policy to handle more transient errors. This should result in fewer errors exporting a channel due to timeout.
-- Added `has:pin` message filter. You can use it to limit exported messages to those that have been pinned. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- Fixed an issue which caused the export to fail when processing stickers that have no name.
-
-### v2.34 (10-Apr-2022)
-
-- [HTML] Reworked layout to be more consistent with Discord.
-- [HTML] Changed user profile picture dimensions from `128x128` to `512x512`. (Thanks [@Chris Helder](https://github.com/TheDude53))
-- [HTML] Improved image scaling for Chromium-based browsers. This should result in higher quality images across the entire export.
-- [HTML] Hovering over messages will now show short timestamps on the left, indicating the time that the individual messages of the group were sent.
-- [HTML] Using "download media" option will now also download scripts, styles, fonts, and other similar resources used by the export.
-- [HTML] Image attachments will now use the provided description as alt text.
-- [HTML] Fixed a few layout inconsistencies related to embeds.
-- [GUI] Added a few clickable links to the usage guide to make the process of locating tokens easier.
-
-### v2.33.2 (07-Mar-2022)
-
-- Actually fixed it this time.
-
-### v2.33.1 (07-Mar-2022)
-
-- Fixed an issue where the application silently failed to run if the system didn't have .NET Runtime 6.0.2 installed. If you continue seeing this issue, please uninstall all existing .NET runtimes from your computer and then try running the application again.
-
-### v2.33 (06-Mar-2022)
-
-- Added messages informing about war in Ukraine and available ways to help.
-- Added support for rendering stickers in HTML and JSON. Lottie-based stickers currently cannot be displayed in HTML exports (see [#803](https://github.com/Tyrrrz/DiscordChatExporter/issues/803)).
-- Added a new `reaction:` message filter which can be used to check if someone reacted to a message with a specific emoji. You can either pass the emoji name (e.g. `reaction:LUL`) or its ID (e.g. `reaction:41771983429993937`).
-- [GUI] Added auto-detection for dark mode. If your system is configured to prefer dark mode in applications, DiscordChatExporter will use it by default instead of light mode.
-- Fixed an issue which caused the export process to crash when downloading media files with extremely long file extensions. (Thanks [@Tomlacko](https://github.com/Tomlacko))
-- Fixed an issue which caused the export process to crash on invalid mentions.
-- [GUI] Fixed an issue where the time pickers used to specify export ranges always displayed time in 12-hour format, instead of respecting the system locale.
-
-### v2.32 (27-Jan-2022)
-
-- Token kind (user or bot) is now detected automatically. Removed the button to switch token kind in GUI. Option `-b|--bot` in CLI is now deprecated and does nothing.
-- Updated user token extraction guide to reflect the fact that devtools are no longer accessible in the desktop version of Discord client. The recommended workaround is to open Discord in browser. (Thanks [@Dhananjay-JSR](https://github.com/Dhananjay-JSR))
-- Fixed an issue which caused an error when parsing invalid date timestamps. Such timestamps are now rendered as "Invalid date", similarly to how the Discord client does it.
-- Fixed an issue which caused an error when parsing certain embed fields.
-- Fixed an issue which caused an error when parsing a mention to a user that has no username.
-- [GUI] Minor visual fixes.
-
-### v2.31.1 (15-Dec-2021)
-
-- Fixed an issue which caused an error when parsing certain custom emoji reactions.
-- [GUI] Improved user interface.
-
-### v2.31 (06-Dec-2021)
-
-- Changed target runtime of the application (both GUI and CLI) from .NET 3.1 to .NET 6. Those using the GUI version will not need to take any action as the application should install the necessary prerequisites automatically. Those using the CLI version will need to download and install .NET 6 runtime manually [from here](https://dotnet.microsoft.com/download/dotnet/6.0) (look for ".NET Runtime 6.0.x" section on the right and choose the distribution appropriate for your system).
-- [HTML] Updated layout design to match Discord more closely. (Thanks [@Artem](https://github.com/Scarg))
-- [HTML] Fixed an issue where markdown inside channel topic was not rendered correctly. (Thanks [@Emily](https://github.com/emillly-b))
-- [HTML] Fixed an issue where the layout was broken for messages containing text in right-to-left languages. (Thanks [@Emily](https://github.com/emillly-b))
-- Fixed an issue where text filters weren't matching content inside of embeds.
-- [GUI] Fixed a multitude of issues related to the bootstrapper.
-
-### v2.30.1 (28-Aug-2021)
-
-- [HTML] Changed user avatars to render using higher resolution images. (Thanks [@Chris Helder](https://github.com/TheDude53))
-- Fixed an issue where `has:file` message filter was not recognized. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-- Fixed an issue where a unix timestamp marker with an invalid offset crashed the export process.
-
-### v2.30 (08-Aug-2021)
-
-- [HTML] Added special casing for Spotify track embeds to render them directly using an embedded player.
-- [HTML] Added special casing for plain image embeds to render them like image attachments.
-- [HTML] Added tooltip text for unix timestamp markers which shows the full date represented by the timestamp, regardless of configured date format.
-- [HTML] Updated the fallback text shown when the referenced message could not be loaded to make it more explicit.
-- [HTML] Updated styling of quoted text in markdown to more closely resemble how it looks in Discord.
-- [HTML] Fixed an issue where some file formats were not correctly recognized as image or video attachments, which affected how they were rendered.
-- [HTML] Fixed an issue where formatting inside named links (e.g. `[**Bold link**](https://example.com)`) was not being parsed.
-- [HTML] Fixed an issue where inline embed fields were missing horizontal spacing between columns.
-- [HTML] Fixed other minor styling issues.
-
-### v2.29 (19-Jul-2021)
-
-- Added support for message filtering, which is accessible as an additional export parameter in the GUI and as the `--filter` option in the CLI. Message filters use a special syntax similar to Discord's search query syntax to allow specifying which messages should be included in the export. For example, you can limit the export to only include messages that contain image attachments (`has:image`) or messages from a certain user (`from:Tyrrrz`) or messages containing certain words (`hello world`), etc. You can also combine filters together (`hi mentions:Tyrrrz`, `from:Tyrrrz | from:96-LB`, `(mentions:Tyrrrz | from:Tyrrrz) has:image`) or negate them (`-has:link`). More thorough documentation coming soon. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-- Added support for rendering mentions of voice channels, in addition to text channels.
-- Added support for rendering unix timestamp markers. Currently, style markers are ignored and timestamps are always rendered with the format configured in settings (or provided via `--date-format` option).
-- Updated in-app instructions for obtaining a user token. (Thanks [@Yudi](https://github.com/Yudi) and [@virtuallyvlad](https://github.com/virtuallyvlad))
-- [HTML] Improved visual appearance of the reference symbol (Г-shaped line in replies) to make it more closely resemble Discord's styling.
-- [HTML] Added more specific fallback text used when rendering referenced messages that contain no text content but have attachments or embeds.
-- [HTML] Fixed an issue where a broken embed author icon occupied visual space, ruining the embed layout. (Thanks [@Cliff J.](https://github.com/CliffJameston))
-- [GUI] Improved handling for fatal errors that may occur when attempting to export a channel. These errors are now displayed in a popup, allowing the user to try again instead of having the application crash completely.
-- [CLI] Fixed an issue where an attempt to export a channel resulted in `NotSupportedException` when the default encoding was set to `UTF8`.
-- [CLI] Fixed an issue where providing an incorrectly formatted partition limit via `-p|--partition` option resulted in a non-descriptive and unhelpful error.
-- Improved "Requested resource does not exist" error message by including the ID of the requested resource.
-
-### v2.28 (19-Jun-2021)
-
-- [HTML] Added special casing for YouTube video embeds to render them directly using an embedded player. (Thanks [@quentinmay](https://github.com/quentinmay))
-- [HTML] Added support for rendering standard emoji by code. Such emoji may sometimes be found in messages sent by bots or through webhooks. (Thanks [@CanePlayz](https://github.com/CanePlayz) and [@Lucas LaBuff](https://github.com/96-LB))
-- [HTML] Changed tooltips on standard emoji to show emoji code instead of their raw string representations. (Thanks [@CanePlayz](https://github.com/CanePlayz) and [@Lucas LaBuff](https://github.com/96-LB))
-- [HTML] Added tooltips on individual messages to show when those messages were sent.
-- [HTML] Updated colors and minor styling elements to match Discord's new style direction after rebranding.
-- [HTML] Updated Twemoji URLs to use SVG image variants for better rendering quality.
-- [HTML] Changed user avatar URLs to include predetermined size query parameter for better rendering quality.
-- Changed embed rendering logic to prefer Discord-proxied URLs for external content, in order to avoid unnecessary HTTP requests to third parties.
-- Fixed an issue where exporting with media sometimes resulted in a crash due to lack of permissions to change file attributes. These errors are now ignored, which means that the creation, write, and access dates of downloaded files may sometimes not match the dates provided by Discord's CDN.
-- [HTML] Fixed styling issues when rendering embed footers.
-- [HTML] Fixed an issue where links didn't render properly inside referenced messages.
-- [HTML] Fixed an issue where standalone emoji were incorrectly enlarged inside referenced messages.
-- [HTML] Fixed an issue where clicking on a referenced message revealed spoilers inside of it.
-- [GUI] Fixed an issue where the list of missing components, reported by the prerequisite check at application startup, included Windows updates that were not applicable to the user's system due to the fact that other superseding updates have already been installed. This issue only affected users running DiscordChatExporter on Windows 7.
-- [GUI] Fixed a few other minor issues related to the prerequisite installation window.
-
-### v2.27.1 (08-Jun-2021)
-
-- [GUI] Application will now detect if the required .NET Runtime or any of its prerequisites are missing and prompt the user to download and install them automatically. **Experimental feature, please test it out and report any issues you may find!**
-- [CLI] Fixed an issue where the application crashed when exporting a channel that had square brackets as part of its name or category name. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-
-### v2.27 (24-Apr-2021)
-
-- Added partitioning by file size. You can now use values such as `10mb` to indicate a size-based cut off point, in addition to values like `10` to indicate a number of messages. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- [CLI] Improved formatting and progress reporting.
-- [CLI] Changed `export` command so that it can accept multiple channel IDs passed to `-c|--channel` option. This makes it possible to export multiple channels at once while benefiting from parallelization.
-- [JSON] Added `color` field to message author. This is a hex string that represents user's color, inherited from their roles. (Thanks [@rtm516](https://github.com/rtm516))
-- [JSON] Added `categoryId` field to the root. This represents the ID of the category channel that the currently exported channel belongs to. (Thanks [@rtm516](https://github.com/rtm516))
-- [JSON] Fixed an issue where user discriminator was written without leading zeroes. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-- [JSON] Fixed an issue where the application sometimes crashed with an error saying `']' invalid without a matching open`, which was just a validation message that masked the actual error behind the failure. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-- Fixed an issue where progress was not reported correctly if the channel didn't have any messages in the specified time range.
-
-### v2.26.1 (06-Feb-2021)
-
-- [CLI] Added support for file name templates, which allow you to dynamically generate output file names based on channel and guild metadata. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-- Fixed an issue where the application sometimes crashed with `Invalid snowflake` message when exporting chat logs that contained invalid or outdated mentions. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-
-### v2.26 (29-Dec-2020)
-
-- [HTML] Added support for replies. (Thanks [@Sanqui](https://github.com/Sanqui))
-- [HTML] Improved styling of non-media attachments (regular files, i.e. not video, audio, or image). (Thanks [@Lucas LaBuff](https://github.com/96-LB))
-- [HTML] Improved initial export performance.
-- [JSON] Relaxed escaping rules for unicode characters. (Thanks [@Sanqui](https://github.com/Sanqui))
-- [JSON] Added support for replies. (Thanks [@Sanqui](https://github.com/Sanqui))
-- [CLI] Added channel names to errors shown on failures when exporting multiple channels. (Thanks [@Sanqui](https://github.com/Sanqui))
-- [CLI] Added support for passing message IDs (snowflakes) to `--after` and `--before` options. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- Files downloaded by the "download referenced media" option now have their dates set according to the `Last-Modified` header provided by Discord CDN. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- Fixed an issue where the application sometimes crashed with `NullReferenceException` when retrying a failed HTTP request.
-- Migrated to Discord API v8.
-
-### v2.25 (23-Nov-2020)
-
-- [JSON] Added `mentions` property to the output. This contains users referenced inside the message text, but doesn't include mentions in embeds. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- [HTML] Added better previews for attached video and audio. They are now rendered using a browser native player element. The actual file path can still be retrieved by right clicking and selecting "Copy file path". (Thanks [@sas41](https://github.com/sas41))
-- [CLI] Fixed an issue where using `--media` option without providing a rooted path via `--output` option triggered an error.
-- [CLI] Fixed an issue where using `--reuse-media` option without also providing `--media` option was accepted, but didn't actually do anything. Now this produces an error instead. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-
-### v2.24 (24-Oct-2020)
-
-- [CLI] Updated to [CliFx v1.5](https://github.com/Tyrrrz/CliFx), which brings some UX improvements.
-- [GUI] Added dark mode, which can be enabled in settings. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- [GUI] Improved the UX in a few minor places.
-- [JSON] Added `embed.color` property to the output. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- Added additional date formats: `unix` to write dates as a unix timestamp and `unixms` for the milliseconds version. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- Added retry policy for downloading media content. This is mostly a workaround for transient failures that sometimes may occur when downloading assets referenced from embeds. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-- Added an option to reuse already downloaded media to avoid redundant network requests. It can be enabled in settings in GUI, or by passing `--reuse-media` in CLI. To facilitate this feature, the file name strategy has been changed as well -- now instead of relying on the original file name and adding `(n)` to the end in case of duplicates, a URL hash is injected in every file name. This also means that when the "reuse media" option is disabled, existing files inside the media directory may be overwritten. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
-
-### v2.23 (14-Sep-2020)
-
-- [CLI] Added a command to export all channels across all servers. Use `exportall` to do it. (Thanks [@wyattscarpenter](https://github.com/wyattscarpenter))
-- [HTML] Fixed an issue where Whitney fonts were not being loaded properly, causing the browser to fall back to Helvetica.
-- Fixed an issue where self-contained export crashed occasionally. This usually happened when the server hosting the file did not serve the stream properly. Such files are now ignored after the first failed attempt.
-
-### v2.22 (12-Aug-2020)
-
-- [GUI] Improved the channel list by adding collapsible category groups. (Thanks [@CarJem Generations](https://github.com/CarJem))
-- [GUI] Improved exporting options by adding a set of controls that can be used to limit the date range of the export down to minutes. Previously it was only possible to configure the date range without the time component. (Thanks [@CarJem Generations](https://github.com/CarJem))
-- [HTML] Fixed an issue where the export didn't reflect changes in nicknames between messages sent by bots. This affected chat logs that contained interactions with the Tupperbox bot. (Thanks [@CarJem Generations](https://github.com/CarJem))
-- [CLI] Fixed an issue where the application crashed if there were two environment variables defined that had the same name but in different case.
-
-### v2.21.2 (30-Jul-2020)
-
-- [GUI] When copy-pasting token, any surrounding spaces are now discarded, in addition to double quotes.
-- [HTML] Changed underlying templating engine to provide higher performance and better error messages. New templating engine adds a small cold start, but any export after the first should be faster.
-- Changed naming schema for downloaded media so that it follows `<original filename> (nn)` format rather than `<original filename>-salt`.
-- [HTML] Fixed an issue where downloaded media was sometimes inaccessible due to reserved characters appearing in the URL.
-- Fixed an issue where the application crashed when trying to download media with a file name that exceeds system's maximum allowed length.
-- Fixed an issue where the application crashed when trying to download media with illegal characters in the file name.
-
-### v2.21.1 (19-Jul-2020)
-
-- Fixed an issue where the export crashed if an embedded image has been deleted. Such media files are now ignored.
-- Changed the naming convention for downloaded media files so that the original file names are used when possible.
-
-### v2.21 (18-Jul-2020)
-
-- Added a new option that enables self-contained exports for all output formats. You can turn it on in the export setup dialog in GUI or using the `--media` option in CLI. When using this, the application will additionally download any media content directly referenced from the exported file instead of linking back to Discord CDN. The files which are downloaded include: guild icons, user avatars, attachments, embedded images, reaction emoji. Note that only files which are actually referenced by the export are downloaded, which means that, for example, user avatars will not be downloaded when using plain text export format. This option is not meant to enable complete offline viewing for HTML exports, but rather to make it easier to archive media content that may eventually get deleted from Discord servers. Also keep in mind that this option may make the export drastically slower and the total file size larger.
-- Changed "discordapp.com" to "discord.com" where applicable as Discord is migrating to a new domain. CDN will remain on "cdn.discordapp.com" for the foreseeable future.
-
-Note that all existing and current HTML exports will likely not render accurately because Discord enabled CORS for their font resources, which prevents them from loading locally. Please refer to [issue #322](https://github.com/Tyrrrz/DiscordChatExporter/issues/322) for discussion on this topic.
-
-### v2.20 (27-Apr-2020)
-
-- [CLI] Added environment variables as fallback for `--token` and `--bot` options. They are `DISCORD_TOKEN` and `DISCORD_TOKEN_BOT` respectively.
-- [GUI] Fixed a crash that occurred if the application was closed in the middle of an auto-update.
-- [GUI] Added a link to project's wiki in the usage guide.
-- [HTML] Added full spoiler support for text and images. To spoil the hidden content you now need to click on it, similarly to how it works in Discord. (Thanks [@FM-96](https://github.com/FM-96))
-- [HTML] Updated grammar for consecutive single-line quotes. Previously they appeared separately, now they're grouped together as if it was one multi-line quote instead.
-- [HTML] Fixed an issue where messages sent by the same bot but with different usernames were grouped together when they shouldn't be.
-- [HTML] Updated grammar for single-line code blocks to accept double backticks as synonymous with single backticks. This change makes code blocks appear the same, whether they were inserted manually or using Discord's buggy markdown preview mode.
-- [HTML] Fixed styling inconsistencies and other minor issues.
-- [TXT/JSON] Fixed an issue where markdown was not parsed correctly in embed fields.
-- [HTML] Changed markdown formatting in embeds so it follows the same set of rules as in Discord.
-- Added channel category to the default file name used when exporting chat logs.
-- [HTML/TXT/JSON] Added channel category to exported metadata.
-- [CLI] Updated commands to also show channel category as well as channel name wherever relevant.
-- Starting with this release, Docker images will have new tags: `stable` for latest stable release and `2.20` for a specific version.
-
-### v2.19 (26-Mar-2020)
-
-- Added parallel exporting. This option allows you to export multiple channels faster by doing it in parallel. You can configure the parallel limit in settings (GUI) or with the `--parallel` option (CLI). Default value is `1`, which means there is no parallelization. Warning: be careful when using this option, as this will result in higher volume of concurrent HTTP requests sent to Discord, which might get you flagged. Use at your own risk.
-- [HTML] Added support for user colors. User names are now appropriately colored according to the assigned guild roles.
-- [HTML] Added support for nicknames. User names are replaced with nicknames where it's applicable. It's still possible to see the full user name by hovering your mouse over the nickname.
-- [HTML] Improved styling for mentions to bring it more in line with how it looks in Discord.
-
-### v2.18 (04-Feb-2020)
-
-- Added JSON export format. It's a structured data format which is easy to parse. If you're using DiscordChatExporter to export chat logs for further ingestion by another tool, this is most likely the format you will want to use.
-- [GUI] You can now quickly jump to a specific channel in a list. For example, if you want to jump to a channel named "General", you can simply press the 'g' key in the channel list view. You can also press 'g', 'e' and 'n' in quick succession which will jump to the next channel that starts with "gen". This mechanic is consistent with other Windows applications.
-- [CLI] Improved help text screen.
-
-### v2.17 (12-Jan-2020)
-
-- Fixed an issue where an empty file was produced when exporting a channel with no messages (for specified period). With the new behavior, no file will be created and instead a message will be shown to the user informing of the failure.
-- [HTML/TXT] Added message count to the bottom of the file. This number shows how many messages were exported as part of the current file. Prior to 2.16 this number was present along with the rest of the metadata at the top, then removed due to changes in the exporter, and now brought back at the end of the file instead.
-- [HTML] Fixed an issue where some emoji were not properly rendered.
-- [GUI] Added a setting that lets you configure whether to remember the last used token. Previously it was the default behavior, but now you can disable it if you don't want the token persisted on your system.
-
-### v2.16 (08-Dec-2019)
-
-- Migrated from .NET Framework to .NET Core. To run this and future versions of DiscordChatExporter you will need [.NET Core runtime for desktop apps](https://dotnet.microsoft.com/download/dotnet-core/3.1/runtime) (for GUI/CLI version on Windows) or [.NET Core base runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1) (for CLI version on Windows, Linux or macOS).
-- Reworked the exporter engine to render output using streaming data source. This means that only a very small portion of messages are cached in memory when exporting. In other words, you are only limited by storage space and not how much RAM you have, so you can now export terabytes of chat logs without hitting out of memory exceptions. I still recommend using partitions if you're exporting very large chat logs (250k+ messages) to HTML, unless you want your computer to catch fire when you try to open the export in browser.
-- Changed how partitioned files are named, due to the fact that total number of partitions is no longer known ahead of time.
-- Added a warning about automating user accounts to the usage guide in both GUI and CLI versions.
-- Added support for announcement (news) channels. You will now be able to see them in the list and export them.
-- Fixed various issues that resulted in exceptions during export process.
-- [HTML/TXT] Removed message count from the metadata. Due to the fact that the messages are exported as they are streamed, total number of messages is not known ahead of time.
-- [HTML] Changed default color of the embed color pill to match the theme.
-- [HTML] Changed emoji parser to be less greedy. As a result it should match fewer character sequences that look like emoji but really aren't, but on the other hand it might miss some actual emoji. This means that some standard emoji (i.e. not custom server emoji) may not look like in Discord. This is a compromise I'm willing to take because detecting emoji in text is really hard to get right and not worth it at all.
-- [HTML] Some other minor styling adjustments.
-- [CSV] Replaced semicolons (;) with (,) as separators.
-
-Please note that CSV export is most likely not going to receive future updates and will remain only as an option for those who wish to use it for text analysis. In other words, it won't contain any of the rich media features like embeds. If you're currently using CSV as a structured output to feed into your program, JSON output will replace that in the future.
-
-### v2.15 (15-Sep-2019)
-
-- Improved markdown parser and made it even faster for non-HTML formats.
-- [HTML] Added support for block quotes.
-- [HTML] Links pointing to a Discord message will now navigate to the linked message inside exported chat log if it's there.
-- [HTML] Updated light theme to match how it looks in Discord after recent changes.
-- [HTML] Added indication for when a message is pinned. Pinned messages now have a tinted background.
-- [HTML] Fixed an issue where multiline code blocks sometimes had incorrect formatting applied to them.
-- [TXT] Added indication for when a message is pinned. Pinned messages now have `(pinned)` next to timestamp and author.
-- [CSV] Added message author's user ID to output.
-- [GUI] Streamlined auto-update process a bit.
-- [GUI] Added some tooltips.
-
-### v2.14 (15-Jun-2019)
-
-- [TXT] Added support for embeds.
-- [TXT] Added support for reactions.
-- [CSV] Added support for reactions.
-- [TXT] Changed how attachments are rendered.
-
-### v2.13.1 (06-Jun-2019)
-
-- Fixed an issue where the app sometimes crashed when exporting due to `System.InvalidCastException`.
-- [HTML] Added `data-user-id` attribute to `span.chatlog__author-name`. The value of this attribute is author's Discord user ID.
-
-### v2.13 (15-May-2019)
-
-- Updated usage instructions.
-- [HTML] Added BOT tags to messages posted by bots.
-- [GUI] UI will now be disabled when exporting.
-- [GUI] Notification informing that the export has completed will now appear after all exports have completed, instead of each of them separately.
-
-### v2.12.1 (12-Apr-2019)
-
-- [GUI] Fixed an issue where the app crashed when trying to export multiple channels.
-- [HTML] Fixed an issue where some of the emoji were rendered via Twemoji while Discord renders them as plain text.
-- [HTML] Fixed an issue where emoji weren't jumbo if there were more than one of them.
-
-### v2.12 (11-Apr-2019)
-
-- Improved markdown parsing performance which speeds up the final stage of exporting by around 4.5 times.
-- Improved performance when exporting as PlainText or CSV.
-- [GUI] Fixed an issue where the app would freeze up and report as "not responding" during the final stage of exporting.
-- [CLI] Fixed an issue where it would say "Completed" after exporting a chat log, even if the process failed.
-
-### v2.11 (14-Mar-2019)
-
-- [HTML] Added syntax highlighting for multiline code blocks via Highlight.js.
-- Added retry policy for all 5xx status codes to prevent random crashes.
-
-### v2.10.2 (10-Mar-2019)
-
-- [HTML] Updated message grouping algorithm to make it the same as in Discord. Removed "message group limit" setting and parameter.
-- [HTML] Added small margin at the end of the chatlog so it doesn't look like it was truncated.
-- [CLI] Fixed an issue where the app would crash if stdout was redirected. Progress will not be reported in such cases.
-
-### v2.10.1 (06-Mar-2019)
-
-- [HTML] Fixed an issue where multiple emoji on a single line would get rendered as one emoji.
-- [HTML] Fixed an issue where an open square bracket character would incorrectly render as an emoji.
-- [HTML] Added alt text to emoji images so that they will be rendered using default font when Twemoji images are not available.
-
-### v2.10 (03-Mar-2019)
-
-- [HTML] Reworked the entire markdown parsing engine which fixes numerous rendering inconsistencies (over 15 issues fixed).
-- [HTML] Added support for animated emoji.
-- [HTML] Standard emoji are now rendered using Twemoji, the same image set that Discord uses.
-- [HTML] Fixed an issue where video attachments would render incorrectly.
-- [HTML] Minor fixes in styling.
-- [GUI] Aggregated export progress is now shown in the taskbar.
-- [GUI] Checkmarks are now displayed next to channels that are selected.
-- [CLI] Added progress reporting when exporting chat logs.
-
-### v2.9.1 (10-Feb-2019)
-
-- Fixed an issue where some of the last messages in a channel would sometimes not get exported.
-
-### v2.9 (09-Feb-2019)
-
-- Added categories to channel list in GUI. Channels are now also grouped by category.
-- Added ability to export multiple channels at once in GUI by selecting them with shift or ctrl keys.
-- Added CLI command to export all available channels in a guild (`exportguild`).
-- Added CLI command to export all direct message channels (`exportdm`).
-- Added retry policy for 503 status code errors to prevent random crashes.
-- Changed how channels are exported in GUI. Now you need to select them first and then click a button to export. You can also double click a single channel to export it as before.
-- Improved default file name generation by adding date ranges and channel ID to the file name.
-- Improved naming of files exported with partitioning.
-- Improved usage instructions.
-- Improved GUI layout and styling.
-- Fixed an issue where dialogs would sometimes appear over other windows.
-- Fixed an issue where launching DiscordChatExporter from Windows Start Menu would make it crash.
-
-### v2.8 (03-Nov-2018)
-
-- Added support for partitioning which lets you split the output into multiple files by setting the partition message limit (`-p` parameter for CLI).
-- Exported file will no longer open automatically on completion.
-- Reduced amount of memory used during exporting.
-- Disabled message grouping in PlainText export.
-- Improved encoding of newlines in CSV export.
-- Improved error messages in the GUI app during crashes.
-
-### v2.7 (14-Sep-2018)
-
-- Updated instructions on how to obtain the user token.
-- Expanded CLI with new commands: `channels` (get a list of channels in a guild), `dm` (get a list of DM channels), `guilds` (get a list of guilds), on top of `export` (export chatlog).
-- Improved help text and error messages in CLI.
-- In CLI, the file name will be automatically generated if the provided output file path is a directory.
-
-### v2.6 (25-Jul-2018)
-
-- Added support for bot tokens as an alternative to user tokens. For GUI, use the button in the top-left to switch between user and bot token. For CLI, pass the `--bot` switch to indicate that the given token is a bot token.
-- Added support for animated avatars.
-
-### v2.5.1 (01-Jul-2018)
-
-- Fixed a bug that would prevent timestamps from rendering properly in CSV and PlainText exports.
-- Fixed incorrect layout in CSV export.
-- Improved readability of PlainText export.
-
-### v2.5 (28-Jun-2018)
-
-- Added support for embeds and webhooks (HTML only).
-- Implemented progress reporting when downloading messages.
-- Added support for reactions (HTML only).
-- Selected date range is now shown in the export (HTML and PlainText).
-- Added placeholders for guild icons to display while the icons are loading.
-- Added support for jumbo emoji (custom emoji only).
-- Added basic retry policy for 429 error responses.
-- Added validation for from/to dates in the UI which prevents choosing invalid date ranges.
-- Added an error message when trying to export a deleted channel.
-
-### v2.4.1 (15-Apr-2018)
-
-- Added CSV export format.
-- Channels are now ordered by name in the UI.
-- Exported file is now always opened upon completion.
-
-### v2.4 (08-Apr-2018)
-
-- Added channel topic to output.
-- Added a command line interface alternative to the current graphical user interface.
-- Implemented application auto-update (can be disabled in settings).
-- Improved some GUI elements and replaced some dialogs with notifications.
-- Fixed a lot of issues with the markdown processor.
-- Fixed DM group chats that have a custom name being shown as blank in the list.
-
-### v2.3 (27-Oct-2017)
-
-- Improved message date filtering, it's now marginally faster.
-- Fixed underscores not recognized as italics in markdown.
-- Added support for custom emoji.
-- Added support for user and role mentions.
-- Added support for channel mentions.
-- Fixed text in pre blocks not being wrapped correctly.
-- Added workaround for non-default message types.

Directory.Build.props

@@ -1,13 +1,14 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>2.35.2</Version>
+    <TargetFramework>net9.0</TargetFramework>
+    <Version>999.9.9-dev</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Oleksii Holub</Copyright>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
   </PropertyGroup>
 
 </Project>

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

@@ -1,25 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
+    <UserSecretsId>d1fe5ae2-2a19-404d-a36e-81ba9eada1c1</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="*.secret" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.17.1" />
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" PrivateAssets="all" />
+    <PackageReference Include="AngleSharp" Version="1.2.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
+    <PackageReference Include="FluentAssertions" Version="8.1.1" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli.Tests/Fixtures/ExportWrapperFixture.cs

@@ -1,117 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
-using AngleSharp.Dom;
-using AngleSharp.Html.Dom;
-using CliFx.Infrastructure;
-using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.Utils;
-using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Exporting;
-using JsonExtensions;
-
-namespace DiscordChatExporter.Cli.Tests.Fixtures;
-
-public class ExportWrapperFixture : IDisposable
-{
-    private string DirPath { get; } = Path.Combine(
-        Path.GetDirectoryName(typeof(ExportWrapperFixture).Assembly.Location) ?? Directory.GetCurrentDirectory(),
-        "ExportCache",
-        Guid.NewGuid().ToString()
-    );
-
-    public ExportWrapperFixture() => DirectoryEx.Reset(DirPath);
-
-    private async ValueTask<string> ExportAsync(Snowflake channelId, ExportFormat format)
-    {
-        var fileName = channelId.ToString() + '.' + format.GetFileExtension();
-        var filePath = Path.Combine(DirPath, fileName);
-
-        // Perform export only if it hasn't been done before
-        if (!File.Exists(filePath))
-        {
-            await new ExportChannelsCommand
-            {
-                Token = Secrets.DiscordToken,
-                ChannelIds = new[] { channelId },
-                ExportFormat = format,
-                OutputPath = filePath
-            }.ExecuteAsync(new FakeConsole());
-        }
-
-        return await File.ReadAllTextAsync(filePath);
-    }
-
-    public async ValueTask<IHtmlDocument> ExportAsHtmlAsync(Snowflake channelId) => Html.Parse(
-        await ExportAsync(channelId, ExportFormat.HtmlDark)
-    );
-
-    public async ValueTask<JsonElement> ExportAsJsonAsync(Snowflake channelId) => Json.Parse(
-        await ExportAsync(channelId, ExportFormat.Json)
-    );
-
-    public async ValueTask<string> ExportAsPlainTextAsync(Snowflake channelId) =>
-        await ExportAsync(channelId, ExportFormat.PlainText);
-
-    public async ValueTask<string> ExportAsCsvAsync(Snowflake channelId) =>
-        await ExportAsync(channelId, ExportFormat.Csv);
-
-    public async ValueTask<IReadOnlyList<IElement>> GetMessagesAsHtmlAsync(Snowflake channelId) =>
-        (await ExportAsHtmlAsync(channelId))
-        .QuerySelectorAll("[data-message-id]")
-        .ToArray();
-
-    public async ValueTask<IReadOnlyList<JsonElement>> GetMessagesAsJsonAsync(Snowflake channelId) =>
-        (await ExportAsJsonAsync(channelId))
-        .GetProperty("messages")
-        .EnumerateArray()
-        .ToArray();
-
-    public async ValueTask<IElement> GetMessageAsHtmlAsync(Snowflake channelId, Snowflake messageId)
-    {
-        var message = (await GetMessagesAsHtmlAsync(channelId))
-            .SingleOrDefault(e =>
-                string.Equals(
-                    e.GetAttribute("data-message-id"),
-                    messageId.ToString(),
-                    StringComparison.OrdinalIgnoreCase
-                )
-            );
-
-        if (message is null)
-        {
-            throw new InvalidOperationException(
-                $"Message '{messageId}' does not exist in the export of channel '{channelId}'."
-            );
-        }
-
-        return message;
-    }
-
-    public async ValueTask<JsonElement> GetMessageAsJsonAsync(Snowflake channelId, Snowflake messageId)
-    {
-        var message = (await GetMessagesAsJsonAsync(channelId))
-            .SingleOrDefault(j =>
-                string.Equals(
-                    j.GetProperty("id").GetString(),
-                    messageId.ToString(),
-                    StringComparison.OrdinalIgnoreCase
-                )
-            );
-
-        if (message.ValueKind == JsonValueKind.Undefined)
-        {
-            throw new InvalidOperationException(
-                $"Message '{messageId}' does not exist in the export of channel '{channelId}'."
-            );
-        }
-
-        return message;
-    }
-
-    public void Dispose() => DirectoryEx.DeleteIfExists(DirPath);
-}

DiscordChatExporter.Cli.Tests/Fixtures/TempOutputFixture.cs

@@ -1,22 +0,0 @@
-using System;
-using System.IO;
-using DiscordChatExporter.Cli.Tests.Utils;
-
-namespace DiscordChatExporter.Cli.Tests.Fixtures;
-
-public class TempOutputFixture : IDisposable
-{
-    public string DirPath { get; } = Path.Combine(
-        Path.GetDirectoryName(typeof(TempOutputFixture).Assembly.Location) ?? Directory.GetCurrentDirectory(),
-        "Temp",
-        Guid.NewGuid().ToString()
-    );
-
-    public TempOutputFixture() => DirectoryEx.Reset(DirPath);
-
-    public string GetTempFilePath(string fileName) => Path.Combine(DirPath, fileName);
-
-    public string GetTempFilePath() => GetTempFilePath(Guid.NewGuid() + ".tmp");
-
-    public void Dispose() => DirectoryEx.DeleteIfExists(DirPath);
-}

DiscordChatExporter.Cli.Tests/Infra/ChannelIds.cs

@@ -1,6 +1,6 @@
 using DiscordChatExporter.Core.Discord;
 
-namespace DiscordChatExporter.Cli.Tests.TestData;
+namespace DiscordChatExporter.Cli.Tests.Infra;
 
 public static class ChannelIds
 {
@@ -10,10 +10,14 @@ 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");
 
+    public static Snowflake MarkdownTestCases { get; } = Snowflake.Parse("866459526819348521");
+
     public static Snowflake MentionTestCases { get; } = Snowflake.Parse("866458801389174794");
 
     public static Snowflake ReplyTestCases { get; } = Snowflake.Parse("866459871934677052");
@@ -21,4 +25,4 @@ public static class ChannelIds
     public static Snowflake SelfContainedTestCases { get; } = Snowflake.Parse("887441432678379560");
 
     public static Snowflake StickerTestCases { get; } = Snowflake.Parse("939668868253769729");
-}
+}

DiscordChatExporter.Cli.Tests/Infra/ExportWrapper.cs

@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json;
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using AngleSharp.Html.Dom;
+using AsyncKeyedLock;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands;
+using DiscordChatExporter.Cli.Tests.Utils;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Exporting;
+using JsonExtensions;
+
+namespace DiscordChatExporter.Cli.Tests.Infra;
+
+public static class ExportWrapper
+{
+    private static readonly AsyncKeyedLocker<string> Locker = new();
+
+    private static readonly string DirPath = Path.Combine(
+        Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+            ?? Directory.GetCurrentDirectory(),
+        "ExportCache"
+    );
+
+    static ExportWrapper()
+    {
+        try
+        {
+            Directory.Delete(DirPath, true);
+        }
+        catch (DirectoryNotFoundException) { }
+
+        Directory.CreateDirectory(DirPath);
+    }
+
+    private static async ValueTask<string> ExportAsync(Snowflake channelId, ExportFormat format)
+    {
+        var fileName = channelId.ToString() + '.' + format.GetFileExtension();
+        var filePath = Path.Combine(DirPath, fileName);
+
+        using var _ = await Locker.LockAsync(filePath);
+        using var console = new FakeConsole();
+
+        // Perform the export only if it hasn't been done before
+        if (!File.Exists(filePath))
+        {
+            await new ExportChannelsCommand
+            {
+                Token = Secrets.DiscordToken,
+                ChannelIds = [channelId],
+                ExportFormat = format,
+                OutputPath = filePath,
+                Locale = "en-US",
+                IsUtcNormalizationEnabled = true,
+            }.ExecuteAsync(console);
+        }
+
+        return await File.ReadAllTextAsync(filePath);
+    }
+
+    public static async ValueTask<IHtmlDocument> ExportAsHtmlAsync(Snowflake channelId) =>
+        Html.Parse(await ExportAsync(channelId, ExportFormat.HtmlDark));
+
+    public static async ValueTask<JsonElement> ExportAsJsonAsync(Snowflake channelId) =>
+        Json.Parse(await ExportAsync(channelId, ExportFormat.Json));
+
+    public static async ValueTask<string> ExportAsPlainTextAsync(Snowflake channelId) =>
+        await ExportAsync(channelId, ExportFormat.PlainText);
+
+    public static async ValueTask<string> ExportAsCsvAsync(Snowflake channelId) =>
+        await ExportAsync(channelId, ExportFormat.Csv);
+
+    public static async ValueTask<IReadOnlyList<IElement>> GetMessagesAsHtmlAsync(
+        Snowflake channelId
+    ) => (await ExportAsHtmlAsync(channelId)).QuerySelectorAll("[data-message-id]").ToArray();
+
+    public static async ValueTask<IReadOnlyList<JsonElement>> GetMessagesAsJsonAsync(
+        Snowflake channelId
+    ) => (await ExportAsJsonAsync(channelId)).GetProperty("messages").EnumerateArray().ToArray();
+
+    public static async ValueTask<IElement> GetMessageAsHtmlAsync(
+        Snowflake channelId,
+        Snowflake messageId
+    )
+    {
+        var message = (await GetMessagesAsHtmlAsync(channelId)).SingleOrDefault(e =>
+            string.Equals(
+                e.GetAttribute("data-message-id"),
+                messageId.ToString(),
+                StringComparison.OrdinalIgnoreCase
+            )
+        );
+
+        if (message is null)
+        {
+            throw new InvalidOperationException(
+                $"Message #{messageId} not found in the export of channel #{channelId}."
+            );
+        }
+
+        return message;
+    }
+
+    public static async ValueTask<JsonElement> GetMessageAsJsonAsync(
+        Snowflake channelId,
+        Snowflake messageId
+    )
+    {
+        var message = (await GetMessagesAsJsonAsync(channelId)).SingleOrDefault(j =>
+            string.Equals(
+                j.GetProperty("id").GetString(),
+                messageId.ToString(),
+                StringComparison.OrdinalIgnoreCase
+            )
+        );
+
+        if (message.ValueKind == JsonValueKind.Undefined)
+        {
+            throw new InvalidOperationException(
+                $"Message #{messageId} not found in the export of channel #{channelId}."
+            );
+        }
+
+        return message;
+    }
+}

DiscordChatExporter.Cli.Tests/Infra/Secrets.cs

@@ -1,26 +1,17 @@
 using System;
-using System.IO;
+using System.Reflection;
+using Microsoft.Extensions.Configuration;
 
 namespace DiscordChatExporter.Cli.Tests.Infra;
 
 internal static class Secrets
 {
-    private static readonly Lazy<string> DiscordTokenLazy = new(() =>
-    {
-        var fromEnvironment = Environment.GetEnvironmentVariable("DISCORD_TOKEN");
-        if (!string.IsNullOrWhiteSpace(fromEnvironment))
-            return fromEnvironment;
+    private static readonly IConfigurationRoot Configuration = new ConfigurationBuilder()
+        .AddUserSecrets(Assembly.GetExecutingAssembly())
+        .AddEnvironmentVariables()
+        .Build();
 
-        var secretFilePath = Path.Combine(
-            Path.GetDirectoryName(typeof(Secrets).Assembly.Location) ?? Directory.GetCurrentDirectory(),
-            "DiscordToken.secret"
-        );
-
-        if (File.Exists(secretFilePath))
-            return File.ReadAllText(secretFilePath);
-
-        throw new InvalidOperationException("Discord token not provided for tests.");
-    });
-
-    public static string DiscordToken => DiscordTokenLazy.Value;
-}
+    public static string DiscordToken =>
+        Configuration["DISCORD_TOKEN"]
+        ?? throw new InvalidOperationException("Discord token not provided for tests.");
+}

DiscordChatExporter.Cli.Tests/Readme.md

@@ -5,9 +5,8 @@ In order to run these tests locally, you need to join the test server and config
 
 1. [Join the test server](https://discord.gg/eRV8Vap5bm)
 2. Locate your Discord authentication token
-3. Specify your token using a file or an environment variable:
-    - **Using a file**: put your token in a new `DiscordToken.secret` file created in this directory
-    - **Using an environment variable**: set `DISCORD_TOKEN` variable to your token
+3. Add your token to user secrets: `dotnet user-secrets set DISCORD_TOKEN <token>`
 4. Run the tests: `dotnet test`
 
-> If you want to add a new test case, please let me know and I will give you the required permissions
+> **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/CsvContentSpecs.cs

@@ -0,0 +1,31 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Infra;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class CsvContentSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_in_the_CSV_format()
+    {
+        // Act
+        var document = await ExportWrapper.ExportAsCsvAsync(ChannelIds.DateRangeTestCases);
+
+        // Assert
+        document
+            .Should()
+            .ContainAll(
+                "tyrrrz",
+                "Hello world",
+                "Goodbye world",
+                "Foo bar",
+                "Hurdle Durdle",
+                "One",
+                "Two",
+                "Three",
+                "Yeet"
+            );
+    }
+}

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

@@ -1,37 +0,0 @@
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
-using FluentAssertions;
-using Xunit;
-
-namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting;
-
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
-{
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
-    [Fact]
-    public async Task Messages_are_exported_correctly()
-    {
-        // Act
-        var document = await _exportWrapper.ExportAsCsvAsync(ChannelIds.DateRangeTestCases);
-
-        // Assert
-        document.Should().ContainAll(
-            "Tyrrrz#5447",
-            "Hello world",
-            "Goodbye world",
-            "Foo bar",
-            "Hurdle Durdle",
-            "One",
-            "Two",
-            "Three",
-            "Yeet"
-        );
-    }
-}

DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs

@@ -4,9 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Fixtures;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
@@ -15,35 +14,27 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class DateRangeSpecs : IClassFixture<TempOutputFixture>
+public class DateRangeSpecs
 {
-    private readonly TempOutputFixture _tempOutput;
-
-    public DateRangeSpecs(TempOutputFixture tempOutput)
-    {
-        _tempOutput = tempOutput;
-    }
-
     [Fact]
-    public async Task Messages_filtered_after_specific_date_only_include_messages_sent_after_that_date()
+    public async Task I_can_filter_the_export_to_only_include_messages_sent_after_the_specified_date()
     {
         // Arrange
         var after = new DateTimeOffset(2021, 07, 24, 0, 0, 0, TimeSpan.Zero);
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ChannelIds = [ChannelIds.DateRangeTestCases],
             ExportFormat = ExportFormat.Json,
-            OutputPath = filePath,
-            After = Snowflake.FromDate(after)
+            OutputPath = file.Path,
+            After = Snowflake.FromDate(after),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        var timestamps = Json
-            .Parse(await File.ReadAllTextAsync(filePath))
+        var timestamps = Json.Parse(await File.ReadAllTextAsync(file.Path))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("timestamp").GetDateTimeOffset())
@@ -51,43 +42,43 @@ public class DateRangeSpecs : IClassFixture<TempOutputFixture>
 
         timestamps.All(t => t > after).Should().BeTrue();
 
-        timestamps.Should().BeEquivalentTo(new[]
-        {
-            new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
-            new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
-            new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
-            new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero),
-            new DateTimeOffset(2021, 09, 08, 14, 26, 35, TimeSpan.Zero)
-        }, o =>
-        {
-            return o
-                .Using<DateTimeOffset>(ctx =>
-                    ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
-                )
-                .WhenTypeIs<DateTimeOffset>();
-        });
+        timestamps
+            .Should()
+            .BeEquivalentTo(
+                [
+                    new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 09, 08, 14, 26, 35, TimeSpan.Zero),
+                ],
+                o =>
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                        )
+                        .WhenTypeIs<DateTimeOffset>()
+            );
     }
 
     [Fact]
-    public async Task Messages_filtered_before_specific_date_only_include_messages_sent_before_that_date()
+    public async Task I_can_filter_the_export_to_only_include_messages_sent_before_the_specified_date()
     {
         // Arrange
         var before = new DateTimeOffset(2021, 07, 24, 0, 0, 0, TimeSpan.Zero);
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ChannelIds = [ChannelIds.DateRangeTestCases],
             ExportFormat = ExportFormat.Json,
-            OutputPath = filePath,
-            Before = Snowflake.FromDate(before)
+            OutputPath = file.Path,
+            Before = Snowflake.FromDate(before),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        var timestamps = Json
-            .Parse(await File.ReadAllTextAsync(filePath))
+        var timestamps = Json.Parse(await File.ReadAllTextAsync(file.Path))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("timestamp").GetDateTimeOffset())
@@ -95,43 +86,43 @@ public class DateRangeSpecs : IClassFixture<TempOutputFixture>
 
         timestamps.All(t => t < before).Should().BeTrue();
 
-        timestamps.Should().BeEquivalentTo(new[]
-        {
-            new DateTimeOffset(2021, 07, 19, 13, 34, 18, TimeSpan.Zero),
-            new DateTimeOffset(2021, 07, 19, 15, 58, 48, TimeSpan.Zero),
-            new DateTimeOffset(2021, 07, 19, 17, 23, 58, TimeSpan.Zero)
-        }, o =>
-        {
-            return o
-                .Using<DateTimeOffset>(ctx =>
-                    ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
-                )
-                .WhenTypeIs<DateTimeOffset>();
-        });
+        timestamps
+            .Should()
+            .BeEquivalentTo(
+                [
+                    new DateTimeOffset(2021, 07, 19, 13, 34, 18, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 19, 15, 58, 48, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 19, 17, 23, 58, TimeSpan.Zero),
+                ],
+                o =>
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                        )
+                        .WhenTypeIs<DateTimeOffset>()
+            );
     }
 
     [Fact]
-    public async Task Messages_filtered_between_specific_dates_only_include_messages_sent_between_those_dates()
+    public async Task I_can_filter_the_export_to_only_include_messages_sent_between_the_specified_dates()
     {
         // Arrange
         var after = new DateTimeOffset(2021, 07, 24, 0, 0, 0, TimeSpan.Zero);
         var before = new DateTimeOffset(2021, 08, 01, 0, 0, 0, TimeSpan.Zero);
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.DateRangeTestCases },
+            ChannelIds = [ChannelIds.DateRangeTestCases],
             ExportFormat = ExportFormat.Json,
-            OutputPath = filePath,
+            OutputPath = file.Path,
             Before = Snowflake.FromDate(before),
-            After = Snowflake.FromDate(after)
+            After = Snowflake.FromDate(after),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        var timestamps = Json
-            .Parse(await File.ReadAllTextAsync(filePath))
+        var timestamps = Json.Parse(await File.ReadAllTextAsync(file.Path))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("timestamp").GetDateTimeOffset())
@@ -139,19 +130,20 @@ public class DateRangeSpecs : IClassFixture<TempOutputFixture>
 
         timestamps.All(t => t < before && t > after).Should().BeTrue();
 
-        timestamps.Should().BeEquivalentTo(new[]
-        {
-            new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
-            new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
-            new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
-            new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero)
-        }, o =>
-        {
-            return o
-                .Using<DateTimeOffset>(ctx =>
-                    ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
-                )
-                .WhenTypeIs<DateTimeOffset>();
-        });
+        timestamps
+            .Should()
+            .BeEquivalentTo(
+                [
+                    new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero),
+                ],
+                o =>
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                        )
+                        .WhenTypeIs<DateTimeOffset>()
+            );
     }
-}
+}

DiscordChatExporter.Cli.Tests/Specs/FilterSpecs.cs

@@ -1,11 +1,11 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Fixtures;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using FluentAssertions;
@@ -14,142 +14,155 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class FilterSpecs : IClassFixture<TempOutputFixture>
+public class FilterSpecs
 {
-    private readonly TempOutputFixture _tempOutput;
-
-    public FilterSpecs(TempOutputFixture tempOutput)
-    {
-        _tempOutput = tempOutput;
-    }
-
     [Fact]
-    public async Task Messages_filtered_by_text_only_include_messages_that_contain_that_text()
+    public async Task I_can_filter_the_export_to_only_include_messages_that_contain_the_specified_text()
     {
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
-            OutputPath = filePath,
-            MessageFilter = MessageFilter.Parse("some text")
+            OutputPath = file.Path,
+            MessageFilter = MessageFilter.Parse("some text"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        Json
-            .Parse(await File.ReadAllTextAsync(filePath))
+        Json.Parse(await File.ReadAllTextAsync(file.Path))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
             .Should()
-            .ContainSingle("Some random text");
+            .AllSatisfy(c => c.Contains("Some random text", StringComparison.Ordinal));
     }
 
     [Fact]
-    public async Task Messages_filtered_by_author_only_include_messages_sent_by_that_author()
+    public async Task I_can_filter_the_export_to_only_include_messages_that_were_sent_by_the_specified_author()
     {
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
-            OutputPath = filePath,
-            MessageFilter = MessageFilter.Parse("from:Tyrrrz")
+            OutputPath = file.Path,
+            MessageFilter = MessageFilter.Parse("from:Tyrrrz"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        Json
-            .Parse(await File.ReadAllTextAsync(filePath))
+        Json.Parse(await File.ReadAllTextAsync(file.Path))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("author").GetProperty("name").GetString())
             .Should()
-            .AllBe("Tyrrrz");
+            .AllBe("tyrrrz");
     }
 
     [Fact]
-    public async Task Messages_filtered_by_content_only_include_messages_that_have_that_content()
+    public async Task I_can_filter_the_export_to_only_include_messages_that_contain_images()
     {
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
-            OutputPath = filePath,
-            MessageFilter = MessageFilter.Parse("has:image")
+            OutputPath = file.Path,
+            MessageFilter = MessageFilter.Parse("has:image"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        Json
-            .Parse(await File.ReadAllTextAsync(filePath))
+        Json.Parse(await File.ReadAllTextAsync(file.Path))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
             .Should()
-            .ContainSingle("This has image");
+            .AllSatisfy(c => c.Contains("This has image", StringComparison.Ordinal));
     }
 
     [Fact]
-    public async Task Messages_filtered_by_pin_only_include_messages_that_have_been_pinned()
+    public async Task I_can_filter_the_export_to_only_include_messages_that_have_been_pinned()
     {
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
-            OutputPath = filePath,
-            MessageFilter = MessageFilter.Parse("has:pin")
+            OutputPath = file.Path,
+            MessageFilter = MessageFilter.Parse("has:pin"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        Json
-            .Parse(await File.ReadAllTextAsync(filePath))
+        Json.Parse(await File.ReadAllTextAsync(file.Path))
             .GetProperty("messages")
             .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 Messages_filtered_by_mention_only_include_messages_that_have_that_mention()
+    public async Task I_can_filter_the_export_to_only_include_messages_that_contain_guild_invites()
     {
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.FilterTestCases },
+            ChannelIds = [ChannelIds.FilterTestCases],
             ExportFormat = ExportFormat.Json,
-            OutputPath = filePath,
-            MessageFilter = MessageFilter.Parse("mentions:Tyrrrz")
+            OutputPath = file.Path,
+            MessageFilter = MessageFilter.Parse("has:invite"),
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        Json
-            .Parse(await File.ReadAllTextAsync(filePath))
+        Json.Parse(await File.ReadAllTextAsync(file.Path))
             .GetProperty("messages")
             .EnumerateArray()
             .Select(j => j.GetProperty("content").GetString())
             .Should()
-            .ContainSingle("This has mention");
+            .AllSatisfy(c => c.Contains("This has invite", StringComparison.Ordinal));
     }
-}
+
+    [Fact]
+    public async Task I_can_filter_the_export_to_only_include_messages_that_contain_the_specified_mention()
+    {
+        // 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("mentions:Tyrrrz"),
+        }.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 mention", StringComparison.Ordinal));
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/HtmlAttachmentSpecs.cs

@@ -1,53 +1,40 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlAttachmentSpecs
 {
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public AttachmentSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
     [Fact]
-    public async Task Message_with_a_generic_attachment_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_generic_attachment()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.AttachmentTestCases,
             Snowflake.Parse("885587844989612074")
         );
 
         // Assert
-        message.Text().Should().ContainAll(
-            "Generic file attachment",
-            "Test.txt",
-            "11 bytes"
-        );
+        message.Text().Should().ContainAll("Generic file attachment", "Test.txt", "11 bytes");
 
         message
             .QuerySelectorAll("a")
             .Select(e => e.GetAttribute("href"))
             .Should()
-            .Contain(
-                "https://cdn.discordapp.com/attachments/885587741654536192/885587844964417596/Test.txt"
-            );
+            .Contain(u => u.Contains("Test.txt", StringComparison.Ordinal));
     }
 
     [Fact]
-    public async Task Message_with_an_image_attachment_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_an_image_attachment()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.AttachmentTestCases,
             Snowflake.Parse("885654862656843786")
         );
@@ -59,18 +46,16 @@ public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
             .QuerySelectorAll("img")
             .Select(e => e.GetAttribute("src"))
             .Should()
-            .Contain(
-                "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png"
-            );
+            .Contain(u => u.Contains("bird-thumbnail.png", StringComparison.Ordinal));
     }
 
     [Fact]
-    public async Task Message_with_a_video_attachment_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_video_attachment()
     {
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/333
 
         // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.AttachmentTestCases,
             Snowflake.Parse("885655761919836171")
         );
@@ -79,18 +64,20 @@ public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
         message.Text().Should().Contain("Video attachment");
 
         var videoUrl = message.QuerySelector("video source")?.GetAttribute("src");
-        videoUrl.Should().Be(
-            "https://cdn.discordapp.com/attachments/885587741654536192/885655761512968233/file_example_MP4_640_3MG.mp4"
-        );
+        videoUrl
+            .Should()
+            .StartWith(
+                "https://cdn.discordapp.com/attachments/885587741654536192/885655761512968233/file_example_MP4_640_3MG.mp4"
+            );
     }
 
     [Fact]
-    public async Task Message_with_an_audio_attachment_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_an_audio_attachment()
     {
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/333
 
         // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.AttachmentTestCases,
             Snowflake.Parse("885656175620808734")
         );
@@ -99,8 +86,10 @@ public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
         message.Text().Should().Contain("Audio attachment");
 
         var audioUrl = message.QuerySelector("audio source")?.GetAttribute("src");
-        audioUrl.Should().Be(
-            "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
-        );
+        audioUrl
+            .Should()
+            .StartWith(
+                "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
+            );
     }
-}
+}

DiscordChatExporter.Cli.Tests/Specs/HtmlContentSpecs.cs

@@ -0,0 +1,47 @@
+using System.Linq;
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Infra;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class HtmlContentSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_in_the_HTML_format()
+    {
+        // Act
+        var messages = await ExportWrapper.GetMessagesAsHtmlAsync(ChannelIds.DateRangeTestCases);
+
+        // Assert
+        messages
+            .Select(e => e.GetAttribute("data-message-id"))
+            .Should()
+            .Equal(
+                "866674314627121232",
+                "866710679758045195",
+                "866732113319428096",
+                "868490009366396958",
+                "868505966528835604",
+                "868505969821364245",
+                "868505973294268457",
+                "885169254029213696"
+            );
+
+        messages
+            .SelectMany(e => e.Text())
+            .Should()
+            .ContainInOrder(
+                "Hello world",
+                "Goodbye world",
+                "Foo bar",
+                "Hurdle Durdle",
+                "One",
+                "Two",
+                "Three",
+                "Yeet"
+            );
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs

@@ -0,0 +1,258 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Utils.Extensions;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class HtmlEmbedSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_rich_embed()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("866769910729146400")
+        );
+
+        // Assert
+        message
+            .Text()
+            .Should()
+            .ContainAll(
+                "Embed author",
+                "Embed title",
+                "Embed description",
+                "Field 1",
+                "Value 1",
+                "Field 2",
+                "Value 2",
+                "Field 3",
+                "Value 3",
+                "Embed footer"
+            );
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_an_image_embed()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/537
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("991768701126852638")
+        );
+
+        // Assert
+        message
+            .QuerySelectorAll("img")
+            .Select(e => e.GetAttribute("src"))
+            .WhereNotNull()
+            .Where(s => s.Contains("f8w05ja8s4e61.png", StringComparison.Ordinal))
+            .Should()
+            .ContainSingle();
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_an_image_embed_and_the_text_is_hidden_if_it_only_contains_the_image_link()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/682
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("991768701126852638")
+        );
+
+        // Assert
+        var content = message.QuerySelector(".chatlog__content")?.Text();
+        content.Should().BeNullOrEmpty();
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_video_embed()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("1083751036596002856")
+        );
+
+        // Assert
+        message
+            .QuerySelectorAll("source")
+            .Select(e => e.GetAttribute("src"))
+            .WhereNotNull()
+            .Where(s =>
+                s.Contains(
+                    "i_am_currently_feeling_slight_displeasure_of_what_you_have_just_sent_lqrem.mp4",
+                    StringComparison.Ordinal
+                )
+            )
+            .Should()
+            .ContainSingle();
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_GIFV_embed()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("1019234520349814794")
+        );
+
+        // Assert
+        message
+            .QuerySelectorAll("source")
+            .Select(e => e.GetAttribute("src"))
+            .WhereNotNull()
+            .Where(s => s.Contains("tooncasm-test-copy.mp4", StringComparison.Ordinal))
+            .Should()
+            .ContainSingle();
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_GIFV_embed_and_the_text_is_hidden_if_it_only_contains_the_video_link()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("1019234520349814794")
+        );
+
+        // Assert
+        var content = message.QuerySelector(".chatlog__content")?.Text();
+        content.Should().BeNullOrEmpty();
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_Spotify_track_embed()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/657
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("867886632203976775")
+        );
+
+        // Assert
+        var iframeUrl = message.QuerySelector("iframe")?.GetAttribute("src");
+        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()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/570
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("866472508588294165")
+        );
+
+        // Assert
+        var iframeUrl = message.QuerySelector("iframe")?.GetAttribute("src");
+        iframeUrl.Should().StartWith("https://www.youtube.com/embed/qOWW4OlgbvE");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_Twitter_post_embed_that_includes_multiple_images()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/695
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("991757444017557665")
+        );
+
+        // Assert
+        var imageUrls = message
+            .QuerySelectorAll("img")
+            .Select(e => e.GetAttribute("src"))
+            .ToArray();
+
+        imageUrls
+            .Should()
+            .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();
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_guild_invite()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/649
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("1075116548966064128")
+        );
+
+        // Assert
+        message.Text().Should().Contain("DiscordChatExporter Test Server");
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/HtmlGroupingSpecs.cs

@@ -4,45 +4,35 @@ using System.Threading.Tasks;
 using AngleSharp.Dom;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Fixtures;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.TestData;
 using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class GroupingSpecs : IClassFixture<TempOutputFixture>
+public class HtmlGroupingSpecs
 {
-    private readonly TempOutputFixture _tempOutput;
-
-    public GroupingSpecs(TempOutputFixture tempOutput)
-    {
-        _tempOutput = tempOutput;
-    }
-
     [Fact]
-    public async Task Messages_are_grouped_correctly()
+    public async Task I_can_export_a_channel_and_the_messages_are_grouped_according_to_their_author_and_timestamps()
     {
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/152
 
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
+        using var file = TempFile.Create();
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.GroupingTestCases },
+            ChannelIds = [ChannelIds.GroupingTestCases],
             ExportFormat = ExportFormat.HtmlDark,
-            OutputPath = filePath
+            OutputPath = file.Path,
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        var messageGroups = Html
-            .Parse(await File.ReadAllTextAsync(filePath))
+        var messageGroups = Html.Parse(await File.ReadAllTextAsync(file.Path))
             .QuerySelectorAll(".chatlog__message-group");
 
         messageGroups.Should().HaveCount(2);
@@ -68,12 +58,6 @@ public class GroupingSpecs : IClassFixture<TempOutputFixture>
             .QuerySelectorAll(".chatlog__content")
             .Select(e => e.Text())
             .Should()
-            .ContainInOrder(
-                "Eleventh",
-                "Twelveth",
-                "Thirteenth",
-                "Fourteenth",
-                "Fifteenth"
-            );
+            .ContainInOrder("Eleventh", "Twelveth", "Thirteenth", "Fourteenth", "Fifteenth");
     }
-}
+}

DiscordChatExporter.Cli.Tests/Specs/HtmlMarkdownSpecs.cs

@@ -0,0 +1,162 @@
+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;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class HtmlMarkdownSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_timestamp_marker()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074323136411078787")
+        );
+
+        // Assert
+        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]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_timestamp_marker_in_the_short_format()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074323205268967596")
+        );
+
+        // Assert
+        message.Text().ReplaceWhiteSpace().Should().Contain("Short time timestamp: 1:36 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_timestamp_marker_in_the_long_format()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074323235342139483")
+        );
+
+        // Assert
+        message.Text().ReplaceWhiteSpace().Should().Contain("Long time timestamp: 1:36:12 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_timestamp_marker_in_the_short_date_format()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074323326727634984")
+        );
+
+        // Assert
+        message.Text().ReplaceWhiteSpace().Should().Contain("Short date timestamp: 2/12/2023");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_timestamp_marker_in_the_long_date_format()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074323350731640863")
+        );
+
+        // Assert
+        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]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_timestamp_marker_in_the_full_format()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074323374379118593")
+        );
+
+        // Assert
+        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]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_timestamp_marker_in_the_full_long_format()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074323409095376947")
+        );
+
+        // Assert
+        message
+            .Text()
+            .ReplaceWhiteSpace()
+            .Should()
+            .Contain("Full long timestamp: Sunday, February 12, 2023 1:36:12 PM");
+
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_timestamp_marker_in_the_relative_format()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074323436853285004")
+        );
+
+        // Assert
+        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]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_an_invalid_timestamp_marker()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.MarkdownTestCases,
+            Snowflake.Parse("1074328534409019563")
+        );
+
+        // Assert
+        message.Text().Should().Contain("Invalid timestamp: Invalid date");
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/HtmlMentionSpecs.cs

@@ -1,41 +1,33 @@
 using System.Threading.Tasks;
 using AngleSharp.Dom;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class MentionSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlMentionSpecs
 {
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public MentionSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
     [Fact]
-    public async Task User_mention_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_user_mention()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866458840245076028")
         );
 
         // Assert
         message.Text().Should().Contain("User mention: @Tyrrrz");
-        message.InnerHtml.Should().Contain("Tyrrrz#5447");
+        message.InnerHtml.Should().Contain("tyrrrz");
     }
 
     [Fact]
-    public async Task Text_channel_mention_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_text_channel_mention()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459040480624680")
         );
@@ -45,23 +37,23 @@ public class MentionSpecs : IClassFixture<ExportWrapperFixture>
     }
 
     [Fact]
-    public async Task Voice_channel_mention_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_voice_channel_mention()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459175462633503")
         );
 
         // Assert
-        message.Text().Should().Contain("Voice channel mention: 🔊chaos-vc");
+        message.Text().Should().Contain("Voice channel mention: 🔊general");
     }
 
     [Fact]
-    public async Task Role_mention_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_role_mention()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459254693429258")
         );
@@ -69,4 +61,4 @@ public class MentionSpecs : IClassFixture<ExportWrapperFixture>
         // Assert
         message.Text().Should().Contain("Role mention: @Role 1");
     }
-}
+}

DiscordChatExporter.Cli.Tests/Specs/HtmlReplySpecs.cs

@@ -0,0 +1,100 @@
+using System.Threading.Tasks;
+using AngleSharp.Dom;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class HtmlReplySpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_that_replies_to_another_message()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ReplyTestCases,
+            Snowflake.Parse("866460738239725598")
+        );
+
+        // Assert
+        message.Text().Should().Contain("reply to original");
+        message.QuerySelector(".chatlog__reply-link")?.Text().Should().Contain("original");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_that_replies_to_a_deleted_message()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/645
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ReplyTestCases,
+            Snowflake.Parse("866460975388819486")
+        );
+
+        // Assert
+        message.Text().Should().Contain("reply to deleted");
+        message
+            .QuerySelector(".chatlog__reply-link")
+            ?.Text()
+            .Should()
+            .Contain("Original message was deleted or could not be loaded.");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_that_replies_to_an_empty_message_with_an_attachment()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/634
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ReplyTestCases,
+            Snowflake.Parse("866462470335627294")
+        );
+
+        // Assert
+        message.Text().Should().Contain("reply to attachment");
+        message
+            .QuerySelector(".chatlog__reply-link")
+            ?.Text()
+            .Should()
+            .Contain("Click to see attachment");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_that_replies_to_an_interaction()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/569
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ReplyTestCases,
+            Snowflake.Parse("1075152916417085492")
+        );
+
+        // Assert
+        message.Text().Should().Contain("used /poll");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_cross_posted_from_another_guild()
+    {
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/633
+
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.ReplyTestCases,
+            Snowflake.Parse("1072165330853576876")
+        );
+
+        // Assert
+        message
+            .Text()
+            .Should()
+            .Contain("This is a test message from an announcement channel on another server");
+        message.Text().Should().Contain("SERVER");
+        message.QuerySelector(".chatlog__reply-link").Should().BeNull();
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/HtmlStickerSpecs.cs

@@ -0,0 +1,43 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class HtmlStickerSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_PNG_sticker()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.StickerTestCases,
+            Snowflake.Parse("939670623158943754")
+        );
+
+        // Assert
+        var stickerUrl = message.QuerySelector("[title='rock'] img")?.GetAttribute("src");
+        stickerUrl.Should().StartWith("https://cdn.discordapp.com/stickers/904215665597120572.png");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_Lottie_sticker()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.StickerTestCases,
+            Snowflake.Parse("939670526517997590")
+        );
+
+        // Assert
+        var stickerUrl = message
+            .QuerySelector("[title='Yikes'] [data-source]")
+            ?.GetAttribute("data-source");
+
+        stickerUrl
+            .Should()
+            .StartWith("https://cdn.discordapp.com/stickers/816087132447178774.json");
+    }
+}

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

@@ -1,49 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using AngleSharp.Dom;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
-using FluentAssertions;
-using Xunit;
-
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
-
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
-{
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
-    [Fact]
-    public async Task Messages_are_exported_correctly()
-    {
-        // Act
-        var messages = await _exportWrapper.GetMessagesAsHtmlAsync(ChannelIds.DateRangeTestCases);
-
-        // Assert
-        messages.Select(e => e.GetAttribute("data-message-id")).Should().Equal(
-            "866674314627121232",
-            "866710679758045195",
-            "866732113319428096",
-            "868490009366396958",
-            "868505966528835604",
-            "868505969821364245",
-            "868505973294268457",
-            "885169254029213696"
-        );
-
-        messages.SelectMany(e => e.Text()).Should().ContainInOrder(
-            "Hello world",
-            "Goodbye world",
-            "Foo bar",
-            "Hurdle Durdle",
-            "One",
-            "Two",
-            "Three",
-            "Yeet"
-        );
-    }
-}

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

@@ -1,134 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using AngleSharp.Dom;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
-using DiscordChatExporter.Core.Discord;
-using FluentAssertions;
-using Xunit;
-
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
-
-public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
-{
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public EmbedSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
-    [Fact]
-    public async Task Message_with_an_embed_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
-            ChannelIds.EmbedTestCases,
-            Snowflake.Parse("866769910729146400")
-        );
-
-        // Assert
-        message.Text().Should().ContainAll(
-            "Embed author",
-            "Embed title",
-            "Embed description",
-            "Field 1", "Value 1",
-            "Field 2", "Value 2",
-            "Field 3", "Value 3",
-            "Embed footer"
-        );
-    }
-
-    [Fact]
-    public async Task Message_containing_an_image_link_is_rendered_with_an_image_embed()
-    {
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/537
-
-        // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
-            ChannelIds.EmbedTestCases,
-            Snowflake.Parse("991768701126852638")
-        );
-
-        // Assert
-        message
-            .QuerySelectorAll("img")
-            .Select(e => e.GetAttribute("src"))
-            .Should()
-            .Contain("https://i.redd.it/f8w05ja8s4e61.png");
-    }
-
-    [Fact]
-    public async Task Message_containing_an_image_link_and_nothing_else_is_rendered_without_text_content()
-    {
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/682
-
-        // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
-            ChannelIds.EmbedTestCases,
-            Snowflake.Parse("991768701126852638")
-        );
-
-        // Assert
-        var content = message.QuerySelector(".chatlog__content")?.Text();
-        content.Should().BeNullOrEmpty();
-    }
-
-    [Fact]
-    public async Task Message_containing_a_Spotify_track_link_is_rendered_with_a_track_embed()
-    {
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/657
-
-        // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
-            ChannelIds.EmbedTestCases,
-            Snowflake.Parse("867886632203976775")
-        );
-
-        // Assert
-        var iframeUrl = message.QuerySelector("iframe")?.GetAttribute("src");
-        iframeUrl.Should().Be("https://open.spotify.com/embed/track/1LHZMWefF9502NPfArRfvP");
-    }
-
-    [Fact]
-    public async Task Message_containing_a_YouTube_video_link_is_rendered_with_a_video_embed()
-    {
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/570
-
-        // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
-            ChannelIds.EmbedTestCases,
-            Snowflake.Parse("866472508588294165")
-        );
-
-        // Assert
-        var iframeUrl = message.QuerySelector("iframe")?.GetAttribute("src");
-        iframeUrl.Should().Be("https://www.youtube.com/embed/qOWW4OlgbvE");
-    }
-
-    [Fact]
-    public async Task Message_containing_a_Twitter_post_link_with_multiple_images_is_rendered_as_a_single_embed()
-    {
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/695
-
-        // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
-            ChannelIds.EmbedTestCases,
-            Snowflake.Parse("991757444017557665")
-        );
-
-        // Assert
-        message
-            .QuerySelectorAll("img")
-            .Select(e => e.GetAttribute("src"))
-            .Should()
-            .ContainInOrder(
-                "https://images-ext-1.discordapp.net/external/-n--xW3EHH_3jlrheVkMXHCM7T86b5Ty4-MzXCT4m1Q/https/pbs.twimg.com/media/FVYIzYPWAAAMBqZ.png",
-                "https://images-ext-2.discordapp.net/external/z5nEmGeEldV-kswydGLhqUsFHbb5AWHtdvc9XT6N5rE/https/pbs.twimg.com/media/FVYJBWJWAAMNAx2.png",
-                "https://images-ext-2.discordapp.net/external/gnip03SawMB6uZLagN5sRDpA_1Ap1CcEhMbJfK1z6WQ/https/pbs.twimg.com/media/FVYJHiRX0AANZcz.png",
-                "https://images-ext-2.discordapp.net/external/jl1v6cCbLaGmiwmKU-ZkXnF4cFsJ39f9A3-oEdqPdZs/https/pbs.twimg.com/media/FVYJNZNXwAAPnVG.png"
-            );
-
-        message.QuerySelectorAll(".chatlog__embed").Should().ContainSingle();
-    }
-}

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

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

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

@@ -1,46 +0,0 @@
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
-using DiscordChatExporter.Core.Discord;
-using FluentAssertions;
-using Xunit;
-
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
-
-public class StickerSpecs : IClassFixture<ExportWrapperFixture>
-{
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public StickerSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
-    [Fact]
-    public async Task Message_with_a_PNG_based_sticker_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
-            ChannelIds.StickerTestCases,
-            Snowflake.Parse("939670623158943754")
-        );
-
-        // Assert
-        var stickerUrl = message.QuerySelector("[title='rock'] img")?.GetAttribute("src");
-        stickerUrl.Should().Be("https://discord.com/stickers/904215665597120572.png");
-    }
-
-    [Fact]
-    public async Task Message_with_a_Lottie_based_sticker_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsHtmlAsync(
-            ChannelIds.StickerTestCases,
-            Snowflake.Parse("939670526517997590")
-        );
-
-        // Assert
-        var stickerUrl = message.QuerySelector("[title='Yikes'] [data-source]")?.GetAttribute("data-source");
-        stickerUrl.Should().Be("https://discord.com/stickers/816087132447178774.json");
-    }
-}

DiscordChatExporter.Cli.Tests/Specs/JsonAttachmentSpecs.cs

@@ -0,0 +1,124 @@
+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 JsonAttachmentSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_generic_attachment()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885587844989612074")
+        );
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Generic file attachment");
+
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
+        attachments.Should().HaveCount(1);
+
+        attachments[0]
+            .GetProperty("url")
+            .GetString()
+            .Should()
+            .StartWith(
+                "https://cdn.discordapp.com/attachments/885587741654536192/885587844964417596/Test.txt"
+            );
+
+        attachments[0].GetProperty("fileName").GetString().Should().Be("Test.txt");
+        attachments[0].GetProperty("fileSizeBytes").GetInt64().Should().Be(11);
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_an_image_attachment()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885654862656843786")
+        );
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Image attachment");
+
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
+        attachments.Should().HaveCount(1);
+
+        attachments[0]
+            .GetProperty("url")
+            .GetString()
+            .Should()
+            .StartWith(
+                "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png"
+            );
+
+        attachments[0].GetProperty("fileName").GetString().Should().Be("bird-thumbnail.png");
+        attachments[0].GetProperty("fileSizeBytes").GetInt64().Should().Be(466335);
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_video_attachment()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885655761919836171")
+        );
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Video attachment");
+
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
+        attachments.Should().HaveCount(1);
+
+        attachments[0]
+            .GetProperty("url")
+            .GetString()
+            .Should()
+            .StartWith(
+                "https://cdn.discordapp.com/attachments/885587741654536192/885655761512968233/file_example_MP4_640_3MG.mp4"
+            );
+
+        attachments[0]
+            .GetProperty("fileName")
+            .GetString()
+            .Should()
+            .Be("file_example_MP4_640_3MG.mp4");
+
+        attachments[0].GetProperty("fileSizeBytes").GetInt64().Should().Be(3114374);
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_an_audio_attachment()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.AttachmentTestCases,
+            Snowflake.Parse("885656175620808734")
+        );
+
+        // Assert
+        message.GetProperty("content").GetString().Should().Be("Audio attachment");
+
+        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
+        attachments.Should().HaveCount(1);
+
+        attachments[0]
+            .GetProperty("url")
+            .GetString()
+            .Should()
+            .StartWith(
+                "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
+            );
+
+        attachments[0].GetProperty("fileName").GetString().Should().Be("file_example_MP3_1MG.mp3");
+        attachments[0].GetProperty("fileSizeBytes").GetInt64().Should().Be(1087849);
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/JsonContentSpecs.cs

@@ -0,0 +1,46 @@
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Infra;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class JsonContentSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_in_the_JSON_format()
+    {
+        // Act
+        var messages = await ExportWrapper.GetMessagesAsJsonAsync(ChannelIds.DateRangeTestCases);
+
+        // Assert
+        messages
+            .Select(j => j.GetProperty("id").GetString())
+            .Should()
+            .Equal(
+                "866674314627121232",
+                "866710679758045195",
+                "866732113319428096",
+                "868490009366396958",
+                "868505966528835604",
+                "868505969821364245",
+                "868505973294268457",
+                "885169254029213696"
+            );
+
+        messages
+            .Select(j => j.GetProperty("content").GetString())
+            .Should()
+            .Equal(
+                "Hello world",
+                "Goodbye world",
+                "Foo bar",
+                "Hurdle Durdle",
+                "One",
+                "Two",
+                "Three",
+                "Yeet"
+            );
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/JsonEmbedSpecs.cs

@@ -1,27 +1,19 @@
 using System.Linq;
 using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonEmbedSpecs
 {
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public EmbedSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
     [Fact]
-    public async Task Message_with_an_embed_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_rich_embed()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
             ChannelIds.EmbedTestCases,
             Snowflake.Parse("866769910729146400")
         );
@@ -60,4 +52,4 @@ public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
         embedFields[2].GetProperty("value").GetString().Should().Be("Value 3");
         embedFields[2].GetProperty("isInline").GetBoolean().Should().BeTrue();
     }
-}
+}

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/JsonMentionSpecs.cs

@@ -1,27 +1,19 @@
 using System.Linq;
 using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class MentionSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonMentionSpecs
 {
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public MentionSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
     [Fact]
-    public async Task User_mention_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_user_mention()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866458840245076028")
         );
@@ -38,36 +30,44 @@ public class MentionSpecs : IClassFixture<ExportWrapperFixture>
     }
 
     [Fact]
-    public async Task Text_channel_mention_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_text_channel_mention()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459040480624680")
         );
 
         // Assert
-        message.GetProperty("content").GetString().Should().Be("Text channel mention: #mention-tests");
+        message
+            .GetProperty("content")
+            .GetString()
+            .Should()
+            .Be("Text channel mention: #mention-tests");
     }
 
     [Fact]
-    public async Task Voice_channel_mention_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_voice_channel_mention()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459175462633503")
         );
 
         // Assert
-        message.GetProperty("content").GetString().Should().Be("Voice channel mention: #chaos-vc [voice]");
+        message
+            .GetProperty("content")
+            .GetString()
+            .Should()
+            .Be("Voice channel mention: #general [voice]");
     }
 
     [Fact]
-    public async Task Role_mention_is_rendered_correctly()
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_role_mention()
     {
         // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
             ChannelIds.MentionTestCases,
             Snowflake.Parse("866459254693429258")
         );
@@ -75,4 +75,4 @@ public class MentionSpecs : IClassFixture<ExportWrapperFixture>
         // Assert
         message.GetProperty("content").GetString().Should().Be("Role mention: @Role 1");
     }
-}
+}

DiscordChatExporter.Cli.Tests/Specs/JsonStickerSpecs.cs

@@ -0,0 +1,55 @@
+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 JsonStickerSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_PNG_sticker()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.StickerTestCases,
+            Snowflake.Parse("939670623158943754")
+        );
+
+        // Assert
+        var sticker = message.GetProperty("stickers").EnumerateArray().Single();
+
+        sticker.GetProperty("id").GetString().Should().Be("904215665597120572");
+        sticker.GetProperty("name").GetString().Should().Be("rock");
+        sticker.GetProperty("format").GetString().Should().Be("Apng");
+        sticker
+            .GetProperty("sourceUrl")
+            .GetString()
+            .Should()
+            .StartWith("https://cdn.discordapp.com/stickers/904215665597120572.png");
+    }
+
+    [Fact]
+    public async Task I_can_export_a_channel_that_contains_a_message_with_a_Lottie_sticker()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.StickerTestCases,
+            Snowflake.Parse("939670526517997590")
+        );
+
+        // Assert
+        var sticker = message.GetProperty("stickers").EnumerateArray().Single();
+
+        sticker.GetProperty("id").GetString().Should().Be("816087132447178774");
+        sticker.GetProperty("name").GetString().Should().Be("Yikes");
+        sticker.GetProperty("format").GetString().Should().Be("Lottie");
+        sticker
+            .GetProperty("sourceUrl")
+            .GetString()
+            .Should()
+            .StartWith("https://cdn.discordapp.com/stickers/816087132447178774.json");
+    }
+}

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

@@ -1,103 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
-using DiscordChatExporter.Core.Discord;
-using FluentAssertions;
-using Xunit;
-
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
-
-public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
-{
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public AttachmentSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
-    [Fact]
-    public async Task Message_with_a_generic_attachment_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
-            ChannelIds.AttachmentTestCases,
-            Snowflake.Parse("885587844989612074")
-        );
-
-        // Assert
-        message.GetProperty("content").GetString().Should().Be("Generic file attachment");
-
-        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
-        attachments.Should().HaveCount(1);
-        attachments.Single().GetProperty("url").GetString().Should().Be(
-            "https://cdn.discordapp.com/attachments/885587741654536192/885587844964417596/Test.txt"
-        );
-        attachments.Single().GetProperty("fileName").GetString().Should().Be("Test.txt");
-        attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(11);
-    }
-
-    [Fact]
-    public async Task Message_with_an_image_attachment_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
-            ChannelIds.AttachmentTestCases,
-            Snowflake.Parse("885654862656843786")
-        );
-
-        // Assert
-        message.GetProperty("content").GetString().Should().Be("Image attachment");
-
-        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
-        attachments.Should().HaveCount(1);
-        attachments.Single().GetProperty("url").GetString().Should().Be(
-            "https://cdn.discordapp.com/attachments/885587741654536192/885654862430359613/bird-thumbnail.png"
-        );
-        attachments.Single().GetProperty("fileName").GetString().Should().Be("bird-thumbnail.png");
-        attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(466335);
-    }
-
-    [Fact]
-    public async Task Message_with_a_video_attachment_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
-            ChannelIds.AttachmentTestCases,
-            Snowflake.Parse("885655761919836171")
-        );
-
-        // Assert
-        message.GetProperty("content").GetString().Should().Be("Video attachment");
-
-        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
-        attachments.Should().HaveCount(1);
-        attachments.Single().GetProperty("url").GetString().Should().Be(
-            "https://cdn.discordapp.com/attachments/885587741654536192/885655761512968233/file_example_MP4_640_3MG.mp4"
-        );
-        attachments.Single().GetProperty("fileName").GetString().Should().Be("file_example_MP4_640_3MG.mp4");
-        attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(3114374);
-    }
-
-    [Fact]
-    public async Task Message_with_an_audio_attachment_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
-            ChannelIds.AttachmentTestCases,
-            Snowflake.Parse("885656175620808734")
-        );
-
-        // Assert
-        message.GetProperty("content").GetString().Should().Be("Audio attachment");
-
-        var attachments = message.GetProperty("attachments").EnumerateArray().ToArray();
-        attachments.Should().HaveCount(1);
-        attachments.Single().GetProperty("url").GetString().Should().Be(
-            "https://cdn.discordapp.com/attachments/885587741654536192/885656175348187146/file_example_MP3_1MG.mp3"
-        );
-        attachments.Single().GetProperty("fileName").GetString().Should().Be("file_example_MP3_1MG.mp3");
-        attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(1087849);
-    }
-}

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

@@ -1,48 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
-using FluentAssertions;
-using Xunit;
-
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
-
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
-{
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
-    [Fact]
-    public async Task Messages_are_exported_correctly()
-    {
-        // Act
-        var messages = await _exportWrapper.GetMessagesAsJsonAsync(ChannelIds.DateRangeTestCases);
-
-        // Assert
-        messages.Select(j => j.GetProperty("id").GetString()).Should().Equal(
-            "866674314627121232",
-            "866710679758045195",
-            "866732113319428096",
-            "868490009366396958",
-            "868505966528835604",
-            "868505969821364245",
-            "868505973294268457",
-            "885169254029213696"
-        );
-
-        messages.Select(j => j.GetProperty("content").GetString()).Should().Equal(
-            "Hello world",
-            "Goodbye world",
-            "Foo bar",
-            "Hurdle Durdle",
-            "One",
-            "Two",
-            "Three",
-            "Yeet"
-        );
-    }
-}

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

@@ -1,61 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
-using DiscordChatExporter.Core.Discord;
-using FluentAssertions;
-using Xunit;
-
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
-
-public class StickerSpecs : IClassFixture<ExportWrapperFixture>
-{
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public StickerSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
-    [Fact]
-    public async Task Message_with_a_PNG_based_sticker_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
-            ChannelIds.StickerTestCases,
-            Snowflake.Parse("939670623158943754")
-        );
-
-        // Assert
-        var sticker = message
-            .GetProperty("stickers")
-            .EnumerateArray()
-            .Single();
-
-        sticker.GetProperty("id").GetString().Should().Be("904215665597120572");
-        sticker.GetProperty("name").GetString().Should().Be("rock");
-        sticker.GetProperty("format").GetString().Should().Be("PngAnimated");
-        sticker.GetProperty("sourceUrl").GetString().Should().Be("https://discord.com/stickers/904215665597120572.png");
-    }
-
-    [Fact]
-    public async Task Message_with_a_Lottie_based_sticker_is_rendered_correctly()
-    {
-        // Act
-        var message = await _exportWrapper.GetMessageAsJsonAsync(
-            ChannelIds.StickerTestCases,
-            Snowflake.Parse("939670526517997590")
-        );
-
-        // Assert
-        var sticker = message
-            .GetProperty("stickers")
-            .EnumerateArray()
-            .Single();
-
-        sticker.GetProperty("id").GetString().Should().Be("816087132447178774");
-        sticker.GetProperty("name").GetString().Should().Be("Yikes");
-        sticker.GetProperty("format").GetString().Should().Be("Lottie");
-        sticker.GetProperty("sourceUrl").GetString().Should().Be("https://discord.com/stickers/816087132447178774.json");
-    }
-}

DiscordChatExporter.Cli.Tests/Specs/PartitioningSpecs.cs

@@ -2,9 +2,8 @@
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Fixtures;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Partitioning;
 using FluentAssertions;
@@ -12,60 +11,47 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class PartitioningSpecs : IClassFixture<TempOutputFixture>
+public class PartitioningSpecs
 {
-    private readonly TempOutputFixture _tempOutput;
-
-    public PartitioningSpecs(TempOutputFixture tempOutput)
-    {
-        _tempOutput = tempOutput;
-    }
-
     [Fact]
-    public async Task Messages_partitioned_by_count_are_split_into_a_corresponding_number_of_files()
+    public async Task I_can_export_a_channel_with_partitioning_based_on_message_count()
     {
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
-        var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
-        var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
+        using var dir = TempDir.Create();
+        var filePath = Path.Combine(dir.Path, "output.html");
 
         // Act
         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
-        Directory.EnumerateFiles(dirPath, fileNameWithoutExt + "*")
-            .Should()
-            .HaveCount(3);
+        Directory.EnumerateFiles(dir.Path, "output*").Should().HaveCount(3);
     }
 
     [Fact]
-    public async Task Messages_partitioned_by_file_size_are_split_into_a_corresponding_number_of_files()
+    public async Task I_can_export_a_channel_with_partitioning_based_on_file_size()
     {
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
-        var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
-        var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
+        using var dir = TempDir.Create();
+        var filePath = Path.Combine(dir.Path, "output.html");
 
         // Act
         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
-        Directory.EnumerateFiles(dirPath, fileNameWithoutExt + "*")
-            .Should()
-            .HaveCount(8);
+        Directory.EnumerateFiles(dir.Path, "output*").Should().HaveCount(8);
     }
-}
+}

DiscordChatExporter.Cli.Tests/Specs/PlainTextContentSpecs.cs

@@ -0,0 +1,31 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Infra;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs;
+
+public class PlainTextContentSpecs
+{
+    [Fact]
+    public async Task I_can_export_a_channel_in_the_TXT_format()
+    {
+        // Act
+        var document = await ExportWrapper.ExportAsPlainTextAsync(ChannelIds.DateRangeTestCases);
+
+        // Assert
+        document
+            .Should()
+            .ContainAll(
+                "tyrrrz",
+                "Hello world",
+                "Goodbye world",
+                "Foo bar",
+                "Hurdle Durdle",
+                "One",
+                "Two",
+                "Three",
+                "Yeet"
+            );
+    }
+}

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

@@ -1,37 +0,0 @@
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Tests.Fixtures;
-using DiscordChatExporter.Cli.Tests.TestData;
-using FluentAssertions;
-using Xunit;
-
-namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting;
-
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
-{
-    private readonly ExportWrapperFixture _exportWrapper;
-
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
-    {
-        _exportWrapper = exportWrapper;
-    }
-
-    [Fact]
-    public async Task Messages_are_exported_correctly()
-    {
-        // Act
-        var document = await _exportWrapper.ExportAsPlainTextAsync(ChannelIds.DateRangeTestCases);
-
-        // Assert
-        document.Should().ContainAll(
-            "Tyrrrz#5447",
-            "Hello world",
-            "Goodbye world",
-            "Foo bar",
-            "Hurdle Durdle",
-            "One",
-            "Two",
-            "Three",
-            "Yeet"
-        );
-    }
-}

DiscordChatExporter.Cli.Tests/Specs/SelfContainedSpecs.cs

@@ -3,9 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Cli.Tests.Fixtures;
 using DiscordChatExporter.Cli.Tests.Infra;
-using DiscordChatExporter.Cli.Tests.TestData;
 using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
@@ -13,40 +11,32 @@ using Xunit;
 
 namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class SelfContainedSpecs : IClassFixture<TempOutputFixture>
+public class SelfContainedSpecs
 {
-    private readonly TempOutputFixture _tempOutput;
-
-    public SelfContainedSpecs(TempOutputFixture tempOutput)
-    {
-        _tempOutput = tempOutput;
-    }
-
     [Fact]
-    public async Task Messages_in_self_contained_export_only_reference_local_file_resources()
+    public async Task I_can_export_a_channel_and_download_all_referenced_assets()
     {
         // Arrange
-        var filePath = _tempOutput.GetTempFilePath();
-        var dirPath = Path.GetDirectoryName(filePath) ?? Directory.GetCurrentDirectory();
+        using var dir = TempDir.Create();
+        var filePath = Path.Combine(dir.Path, "output.html");
 
         // Act
         await new ExportChannelsCommand
         {
             Token = Secrets.DiscordToken,
-            ChannelIds = new[] { ChannelIds.SelfContainedTestCases },
+            ChannelIds = [ChannelIds.SelfContainedTestCases],
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
-            ShouldDownloadMedia = true
+            ShouldDownloadAssets = true,
         }.ExecuteAsync(new FakeConsole());
 
         // Assert
-        Html
-            .Parse(await File.ReadAllTextAsync(filePath))
+        Html.Parse(await File.ReadAllTextAsync(filePath))
             .QuerySelectorAll("body [src]")
             .Select(e => e.GetAttribute("src")!)
-            .Select(f => Path.GetFullPath(f, dirPath))
+            .Select(f => Path.GetFullPath(f, dir.Path))
             .All(File.Exists)
             .Should()
             .BeTrue();
     }
-}
+}

DiscordChatExporter.Cli.Tests/Utils/DirectoryEx.cs

@@ -1,23 +0,0 @@
-using System.IO;
-
-namespace DiscordChatExporter.Cli.Tests.Utils;
-
-internal static class DirectoryEx
-{
-    public static void DeleteIfExists(string dirPath, bool recursive = true)
-    {
-        try
-        {
-            Directory.Delete(dirPath, recursive);
-        }
-        catch (DirectoryNotFoundException)
-        {
-        }
-    }
-
-    public static void Reset(string dirPath)
-    {
-        DeleteIfExists(dirPath);
-        Directory.CreateDirectory(dirPath);
-    }
-}

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

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

DiscordChatExporter.Cli.Tests/Utils/Html.cs

@@ -8,4 +8,4 @@ internal static class Html
     private static readonly IHtmlParser Parser = new HtmlParser();
 
     public static IHtmlDocument Parse(string source) => Parser.ParseDocument(source);
-}
+}

DiscordChatExporter.Cli.Tests/Utils/TempDir.cs

@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+using System.Reflection;
+using PathEx = System.IO.Path;
+
+namespace DiscordChatExporter.Cli.Tests.Utils;
+
+internal partial class TempDir(string path) : IDisposable
+{
+    public string Path { get; } = path;
+
+    public void Dispose()
+    {
+        try
+        {
+            Directory.Delete(Path, true);
+        }
+        catch (DirectoryNotFoundException) { }
+    }
+}
+
+internal partial class TempDir
+{
+    public static TempDir Create()
+    {
+        var dirPath = PathEx.Combine(
+            PathEx.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+                ?? Directory.GetCurrentDirectory(),
+            "Temp",
+            Guid.NewGuid().ToString()
+        );
+
+        Directory.CreateDirectory(dirPath);
+
+        return new TempDir(dirPath);
+    }
+}

DiscordChatExporter.Cli.Tests/Utils/TempFile.cs

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

DiscordChatExporter.Cli.dockerfile

@@ -1,18 +1,63 @@
-# Build
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+# -- Build
+# Specify the platform here so that we pull the SDK image matching the host platform,
+# instead of the target platform specified during build by the `--platform` option.
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
 
-COPY favicon.ico ./
-COPY NuGet.config ./
-COPY Directory.Build.props ./
-COPY DiscordChatExporter.Core ./DiscordChatExporter.Core
-COPY DiscordChatExporter.Cli ./DiscordChatExporter.Cli
+# Expose the target architecture set by the `docker build --platform` option, so that
+# we can build the assembly for the correct platform.
+ARG TARGETARCH
 
-RUN dotnet publish DiscordChatExporter.Cli -c Release -o ./publish
+# Allow setting the assembly version from the build command
+ARG VERSION=0.0.0
 
-# Run
-FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run
+WORKDIR /tmp/app
 
-COPY --from=build ./publish ./
+COPY favicon.ico .
+COPY NuGet.config .
+COPY Directory.Build.props .
+COPY DiscordChatExporter.Core DiscordChatExporter.Core
+COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
 
-WORKDIR ./out
-ENTRYPOINT ["dotnet", "/DiscordChatExporter.Cli.dll"]
+# Publish a self-contained assembly so we can use a slimmer runtime image
+RUN dotnet publish DiscordChatExporter.Cli \
+    -p:Version=$VERSION \
+    -p:CSharpier_Bypass=true \
+    --configuration Release \
+    --self-contained \
+    --use-current-runtime \
+    --arch $TARGETARCH \
+    --output DiscordChatExporter.Cli/bin/publish/
+
+# -- Run
+# Use `runtime-deps` instead of `runtime` because we have a self-contained assembly
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/runtime-deps:9.0-alpine AS run
+
+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."
+LABEL org.opencontainers.image.authors="tyrrrz.me"
+LABEL org.opencontainers.image.source="https://github.com/Tyrrrz/DiscordChatExporter"
+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 icu-data-full
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+
+# 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
+# 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
+COPY docker-entrypoint.sh /opt/app
+ENTRYPOINT ["/opt/app/docker-entrypoint.sh"]

DiscordChatExporter.Cli/Commands/Base/DiscordCommandBase.cs

@@ -0,0 +1,61 @@
+using System;
+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;
+
+public abstract class DiscordCommandBase : ICommand
+{
+    [CommandOption(
+        "token",
+        't',
+        EnvironmentVariable = "DISCORD_TOKEN",
+        Description = "Authentication token."
+    )]
+    public required string Token { get; init; }
+
+    [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
+    [CommandOption(
+        "bot",
+        'b',
+        EnvironmentVariable = "DISCORD_TOKEN_BOT",
+        Description = "This option doesn't do anything. Kept for backwards compatibility."
+    )]
+    public bool IsBotToken { get; init; } = false;
+
+    private DiscordClient? _discordClient;
+    protected DiscordClient Discord => _discordClient ??= new DiscordClient(Token);
+
+    public virtual ValueTask ExecuteAsync(IConsole console)
+    {
+#pragma warning disable CS0618
+        // Warn if the bot option is used
+        if (IsBotToken)
+        {
+            using (console.WithForegroundColor(ConsoleColor.DarkYellow))
+            {
+                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 for Docker
+        if (console.IsOutputRedirected && Docker.IsRunningInContainer)
+        {
+            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

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Exceptions;
 using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Converters;
 using DiscordChatExporter.Cli.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
@@ -14,33 +15,33 @@ using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
-using DiscordChatExporter.Core.Utils;
+using DiscordChatExporter.Core.Utils.Extensions;
 using Gress;
+using Spectre.Console;
 
 namespace DiscordChatExporter.Cli.Commands.Base;
 
-public abstract class ExportCommandBase : TokenCommandBase
+public abstract class ExportCommandBase : DiscordCommandBase
 {
     private readonly string _outputPath = Directory.GetCurrentDirectory();
 
     [CommandOption(
         "output",
         'o',
-        Description = "Output file or directory path. Directory path should end in a slash."
+        Description = "Output file or directory path. "
+            + "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;
-        // Handle ~/ in paths on *nix systems
+        // Handle ~/ in paths on Unix systems
         // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
         init => _outputPath = Path.GetFullPath(value);
     }
 
-    [CommandOption(
-        "format",
-        'f',
-        Description = "Export format."
-    )]
+    [CommandOption("format", 'f', Description = "Export format.")]
     public ExportFormat ExportFormat { get; init; } = ExportFormat.HtmlDark;
 
     [CommandOption(
@@ -58,13 +59,15 @@ public abstract class ExportCommandBase : TokenCommandBase
     [CommandOption(
         "partition",
         'p',
-        Description = "Split output into partitions, each limited to this number of messages (e.g. '100') or file size (e.g. '10mb')."
+        Description = "Split the output into partitions, each limited to the specified "
+            + "number of messages (e.g. '100') or file size (e.g. '10mb')."
     )]
     public PartitionLimit PartitionLimit { get; init; } = PartitionLimit.Null;
 
     [CommandOption(
         "filter",
-        Description = "Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image')."
+        Description = "Only include messages that satisfy this filter. "
+            + "See the documentation for more info."
     )]
     public MessageFilter MessageFilter { get; init; } = MessageFilter.Null;
 
@@ -75,171 +78,281 @@ public abstract class ExportCommandBase : TokenCommandBase
     public int ParallelLimit { get; init; } = 1;
 
     [CommandOption(
-        "media",
-        Description = "Download referenced media content."
+        "markdown",
+        Description = "Process markdown, mentions, and other special tokens."
     )]
-    public bool ShouldDownloadMedia { get; init; }
+    public bool ShouldFormatMarkdown { get; init; } = true;
+
+    [CommandOption(
+        "media",
+        Description = "Download assets referenced by the export (user avatars, attached files, embedded images, etc.)."
+    )]
+    public bool ShouldDownloadAssets { get; init; }
 
     [CommandOption(
         "reuse-media",
-        Description = "Reuse already existing media content to skip redundant downloads."
+        Description = "Reuse previously downloaded assets to avoid redundant requests."
     )]
-    public bool ShouldReuseMedia { get; init; }
+    public bool ShouldReuseAssets { get; init; } = false;
+
+    private readonly string? _assetsDirPath;
 
     [CommandOption(
-        "dateformat",
-        Description = "Format used when writing dates."
+        "media-dir",
+        Description = "Download assets to this directory. "
+            + "If not specified, the asset directory path will be derived from the output path."
     )]
-    public string DateFormat { get; init; } = "dd-MMM-yy hh:mm tt";
+    public string? AssetsDirPath
+    {
+        get => _assetsDirPath;
+        // Handle ~/ in paths on Unix systems
+        // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
+        init => _assetsDirPath = value is not null ? Path.GetFullPath(value) : null;
+    }
+
+    [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
+    [CommandOption(
+        "dateformat",
+        Description = "This option doesn't do anything. Kept for backwards compatibility."
+    )]
+    public string DateFormat { get; init; } = "MM/dd/yyyy h:mm tt";
+
+    [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;
+
+    [CommandOption(
+        "fuck-russia",
+        EnvironmentVariable = "FUCK_RUSSIA",
+        Description = "Don't print the Support Ukraine message to the console.",
+        // Use a converter to accept '1' as 'true' to reuse the existing environment variable
+        Converter = typeof(TruthyBooleanBindingConverter)
+    )]
+    public bool IsUkraineSupportMessageDisabled { get; init; } = false;
 
     private ChannelExporter? _channelExporter;
     protected ChannelExporter Exporter => _channelExporter ??= new ChannelExporter(Discord);
 
-    protected async ValueTask ExecuteAsync(IConsole console, IReadOnlyList<Channel> channels)
+    protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Channel> channels)
     {
-        // Reuse media option should only be used when the media option is set.
+        // Asset reuse can only be enabled if the download assets option is set
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/425
-        if (ShouldReuseMedia && !ShouldDownloadMedia)
+        if (ShouldReuseAssets && !ShouldDownloadAssets)
         {
-            throw new CommandException(
-                "Option --reuse-media cannot be used without --media."
-            );
+            throw new CommandException("Option --reuse-media cannot be used without --media.");
         }
 
-        // Make sure the user does not try to export all channels into a single file.
-        // Output path must either be a directory, or contain template tokens.
+        // Assets directory can only be specified if the download assets option is set
+        if (!string.IsNullOrWhiteSpace(AssetsDirPath) && !ShouldDownloadAssets)
+        {
+            throw new CommandException("Option --media-dir cannot be used without --media.");
+        }
+
+        // Make sure the user does not try to export multiple channels into one file.
+        // Output path must either be a directory or contain template tokens for this to work.
         // 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 ||
+            channels.Count <= 1
             // When using template tokens, assume the user knows what they're doing
-            OutputPath.Contains('%') ||
+            || OutputPath.Contains('%')
             // Otherwise, require an existing directory or an unambiguous directory path
-            Directory.Exists(OutputPath) || PathEx.IsDirectoryPath(OutputPath);
+            || Directory.Exists(OutputPath)
+            || Path.EndsInDirectorySeparator(OutputPath);
 
         if (!isValidOutputPath)
         {
             throw new CommandException(
-                "Attempted to export multiple channels, but the output path is neither a directory nor a template."
+                "Attempted to export multiple channels, but the output path is neither a directory nor a template. "
+                    + "If the provided output path is meant to be treated as a directory, make sure it ends with a slash. "
+                    + $"Provided output path: '{OutputPath}'."
             );
         }
 
-        var cancellationToken = console.RegisterCancellationHandler();
-        var errors = new ConcurrentDictionary<Channel, string>();
-
         // Export
+        var cancellationToken = console.RegisterCancellationHandler();
+        var errorsByChannel = new ConcurrentDictionary<Channel, string>();
+
         await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
-        await console.CreateProgressTicker().StartAsync(async progressContext =>
-        {
-            await Parallel.ForEachAsync(
-                channels,
-                new ParallelOptions
-                {
-                    MaxDegreeOfParallelism = Math.Max(1, ParallelLimit),
-                    CancellationToken = cancellationToken
-                },
-                async (channel, innerCancellationToken) =>
-                {
-                    try
+        await console
+            .CreateProgressTicker()
+            .HideCompleted(
+                // When exporting multiple channels in parallel, hide the completed tasks
+                // because it gets hard to visually parse them as they complete out of order.
+                // https://github.com/Tyrrrz/DiscordChatExporter/issues/1124
+                ParallelLimit > 1
+            )
+            .StartAsync(async ctx =>
+            {
+                await Parallel.ForEachAsync(
+                    channels,
+                    new ParallelOptions
                     {
-                        await progressContext.StartTaskAsync($"{channel.Category.Name} / {channel.Name}",
-                            async progress =>
-                            {
-                                var guild = await Discord.GetGuildAsync(channel.GuildId, innerCancellationToken);
-
-                                var request = new ExportRequest(
-                                    guild,
-                                    channel,
-                                    OutputPath,
-                                    ExportFormat,
-                                    After,
-                                    Before,
-                                    PartitionLimit,
-                                    MessageFilter,
-                                    ShouldDownloadMedia,
-                                    ShouldReuseMedia,
-                                    DateFormat
-                                );
-
-                                await Exporter.ExportChannelAsync(
-                                    request,
-                                    progress.ToPercentageBased(),
-                                    innerCancellationToken
-                                );
-                            }
-                        );
-                    }
-                    catch (DiscordChatExporterException ex) when (!ex.IsFatal)
+                        MaxDegreeOfParallelism = Math.Max(1, ParallelLimit),
+                        CancellationToken = cancellationToken,
+                    },
+                    async (channel, innerCancellationToken) =>
                     {
-                        errors[channel] = ex.Message;
-                    }
-                }
-            );
-        });
+                        try
+                        {
+                            await ctx.StartTaskAsync(
+                                Markup.Escape(channel.GetHierarchicalName()),
+                                async progress =>
+                                {
+                                    var guild = await Discord.GetGuildAsync(
+                                        channel.GuildId,
+                                        innerCancellationToken
+                                    );
 
-        // Print result
+                                    var request = new ExportRequest(
+                                        guild,
+                                        channel,
+                                        OutputPath,
+                                        AssetsDirPath,
+                                        ExportFormat,
+                                        After,
+                                        Before,
+                                        PartitionLimit,
+                                        MessageFilter,
+                                        ShouldFormatMarkdown,
+                                        ShouldDownloadAssets,
+                                        ShouldReuseAssets,
+                                        Locale,
+                                        IsUtcNormalizationEnabled
+                                    );
+
+                                    await Exporter.ExportChannelAsync(
+                                        request,
+                                        progress.ToPercentageBased(),
+                                        innerCancellationToken
+                                    );
+                                }
+                            );
+                        }
+                        catch (DiscordChatExporterException ex) when (!ex.IsFatal)
+                        {
+                            errorsByChannel[channel] = ex.Message;
+                        }
+                    }
+                );
+            });
+
+        // Print the result
         using (console.WithForegroundColor(ConsoleColor.White))
         {
             await console.Output.WriteLineAsync(
-                $"Successfully exported {channels.Count - errors.Count} channel(s)."
+                $"Successfully exported {channels.Count - errorsByChannel.Count} channel(s)."
             );
         }
 
         // Print errors
-        if (errors.Any())
+        if (errorsByChannel.Any())
         {
             await console.Output.WriteLineAsync();
 
             using (console.WithForegroundColor(ConsoleColor.Red))
             {
-                await console.Output.WriteLineAsync(
-                    $"Failed to export {errors.Count} channel(s):"
+                await console.Error.WriteLineAsync(
+                    $"Failed to export {errorsByChannel.Count} the following channel(s):"
                 );
             }
 
-            foreach (var (channel, error) in errors)
+            foreach (var (channel, error) in errorsByChannel)
             {
-                await console.Output.WriteAsync($"{channel.Category.Name} / {channel.Name}: ");
-
+                await console.Error.WriteAsync($"{channel.GetHierarchicalName()}: ");
                 using (console.WithForegroundColor(ConsoleColor.Red))
-                    await console.Output.WriteLineAsync(error);
+                    await console.Error.WriteLineAsync(error);
             }
 
-            await console.Output.WriteLineAsync();
+            await console.Error.WriteLineAsync();
         }
 
         // Fail the command only if ALL channels failed to export.
-        // Having some of the channels fail to export is expected.
-        if (errors.Count >= channels.Count)
-        {
+        // If only some channels failed to export, it's okay.
+        if (errorsByChannel.Count >= channels.Count)
             throw new CommandException("Export failed.");
-        }
     }
 
-    protected async ValueTask ExecuteAsync(IConsole console, IReadOnlyList<Snowflake> channelIds)
+    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);
-            channels.Add(channel);
+
+            // 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 ExecuteAsync(console, channels);
+        await ExportAsync(console, channels);
     }
 
-    public override ValueTask ExecuteAsync(IConsole console)
+    public override async ValueTask ExecuteAsync(IConsole console)
     {
-        // War in Ukraine message
-        console.Output.WriteLine("========================================================================");
-        console.Output.WriteLine("||   Ukraine is at war! Support my country in its fight for freedom~  ||");
-        console.Output.WriteLine("||   Learn more on my website: https://tyrrrz.me                      ||");
-        console.Output.WriteLine("========================================================================");
-        console.Output.WriteLine("");
+        // 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("");
+        }
 
-        return default;
+        await base.ExecuteAsync(console);
     }
-}
+}

DiscordChatExporter.Cli/Commands/Base/TokenCommandBase.cs

@@ -1,34 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using CliFx.Infrastructure;
-using DiscordChatExporter.Core.Discord;
-
-namespace DiscordChatExporter.Cli.Commands.Base;
-
-public abstract class TokenCommandBase : ICommand
-{
-    [CommandOption(
-        "token",
-        't',
-        IsRequired = true,
-        EnvironmentVariable = "DISCORD_TOKEN",
-        Description = "Authentication token."
-    )]
-    public string Token { get; init; } = "";
-
-    [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
-    [CommandOption(
-        "bot",
-        'b',
-        EnvironmentVariable = "DISCORD_TOKEN_BOT",
-        Description = "This option doesn't do anything. Kept for backwards compatibility."
-    )]
-    public bool IsBotToken { get; init; }
-
-    private DiscordClient? _discordClient;
-    protected DiscordClient Discord => _discordClient ??= new DiscordClient(Token);
-
-    public abstract ValueTask ExecuteAsync(IConsole console);
-}

DiscordChatExporter.Cli/Commands/Converters/ThreadInclusionModeBindingConverter.cs

@@ -0,0 +1,22 @@
+using System;
+using CliFx.Extensibility;
+using DiscordChatExporter.Cli.Commands.Shared;
+
+namespace DiscordChatExporter.Cli.Commands.Converters;
+
+internal class ThreadInclusionModeBindingConverter : BindingConverter<ThreadInclusionMode>
+{
+    public override ThreadInclusionMode Convert(string? rawValue)
+    {
+        // Empty or unset value is treated as 'active' to match the previous behavior
+        if (string.IsNullOrWhiteSpace(rawValue))
+            return ThreadInclusionMode.Active;
+
+        // Boolean 'true' is treated as 'active', boolean 'false' is treated as 'none'
+        if (bool.TryParse(rawValue, out var boolValue))
+            return boolValue ? ThreadInclusionMode.Active : ThreadInclusionMode.None;
+
+        // Otherwise, fall back to regular enum parsing
+        return Enum.Parse<ThreadInclusionMode>(rawValue, true);
+    }
+}

DiscordChatExporter.Cli/Commands/Converters/TruthyBooleanBindingConverter.cs

@@ -0,0 +1,21 @@
+using System.Globalization;
+using CliFx.Extensibility;
+
+namespace DiscordChatExporter.Cli.Commands.Converters;
+
+internal class TruthyBooleanBindingConverter : BindingConverter<bool>
+{
+    public override bool Convert(string? rawValue)
+    {
+        // Empty or unset value is treated as 'true', to match the regular boolean behavior
+        if (string.IsNullOrWhiteSpace(rawValue))
+            return true;
+
+        // Number '1' is treated as 'true', other numbers are treated as 'false'
+        if (int.TryParse(rawValue, CultureInfo.InvariantCulture, out var intValue))
+            return intValue == 1;
+
+        // Otherwise, fall back to regular boolean parsing
+        return bool.Parse(rawValue);
+    }
+}

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -1,20 +1,45 @@
+using System;
 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.Data;
+using DiscordChatExporter.Core.Discord.Dump;
+using DiscordChatExporter.Core.Exceptions;
+using Spectre.Console;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("exportall", Description = "Export all accessible channels.")]
+[Command("exportall", Description = "Exports all accessible channels.")]
 public class ExportAllCommand : ExportCommandBase
 {
+    [CommandOption("include-dm", Description = "Include direct message channels.")]
+    public bool IncludeDirectChannels { get; init; } = true;
+
+    [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-dm",
-        Description = "Include direct message channels."
+        "include-threads",
+        Description = "Which types of threads should be included.",
+        Converter = typeof(ThreadInclusionModeBindingConverter)
     )]
-    public bool IncludeDirectMessages { get; init; } = true;
+    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
+
+    [CommandOption(
+        "data-package",
+        Description = "Path to the personal data package (ZIP file) requested from Discord. "
+            + "If provided, only channels referenced in the dump will be exported."
+    )]
+    public string? DataPackageFilePath { get; init; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
@@ -23,17 +48,162 @@ public class ExportAllCommand : ExportCommandBase
         var cancellationToken = console.RegisterCancellationHandler();
         var channels = new List<Channel>();
 
-        await console.Output.WriteLineAsync("Fetching channels...");
-        await foreach (var guild in Discord.GetUserGuildsAsync(cancellationToken))
+        // Pull from the API
+        if (string.IsNullOrWhiteSpace(DataPackageFilePath))
         {
-            // Skip DMs if instructed to
-            if (!IncludeDirectMessages && guild.Id == Guild.DirectMessages.Id)
-                continue;
+            await foreach (var guild in Discord.GetUserGuildsAsync(cancellationToken))
+            {
+                // Regular channels
+                await console.Output.WriteLineAsync(
+                    $"Fetching channels for server '{guild.Name}'..."
+                );
 
-            await foreach (var channel in Discord.GetGuildChannelsAsync(guild.Id, cancellationToken))
-                channels.Add(channel);
+                var fetchedChannelsCount = 0;
+                await console
+                    .CreateStatusTicker()
+                    .StartAsync(
+                        "...",
+                        async ctx =>
+                        {
+                            await foreach (
+                                var channel in Discord.GetGuildChannelsAsync(
+                                    guild.Id,
+                                    cancellationToken
+                                )
+                            )
+                            {
+                                if (channel.IsCategory)
+                                    continue;
+
+                                if (!IncludeVoiceChannels && channel.IsVoice)
+                                    continue;
+
+                                channels.Add(channel);
+
+                                ctx.Status(
+                                    Markup.Escape($"Fetched '{channel.GetHierarchicalName()}'.")
+                                );
+
+                                fetchedChannelsCount++;
+                            }
+                        }
+                    );
+
+                await console.Output.WriteLineAsync($"Fetched {fetchedChannelsCount} channel(s).");
+
+                // Threads
+                if (ThreadInclusionMode != ThreadInclusionMode.None)
+                {
+                    await console.Output.WriteLineAsync(
+                        $"Fetching threads for server '{guild.Name}'..."
+                    );
+
+                    var fetchedThreadsCount = 0;
+                    await console
+                        .CreateStatusTicker()
+                        .StartAsync(
+                            "...",
+                            async ctx =>
+                            {
+                                await foreach (
+                                    var thread in Discord.GetGuildThreadsAsync(
+                                        guild.Id,
+                                        ThreadInclusionMode == ThreadInclusionMode.All,
+                                        Before,
+                                        After,
+                                        cancellationToken
+                                    )
+                                )
+                                {
+                                    channels.Add(thread);
+
+                                    ctx.Status(
+                                        Markup.Escape($"Fetched '{thread.GetHierarchicalName()}'.")
+                                    );
+
+                                    fetchedThreadsCount++;
+                                }
+                            }
+                        );
+
+                    await console.Output.WriteLineAsync(
+                        $"Fetched {fetchedThreadsCount} thread(s)."
+                    );
+                }
+            }
+        }
+        // Pull from the data package
+        else
+        {
+            await console.Output.WriteLineAsync("Extracting channels...");
+
+            var dump = await DataDump.LoadAsync(DataPackageFilePath, cancellationToken);
+            var inaccessibleChannels = new List<DataDumpChannel>();
+
+            await console
+                .CreateStatusTicker()
+                .StartAsync(
+                    "...",
+                    async ctx =>
+                    {
+                        foreach (var dumpChannel in dump.Channels)
+                        {
+                            ctx.Status(
+                                Markup.Escape(
+                                    $"Fetching '{dumpChannel.Name}' ({dumpChannel.Id})..."
+                                )
+                            );
+
+                            try
+                            {
+                                var channel = await Discord.GetChannelAsync(
+                                    dumpChannel.Id,
+                                    cancellationToken
+                                );
+
+                                channels.Add(channel);
+                            }
+                            catch (DiscordChatExporterException)
+                            {
+                                inaccessibleChannels.Add(dumpChannel);
+                            }
+                        }
+                    }
+                );
+
+            await console.Output.WriteLineAsync($"Fetched {channels} channel(s).");
+
+            // Print inaccessible channels
+            if (inaccessibleChannels.Any())
+            {
+                await console.Output.WriteLineAsync();
+
+                using (console.WithForegroundColor(ConsoleColor.Red))
+                {
+                    await console.Error.WriteLineAsync(
+                        "Failed to access the following channel(s):"
+                    );
+                }
+
+                foreach (var dumpChannel in inaccessibleChannels)
+                    await console.Error.WriteLineAsync($"{dumpChannel.Name} ({dumpChannel.Id})");
+
+                await console.Error.WriteLineAsync();
+            }
         }
 
-        await base.ExecuteAsync(console, channels);
+        // Filter out unwanted channels
+        if (!IncludeDirectChannels)
+            channels.RemoveAll(c => c.IsDirect);
+        if (!IncludeGuildChannels)
+            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

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
@@ -8,21 +7,21 @@ using DiscordChatExporter.Core.Discord;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("export", Description = "Export one or multiple channels.")]
+[Command("export", Description = "Exports one or multiple channels.")]
 public class ExportChannelsCommand : ExportCommandBase
 {
     // TODO: change this to plural (breaking change)
     [CommandOption(
         "channel",
         'c',
-        IsRequired = true,
-        Description = "Channel ID(s)."
+        Description = "Channel ID(s). "
+            + "If provided with category ID(s), all channels inside those categories will be exported."
     )]
-    public IReadOnlyList<Snowflake> ChannelIds { get; init; } = Array.Empty<Snowflake>();
+    public required IReadOnlyList<Snowflake> ChannelIds { get; init; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
-        await base.ExecuteAsync(console, ChannelIds);
+        await ExportAsync(console, ChannelIds);
     }
-}
+}

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
@@ -8,7 +7,7 @@ using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("exportdm", Description = "Export all direct message channels.")]
+[Command("exportdm", Description = "Exports all direct message channels.")]
 public class ExportDirectMessagesCommand : ExportCommandBase
 {
     public override async ValueTask ExecuteAsync(IConsole console)
@@ -18,11 +17,11 @@ public class ExportDirectMessagesCommand : ExportCommandBase
         var cancellationToken = console.RegisterCancellationHandler();
 
         await console.Output.WriteLineAsync("Fetching channels...");
+        var channels = await Discord.GetGuildChannelsAsync(
+            Guild.DirectMessages.Id,
+            cancellationToken
+        );
 
-        var channels = (await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken))
-            .Where(c => c.Kind != ChannelKind.GuildCategory)
-            .ToArray();
-
-        await base.ExecuteAsync(console, channels);
+        await ExportAsync(console, channels);
     }
-}
+}

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -1,37 +1,105 @@
-using System.Linq;
+using System.Collections.Generic;
 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;
-using DiscordChatExporter.Core.Utils.Extensions;
+using Spectre.Console;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("exportguild", Description = "Export all channels within specified guild.")]
+[Command("exportguild", Description = "Exports all channels within the specified server.")]
 public class ExportGuildCommand : ExportCommandBase
 {
+    [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(
-        "guild",
-        'g',
-        IsRequired = true,
-        Description = "Guild ID."
+        "include-threads",
+        Description = "Which types of threads should be included.",
+        Converter = typeof(ThreadInclusionModeBindingConverter)
     )]
-    public Snowflake GuildId { get; init; }
+    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
 
         var cancellationToken = console.RegisterCancellationHandler();
+        var channels = new List<Channel>();
 
+        // Regular channels
         await console.Output.WriteLineAsync("Fetching channels...");
 
-        var channels = (await Discord.GetGuildChannelsAsync(GuildId, cancellationToken))
-            .Where(c => c.Kind != ChannelKind.GuildCategory)
-            .ToArray();
+        var fetchedChannelsCount = 0;
+        await console
+            .CreateStatusTicker()
+            .StartAsync(
+                "...",
+                async ctx =>
+                {
+                    await foreach (
+                        var channel in Discord.GetGuildChannelsAsync(GuildId, cancellationToken)
+                    )
+                    {
+                        if (channel.IsCategory)
+                            continue;
 
-        await base.ExecuteAsync(console, channels);
+                        if (!IncludeVoiceChannels && channel.IsVoice)
+                            continue;
+
+                        channels.Add(channel);
+
+                        ctx.Status(Markup.Escape($"Fetched '{channel.GetHierarchicalName()}'."));
+
+                        fetchedChannelsCount++;
+                    }
+                }
+            );
+
+        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

@@ -4,47 +4,111 @@ 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.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.")]
-public class GetChannelsCommand : TokenCommandBase
+[Command("channels", Description = "Get the list of channels in a server.")]
+public class GetChannelsCommand : DiscordCommandBase
 {
+    [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(
-        "guild",
-        'g',
-        IsRequired = true,
-        Description = "Guild ID."
+        "include-threads",
+        Description = "Which types of threads should be included.",
+        Converter = typeof(ThreadInclusionModeBindingConverter)
     )]
-    public Snowflake GuildId { get; init; }
+    public ThreadInclusionMode ThreadInclusionMode { get; init; } = ThreadInclusionMode.None;
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
+        await base.ExecuteAsync(console);
+
         var cancellationToken = console.RegisterCancellationHandler();
 
         var channels = (await Discord.GetGuildChannelsAsync(GuildId, cancellationToken))
-            .Where(c => c.Kind != ChannelKind.GuildCategory)
-            .OrderBy(c => c.Category.Position)
+            .Where(c => !c.IsCategory)
+            .Where(c => IncludeVoiceChannels || !c.IsVoice)
+            .OrderBy(c => c.Parent?.Position)
             .ThenBy(c => c.Name)
             .ToArray();
 
+        var channelIdMaxLength = channels
+            .Select(c => c.Id.ToString().Length)
+            .OrderDescending()
+            .FirstOrDefault();
+
+        var threads =
+            ThreadInclusionMode != ThreadInclusionMode.None
+                ? (
+                    await Discord.GetGuildThreadsAsync(
+                        GuildId,
+                        ThreadInclusionMode == ThreadInclusionMode.All,
+                        null,
+                        null,
+                        cancellationToken
+                    )
+                )
+                    .OrderBy(c => c.Name)
+                    .ToArray()
+                : [];
+
         foreach (var channel in channels)
         {
             // Channel ID
             await console.Output.WriteAsync(
-                channel.Id.ToString().PadRight(18, ' ')
+                channel.Id.ToString().PadRight(channelIdMaxLength, ' ')
             );
 
             // Separator
             using (console.WithForegroundColor(ConsoleColor.DarkGray))
                 await console.Output.WriteAsync(" | ");
 
-            // Channel category / name
+            // Channel name
             using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
+                await console.Output.WriteLineAsync(channel.GetHierarchicalName());
+
+            var channelThreads = threads.Where(t => t.Parent?.Id == channel.Id).ToArray();
+            var channelThreadIdMaxLength = channelThreads
+                .Select(t => t.Id.ToString().Length)
+                .OrderDescending()
+                .FirstOrDefault();
+
+            foreach (var channelThread in channelThreads)
+            {
+                // Indent
+                await console.Output.WriteAsync(" * ");
+
+                // Thread ID
+                await console.Output.WriteAsync(
+                    channelThread.Id.ToString().PadRight(channelThreadIdMaxLength, ' ')
+                );
+
+                // Separator
+                using (console.WithForegroundColor(ConsoleColor.DarkGray))
+                    await console.Output.WriteAsync(" | ");
+
+                // Thread name
+                using (console.WithForegroundColor(ConsoleColor.White))
+                    await console.Output.WriteAsync($"Thread / {channelThread.Name}");
+
+                // Separator
+                using (console.WithForegroundColor(ConsoleColor.DarkGray))
+                    await console.Output.WriteAsync(" | ");
+
+                // Thread status
+                using (console.WithForegroundColor(ConsoleColor.White))
+                    await console.Output.WriteLineAsync(
+                        channelThread.IsArchived ? "Archived" : "Active"
+                    );
+            }
         }
     }
-}
+}

DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs

@@ -9,33 +9,41 @@ using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("dm", Description = "Get the list of direct message channels.")]
-public class GetDirectMessageChannelsCommand : TokenCommandBase
+[Command("dm", Description = "Gets the list of all direct message channels.")]
+public class GetDirectChannelsCommand : DiscordCommandBase
 {
     public override async ValueTask ExecuteAsync(IConsole console)
     {
+        await base.ExecuteAsync(console);
+
         var cancellationToken = console.RegisterCancellationHandler();
 
-        var channels = (await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken))
-            .Where(c => c.Kind != ChannelKind.GuildCategory)
+        var channels = (
+            await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id, cancellationToken)
+        )
             .OrderByDescending(c => c.LastMessageId)
             .ThenBy(c => c.Name)
             .ToArray();
 
+        var channelIdMaxLength = channels
+            .Select(c => c.Id.ToString().Length)
+            .OrderDescending()
+            .FirstOrDefault();
+
         foreach (var channel in channels)
         {
             // Channel ID
             await console.Output.WriteAsync(
-                channel.Id.ToString().PadRight(18, ' ')
+                channel.Id.ToString().PadRight(channelIdMaxLength, ' ')
             );
 
             // Separator
             using (console.WithForegroundColor(ConsoleColor.DarkGray))
                 await console.Output.WriteAsync(" | ");
 
-            // Channel category / name
+            // Channel name
             using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
+                await console.Output.WriteLineAsync(channel.GetHierarchicalName());
         }
     }
-}
+}

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -9,24 +9,30 @@ using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("guilds", Description = "Get the list of accessible guilds.")]
-public class GetGuildsCommand : TokenCommandBase
+[Command("guilds", Description = "Gets the list of accessible servers.")]
+public class GetGuildsCommand : DiscordCommandBase
 {
     public override async ValueTask ExecuteAsync(IConsole console)
     {
+        await base.ExecuteAsync(console);
+
         var cancellationToken = console.RegisterCancellationHandler();
 
         var guilds = (await Discord.GetUserGuildsAsync(cancellationToken))
             // Show direct messages first
             .OrderByDescending(g => g.Id == Guild.DirectMessages.Id)
-            .ThenBy(g => g.Name);
+            .ThenBy(g => g.Name)
+            .ToArray();
+
+        var guildIdMaxLength = guilds
+            .Select(g => g.Id.ToString().Length)
+            .OrderDescending()
+            .FirstOrDefault();
 
         foreach (var guild in guilds)
         {
             // Guild ID
-            await console.Output.WriteAsync(
-                guild.Id.ToString().PadRight(18, ' ')
-            );
+            await console.Output.WriteAsync(guild.Id.ToString().PadRight(guildIdMaxLength, ' '));
 
             // Separator
             using (console.WithForegroundColor(ConsoleColor.DarkGray))
@@ -37,4 +43,4 @@ public class GetGuildsCommand : TokenCommandBase
                 await console.Output.WriteLineAsync(guild.Name);
         }
     }
-}
+}

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -6,67 +6,71 @@ using CliFx.Infrastructure;
 
 namespace DiscordChatExporter.Cli.Commands;
 
-[Command("guide", Description = "Explains how to obtain 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");
         console.Output.WriteLine(" 4. Navigate to the Network tab");
         console.Output.WriteLine(" 5. Press Ctrl+R to reload");
-        console.Output.WriteLine(" 6. Search for a request containing \"messages?limit=50\" or similar");
-        console.Output.WriteLine(" 7. Select the Headers tab on the right");
-        console.Output.WriteLine(" 8. Scroll down to the Request Headers section");
-        console.Output.WriteLine(" 9. Copy the value of the \"authorization\" header");
+        console.Output.WriteLine(" 6. Switch between random channels to trigger network requests");
+        console.Output.WriteLine(" 7. Search for a request that starts with \"messages\"");
+        console.Output.WriteLine(" 8. Select the Headers tab on the right");
+        console.Output.WriteLine(" 9. Scroll down to the Request Headers section");
+        console.Output.WriteLine(" 10. Copy the value of the \"authorization\" header");
         console.Output.WriteLine();
 
         // 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(" 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(
+            " *  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 guild 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 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();
 
-        // Direct message channel ID
+        // Docs link
         using (console.WithForegroundColor(ConsoleColor.White))
-            console.Output.WriteLine("To get direct message channel ID:");
+        {
+            console.Output.WriteLine(
+                "If you have questions or issues, please refer to the documentation:"
+            );
+        }
 
-        console.Output.WriteLine(" 1. Open Discord");
-        console.Output.WriteLine(" 2. Open the desired direct message channel");
-        console.Output.WriteLine(" 3. Press Ctrl+Shift+I to show developer tools");
-        console.Output.WriteLine(" 4. Navigate to the Console tab");
-        console.Output.WriteLine(" 5. Type \"window.location.href\" and press Enter");
-        console.Output.WriteLine(" 6. Copy the first long sequence of numbers inside the URL");
-        console.Output.WriteLine();
-
-        // Wiki link
-        using (console.WithForegroundColor(ConsoleColor.White))
-            console.Output.WriteLine("If you have questions or issues, please refer to the wiki:");
         using (console.WithForegroundColor(ConsoleColor.DarkCyan))
-            console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");
+        {
+            console.Output.WriteLine(
+                "https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs"
+            );
+        }
 
         return default;
     }
-}
+}

DiscordChatExporter.Cli/Commands/Shared/ThreadInclusionMode.cs

@@ -0,0 +1,8 @@
+namespace DiscordChatExporter.Cli.Commands.Shared;
+
+public enum ThreadInclusionMode
+{
+    None,
+    Active,
+    All,
+}

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -3,13 +3,16 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ApplicationIcon>..\favicon.ico</ApplicationIcon>
+    <PublishTrimmed>true</PublishTrimmed>
+    <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="2.3.0" />
-    <PackageReference Include="Spectre.Console" Version="0.44.0" />
-    <PackageReference Include="Gress" Version="2.0.1" />
-    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.3.1" PrivateAssets="all" />
+    <PackageReference Include="CliFx" Version="2.3.5" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.30.6" PrivateAssets="all" />
+    <PackageReference Include="Deorcify" Version="1.1.0" PrivateAssets="all" />
+    <PackageReference Include="Gress" Version="2.1.1" />
+    <PackageReference Include="Spectre.Console" Version="0.49.1" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli/Program.cs

@@ -1,6 +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

@@ -8,34 +8,44 @@ 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 Progress CreateProgressTicker(this IConsole console) => console
-        .CreateAnsiConsole()
-        .Progress()
-        .AutoClear(false)
-        .AutoRefresh(true)
-        .HideCompleted(false)
-        .Columns(
-            new TaskDescriptionColumn {Alignment = Justify.Left},
-            new ProgressBarColumn(),
-            new PercentageColumn()
+        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()
+            );
+
     public static async ValueTask StartTaskAsync(
-        this ProgressContext progressContext,
+        this ProgressContext context,
         string description,
-        Func<ProgressTask, ValueTask> performOperationAsync)
+        Func<ProgressTask, ValueTask> performOperationAsync
+    )
     {
-        var progressTask = progressContext.AddTask(
-            // Don't recognize random square brackets as style tags
-            Markup.Escape(description),
-            new ProgressTaskSettings {MaxValue = 1}
+        // Description cannot be empty
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1133
+        var actualDescription = !string.IsNullOrWhiteSpace(description) ? description : "...";
+
+        var progressTask = context.AddTask(
+            actualDescription,
+            new ProgressTaskSettings { MaxValue = 1 }
         );
 
         try
@@ -44,7 +54,8 @@ internal static class ConsoleExtensions
         }
         finally
         {
+            progressTask.Value = progressTask.MaxValue;
             progressTask.StopTask();
         }
     }
-}
+}

DiscordChatExporter.Core/Discord/Data/Application.cs

@@ -0,0 +1,28 @@
+using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+
+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 { get; } =
+        Flags.HasFlag(ApplicationFlags.GatewayMessageContent)
+        || Flags.HasFlag(ApplicationFlags.GatewayMessageContentLimited);
+}
+
+public partial record Application
+{
+    public static Application Parse(JsonElement json)
+    {
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var name = json.GetProperty("name").GetNonWhiteSpaceString();
+
+        var flags =
+            json.GetPropertyOrNull("flags")?.GetInt32OrNull()?.Pipe(x => (ApplicationFlags)x)
+            ?? ApplicationFlags.None;
+
+        return new Application(id, name, flags);
+    }
+}

DiscordChatExporter.Core/Discord/Data/ApplicationFlags.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace DiscordChatExporter.Core.Discord.Data;
+
+// https://discord.com/developers/docs/resources/application#application-object-application-flags
+[Flags]
+public enum ApplicationFlags
+{
+    None = 0,
+    ApplicationAutoModerationRuleCreateBadge = 64,
+    GatewayPresence = 4096,
+    GatewayPresenceLimited = 8192,
+    GatewayGuildMembers = 16384,
+    GatewayGuildMembersLimited = 32768,
+    VerificationPendingGuildLimit = 65536,
+    Embedded = 131072,
+    GatewayMessageContent = 262144,
+    GatewayMessageContentLimited = 524288,
+    ApplicationCommandBadge = 8388608,
+}

DiscordChatExporter.Core/Discord/Data/Attachment.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
@@ -16,17 +15,33 @@ public partial record Attachment(
     string? Description,
     int? Width,
     int? Height,
-    FileSize FileSize) : IHasId
+    FileSize FileSize
+) : IHasId
 {
-    public string FileExtension => Path.GetExtension(FileName);
+    public string FileExtension { get; } = Path.GetExtension(FileName);
 
-    public bool IsImage => FileFormat.IsImage(FileExtension);
+    public bool IsImage =>
+        string.Equals(FileExtension, ".jpg", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".jpeg", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".png", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".gif", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".bmp", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".webp", StringComparison.OrdinalIgnoreCase);
 
-    public bool IsVideo => FileFormat.IsVideo(FileExtension);
+    public bool IsVideo =>
+        string.Equals(FileExtension, ".gifv", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".mp4", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".webm", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".mov", StringComparison.OrdinalIgnoreCase);
 
-    public bool IsAudio => FileFormat.IsAudio(FileExtension);
+    public bool IsAudio =>
+        string.Equals(FileExtension, ".mp3", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".wav", StringComparison.OrdinalIgnoreCase)
+        || string.Equals(FileExtension, ".ogg", StringComparison.OrdinalIgnoreCase)
+        || 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
@@ -43,4 +58,4 @@ public partial record Attachment
 
         return new Attachment(id, url, fileName, description, width, height, fileSize);
     }
-}
+}

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
@@ -11,70 +12,106 @@ public partial record Channel(
     Snowflake Id,
     ChannelKind Kind,
     Snowflake GuildId,
-    ChannelCategory Category,
+    Channel? Parent,
     string Name,
     int? Position,
+    string? IconUrl,
     string? Topic,
-    Snowflake? LastMessageId) : IHasId
+    bool IsArchived,
+    Snowflake? LastMessageId
+) : IHasId
 {
-    public bool SupportsVoice => Kind is ChannelKind.GuildVoiceChat or ChannelKind.GuildStageVoice;
+    public bool IsDirect { get; } =
+        Kind is ChannelKind.DirectTextChat or ChannelKind.DirectGroupTextChat;
+
+    public bool IsGuild => !IsDirect;
+
+    public bool IsCategory { get; } = Kind == ChannelKind.GuildCategory;
+
+    public bool IsVoice { get; } =
+        Kind is ChannelKind.GuildVoiceChat or ChannelKind.GuildStageVoice;
+
+    public bool IsThread { get; } =
+        Kind
+            is ChannelKind.GuildNewsThread
+                or ChannelKind.GuildPublicThread
+                or ChannelKind.GuildPrivateThread;
+
+    public bool IsEmpty { get; } = LastMessageId is null;
+
+    public IEnumerable<Channel> GetParents()
+    {
+        var current = Parent;
+        while (current is not null)
+        {
+            yield return current;
+            current = current.Parent;
+        }
+    }
+
+    public Channel? TryGetRootParent() => GetParents().LastOrDefault();
+
+    public string GetHierarchicalName() =>
+        string.Join(" / ", GetParents().Reverse().Select(c => c.Name).Append(Name));
+
+    public bool MayHaveMessagesAfter(Snowflake messageId) => !IsEmpty && messageId < LastMessageId;
+
+    public bool MayHaveMessagesBefore(Snowflake messageId) => !IsEmpty && messageId > Id;
 }
 
 public partial record Channel
 {
-    private static ChannelCategory GetFallbackCategory(ChannelKind channelKind) => new(
-        Snowflake.Zero,
-        channelKind switch
-        {
-            ChannelKind.GuildTextChat => "Text",
-            ChannelKind.DirectTextChat => "Private",
-            ChannelKind.DirectGroupTextChat => "Group",
-            ChannelKind.GuildNews => "News",
-            _ => "Default"
-        },
-        null
-    );
-
-    public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? positionHint = null)
+    public static Channel Parse(JsonElement json, Channel? parent = null, int? positionHint = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-        var kind = (ChannelKind)json.GetProperty("type").GetInt32();
-        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
+        var kind = json.GetProperty("type").GetInt32().Pipe(t => (ChannelKind)t);
+
+        var guildId =
+            json.GetPropertyOrNull("guild_id")
+                ?.GetNonWhiteSpaceStringOrNull()
+                ?.Pipe(Snowflake.Parse) ?? Guild.DirectMessages.Id;
 
         var name =
             // Guild channel
-            json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
-
+            json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull()
             // DM channel
-            json.GetPropertyOrNull("recipients")?
-                .EnumerateArrayOrNull()?
-                .Select(User.Parse)
-                .Select(u => u.Name)
-                .Pipe(s => string.Join(", ", s)) ??
-
+            ?? json.GetPropertyOrNull("recipients")
+                ?.EnumerateArrayOrNull()
+                ?.Select(User.Parse)
+                .Select(u => u.DisplayName)
+                .Pipe(s => string.Join(", ", s))
             // Fallback
-            id.ToString();
+            ?? id.ToString();
 
-        var position =
-            positionHint ??
-            json.GetPropertyOrNull("position")?.GetInt32OrNull();
+        var position = positionHint ?? json.GetPropertyOrNull("position")?.GetInt32OrNull();
+
+        // Icons can only be set for group DM channels
+        var iconUrl = json.GetPropertyOrNull("icon")
+            ?.GetNonWhiteSpaceStringOrNull()
+            ?.Pipe(h => ImageCdn.GetChannelIconUrl(id, h));
 
         var topic = json.GetPropertyOrNull("topic")?.GetStringOrNull();
 
-        var lastMessageId = json
-            .GetPropertyOrNull("last_message_id")?
-            .GetNonWhiteSpaceStringOrNull()?
-            .Pipe(Snowflake.Parse);
+        var isArchived =
+            json.GetPropertyOrNull("thread_metadata")
+                ?.GetPropertyOrNull("archived")
+                ?.GetBooleanOrNull() ?? false;
+
+        var lastMessageId = json.GetPropertyOrNull("last_message_id")
+            ?.GetNonWhiteSpaceStringOrNull()
+            ?.Pipe(Snowflake.Parse);
 
         return new Channel(
             id,
             kind,
-            guildId ?? Guild.DirectMessages.Id,
-            category ?? GetFallbackCategory(kind),
+            guildId,
+            parent,
             name,
             position,
+            iconUrl,
             topic,
+            isArchived,
             lastMessageId
         );
     }
-}
+}

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -1,26 +0,0 @@
-using System.Text.Json;
-using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
-using JsonExtensions.Reading;
-
-namespace DiscordChatExporter.Core.Discord.Data;
-
-public record ChannelCategory(Snowflake Id, string Name, int? Position) : IHasId
-{
-    public static ChannelCategory Unknown { get; } = new(Snowflake.Zero, "<unknown category>", 0);
-
-    public static ChannelCategory Parse(JsonElement json, int? positionHint = null)
-    {
-        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-
-        var name =
-            json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
-            id.ToString();
-
-        var position =
-            positionHint ??
-            json.GetPropertyOrNull("position")?.GetInt32OrNull();
-
-        return new ChannelCategory(id, name, position);
-    }
-}

DiscordChatExporter.Core/Discord/Data/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

@@ -1,7 +1,6 @@
 namespace DiscordChatExporter.Core.Discord.Data;
 
 // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
-// Order of enum fields needs to match the order in the docs.
 public enum ChannelKind
 {
     GuildTextChat = 0,
@@ -15,5 +14,5 @@ public enum ChannelKind
     GuildPrivateThread = 12,
     GuildStageVoice = 13,
     GuildDirectory = 14,
-    GuildForum = 15
-}
+    GuildForum = 15,
+}

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

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 
 namespace DiscordChatExporter.Core.Discord.Data.Common;
 
@@ -39,10 +40,14 @@ public readonly partial record struct FileSize(long TotalBytes)
     }
 
     [ExcludeFromCodeCoverage]
-    public override string ToString() => $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}";
+    public override string ToString() =>
+        string.Create(
+            CultureInfo.InvariantCulture,
+            $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}"
+        );
 }
 
 public partial record struct FileSize
 {
     public static FileSize FromBytes(long bytes) => new(bytes);
-}
+}

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

@@ -3,4 +3,4 @@
 public interface IHasId
 {
     Snowflake Id { get; }
-}
+}

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

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

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

@@ -0,0 +1,65 @@
+using System;
+using System.Globalization;
+using System.Linq;
+
+namespace DiscordChatExporter.Core.Discord.Data.Common;
+
+// https://discord.com/developers/docs/reference#image-formatting
+public static class ImageCdn
+{
+    // Standard emoji are rendered through Twemoji
+    public static string GetStandardEmojiUrl(string emojiName)
+    {
+        var runes = emojiName.EnumerateRunes().ToArray();
+
+        // Variant selector rune is skipped in Twemoji IDs,
+        // except when the emoji also contains a zero-width joiner.
+        // VS = 0xfe0f; ZWJ = 0x200d.
+        var filteredRunes = runes.Any(r => r.Value == 0x200d)
+            ? runes
+            : runes.Where(r => r.Value != 0xfe0f);
+
+        var twemojiId = string.Join(
+            "-",
+            filteredRunes.Select(r => r.Value.ToString("x", CultureInfo.InvariantCulture))
+        );
+
+        return $"https://cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/{twemojiId}.svg";
+    }
+
+    public static string GetCustomEmojiUrl(Snowflake emojiId, bool isAnimated = false) =>
+        isAnimated
+            ? $"https://cdn.discordapp.com/emojis/{emojiId}.gif"
+            : $"https://cdn.discordapp.com/emojis/{emojiId}.png";
+
+    public static string GetGuildIconUrl(Snowflake guildId, string iconHash, int size = 512) =>
+        iconHash.StartsWith("a_", StringComparison.Ordinal)
+            ? $"https://cdn.discordapp.com/icons/{guildId}/{iconHash}.gif?size={size}"
+            : $"https://cdn.discordapp.com/icons/{guildId}/{iconHash}.png?size={size}";
+
+    public static string GetChannelIconUrl(Snowflake channelId, string iconHash, int size = 512) =>
+        iconHash.StartsWith("a_", StringComparison.Ordinal)
+            ? $"https://cdn.discordapp.com/channel-icons/{channelId}/{iconHash}.gif?size={size}"
+            : $"https://cdn.discordapp.com/channel-icons/{channelId}/{iconHash}.png?size={size}";
+
+    public static string GetUserAvatarUrl(Snowflake userId, string avatarHash, int size = 512) =>
+        avatarHash.StartsWith("a_", StringComparison.Ordinal)
+            ? $"https://cdn.discordapp.com/avatars/{userId}/{avatarHash}.gif?size={size}"
+            : $"https://cdn.discordapp.com/avatars/{userId}/{avatarHash}.png?size={size}";
+
+    public static string GetFallbackUserAvatarUrl(int index = 0) =>
+        $"https://cdn.discordapp.com/embed/avatars/{index}.png";
+
+    public static string GetMemberAvatarUrl(
+        Snowflake guildId,
+        Snowflake userId,
+        string avatarHash,
+        int size = 512
+    ) =>
+        avatarHash.StartsWith("a_", StringComparison.Ordinal)
+            ? $"https://cdn.discordapp.com/guilds/{guildId}/users/{userId}/avatars/{avatarHash}.gif?size={size}"
+            : $"https://cdn.discordapp.com/guilds/{guildId}/users/{userId}/avatars/{avatarHash}.png?size={size}";
+
+    public static string GetStickerUrl(Snowflake stickerId, string format = "png") =>
+        $"https://cdn.discordapp.com/stickers/{stickerId}.{format}";
+}

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

@@ -11,6 +11,7 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds;
 // https://discord.com/developers/docs/resources/channel#embed-object
 public partial record Embed(
     string? Title,
+    EmbedKind Kind,
     string? Url,
     DateTimeOffset? Timestamp,
     Color? Color,
@@ -19,14 +20,20 @@ public partial record Embed(
     IReadOnlyList<EmbedField> Fields,
     EmbedImage? Thumbnail,
     IReadOnlyList<EmbedImage> Images,
-    EmbedFooter? Footer)
+    EmbedVideo? Video,
+    EmbedFooter? Footer
+)
 {
-    public PlainImageEmbedProjection? TryGetPlainImage() =>
-        PlainImageEmbedProjection.TryResolve(this);
+    // Embeds can only have one image according to the API model,
+    // but the client can render multiple images in some cases.
+    public EmbedImage? Image => Images.FirstOrDefault();
 
     public SpotifyTrackEmbedProjection? TryGetSpotifyTrack() =>
         SpotifyTrackEmbedProjection.TryResolve(this);
 
+    public TwitchClipEmbedProjection? TryGetTwitchClip() =>
+        TwitchClipEmbedProjection.TryResolve(this);
+
     public YouTubeVideoEmbedProjection? TryGetYouTubeVideo() =>
         YouTubeVideoEmbedProjection.TryResolve(this);
 }
@@ -36,15 +43,27 @@ public partial record Embed
     public static Embed Parse(JsonElement json)
     {
         var title = json.GetPropertyOrNull("title")?.GetStringOrNull();
+
+        var kind =
+            json.GetPropertyOrNull("type")?.GetStringOrNull()?.ParseEnumOrNull<EmbedKind>()
+            ?? EmbedKind.Rich;
+
         var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
-        var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffset();
-        var color = json.GetPropertyOrNull("color")?.GetInt32OrNull()?.Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
+        var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffsetOrNull();
+
+        var color = json.GetPropertyOrNull("color")
+            ?.GetInt32OrNull()
+            ?.Pipe(System.Drawing.Color.FromArgb)
+            .ResetAlpha();
+
         var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
         var description = json.GetPropertyOrNull("description")?.GetStringOrNull();
 
         var fields =
-            json.GetPropertyOrNull("fields")?.EnumerateArrayOrNull()?.Select(EmbedField.Parse).ToArray() ??
-            Array.Empty<EmbedField>();
+            json.GetPropertyOrNull("fields")
+                ?.EnumerateArrayOrNull()
+                ?.Select(EmbedField.Parse)
+                .ToArray() ?? [];
 
         var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);
 
@@ -56,13 +75,18 @@ public partial record Embed
         // with this by merging related embeds at the end of the message parsing process.
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/695
         var images =
-            json.GetPropertyOrNull("image")?.Pipe(EmbedImage.Parse).Enumerate().ToArray() ??
-            Array.Empty<EmbedImage>();
+            json.GetPropertyOrNull("image")
+                ?.Pipe(EmbedImage.Parse)
+                .ToSingletonEnumerable()
+                .ToArray() ?? [];
+
+        var video = json.GetPropertyOrNull("video")?.Pipe(EmbedVideo.Parse);
 
         var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse);
 
         return new Embed(
             title,
+            kind,
             url,
             timestamp,
             color,
@@ -71,7 +95,8 @@ public partial record Embed
             fields,
             thumbnail,
             images,
+            video,
             footer
         );
     }
-}
+}

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

@@ -4,11 +4,7 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data.Embeds;
 
 // https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
-public record EmbedAuthor(
-    string? Name,
-    string? Url,
-    string? IconUrl,
-    string? IconProxyUrl)
+public record EmbedAuthor(string? Name, string? Url, string? IconUrl, string? IconProxyUrl)
 {
     public static EmbedAuthor Parse(JsonElement json)
     {
@@ -19,4 +15,4 @@ public record EmbedAuthor(
 
         return new EmbedAuthor(name, url, iconUrl, iconProxyUrl);
     }
-}
+}

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

@@ -4,10 +4,7 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data.Embeds;
 
 // https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
-public record EmbedField(
-    string Name,
-    string Value,
-    bool IsInline)
+public record EmbedField(string Name, string Value, bool IsInline)
 {
     public static EmbedField Parse(JsonElement json)
     {
@@ -17,4 +14,4 @@ public record EmbedField(
 
         return new EmbedField(name, value, isInline);
     }
-}
+}

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

@@ -4,10 +4,7 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data.Embeds;
 
 // https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
-public record EmbedFooter(
-    string Text,
-    string? IconUrl,
-    string? IconProxyUrl)
+public record EmbedFooter(string Text, string? IconUrl, string? IconProxyUrl)
 {
     public static EmbedFooter Parse(JsonElement json)
     {
@@ -17,4 +14,4 @@ public record EmbedFooter(
 
         return new EmbedFooter(text, iconUrl, iconProxyUrl);
     }
-}
+}

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

@@ -4,11 +4,7 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data.Embeds;
 
 // https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
-public record EmbedImage(
-    string? Url,
-    string? ProxyUrl,
-    int? Width,
-    int? Height)
+public record EmbedImage(string? Url, string? ProxyUrl, int? Width, int? Height)
 {
     public static EmbedImage Parse(JsonElement json)
     {
@@ -19,4 +15,4 @@ public record EmbedImage(
 
         return new EmbedImage(url, proxyUrl, width, height);
     }
-}
+}

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

@@ -0,0 +1,11 @@
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-types
+public enum EmbedKind
+{
+    Rich,
+    Image,
+    Video,
+    Gifv,
+    Link,
+}

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

@@ -0,0 +1,18 @@
+using System.Text.Json;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-video-structure
+public record EmbedVideo(string? Url, string? ProxyUrl, int? Width, int? Height)
+{
+    public static EmbedVideo Parse(JsonElement json)
+    {
+        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
+        var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetNonWhiteSpaceStringOrNull();
+        var width = json.GetPropertyOrNull("width")?.GetInt32OrNull();
+        var height = json.GetPropertyOrNull("height")?.GetInt32OrNull();
+
+        return new EmbedVideo(url, proxyUrl, width, height);
+    }
+}

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

@@ -1,33 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using DiscordChatExporter.Core.Utils;
-
-namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-
-public record PlainImageEmbedProjection(string Url)
-{
-    public static PlainImageEmbedProjection? TryResolve(Embed embed)
-    {
-        if (string.IsNullOrWhiteSpace(embed.Url))
-            return null;
-
-        // Has to be an embed without any data (except URL and image)
-        if (!string.IsNullOrWhiteSpace(embed.Title) ||
-            embed.Timestamp is not null ||
-            embed.Author is not null ||
-            !string.IsNullOrWhiteSpace(embed.Description) ||
-            embed.Fields.Any() ||
-            embed.Footer is not null)
-        {
-            return null;
-        }
-
-        // Has to be an image file
-        var fileName = Regex.Match(embed.Url, @".+/([^?]*)").Groups[1].Value;
-        if (string.IsNullOrWhiteSpace(fileName) || !FileFormat.IsImage(Path.GetExtension(fileName)))
-            return null;
-
-        return new PlainImageEmbedProjection(embed.Url);
-    }
-}

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
@@ -12,7 +12,11 @@ public partial record SpotifyTrackEmbedProjection
     private static string? TryParseTrackId(string embedUrl)
     {
         // https://open.spotify.com/track/1LHZMWefF9502NPfArRfvP?si=3efac6ce9be04f0a
-        var trackId = Regex.Match(embedUrl, @"spotify\.com/track/(.*?)(?:\?|&|/|$)").Groups[1].Value;
+        var trackId = Regex
+            .Match(embedUrl, @"spotify\.com/track/(.*?)(?:\?|&|/|$)")
+            .Groups[1]
+            .Value;
+
         if (!string.IsNullOrWhiteSpace(trackId))
             return trackId;
 
@@ -21,6 +25,9 @@ public partial record SpotifyTrackEmbedProjection
 
     public static SpotifyTrackEmbedProjection? TryResolve(Embed embed)
     {
+        if (embed.Kind != EmbedKind.Link)
+            return null;
+
         if (string.IsNullOrWhiteSpace(embed.Url))
             return null;
 
@@ -30,4 +37,4 @@ public partial record SpotifyTrackEmbedProjection
 
         return new SpotifyTrackEmbedProjection(trackId);
     }
-}
+}

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);
+    }
+}