Update version

Fix crash when parsing position on DM channels (#496 )
[CLI] Fix missing channel category bug when API returns empty string (#492 )
2026-07-07 14:44:39 +02:00 · 2021-02-06 21:22:42 +02:00 · 2021-02-06 17:00:29 +02:00 · 2021-02-02 14:42:04 +02:00 · 2021-01-31 17:23:46 +02:00 · 2021-01-28 22:01:13 +02:00
209 changed files with 7137 additions and 4622 deletions
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "xamlstyler.console": {
+      "version": "3.2003.9",
+      "commands": [
+        "xstyler"
+      ]
+    }
+  }
+}
@@ -1,63 +0,0 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
-* text=auto
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
@@ -0,0 +1,3 @@
+github: Tyrrrz
+patreon: Tyrrrz
+custom: ['buymeacoffee.com/Tyrrrz', 'tyrrrz.me/donate']
@@ -0,0 +1,71 @@
+name: CD
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.3
+
+      - name: Install .NET (v3.1)
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: 3.1.x
+
+      - name: Install .NET (v5.0)
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: 5.0.x
+
+      - name: Build & publish (CLI)
+        run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
+
+      - name: Build & publish (GUI)
+        run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release
+
+      - name: Pack (CLI)
+        run: Compress-Archive -Path DiscordChatExporter.Cli/bin/Publish/* -DestinationPath DiscordChatExporter.Cli/bin/Publish/Archive.zip -Force
+        shell: pwsh
+
+      - name: Pack (GUI)
+        run: Compress-Archive -Path DiscordChatExporter.Gui/bin/Publish/* -DestinationPath DiscordChatExporter.Gui/bin/Publish/Archive.zip -Force
+        shell: pwsh
+
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1.0.1
+        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
+
+      - name: Upload release asset (CLI)
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: DiscordChatExporter.Cli/bin/Publish/Archive.zip
+          asset_name: DiscordChatExporter.CLI.zip
+          asset_content_type: application/zip
+
+      - name: Upload release asset (GUI)
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: DiscordChatExporter.Gui/bin/Publish/Archive.zip
+          asset_name: DiscordChatExporter.zip
+          asset_content_type: application/zip
@@ -0,0 +1,39 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.3
+
+      - name: Install .NET (v3.1)
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: 3.1.x
+
+      - name: Install .NET (v5.0)
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: 5.0.x
+
+      - name: Build & publish (CLI)
+        run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
+
+      - name: Build & publish (GUI)
+        run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release
+
+      - name: Upload build artifacts (CLI)
+        uses: actions/upload-artifact@v1
+        with:
+          name: DiscordChatExporter.CLI
+          path: DiscordChatExporter.Cli/bin/Publish/
+
+      - name: Upload build artifact (GUI)
+        uses: actions/upload-artifact@v1
+        with:
+          name: DiscordChatExporter
+          path: DiscordChatExporter.Gui/bin/Publish/
@@ -1,261 +1,22 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
 # User-specific files
 *.suo
 *.user
 *.userosscache
 *.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
+.idea/
+.vs/

 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-x64/
-x86/
+[Xx]64/
+[Xx]86/
+[Bb]uild/
 bld/
 [Bb]in/
 [Oo]bj/
-[Ll]og/

-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-#*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
+# Coverage
+*.opencover.xml
@@ -1,3 +1,187 @@
+### 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 emojis. 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 emojis 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 emojis but really aren't, but on the other hand it might miss some actual emojis. This means that some standard emojis (i.e. not custom server emojis) may not look like in Discord. This is a compromise I'm willing to take because detecting emojis 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 emojis were rendered via Twemoji while Discord renders them as plain text.
+- [HTML] Fixed an issue where emojis 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 emojis 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).
@@ -1,11 +0,0 @@
-New-Item "$PSScriptRoot\bin" -ItemType Directory -Force
-
-# GUI
-$files = @()
-$files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Gui\bin\Release\*" -Include "*.exe", "*.dll", "*.config"
-$files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporter.zip" -Force
-
-# CLI
-$files = @()
-$files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Cli\bin\Release\net461\*" -Include "*.exe", "*.dll", "*.config"
-$files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporter.CLI.zip" -Force
@@ -0,0 +1,13 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Version>2.26.1</Version>
+    <Company>Tyrrrz</Company>
+    <Copyright>Copyright (c) Alexey Golub</Copyright>
+    <LangVersion>preview</LangVersion>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
+  </PropertyGroup>
+
+</Project>
@@ -0,0 +1,87 @@
+using System.IO;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using CliFx.Exceptions;
+using CliFx.Utilities;
+using DiscordChatExporter.Domain.Discord;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Exporting;
+
+namespace DiscordChatExporter.Cli.Commands.Base
+{
+    public abstract class ExportCommandBase : TokenCommandBase
+    {
+        [CommandOption("output", 'o', Description = "Output file or directory path.")]
+        public string OutputPath { get; init; } = Directory.GetCurrentDirectory();
+
+        [CommandOption("format", 'f', Description = "Export format.")]
+        public ExportFormat ExportFormat { get; init; } = ExportFormat.HtmlDark;
+
+        [CommandOption("after", Description = "Only include messages sent after this date or message ID.")]
+        public Snowflake? After { get; init; }
+
+        [CommandOption("before", Description = "Only include messages sent before this date or message ID.")]
+        public Snowflake? Before { get; init; }
+
+        [CommandOption("partition", 'p', Description = "Split output into partitions limited to this number of messages.")]
+        public int? PartitionLimit { get; init; }
+
+        [CommandOption("media", Description = "Download referenced media content.")]
+        public bool ShouldDownloadMedia { get; init; }
+
+        [CommandOption("reuse-media", Description = "Reuse already existing media content to skip redundant downloads.")]
+        public bool ShouldReuseMedia { get; init; }
+
+        [CommandOption("dateformat", Description = "Format used when writing dates.")]
+        public string DateFormat { get; init; } = "dd-MMM-yy hh:mm tt";
+
+        protected ChannelExporter GetChannelExporter() => new(GetDiscordClient());
+
+        protected async ValueTask ExportAsync(IConsole console, Guild guild, Channel channel)
+        {
+            console.Output.Write($"Exporting channel '{channel.Category} / {channel.Name}'... ");
+            var progress = console.CreateProgressTicker();
+
+            var request = new ExportRequest(
+                guild,
+                channel,
+                OutputPath,
+                ExportFormat,
+                After,
+                Before,
+                PartitionLimit,
+                ShouldDownloadMedia,
+                ShouldReuseMedia,
+                DateFormat
+            );
+
+            await GetChannelExporter().ExportChannelAsync(request, progress);
+
+            console.Output.WriteLine();
+            console.Output.WriteLine("Done.");
+        }
+
+        protected async ValueTask ExportAsync(IConsole console, Channel channel)
+        {
+            var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId);
+            await ExportAsync(console, guild, channel);
+        }
+
+        protected async ValueTask ExportAsync(IConsole console, Snowflake channelId)
+        {
+            var channel = await GetDiscordClient().GetChannelAsync(channelId);
+            await ExportAsync(console, channel);
+        }
+
+        public override ValueTask ExecuteAsync(IConsole console)
+        {
+            if (ShouldReuseMedia && !ShouldDownloadMedia)
+            {
+                throw new CommandException("The --reuse-media option cannot be used without the --media option.");
+            }
+
+            return default;
+        }
+    }
+}
@@ -0,0 +1,79 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using CliFx.Utilities;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Exceptions;
+using DiscordChatExporter.Domain.Exporting;
+using DiscordChatExporter.Domain.Utilities;
+using Gress;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Cli.Commands.Base
+{
+    public abstract class ExportMultipleCommandBase : ExportCommandBase
+    {
+        [CommandOption("parallel", Description = "Limits how many channels can be exported in parallel.")]
+        public int ParallelLimit { get; init; } = 1;
+
+        protected async ValueTask ExportMultipleAsync(IConsole console, IReadOnlyList<Channel> channels)
+        {
+            // This uses a different route from ExportCommandBase.ExportAsync() because it runs
+            // in parallel and needs another way to report progress to console.
+
+            console.Output.Write($"Exporting {channels.Count} channels... ");
+            var progress = console.CreateProgressTicker();
+
+            var operations = progress.Wrap().CreateOperations(channels.Count);
+
+            var successfulExportCount = 0;
+            var errors = new ConcurrentBag<(Channel, string)>();
+
+            await channels.Zip(operations).ParallelForEachAsync(async tuple =>
+            {
+                var (channel, operation) = tuple;
+
+                try
+                {
+                    var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId);
+
+                    var request = new ExportRequest(
+                        guild,
+                        channel,
+                        OutputPath,
+                        ExportFormat,
+                        After,
+                        Before,
+                        PartitionLimit,
+                        ShouldDownloadMedia,
+                        ShouldReuseMedia,
+                        DateFormat
+                    );
+
+                    await GetChannelExporter().ExportChannelAsync(request, operation);
+
+                    Interlocked.Increment(ref successfulExportCount);
+                }
+                catch (DiscordChatExporterException ex) when (!ex.IsCritical)
+                {
+                    errors.Add((channel, ex.Message));
+                }
+                finally
+                {
+                    operation.Dispose();
+                }
+            }, ParallelLimit.ClampMin(1));
+
+            console.Output.WriteLine();
+
+            foreach (var (channel, error) in errors)
+                console.Error.WriteLine($"Channel '{channel}': {error}");
+
+            console.Output.WriteLine($"Successfully exported {successfulExportCount} channel(s).");
+        }
+    }
+}
@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Domain.Discord;
+
+namespace DiscordChatExporter.Cli.Commands.Base
+{
+    public abstract class TokenCommandBase : ICommand
+    {
+        [CommandOption("token", 't', IsRequired = true, EnvironmentVariableName = "DISCORD_TOKEN", Description = "Authorization token.")]
+        public string TokenValue { get; init; } = "";
+
+        [CommandOption("bot", 'b', EnvironmentVariableName = "DISCORD_TOKEN_BOT", Description = "Authorize as a bot.")]
+        public bool IsBotToken { get; init; }
+
+        protected AuthToken GetAuthToken() => new(
+            IsBotToken
+                ? AuthTokenType.Bot
+                : AuthTokenType.User,
+            TokenValue
+        );
+
+        protected DiscordClient GetDiscordClient() => new(GetAuthToken());
+
+        public abstract ValueTask ExecuteAsync(IConsole console);
+    }
+}
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Discord.Models;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("exportall", Description = "Export all accessible channels.")]
+    public class ExportAllCommand : ExportMultipleCommandBase
+    {
+        [CommandOption("include-dm", Description = "Include direct message channels.")]
+        public bool IncludeDirectMessages { get; init; } = true;
+
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            var channels = new List<Channel>();
+
+            // Aggregate channels from all guilds
+            await foreach (var guild in GetDiscordClient().GetUserGuildsAsync())
+            {
+                // Skip DMs if instructed to
+                if (!IncludeDirectMessages && guild.Id == Guild.DirectMessages.Id)
+                    continue;
+
+                await foreach (var channel in GetDiscordClient().GetGuildChannelsAsync(guild.Id))
+                {
+                    channels.Add(channel);
+                }
+            }
+
+            await ExportMultipleAsync(console, channels);
+        }
+    }
+}
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Discord;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("export", Description = "Export a channel.")]
+    public class ExportChannelCommand : ExportCommandBase
+    {
+        [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID.")]
+        public Snowflake ChannelId { get; init; }
+
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            await base.ExecuteAsync(console);
+            await ExportAsync(console, ChannelId);
+        }
+    }
+}
@@ -0,0 +1,19 @@
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Utilities;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("exportdm", Description = "Export all direct message channels.")]
+    public class ExportDirectMessagesCommand : ExportMultipleCommandBase
+    {
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            var channels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
+            await ExportMultipleAsync(console, channels);
+        }
+    }
+}
@@ -0,0 +1,22 @@
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Discord;
+using DiscordChatExporter.Domain.Utilities;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("exportguild", Description = "Export all channels within specified guild.")]
+    public class ExportGuildCommand : ExportMultipleCommandBase
+    {
+        [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
+        public Snowflake GuildId { get; init; }
+
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            var channels = await GetDiscordClient().GetGuildChannelsAsync(GuildId);
+            await ExportMultipleAsync(console, channels);
+        }
+    }
+}
@@ -0,0 +1,26 @@
+using System.Linq;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Discord;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Utilities;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("channels", Description = "Get the list of channels in a guild.")]
+    public class GetChannelsCommand : TokenCommandBase
+    {
+        [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
+        public Snowflake GuildId { get; init; }
+
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            var channels = await GetDiscordClient().GetGuildChannelsAsync(GuildId);
+
+            foreach (var channel in channels.OrderBy(c => c.Category, PositionBasedComparer.Instance).ThenBy(c => c.Name))
+                console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
+        }
+    }
+}
@@ -0,0 +1,23 @@
+using System.Linq;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Utilities;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("dm", Description = "Get the list of direct message channels.")]
+    public class GetDirectMessageChannelsCommand : TokenCommandBase
+    {
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            var channels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
+
+            foreach (var channel in channels.OrderBy(c => c.Name))
+                console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
+        }
+    }
+}
@@ -0,0 +1,21 @@
+using System.Linq;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Utilities;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("guilds", Description = "Get the list of accessible guilds.")]
+    public class GetGuildsCommand : TokenCommandBase
+    {
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            var guilds = await GetDiscordClient().GetUserGuildsAsync();
+
+            foreach (var guild in guilds.OrderBy(g => g.Name))
+                console.Output.WriteLine($"{guild.Id} | {guild.Name}");
+        }
+    }
+}
@@ -0,0 +1,65 @@
+using System;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("guide", Description = "Explains how to obtain token, guild or channel ID.")]
+    public class GuideCommand : ICommand
+    {
+        public ValueTask ExecuteAsync(IConsole console)
+        {
+            console.WithForegroundColor(ConsoleColor.White, () =>
+                console.Output.WriteLine("To get user token:")
+            );
+            console.Output.WriteLine(" 1. Open Discord");
+            console.Output.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
+            console.Output.WriteLine(" 3. Navigate to the Application tab");
+            console.Output.WriteLine(" 4. Select \"Local Storage\" > \"https://discord.com\" on the left");
+            console.Output.WriteLine(" 5. Press Ctrl+R to reload");
+            console.Output.WriteLine(" 6. Find \"token\" at the bottom and copy the value");
+            console.Output.WriteLine(" *  Automating user accounts is technically against TOS, use at your own risk.");
+            console.Output.WriteLine();
+
+            console.WithForegroundColor(ConsoleColor.White, () =>
+                console.Output.WriteLine("To get bot token:")
+            );
+            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();
+
+            console.WithForegroundColor(ConsoleColor.White, () =>
+                console.Output.WriteLine("To get guild ID or guild channel ID:")
+            );
+            console.Output.WriteLine(" 1. Open Discord");
+            console.Output.WriteLine(" 2. Open Settings");
+            console.Output.WriteLine(" 3. Go to Appearance 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();
+
+            console.WithForegroundColor(ConsoleColor.White, () =>
+                console.Output.WriteLine("To get direct message channel ID:")
+            );
+            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();
+
+            console.WithForegroundColor(ConsoleColor.White,
+                () => console.Output.WriteLine("For more information, check out the wiki:")
+            );
+            console.WithForegroundColor(ConsoleColor.Blue,
+                () => console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki")
+            );
+
+            return default;
+        }
+    }
+}
@@ -1,24 +0,0 @@
-using DiscordChatExporter.Core.Services;
-using StyletIoC;
-
-namespace DiscordChatExporter.Cli
-{
-    public static class Container
-    {
-        public static IContainer Instance { get; }
-
-        static Container()
-        {
-            var builder = new StyletIoCBuilder();
-
-            // Autobind services in the .Core assembly
-            builder.Autobind(typeof(DataService).Assembly);
-
-            // Bind settings as singleton
-            builder.Bind<SettingsService>().ToSelf().InSingletonScope();
-
-            // Set instance
-            Instance = builder.BuildContainer();
-        }
-    }
-}
@@ -1,22 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net461</TargetFramework>
-        <Version>2.10</Version>
-        <Company>Tyrrrz</Company>
-        <Copyright>Copyright (c) Alexey Golub</Copyright>
-        <ApplicationIcon>..\favicon.ico</ApplicationIcon>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <ApplicationIcon>..\favicon.ico</ApplicationIcon>
+  </PropertyGroup>

-    <ItemGroup>
-        <PackageReference Include="CommandLineParser" Version="2.3.0" />
-        <PackageReference Include="Stylet" Version="1.1.22" />
-        <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CliFx" Version="1.6.0" />
+    <PackageReference Include="Gress" Version="1.2.0" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
+  </ItemGroup>

-    <ItemGroup>
-        <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DiscordChatExporter.Domain\DiscordChatExporter.Domain.csproj" />
+  </ItemGroup>

 </Project>
@@ -1,28 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Cli.Internal
-{
-    internal class InlineProgress : IProgress<double>, IDisposable
-    {
-        private readonly int _posX;
-        private readonly int _posY;
-
-        public InlineProgress()
-        {
-            _posX = Console.CursorLeft;
-            _posY = Console.CursorTop;
-        }
-
-        public void Report(double progress)
-        {
-            Console.SetCursorPosition(_posX, _posY);
-            Console.WriteLine($"{progress:P1}");
-        }
-
-        public void Dispose()
-        {
-            Console.SetCursorPosition(_posX, _posY);
-            Console.WriteLine("Completed ✓");
-        }
-    }
-}
@@ -0,0 +1,9 @@
+// ReSharper disable CheckNamespace
+// TODO: remove after moving to .NET 5
+
+namespace System.Runtime.CompilerServices
+{
+    internal static class IsExternalInit
+    {
+    }
+}
@@ -1,72 +1,14 @@
-using System;
-using System.Linq;
-using CommandLine;
-using DiscordChatExporter.Cli.Verbs;
-using DiscordChatExporter.Cli.Verbs.Options;
+using System.Threading.Tasks;
+using CliFx;

 namespace DiscordChatExporter.Cli
 {
    public static class Program
    {
-        private static void PrintTokenHelp()
-        {
-            Console.WriteLine("# To get user token:");
-            Console.WriteLine(" 1. Open Discord");
-            Console.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
-            Console.WriteLine(" 3. Press Ctrl+R to reload");
-            Console.WriteLine(" 4. Navigate to the Application tab");
-            Console.WriteLine(" 5. Select \"Local Storage\" > \"https://discordapp.com\" on the left");
-            Console.WriteLine(" 6. Find \"token\" under key and copy the value");
-            Console.WriteLine();
-            Console.WriteLine("# To get bot token:");
-            Console.WriteLine(" 1. Go to Discord developer portal");
-            Console.WriteLine(" 2. Open your application's settings");
-            Console.WriteLine(" 3. Navigate to the Bot section on the left");
-            Console.WriteLine(" 4. Under Token click Copy");
-            Console.WriteLine();
-            Console.WriteLine("# To get guild or channel ID:");
-            Console.WriteLine(" 1. Open Discord");
-            Console.WriteLine(" 2. Open Settings");
-            Console.WriteLine(" 3. Go to Appearance section");
-            Console.WriteLine(" 4. Enable Developer Mode");
-            Console.WriteLine(" 5. Right click on the desired guild or channel and click Copy ID");
-        }
-
-        public static void Main(string[] args)
-        {
-            // Get all verb types
-            var verbTypes = new[]
-            {
-                typeof(ExportChannelOptions),
-                typeof(ExportDirectMessagesOptions),
-                typeof(ExportGuildOptions),
-                typeof(GetChannelsOptions),
-                typeof(GetDirectMessageChannelsOptions),
-                typeof(GetGuildsOptions)
-            };
-
-            // Parse command line arguments
-            var parsedArgs = Parser.Default.ParseArguments(args, verbTypes);
-
-            // Execute commands
-            parsedArgs.WithParsed<ExportChannelOptions>(o => new ExportChannelVerb(o).Execute());
-            parsedArgs.WithParsed<ExportDirectMessagesOptions>(o => new ExportDirectMessagesVerb(o).Execute());
-            parsedArgs.WithParsed<ExportGuildOptions>(o => new ExportGuildVerb(o).Execute());
-            parsedArgs.WithParsed<GetChannelsOptions>(o => new GetChannelsVerb(o).Execute());
-            parsedArgs.WithParsed<GetDirectMessageChannelsOptions>(o => new GetDirectMessageChannelsVerb(o).Execute());
-            parsedArgs.WithParsed<GetGuildsOptions>(o => new GetGuildsVerb(o).Execute());
-
-            // Show token help if help requested or no verb specified
-            parsedArgs.WithNotParsed(errs =>
-            {
-                var err = errs.First();
-
-                if (err.Tag == ErrorType.NoVerbSelectedError)
-                    PrintTokenHelp();
-
-                if (err.Tag == ErrorType.HelpVerbRequestedError && args.Length == 1)
-                    PrintTokenHelp();
-            });
-        }
+        public static async Task<int> Main(string[] args) =>
+            await new CliApplicationBuilder()
+                .AddCommandsFromThisAssembly()
+                .Build()
+                .RunAsync(args);
    }
 }
@@ -1,57 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Internal;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Helpers;
-using DiscordChatExporter.Core.Services;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class ExportChannelVerb : Verb<ExportChannelOptions>
-    {
-        public ExportChannelVerb(ExportChannelOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get services
-            var settingsService = Container.Instance.Get<SettingsService>();
-            var dataService = Container.Instance.Get<DataService>();
-            var exportService = Container.Instance.Get<ExportService>();
-
-            // Configure settings
-            if (Options.DateFormat.IsNotBlank())
-                settingsService.DateFormat = Options.DateFormat;
-            if (Options.MessageGroupLimit > 0)
-                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
-
-            // Track progress
-            Console.Write($"Exporting channel [{Options.ChannelId}]... ");
-            using (var progress = new InlineProgress())
-            {
-                // Get chat log
-                var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), Options.ChannelId,
-                    Options.After, Options.Before, progress);
-
-                // Generate file path if not set or is a directory
-                var filePath = Options.OutputPath;
-                if (filePath.IsBlank() || ExportHelper.IsDirectoryPath(filePath))
-                {
-                    // Generate default file name
-                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                        chatLog.Channel, Options.After, Options.Before);
-
-                    // Combine paths
-                    filePath = Path.Combine(filePath ?? "", fileName);
-                }
-
-                // Export
-                exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-            }
-        }
-    }
-}
@@ -1,76 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Internal;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Exceptions;
-using DiscordChatExporter.Core.Helpers;
-using DiscordChatExporter.Core.Services;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class ExportDirectMessagesVerb : Verb<ExportDirectMessagesOptions>
-    {
-        public ExportDirectMessagesVerb(ExportDirectMessagesOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get services
-            var settingsService = Container.Instance.Get<SettingsService>();
-            var dataService = Container.Instance.Get<DataService>();
-            var exportService = Container.Instance.Get<ExportService>();
-
-            // Configure settings
-            if (Options.DateFormat.IsNotBlank())
-                settingsService.DateFormat = Options.DateFormat;
-            if (Options.MessageGroupLimit > 0)
-                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
-
-            // Get channels
-            var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
-
-            // Order channels
-            channels = channels.OrderBy(c => c.Name).ToArray();
-
-            // Loop through channels
-            foreach (var channel in channels)
-            {
-                try
-                {
-                    // Track progress
-                    Console.Write($"Exporting channel [{channel.Name}]... ");
-                    using (var progress = new InlineProgress())
-                    {
-                        // Get chat log
-                        var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
-                            Options.After, Options.Before, progress);
-
-                        // Generate default file name
-                        var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                            chatLog.Channel, Options.After, Options.Before);
-
-                        // Generate file path
-                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
-
-                        // Export
-                        exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-                    }
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
-                {
-                    Console.Error.WriteLine("You don't have access to this channel");
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
-                {
-                    Console.Error.WriteLine("This channel doesn't exist");
-                }
-            }
-        }
-    }
-}
@@ -1,77 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Internal;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Exceptions;
-using DiscordChatExporter.Core.Helpers;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class ExportGuildVerb : Verb<ExportGuildOptions>
-    {
-        public ExportGuildVerb(ExportGuildOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get services
-            var settingsService = Container.Instance.Get<SettingsService>();
-            var dataService = Container.Instance.Get<DataService>();
-            var exportService = Container.Instance.Get<ExportService>();
-
-            // Configure settings
-            if (Options.DateFormat.IsNotBlank())
-                settingsService.DateFormat = Options.DateFormat;
-            if (Options.MessageGroupLimit > 0)
-                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
-
-            // Get channels
-            var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
-
-            // Filter and order channels
-            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
-
-            // Loop through channels
-            foreach (var channel in channels)
-            {
-                try
-                {
-                    // Track progress
-                    Console.Write($"Exporting channel [{channel.Name}]... ");
-                    using (var progress = new InlineProgress())
-                    {
-                        // Get chat log
-                        var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
-                            Options.After, Options.Before, progress);
-
-                        // Generate default file name
-                        var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                            chatLog.Channel, Options.After, Options.Before);
-
-                        // Generate file path
-                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
-
-                        // Export
-                        exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-                    }
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
-                {
-                    Console.Error.WriteLine("You don't have access to this channel");
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
-                {
-                    Console.Error.WriteLine("This channel doesn't exist");
-                }
-            }
-        }
-    }
-}
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class GetChannelsVerb : Verb<GetChannelsOptions>
-    {
-        public GetChannelsVerb(GetChannelsOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get data service
-            var dataService = Container.Instance.Get<DataService>();
-
-            // Get channels
-            var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
-
-            // Filter and order channels
-            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
-
-            // Print result
-            foreach (var channel in channels)
-                Console.WriteLine($"{channel.Id} | {channel.Name}");
-        }
-    }
-}
@@ -1,32 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class GetDirectMessageChannelsVerb : Verb<GetDirectMessageChannelsOptions>
-    {
-        public GetDirectMessageChannelsVerb(GetDirectMessageChannelsOptions options) 
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get data service
-            var dataService = Container.Instance.Get<DataService>();
-
-            // Get channels
-            var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
-
-            // Order channels
-            channels = channels.OrderBy(c => c.Name).ToArray();
-
-            // Print result
-            foreach (var channel in channels)
-                Console.WriteLine($"{channel.Id} | {channel.Name}");
-        }
-    }
-}
@@ -1,32 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class GetGuildsVerb : Verb<GetGuildsOptions>
-    {
-        public GetGuildsVerb(GetGuildsOptions options) 
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get data service
-            var dataService = Container.Instance.Get<DataService>();
-
-            // Get guilds
-            var guilds = await dataService.GetUserGuildsAsync(Options.GetToken());
-
-            // Order guilds
-            guilds = guilds.OrderBy(g => g.Name).ToArray();
-
-            // Print result
-            foreach (var guild in guilds)
-                Console.WriteLine($"{guild.Id} | {guild.Name}");
-        }
-    }
-}
@@ -1,11 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("export", HelpText = "Export channel.")]
-    public class ExportChannelOptions : ExportOptions
-    {
-        [Option('c', "channel", Required = true, HelpText = "Channel ID.")]
-        public string ChannelId { get; set; }
-    }
-}
@@ -1,9 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("exportdm", HelpText = "Export all direct message channels.")]
-    public class ExportDirectMessagesOptions : ExportOptions
-    {
-    }
-}
@@ -1,11 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("exportguild", HelpText = "Export all channels within a given guild.")]
-    public class ExportGuildOptions : ExportOptions
-    {
-        [Option('g', "guild", Required = true, HelpText = "Guild ID.")]
-        public string GuildId { get; set; }
-    }
-}
@@ -1,30 +0,0 @@
-using System;
-using CommandLine;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    public abstract class ExportOptions : TokenOptions
-    {
-        [Option('f', "format", Default = ExportFormat.HtmlDark, HelpText = "Output file format.")]
-        public ExportFormat ExportFormat { get; set; }
-
-        [Option('o', "output", Default = null, HelpText = "Output file or directory path.")]
-        public string OutputPath { get; set; }
-
-        [Option("after", Default = null, HelpText = "Limit to messages sent after this date.")]
-        public DateTime? After { get; set; }
-
-        [Option("before", Default = null, HelpText = "Limit to messages sent before this date.")]
-        public DateTime? Before { get; set; }
-
-        [Option('p', "partition", Default = null, HelpText = "Split output into partitions limited to this number of messages.")]
-        public int? PartitionLimit { get; set; }
-
-        [Option("dateformat", Default = null, HelpText = "Date format used in output.")]
-        public string DateFormat { get; set; }
-
-        [Option("grouplimit", Default = 0, HelpText = "Message group limit.")]
-        public int MessageGroupLimit { get; set; }
-    }
-}
@@ -1,11 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("channels", HelpText = "Get the list of channels in the given guild.")]
-    public class GetChannelsOptions : TokenOptions
-    {
-        [Option('g', "guild", Required = true, HelpText = "Guild ID.")]
-        public string GuildId { get; set; }
-    }
-}
@@ -1,9 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("dm", HelpText = "Get the list of direct message channels.")]
-    public class GetDirectMessageChannelsOptions : TokenOptions
-    {
-    }
-}
@@ -1,9 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("guilds", HelpText = "Get the list of accessible guilds.")]
-    public class GetGuildsOptions : TokenOptions
-    {
-    }
-}
@@ -1,16 +0,0 @@
-using CommandLine;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    public abstract class TokenOptions
-    {
-        [Option('t', "token", Required = true, HelpText = "Authorization token.")]
-        public string TokenValue { get; set; }
-
-        [Option('b', "bot", Default = false, HelpText = "Whether this authorization token belongs to a bot.")]
-        public bool IsBotToken { get; set; }
-
-        public AuthToken GetToken() => new AuthToken(IsBotToken ? AuthTokenType.Bot : AuthTokenType.User, TokenValue);
-    }
-}
@@ -1,18 +0,0 @@
-using System.Threading.Tasks;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public abstract class Verb<TOptions>
-    {
-        protected TOptions Options { get; }
-
-        protected Verb(TOptions options)
-        {
-            Options = options;
-        }
-
-        public abstract Task ExecuteAsync();
-
-        public virtual void Execute() => ExecuteAsync().GetAwaiter().GetResult();
-    }
-}
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Sprache" Version="2.2.0" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
-  </ItemGroup>
-
-</Project>
@@ -1,30 +0,0 @@
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Markdown
-{
-    public class EmojiNode : Node
-    {
-        public string Id { get; }
-
-        public string Name { get; }
-
-        public bool IsAnimated { get; }
-
-        public bool IsCustomEmoji => Id.IsNotBlank();
-
-        public EmojiNode(string lexeme, string id, string name, bool isAnimated)
-            : base(lexeme)
-        {
-            Id = id;
-            Name = name;
-            IsAnimated = isAnimated;
-        }
-
-        public EmojiNode(string lexeme, string name)
-            : this(lexeme, null, name, false)
-        {
-        }
-
-        public override string ToString() => $"<Emoji> {Name}";
-    }
-}
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Markdown
-{
-    public class FormattedNode : Node
-    {
-        public string Token { get; }
-
-        public TextFormatting Formatting { get; }
-
-        public IReadOnlyList<Node> Children { get; }
-
-        public FormattedNode(string lexeme, string token, TextFormatting formatting, IReadOnlyList<Node> children)
-            : base(lexeme)
-        {
-            Token = token;
-            Formatting = formatting;
-            Children = children;
-        }
-
-        public override string ToString() => $"<{Formatting}> ({Children.Count} direct children)";
-    }
-}
@@ -1,15 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public class InlineCodeBlockNode : Node
-    {
-        public string Code { get; }
-
-        public InlineCodeBlockNode(string lexeme, string code)
-            : base(lexeme)
-        {
-            Code = code;
-        }
-
-        public override string ToString() => $"<Code> {Code}";
-    }
-}
@@ -1,178 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Sprache;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Markdown.Internal
-{
-    // The following parsing logic is meant to replicate Discord's markdown grammar as close as possible
-    internal static class Grammar
-    {
-        /* Formatting */
-
-        // Capture until the earliest double asterisk not followed by an asterisk
-        private static readonly Parser<Node> BoldFormattedNode =
-            Parse.RegexMatch(new Regex("\\*\\*(.+?)\\*\\*(?!\\*)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "**", TextFormatting.Bold, BuildTree(m.Groups[1].Value)));
-
-        // Capture until the earliest single asterisk not preceded or followed by an asterisk
-        // Can't have whitespace right after opening or right before closing asterisk
-        private static readonly Parser<Node> ItalicFormattedNode =
-            Parse.RegexMatch(new Regex("\\*(?!\\s)(.+?)(?<!\\s|\\*)\\*(?!\\*)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "*", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
-
-        // Can't have underscores inside
-        // Can't have word characters right after closing underscore
-        private static readonly Parser<Node> ItalicAltFormattedNode =
-            Parse.RegexMatch(new Regex("_([^_]+?)_(?!\\w)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "_", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
-
-        // Treated as a separate entity for simplicity
-        // Capture until the earliest triple asterisk not preceded or followed by an asterisk
-        private static readonly Parser<Node> ItalicBoldFormattedNode =
-            Parse.RegexMatch(new Regex("\\*(\\*\\*(?:.+?)\\*\\*)\\*(?!\\*)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "*", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
-
-        // Capture until the earliest double underscore not followed by an underscore
-        private static readonly Parser<Node> UnderlineFormattedNode =
-            Parse.RegexMatch(new Regex("__(.+?)__(?!_)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "__", TextFormatting.Underline, BuildTree(m.Groups[1].Value)));
-
-        // Treated as a separate entity for simplicity
-        // Capture until the earliest triple underscore not preceded or followed by an underscore
-        private static readonly Parser<Node> ItalicUnderlineFormattedNode =
-            Parse.RegexMatch(new Regex("_(__(?:.+?)__)_(?!_)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "_", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
-
-        // Strikethrough is safe
-        private static readonly Parser<Node> StrikethroughFormattedNode =
-            Parse.RegexMatch(new Regex("~~(.+?)~~", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "~~", TextFormatting.Strikethrough, BuildTree(m.Groups[1].Value)));
-
-        // Spoiler is safe
-        private static readonly Parser<Node> SpoilerFormattedNode =
-            Parse.RegexMatch(new Regex("\\|\\|(.+?)\\|\\|", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "||", TextFormatting.Spoiler, BuildTree(m.Groups[1].Value)));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyFormattedNode = 
-            ItalicBoldFormattedNode.Or(ItalicUnderlineFormattedNode)
-            .Or(BoldFormattedNode).Or(ItalicFormattedNode)
-            .Or(UnderlineFormattedNode).Or(ItalicAltFormattedNode)
-            .Or(StrikethroughFormattedNode).Or(SpoilerFormattedNode);
-
-        /* Code blocks */
-
-        // Can't have backticks inside and surrounding whitespace is trimmed
-        private static readonly Parser<Node> InlineCodeBlockNode =
-            Parse.RegexMatch(new Regex("`\\s*([^`]+?)\\s*`", RegexOptions.Singleline))
-                .Select(m => new InlineCodeBlockNode(m.Value, m.Groups[1].Value));
-
-        // The first word is a language identifier if it's the only word followed by a newline, the rest is code
-        private static readonly Parser<Node> MultilineCodeBlockNode =
-            Parse.RegexMatch(new Regex("```(?:(\\w*?)?(?:\\s*?\\n))?(.+)```", RegexOptions.Singleline))
-                .Select(m => new MultilineCodeBlockNode(m.Value, m.Groups[1].Value, m.Groups[2].Value));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyCodeBlockNode = MultilineCodeBlockNode.Or(InlineCodeBlockNode);
-
-        /* Mentions */
-
-        // @everyone or @here
-        private static readonly Parser<Node> MetaMentionNode = Parse.RegexMatch("@(everyone|here)")
-            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Meta));
-
-        // <@123456> or <@!123456>
-        private static readonly Parser<Node> UserMentionNode = Parse.RegexMatch("<@!?(\\d+)>")
-            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.User));
-
-        // <#123456>
-        private static readonly Parser<Node> ChannelMentionNode = Parse.RegexMatch("<#(\\d+)>")
-            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Channel));
-
-        // <@&123456>
-        private static readonly Parser<Node> RoleMentionNode = Parse.RegexMatch("<@&(\\d+)>")
-            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Role));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyMentionNode =
-            MetaMentionNode.Or(UserMentionNode).Or(ChannelMentionNode).Or(RoleMentionNode);
-
-        /* Emojis */
-
-        // Matches all standard unicode emojis
-        private static readonly Parser<Node> StandardEmojiNode = Parse.RegexMatch(
-                "([\\u2700-\\u27bf]|" +
-                "(?:\\ud83c[\\udde6-\\uddff]){2}|" +
-                "[\\ud800-\\udbff][\\udc00-\\udfff]|" +
-                "[\\u0023-\\u0039]\\u20e3|" +
-                "\\u3299|\\u3297|\\u303d|\\u3030|\\u24c2|\\ud83c[\\udd70-\\udd71]|\\ud83c[\\udd7e-\\udd7f]|\\ud83c\\udd8e|\\ud83c[\\udd91-\\udd9a]|\\ud83c[\\udde6-\\uddff]|" +
-                "[\\ud83c[\\ude01-\\ude02]|\\ud83c\\ude1a|\\ud83c\\ude2f|[\\ud83c[\\ude32-\\ude3a]|[\\ud83c[\\ude50-\\ude51]|\\u203c|\\u2049|[\\u25aa-\\u25ab]|" +
-                "\\u25b6|\\u25c0|[\\u25fb-\\u25fe]|\\u00a9|\\u00ae|\\u2122|\\u2139|\\ud83c\\udc04|[\\u2600-\\u26FF]|\\u2b05|\\u2b06|\\u2b07|\\u2b1b|\\u2b1c|\\u2b50|" +
-                "\\u2b55|\\u231a|\\u231b|\\u2328|\\u23cf|[\\u23e9-\\u23f3]|[\\u23f8-\\u23fa]|\\ud83c\\udccf|\\u2934|\\u2935|[\\u2190-\\u21ff])")
-            .Select(m => new EmojiNode(m.Value, m.Groups[1].Value));
-
-        // <:lul:123456> or <a:lul:123456>
-        private static readonly Parser<Node> CustomEmojiNode = Parse.RegexMatch("<(a)?:(.+):(\\d+)>")
-            .Select(m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, m.Groups[1].Value.IsNotBlank()));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyEmojiNode = StandardEmojiNode.Or(CustomEmojiNode);
-
-        /* Links */
-
-        // [title](link)
-        private static readonly Parser<Node> TitledLinkNode = Parse.RegexMatch("\\[(.+)\\]\\((.+)\\)")
-            .Select(m => new LinkNode(m.Value, m.Groups[2].Value, m.Groups[1].Value));
-
-        // Starts with http:// or https://, stops at the last non-whitespace character followed by whitespace or punctuation character
-        private static readonly Parser<Node> AutoLinkNode = Parse.RegexMatch("(https?://\\S*[^\\.,:;\"\'\\s])")
-            .Select(m => new LinkNode(m.Value, m.Groups[1].Value));
-
-        // Autolink surrounded by angular brackets
-        private static readonly Parser<Node> HiddenLinkNode = Parse.RegexMatch("<(https?://\\S*[^\\.,:;\"\'\\s])>")
-            .Select(m => new LinkNode(m.Value, m.Groups[1].Value));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyLinkNode = TitledLinkNode.Or(HiddenLinkNode).Or(AutoLinkNode); 
-
-        /* Text */
-
-        // Shrug is an exception and needs to be exempt from formatting
-        private static readonly Parser<Node> ShrugTextNode =
-            Parse.String("¯\\_(ツ)_/¯").Text().Select(s => new TextNode(s));
-
-        // Backslash escapes any following unicode surrogate pair
-        private static readonly Parser<Node> EscapedSurrogateTextNode =
-            from slash in Parse.Char('\\')
-            from high in Parse.AnyChar.Where(char.IsHighSurrogate)
-            from low in Parse.AnyChar
-            let lexeme = $"{slash}{high}{low}"
-            let text = $"{high}{low}"
-            select new TextNode(lexeme, text);
-
-        // Backslash escapes any following non-whitespace character except for digits and latin letters
-        private static readonly Parser<Node> EscapedTextNode =
-            Parse.RegexMatch("\\\\([^a-zA-Z0-9\\s])").Select(m => new TextNode(m.Value, m.Groups[1].Value));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyTextNode = ShrugTextNode.Or(EscapedSurrogateTextNode).Or(EscapedTextNode);
-
-        /* Aggregator and fallback */
-
-        // Any node recognized by above patterns
-        private static readonly Parser<Node> AnyRecognizedNode = AnyFormattedNode.Or(AnyCodeBlockNode)
-            .Or(AnyMentionNode).Or(AnyEmojiNode).Or(AnyLinkNode).Or(AnyTextNode);
-
-        // Any node not recognized by above patterns (treated as plain text)
-        private static readonly Parser<Node> FallbackNode =
-            Parse.AnyChar.Except(AnyRecognizedNode).AtLeastOnce().Text().Select(s => new TextNode(s));
-
-        // Any node
-        private static readonly Parser<Node> AnyNode = AnyRecognizedNode.Or(FallbackNode);
-
-        // Entry point
-        public static IReadOnlyList<Node> BuildTree(string input) => AnyNode.Many().Parse(input).ToArray();
-    }
-}
@@ -1,22 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public class LinkNode : Node
-    {
-        public string Url { get; }
-
-        public string Title { get; }
-
-        public LinkNode(string lexeme, string url, string title)
-            : base(lexeme)
-        {
-            Url = url;
-            Title = title;
-        }
-
-        public LinkNode(string lexeme, string url) : this(lexeme, url, url)
-        {
-        }
-
-        public override string ToString() => $"<Link> {Title}";
-    }
-}
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Markdown.Internal;
-
-namespace DiscordChatExporter.Core.Markdown
-{
-    public static class MarkdownParser
-    {
-        public static IReadOnlyList<Node> Parse(string input) => Grammar.BuildTree(input);
-    }
-}
@@ -1,18 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public class MentionNode : Node
-    {
-        public string Id { get; }
-
-        public MentionType Type { get; }
-
-        public MentionNode(string lexeme, string id, MentionType type)
-            : base(lexeme)
-        {
-            Id = id;
-            Type = type;
-        }
-
-        public override string ToString() => $"<{Type} mention> {Id}";
-    }
-}
@@ -1,10 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public enum MentionType
-    {
-        Meta,
-        User,
-        Channel,
-        Role
-    }
-}
@@ -1,18 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public class MultilineCodeBlockNode : Node
-    {
-        public string Language { get; }
-
-        public string Code { get; }
-
-        public MultilineCodeBlockNode(string lexeme, string language, string code)
-            : base(lexeme)
-        {
-            Language = language;
-            Code = code;
-        }
-
-        public override string ToString() => $"<Code [{Language}]> {Code}";
-    }
-}
@@ -1,12 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public abstract class Node
-    {
-        public string Lexeme { get; }
-
-        protected Node(string lexeme)
-        {
-            Lexeme = lexeme;
-        }
-    }
-}
@@ -1,11 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public enum TextFormatting
-    {
-        Bold,
-        Italic,
-        Underline,
-        Strikethrough,
-        Spoiler
-    }
-}
@@ -1,19 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public class TextNode : Node
-    {
-        public string Text { get; }
-
-        public TextNode(string lexeme, string text)
-            : base(lexeme)
-        {
-            Text = text;
-        }
-
-        public TextNode(string text) : this(text, text)
-        {
-        }
-
-        public override string ToString() => Text;
-    }
-}
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net461</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\ExportTemplates\PlainText\Template.txt" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark\Template.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight\Template.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlShared\Main.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlShared\Main.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark\Theme.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight\Theme.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Csv\Template.csv" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Reference Include="mscorlib" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="ByteSize" Version="1.3.0" />
-        <PackageReference Include="Failsafe" Version="1.1.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-        <PackageReference Include="Onova" Version="2.2.0" />
-        <PackageReference Include="Scriban" Version="1.2.9" />
-        <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
-        <PackageReference Include="Tyrrrz.Settings" Version="1.3.3" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj" />
-    </ItemGroup>
-
-</Project>
@@ -1,19 +0,0 @@
-using System;
-using System.Net;
-
-namespace DiscordChatExporter.Core.Exceptions
-{
-    public class HttpErrorStatusCodeException : Exception
-    {
-        public HttpStatusCode StatusCode { get; }
-
-        public string ReasonPhrase { get; }
-
-        public HttpErrorStatusCodeException(HttpStatusCode statusCode, string reasonPhrase)
-            : base($"Error HTTP status code: {statusCode} - {reasonPhrase}")
-        {
-            StatusCode = statusCode;
-            ReasonPhrase = reasonPhrase;
-        }
-    }
-}
@@ -1,59 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Helpers
-{
-    public static class ExportHelper
-    {
-        public static bool IsDirectoryPath(string path)
-            => path.Last() == Path.DirectorySeparatorChar ||
-               path.Last() == Path.AltDirectorySeparatorChar ||
-               Path.GetExtension(path).IsBlank();
-
-        public static string GetDefaultExportFileName(ExportFormat format, Guild guild, Channel channel,
-            DateTime? from = null, DateTime? to = null)
-        {
-            var result = new StringBuilder();
-
-            // Append guild and channel names
-            result.Append($"{guild.Name} - {channel.Name} [{channel.Id}]");
-
-            // Append date range
-            if (from != null || to != null)
-            {
-                result.Append(" (");
-
-                // Both 'from' and 'to' are set
-                if (from != null && to != null)
-                {
-                    result.Append($"{from:yyyy-MM-dd} to {to:yyyy-MM-dd}");
-                }
-                // Only 'from' is set
-                else if (from != null)
-                {
-                    result.Append($"after {from:yyyy-MM-dd}");
-                }
-                // Only 'to' is set
-                else
-                {
-                    result.Append($"before {to:yyyy-MM-dd}");
-                }
-
-                result.Append(")");
-            }
-
-            // Append extension
-            result.Append($".{format.GetFileExtension()}");
-
-            // Replace invalid chars
-            foreach (var invalidChar in Path.GetInvalidFileNameChars())
-                result.Replace(invalidChar, '_');
-
-            return result.ToString();
-        }
-    }
-}
@@ -1,21 +0,0 @@
-using System;
-using System.Drawing;
-using System.Net;
-
-namespace DiscordChatExporter.Core.Internal
-{
-    internal static class Extensions
-    {
-        public static string ToSnowflake(this DateTime dateTime)
-        {
-            const long epoch = 62135596800000;
-            var unixTime = dateTime.ToUniversalTime().Ticks / TimeSpan.TicksPerMillisecond - epoch;
-            var value = ((ulong) unixTime - 1420070400000UL) << 22;
-            return value.ToString();
-        }
-
-        public static Color ResetAlpha(this Color color) => Color.FromArgb(1, color);
-
-        public static string HtmlEncode(this string value) => WebUtility.HtmlEncode(value);
-    }
-}
@@ -1,40 +0,0 @@
-using System;
-using ByteSizeLib;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#attachment-object
-
-    public class Attachment
-    {
-        public string Id { get; }
-
-        public string Url { get; }
-
-        public int? Width { get; }
-
-        public int? Height { get; }
-
-        public string FileName { get; }
-
-        public bool IsImage => FileName.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase) ||
-                               FileName.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase) ||
-                               FileName.EndsWith(".png", StringComparison.OrdinalIgnoreCase) ||
-                               FileName.EndsWith(".gif", StringComparison.OrdinalIgnoreCase) ||
-                               FileName.EndsWith(".bmp", StringComparison.OrdinalIgnoreCase);
-
-        public ByteSize FileSize { get; }
-
-        public Attachment(string id, int? width, int? height, string url, string fileName, ByteSize fileSize)
-        {
-            Id = id;
-            Url = url;
-            Width = width;
-            Height = height;
-            FileName = fileName;
-            FileSize = fileSize;
-        }
-
-        public override string ToString() => FileName;
-    }
-}
@@ -1,15 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    public class AuthToken
-    {
-        public AuthTokenType Type { get; }
-
-        public string Value { get; }
-
-        public AuthToken(AuthTokenType type, string value)
-        {
-            Type = type;
-            Value = value;
-        }
-    }
-}
@@ -1,8 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    public enum AuthTokenType
-    {
-        User,
-        Bot
-    }
-}
@@ -1,37 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#channel-object
-
-    public partial class Channel
-    {
-        public string Id { get; }
-
-        public string ParentId { get; }
-
-        public string GuildId { get; }
-
-        public string Name { get; }
-
-        public string Topic { get; }
-
-        public ChannelType Type { get; }
-        
-        public Channel(string id, string parentId, string guildId, string name, string topic, ChannelType type)
-        {
-            Id = id;
-            ParentId = parentId;
-            GuildId = guildId;
-            Name = name;
-            Topic = topic;
-            Type = type;
-        }
-
-        public override string ToString() => Name;
-    }
-
-    public partial class Channel
-    {
-        public static Channel CreateDeletedChannel(string id) =>
-            new Channel(id, null, null, "deleted-channel", null, ChannelType.GuildTextChat);
-    }
-}
@@ -1,13 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#channel-object-channel-types
-
-    public enum ChannelType
-    {
-        GuildTextChat,
-        DirectTextChat,
-        GuildVoiceChat,
-        DirectGroupTextChat,
-        Category
-    }
-}
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public class ChatLog
-    {
-        public Guild Guild { get; }
-
-        public Channel Channel { get; }
-
-        public DateTime? From { get; }
-
-        public DateTime? To { get; }
-
-        public IReadOnlyList<Message> Messages { get; }
-
-        public Mentionables Mentionables { get; }
-
-        public ChatLog(Guild guild, Channel channel, DateTime? from, DateTime? to,
-            IReadOnlyList<Message> messages, Mentionables mentionables)
-        {
-            Guild = guild;
-            Channel = channel;
-            From = from;
-            To = to;
-            Messages = messages;
-            Mentionables = mentionables;
-        }
-
-        public override string ToString() => $"{Guild.Name} | {Channel.Name}";
-    }
-}
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#embed-object
-
-    public class Embed
-    {
-        public string Title { get; }
-
-        public string Url { get; }
-
-        public DateTime? Timestamp { get; }
-
-        public Color Color { get; }
-
-        public EmbedAuthor Author { get; }
-
-        public string Description { get; }
-
-        public IReadOnlyList<EmbedField> Fields { get; }
-
-        public EmbedImage Thumbnail { get; }
-
-        public EmbedImage Image { get; }
-
-        public EmbedFooter Footer { get; }
-
-        public Embed(string title, string url, DateTime? timestamp, Color color, EmbedAuthor author, string description,
-            IReadOnlyList<EmbedField> fields, EmbedImage thumbnail, EmbedImage image, EmbedFooter footer)
-        {
-            Title = title;
-            Url = url;
-            Timestamp = timestamp;
-            Color = color;
-            Author = author;
-            Description = description;
-            Fields = fields;
-            Thumbnail = thumbnail;
-            Image = image;
-            Footer = footer;
-        }
-
-        public override string ToString() => Title;
-    }
-}
@@ -1,22 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-author-structure
-
-    public class EmbedAuthor
-    {
-        public string Name { get; }
-
-        public string Url { get; }
-
-        public string IconUrl { get; }
-
-        public EmbedAuthor(string name, string url, string iconUrl)
-        {
-            Name = name;
-            Url = url;
-            IconUrl = iconUrl;
-        }
-
-        public override string ToString() => Name;
-    }
-}
@@ -1,22 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-field-structure
-
-    public class EmbedField
-    {
-        public string Name { get; }
-
-        public string Value { get; }
-
-        public bool IsInline { get; }
-
-        public EmbedField(string name, string value, bool isInline)
-        {
-            Name = name;
-            Value = value;
-            IsInline = isInline;
-        }
-
-        public override string ToString() => $"{Name} | {Value}";
-    }
-}
@@ -1,19 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-footer-structure
-
-    public class EmbedFooter
-    {
-        public string Text { get; }
-
-        public string IconUrl { get; }
-
-        public EmbedFooter(string text, string iconUrl)
-        {
-            Text = text;
-            IconUrl = iconUrl;
-        }
-
-        public override string ToString() => Text;
-    }
-}
@@ -1,20 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-image-structure
-
-    public class EmbedImage
-    {
-        public string Url { get; }
-
-        public int? Width { get; }
-
-        public int? Height { get; }
-
-        public EmbedImage(string url, int? width, int? height)
-        {
-            Url = url;
-            Height = height;
-            Width = width;
-        }
-    }
-}
@@ -1,56 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/emoji#emoji-object
-
-    public partial class Emoji
-    {
-        public string Id { get; }
-
-        public string Name { get; }
-
-        public bool IsAnimated { get; }
-
-        public string ImageUrl
-        {
-            get
-            {
-                // Custom emoji
-                if (Id.IsNotBlank())
-                {
-                    // Animated
-                    if (IsAnimated)
-                        return $"https://cdn.discordapp.com/emojis/{Id}.gif";
-
-                    // Non-animated
-                    return $"https://cdn.discordapp.com/emojis/{Id}.png";
-                }
-
-                // Standard unicode emoji (via twemoji)
-                return $"https://twemoji.maxcdn.com/2/72x72/{GetTwemojiName(Name)}.png";
-            }
-        }
-
-        public Emoji(string id, string name, bool isAnimated)
-        {
-            Id = id;
-            Name = name;
-            IsAnimated = isAnimated;
-        }
-    }
-
-    public partial class Emoji
-    {
-        private static IEnumerable<int> GetCodePoints(string emoji)
-        {
-            for (var i = 0; i < emoji.Length; i += char.IsHighSurrogate(emoji[i]) ? 2 : 1)
-                yield return char.ConvertToUtf32(emoji, i);
-        }
-
-        private static string GetTwemojiName(string emoji)
-            => GetCodePoints(emoji).Select(i => i.ToString("x")).JoinToString("-");
-    }
-}
@@ -1,10 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    public enum ExportFormat
-    {
-        PlainText,
-        HtmlDark,
-        HtmlLight,
-        Csv
-    }
-}
@@ -1,35 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public static class Extensions
-    {
-        public static string GetFileExtension(this ExportFormat format)
-        {
-            if (format == ExportFormat.PlainText)
-                return "txt";
-            if (format == ExportFormat.HtmlDark)
-                return "html";
-            if (format == ExportFormat.HtmlLight)
-                return "html";
-            if (format == ExportFormat.Csv)
-                return "csv";
-
-            throw new ArgumentOutOfRangeException(nameof(format));
-        }
-
-        public static string GetDisplayName(this ExportFormat format)
-        {
-            if (format == ExportFormat.PlainText)
-                return "Plain Text";
-            if (format == ExportFormat.HtmlDark)
-                return "HTML (Dark)";
-            if (format == ExportFormat.HtmlLight)
-                return "HTML (Light)";
-            if (format == ExportFormat.Csv)
-                return "Comma Seperated Values (CSV)";
-
-            throw new ArgumentOutOfRangeException(nameof(format));
-        }
-    }
-}
@@ -1,33 +0,0 @@
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/guild#guild-object
-
-    public partial class Guild
-    {
-        public string Id { get; }
-
-        public string Name { get; }
-
-        public string IconHash { get; }
-
-        public string IconUrl => IconHash.IsNotBlank()
-            ? $"https://cdn.discordapp.com/icons/{Id}/{IconHash}.png"
-            : "https://cdn.discordapp.com/embed/avatars/0.png";
-
-        public Guild(string id, string name, string iconHash)
-        {
-            Id = id;
-            Name = name;
-            IconHash = iconHash;
-        }
-
-        public override string ToString() => Name;
-    }
-
-    public partial class Guild
-    {
-        public static Guild DirectMessages { get; } = new Guild("@me", "Direct Messages", null);
-    }
-}
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public class Mentionables
-    {
-        public IReadOnlyList<User> Users { get; }
-
-        public IReadOnlyList<Channel> Channels { get; }
-
-        public IReadOnlyList<Role> Roles { get; }
-
-        public Mentionables(IReadOnlyList<User> users, IReadOnlyList<Channel> channels, IReadOnlyList<Role> roles)
-        {
-            Users = users;
-            Channels = channels;
-            Roles = roles;
-        }
-
-        public User GetUser(string id) =>
-            Users.FirstOrDefault(u => u.Id == id) ?? User.CreateUnknownUser(id);
-
-        public Channel GetChannel(string id) =>
-            Channels.FirstOrDefault(c => c.Id == id) ?? Channel.CreateDeletedChannel(id);
-
-        public Role GetRole(string id) =>
-            Roles.FirstOrDefault(r => r.Id == id) ?? Role.CreateDeletedRole(id);
-    }
-}
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#message-object
-
-    public class Message
-    {
-        public string Id { get; }
-
-        public string ChannelId { get; }
-
-        public MessageType Type { get; }
-
-        public User Author { get; }
-
-        public DateTime Timestamp { get; }
-
-        public DateTime? EditedTimestamp { get; }
-
-        public string Content { get; }
-
-        public IReadOnlyList<Attachment> Attachments { get; }
-
-        public IReadOnlyList<Embed> Embeds { get; }
-
-        public IReadOnlyList<Reaction> Reactions { get; }
-
-        public IReadOnlyList<User> MentionedUsers { get; }
-
-        public Message(string id, string channelId, MessageType type, User author, DateTime timestamp,
-            DateTime? editedTimestamp, string content, IReadOnlyList<Attachment> attachments,
-            IReadOnlyList<Embed> embeds, IReadOnlyList<Reaction> reactions, IReadOnlyList<User> mentionedUsers)
-        {
-            Id = id;
-            ChannelId = channelId;
-            Type = type;
-            Author = author;
-            Timestamp = timestamp;
-            EditedTimestamp = editedTimestamp;
-            Content = content;
-            Attachments = attachments;
-            Embeds = embeds;
-            Reactions = reactions;
-            MentionedUsers = mentionedUsers;
-        }
-
-        public override string ToString() => Content;
-    }
-}
@@ -1,16 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#message-object-message-types
-
-    public enum MessageType
-    {
-        Default,
-        RecipientAdd,
-        RecipientRemove,
-        Call,
-        ChannelNameChange,
-        ChannelIconChange,
-        ChannelPinnedMessage,
-        GuildMemberJoin
-    }
-}
@@ -1,17 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#reaction-object
-
-    public class Reaction
-    {
-        public int Count { get; }
-
-        public Emoji Emoji { get; }
-
-        public Reaction(int count, Emoji emoji)
-        {
-            Count = count;
-            Emoji = emoji;
-        }
-    }
-}
@@ -1,25 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/topics/permissions#role-object
-
-    public partial class Role
-    {
-        public string Id { get; }
-
-        public string Name { get; }
-
-        public Role(string id, string name)
-        {
-            Id = id;
-            Name = name;
-        }
-
-        public override string ToString() => Name;
-    }
-
-    public partial class Role
-    {
-        public static Role CreateDeletedRole(string id) =>
-            new Role(id, "deleted-role");
-    }
-}
@@ -1,61 +0,0 @@
-using System;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/topics/permissions#role-object
-
-    public partial class User
-    {
-        public string Id { get; }
-
-        public int Discriminator { get; }
-
-        public string Name { get; }
-
-        public string FullName => $"{Name}#{Discriminator:0000}";
-
-        public string DefaultAvatarHash => $"{Discriminator % 5}";
-
-        public string AvatarHash { get; }
-
-        public bool IsAvatarAnimated =>
-            AvatarHash.IsNotBlank() && AvatarHash.StartsWith("a_", StringComparison.Ordinal);
-
-        public string AvatarUrl
-        {
-            get
-            {
-                // Custom avatar
-                if (AvatarHash.IsNotBlank())
-                {
-                    // Animated
-                    if (IsAvatarAnimated)
-                        return $"https://cdn.discordapp.com/avatars/{Id}/{AvatarHash}.gif";
-
-                    // Non-animated
-                    return $"https://cdn.discordapp.com/avatars/{Id}/{AvatarHash}.png";
-                }
-
-                // Default avatar
-                return $"https://cdn.discordapp.com/embed/avatars/{DefaultAvatarHash}.png";
-            }
-        }
-
-        public User(string id, int discriminator, string name, string avatarHash)
-        {
-            Id = id;
-            Discriminator = discriminator;
-            Name = name;
-            AvatarHash = avatarHash;
-        }
-
-        public override string ToString() => FullName;
-    }
-
-    public partial class User
-    {
-        public static User CreateUnknownUser(string id) =>
-            new User(id, 0, "Unknown", null);
-    }
-}
@@ -1,10 +0,0 @@
-Author;Date;Content;Attachments;
-{{~ for message in Model.Messages -}}
-  {{- }}"{{ message.Author.FullName }}";
-
-  {{- }}"{{ message.Timestamp | FormatDate }}";
-
-  {{- }}"{{ message.Content | FormatMarkdown | string.replace "\"" "\"\"" }}";
-
-  {{- }}"{{ message.Attachments | array.map "Url" | array.join "," }}";
-{{~ end -}}
@@ -1,2 +0,0 @@
-{{~ ThemeStyleSheet = include "HtmlDark.Theme.css" ~}}
-{{~ include "HtmlShared.Main.html" ~}}
@@ -1,2 +0,0 @@
-{{~ ThemeStyleSheet = include "HtmlLight.Theme.css" ~}}
-{{~ include "HtmlShared.Main.html" ~}}
@@ -1,101 +0,0 @@
-/* === GENERAL === */
-
-body {
-    background-color: #ffffff;
-    color: #747f8d;
-}
-
-a {
-    color: #00b0f4;
-}
-
-.spoiler {
-    background-color: rgba(0, 0, 0, 0.1);
-}
-
-.pre {
-    background-color: #f9f9f9;
-}
-
-.pre--multiline {
-    border-color: #f3f3f3;
-    color: #657b83;
-}
-
-.mention {
-    background-color: #f1f3fb;
-    color: #7289da;
-}
-
-/* === INFO === */
-
-.info__guild-name {
-    color: #2f3136;
-}
-
-.info__channel-name {
-    color: #2f3136;
-}
-
-.info__channel-topic {
-    color: #2f3136;
-}
-
-/* === CHATLOG === */
-
-.chatlog__message-group {
-    border-color: #eceeef;
-}
-
-.chatlog__author-name {
-    color: #2f3136;
-}
-
-.chatlog__timestamp {
-    color: #99aab5;
-}
-
-.chatlog__edited-timestamp {
-    color: #99aab5;
-}
-
-.chatlog__embed-content-container {
-    background-color: rgba(249, 249, 249, 0.3);
-    border-color: rgba(204, 204, 204, 0.3);
-}
-
-.chatlog__embed-author-name {
-    color: #4f545c;
-}
-
-.chatlog__embed-author-name-link {
-    color: #4f545c;
-}
-
-.chatlog__embed-title {
-    color: #4f545c;
-}
-
-.chatlog__embed-description {
-    color: #737f8d;
-}
-
-.chatlog__embed-field-name {
-    color: #36393e;
-}
-
-.chatlog__embed-field-value {
-    color: #737f8d;
-}
-
-.chatlog__embed-footer {
-    color: rgba(79, 83, 91, 0.4);
-}
-
-.chatlog__reaction {
-    background-color: rgba(79, 84, 92, 0.06);
-}
-
-.chatlog__reaction-count {
-    color: #99aab5;
-}
@@ -1,311 +0,0 @@
-/* === GENERAL === */
-
-body {
-    font-family: "Whitney", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: 16px;
-}
-
-a {
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-img {
-    object-fit: contain;
-}
-
-.markdown {
-    white-space: pre-wrap;
-    line-height: 1.3;
-    overflow-wrap: break-word;
-}
-
-.spoiler {
-    border-radius: 3px;
-}
-
-.pre {
-    font-family: "Consolas", "Courier New", Courier, Monospace;
-}
-
-.pre--multiline {
-    margin-top: 4px;
-    padding: 8px;
-    border: 2px solid;
-    border-radius: 5px;    
-}
-
-.pre--inline {
-    padding: 2px;
-    border-radius: 3px;
-}
-
-.mention {
-    font-weight: 500;
-}
-
-.emoji {
-    width: 1.45em;
-    height: 1.45em;
-    margin: 0 1px;
-    vertical-align: -0.4em;
-}
-
-.emoji--small {
-    width: 1rem;
-    height: 1rem;
-}
-
-.emoji--large {
-    width: 2rem;
-    height: 2rem;
-}
-
-/* === INFO === */
-
-.info {
-    display: flex;
-    max-width: 100%;
-    margin: 0 5px 10px 5px;    
-}
-
-.info__guild-icon-container {
-    flex: 0;
-}
-
-.info__guild-icon {
-    max-width: 88px;
-    max-height: 88px;
-}
-
-.info__metadata {
-    flex: 1;
-    margin-left: 10px;
-}
-
-.info__guild-name {
-    font-size: 1.4em;
-}
-
-.info__channel-name {
-    font-size: 1.2em;
-}
-
-.info__channel-topic {
-    margin-top: 2px;
-}
-
-.info__channel-message-count {
-    margin-top: 2px;
-}
-
-.info__channel-date-range {
-    margin-top: 2px;
-}
-
-/* === CHATLOG === */
-
-.chatlog {
-    max-width: 100%;
-}
-
-.chatlog__message-group {
-    display: flex;
-    margin: 0 10px;
-    padding: 15px 0;
-    border-top: 1px solid;
-}
-
-.chatlog__author-avatar-container {
-    flex: 0;
-    width: 40px;
-    height: 40px;
-}
-
-.chatlog__author-avatar {
-    border-radius: 50%;
-    height: 40px;
-    width: 40px;
-}
-
-.chatlog__messages {
-    flex: 1;
-    min-width: 50%;
-    margin-left: 20px;
-}
-
-.chatlog__author-name {
-    font-size: 1em;
-    font-weight: 500;
-}
-
-.chatlog__timestamp {
-    margin-left: 5px;
-    font-size: .75em;
-}
-
-.chatlog__content {
-    padding-top: 5px;
-    font-size: .9375em;
-    word-wrap: break-word;
-}
-
-.chatlog__edited-timestamp {
-    margin-left: 3px;
-    font-size: .8em;
-}
-
-.chatlog__attachment {
-    margin: 5px 0;
-}
-
-.chatlog__attachment-thumbnail {
-    max-width: 50%;
-    max-height: 500px;
-    border-radius: 3px;
-}
-
-.chatlog__embed {
-    display: flex;
-    max-width: 520px;
-    margin-top: 5px;
-}
-
-.chatlog__embed-color-pill {
-    flex-shrink: 0;
-    width: 4px;
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
-}
-
-.chatlog__embed-content-container {
-    display: flex;
-    flex-direction: column;
-    padding: 8px 10px;
-    border: 1px solid;
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
-}
-
-.chatlog__embed-content {
-    width: 100%;
-    display: flex;
-}
-
-.chatlog__embed-text {
-    flex: 1;
-}
-
-.chatlog__embed-author {
-    display: flex;
-    align-items: center;
-    margin-bottom: 5px;
-}
-
-.chatlog__embed-author-icon {
-    width: 20px;
-    height: 20px;
-    margin-right: 9px;
-    border-radius: 50%;
-}
-
-.chatlog__embed-author-name {
-    font-size: .875em;
-    font-weight: 600;
-}
-
-.chatlog__embed-title {
-    margin-bottom: 4px;
-    font-size: .875em;
-    font-weight: 600;
-}
-
-.chatlog__embed-description {
-    font-weight: 500;
-    font-size: 14px;
-}
-
-.chatlog__embed-fields {
-    display: flex;
-    flex-wrap: wrap;
-}
-
-.chatlog__embed-field {
-    flex: 0;
-    min-width: 100%;
-    max-width: 506px;
-    padding-top: 10px;
-}
-
-.chatlog__embed-field--inline {
-    flex: 1;
-    flex-basis: auto;
-    min-width: 150px;
-}
-
-.chatlog__embed-field-name {
-    margin-bottom: 4px;
-    font-size: .875em;
-    font-weight: 600;
-}
-
-.chatlog__embed-field-value {
-    font-size: .875em;
-    font-weight: 500;
-}
-
-.chatlog__embed-thumbnail {
-    flex: 0;
-    margin-left: 20px;
-    max-width: 80px;
-    max-height: 80px;
-    border-radius: 3px;
-}
-
-.chatlog__embed-image-container {
-    margin-top: 10px;
-}
-
-.chatlog__embed-image {    
-    max-width: 500px;
-    max-height: 400px;
-    border-radius: 3px;
-}
-
-.chatlog__embed-footer {
-    margin-top: 10px;
-}
-
-.chatlog__embed-footer-icon {
-    margin-right: 4px;
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    vertical-align: middle;
-}
-
-.chatlog__embed-footer-text {
-    font-weight: 600;
-    font-size: .75em;
-}
-
-.chatlog__reactions {
-    display: flex;
-}
-
-.chatlog__reaction {
-    display: flex;
-    align-items: center;
-    margin: 6px 2px 2px 2px;
-    padding: 3px 6px;
-    border-radius: 3px;
-}
-
-.chatlog__reaction-count {
-    min-width: 9px;
-    margin-left: 6px;
-    font-size: .875em;
-}
@@ -1,211 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <title>{{ Model.Guild.Name | html.escape }} - {{ Model.Channel.Name | html.escape }}</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width" />
-    <style>
-        {{ include "HtmlShared.Main.css" }}
-    </style>
-    <style>
-        {{ ThemeStyleSheet }}
-    </style>
-</head>
-<body>
-    
-{{~ # Info ~}}
-<div class="info">
-    <div class="info__guild-icon-container">
-        <img class="info__guild-icon" src="{{ Model.Guild.IconUrl }}" />
-    </div>
-    <div class="info__metadata">
-        <div class="info__guild-name">{{ Model.Guild.Name | html.escape }}</div>
-        <div class="info__channel-name">{{ Model.Channel.Name | html.escape }}</div>
-        
-        {{~ if Model.Channel.Topic ~}}
-            <div class="info__channel-topic">{{ Model.Channel.Topic | html.escape }}</div>
-        {{~ end ~}}
-
-        <div class="info__channel-message-count">{{ Model.Messages | array.size | Format "N0" }} messages</div>
-        
-        {{~ if Model.From || Model.To ~}}
-            <div class="info__channel-date-range">
-                {{~ if Model.From && Model.To ~}}
-                    Between {{ Model.From | FormatDate | html.escape }} and {{ Model.To | FormatDate | html.escape }}
-                {{~ else if Model.From ~}}
-                    After {{ Model.From | FormatDate | html.escape }}
-                {{~ else if Model.To ~}}
-                    Before {{ Model.To | FormatDate | html.escape }}
-                {{~ end ~}}
-            </div>
-        {{~ end ~}}
-    </div>
-</div>
-
-{{~ # Log ~}}
-<div class="chatlog">
-    {{~ for group in Model.Messages | GroupMessages ~}}
-        <div class="chatlog__message-group">
-            {{~ # Avatar ~}}
-            <div class="chatlog__author-avatar-container">
-                <img class="chatlog__author-avatar" src="{{ group.Author.AvatarUrl }}" />
-            </div>            
-            <div class="chatlog__messages">
-                {{~ # Author name and timestamp ~}}
-                <span class="chatlog__author-name" title="{{ group.Author.FullName | html.escape }}">{{ group.Author.Name | html.escape }}</span>
-                <span class="chatlog__timestamp">{{ group.Timestamp | FormatDate | html.escape }}</span>
-
-                {{~ # Messages ~}}
-                {{~ for message in group.Messages ~}}
-                    {{~ # Content ~}}
-                    {{~ if message.Content ~}}
-                        <div class="chatlog__content">
-                            <span class="markdown">{{ message.Content | FormatMarkdown }}</span>
-
-                            {{~ # Edited timestamp ~}}
-                            {{~ if message.EditedTimestamp ~}}
-                                <span class="chatlog__edited-timestamp" title="{{ message.EditedTimestamp | FormatDate | html.escape }}">(edited)</span>
-                            {{~ end ~}}
-                        </div>
-                    {{~ end ~}}
-
-                    {{~ # Attachments ~}}
-                    {{~ for attachment in message.Attachments ~}}
-                        <div class="chatlog__attachment">
-                            <a href="{{ attachment.Url }}">
-                                {{ # Image }}
-                                {{~ if attachment.IsImage ~}}
-                                    <img class="chatlog__attachment-thumbnail" src="{{ attachment.Url }}" />
-                                {{~ # Non-image ~}}
-                                {{~ else ~}}
-                                    Attachment: {{ attachment.FileName }} ({{ attachment.FileSize }})
-                                {{~ end ~}}
-                            </a>
-                        </div>
-                    {{~ end ~}}
-
-                    {{~ # Embeds ~}}
-                    {{~ for embed in message.Embeds ~}}
-                        <div class="chatlog__embed">
-                            <div class="chatlog__embed-color-pill" style="background-color: rgba({{ embed.Color.R }},{{ embed.Color.G }},{{ embed.Color.B }},{{ embed.Color.A }})"></div>
-                            <div class="chatlog__embed-content-container">
-                                <div class="chatlog__embed-content">
-                                    <div class="chatlog__embed-text">
-                                        {{~ # Author ~}}
-                                        {{~ if embed.Author ~}}
-                                            <div class="chatlog__embed-author">
-                                                {{~ if embed.Author.IconUrl ~}}
-                                                    <img class="chatlog__embed-author-icon" src="{{ embed.Author.IconUrl }}" />
-                                                {{~ end ~}}
-
-                                                {{~ if embed.Author.Name ~}}
-                                                    <span class="chatlog__embed-author-name">
-                                                        {{~ if embed.Author.Url ~}}
-                                                            <a class="chatlog__embed-author-name-link" href="{{ embed.Author.Url }}">{{ embed.Author.Name | html.escape }}</a>
-                                                        {{~ else ~}}
-                                                            {{ embed.Author.Name | html.escape }}
-                                                        {{~ end ~}}
-                                                    </span>
-                                                {{~ end ~}}
-                                            </div>
-                                        {{~ end ~}}
-
-                                        {{~ # Title ~}}
-                                        {{~ if embed.Title ~}}
-                                            <div class="chatlog__embed-title">
-                                                {{~ if embed.Url ~}}
-                                                    <a class="chatlog__embed-title-link" href="{{ embed.Url }}"><span class="markdown">{{ embed.Title | FormatMarkdown }}</span></a>
-                                                {{~ else ~}}
-                                                    <span class="markdown">{{ embed.Title | FormatMarkdown }}</span>
-                                                {{~ end ~}}
-                                            </div>
-                                        {{~ end ~}}
-
-                                        {{~ # Description ~}}
-                                        {{~ if embed.Description ~}}
-                                        <div class="chatlog__embed-description"><span class="markdown">{{ embed.Description | FormatMarkdown }}</span></div>
-                                        {{~ end ~}}
-
-                                        {{~ # Fields ~}}
-                                        {{~ if embed.Fields | array.size > 0 ~}}
-                                            <div class="chatlog__embed-fields">
-                                                {{~ for field in embed.Fields ~}}
-                                                    <div class="chatlog__embed-field {{ if field.IsInline }} chatlog__embed-field--inline {{ end }}">
-                                                        {{~ if field.Name ~}}
-                                                            <div class="chatlog__embed-field-name"><span class="markdown">{{ field.Name | FormatMarkdown }}</span></div>
-                                                        {{~ end ~}}
-                                                        {{~ if field.Value ~}}
-                                                            <div class="chatlog__embed-field-value"><span class="markdown">{{ field.Value | FormatMarkdown }}</span></div>
-                                                        {{~ end ~}}
-                                                    </div>
-                                                {{~ end ~}}
-                                            </div>
-                                        {{~ end ~}}
-                                    </div>
-
-                                    {{~ # Thumbnail ~}}
-                                    {{~ if embed.Thumbnail ~}}
-                                        <div class="chatlog__embed-thumbnail-container">
-                                            <a class="chatlog__embed-thumbnail-link" href="{{ embed.Thumbnail.Url }}">
-                                                <img class="chatlog__embed-thumbnail" src="{{ embed.Thumbnail.Url }}" />
-                                            </a>
-                                        </div>
-                                    {{~ end ~}}
-                                </div>    
-
-                                {{~ # Image ~}} 
-                                {{~ if embed.Image ~}}
-                                    <div class="chatlog__embed-image-container">
-                                        <a class="chatlog__embed-image-link" href="{{ embed.Image.Url }}">
-                                            <img class="chatlog__embed-image" src="{{ embed.Image.Url }}" />
-                                        </a>
-                                    </div>
-                                {{~ end ~}}
-
-                                {{~ # Footer ~}}
-                                {{~ if embed.Footer || embed.Timestamp ~}}
-                                    <div class="chatlog__embed-footer">
-                                        {{~ if embed.Footer ~}}
-                                            {{~ if embed.Footer.Text && embed.Footer.IconUrl ~}}
-                                                <img class="chatlog__embed-footer-icon" src="{{ embed.Footer.IconUrl }}" />
-                                            {{~ end ~}}
-                                        {{~ end ~}}
-                                        
-                                        <span class="chatlog__embed-footer-text">
-                                            {{~ if embed.Footer ~}}
-                                                {{~ if embed.Footer.Text ~}}
-                                                    {{ embed.Footer.Text | html.escape }}
-                                                    {{ if embed.Timestamp }} • {{ end }}
-                                                {{~ end ~}}
-                                            {{~ end ~}}
-
-                                            {{~ if embed.Timestamp ~}}
-                                                {{ embed.Timestamp | FormatDate | html.escape }}
-                                            {{~ end ~}}
-                                        </span>
-                                    </div>
-                                {{~ end ~}}
-                            </div>
-                        </div>
-                    {{~ end ~}}
-
-                    {{~ # Reactions ~}}
-                    {{~ if message.Reactions | array.size > 0 ~}}
-                        <div class="chatlog__reactions">
-                            {{~ for reaction in message.Reactions ~}}
-                                <div class="chatlog__reaction">
-                                    <img class="emoji emoji--small" title="{{ reaction.Emoji.Name }}" src="{{ reaction.Emoji.ImageUrl }}" />
-                                    <span class="chatlog__reaction-count">{{ reaction.Count }}</span>
-                                </div>
-                            {{~ end ~}}
-                        </div>
-                    {{~ end ~}}
-                {{~ end ~}}
-            </div>
-        </div>
-    {{~ end ~}}
-</div>
-
-</body>
-</html>
@@ -1,21 +0,0 @@
-{{~ # Info ~}}
-==============================================================
-Guild:    {{ Model.Guild.Name }}
-Channel:  {{ Model.Channel.Name }}
-Topic:    {{ Model.Channel.Topic }}
-Messages: {{ Model.Messages | array.size | Format "N0" }}
-Range:    {{ if Model.From }}{{ Model.From | FormatDate }} {{ end }}{{ if Model.From || Model.To }}->{{ end }}{{ if Model.To }} {{ Model.To | FormatDate }}{{ end }}
-==============================================================
-
-{{~ # Log ~}}
-{{~ for message in Model.Messages ~}}
-  {{~ # Author name and timestamp ~}}
-  {{~ }}[{{ message.Timestamp | FormatDate }}] {{ message.Author.FullName }}
-  {{~ # Content ~}}
-  {{~ message.Content | FormatMarkdown }}
-  {{~ # Attachments ~}}
-  {{~ for attachment in message.Attachments ~}}
-    {{~ attachment.Url }}
-  {{~ end ~}}
-
-{{~ end ~}}
@@ -1,208 +0,0 @@
-using System;
-using System.Drawing;
-using System.Linq;
-using ByteSizeLib;
-using DiscordChatExporter.Core.Internal;
-using DiscordChatExporter.Core.Models;
-using Newtonsoft.Json.Linq;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class DataService
-    {
-        private User ParseUser(JToken json)
-        {
-            var id = json["id"].Value<string>();
-            var discriminator = json["discriminator"].Value<int>();
-            var name = json["username"].Value<string>();
-            var avatarHash = json["avatar"].Value<string>();
-
-            return new User(id, discriminator, name, avatarHash);
-        }
-
-        private Guild ParseGuild(JToken json)
-        {
-            var id = json["id"].Value<string>();
-            var name = json["name"].Value<string>();
-            var iconHash = json["icon"].Value<string>();
-
-            return new Guild(id, name, iconHash);
-        }
-
-        private Channel ParseChannel(JToken json)
-        {
-            // Get basic data
-            var id = json["id"].Value<string>();
-            var parentId = json["parent_id"]?.Value<string>();
-            var type = (ChannelType) json["type"].Value<int>();
-            var topic = json["topic"]?.Value<string>();
-
-            // Try to extract guild ID
-            var guildId = json["guild_id"]?.Value<string>();
-
-            // If the guild ID is blank, it's direct messages
-            if (guildId.IsBlank())
-                guildId = Guild.DirectMessages.Id;
-
-            // Try to extract name
-            var name = json["name"]?.Value<string>();
-
-            // If the name is blank, it's direct messages
-            if (name.IsBlank())
-                name = json["recipients"].Select(ParseUser).Select(u => u.Name).JoinToString(", ");
-
-            return new Channel(id, parentId, guildId, name, topic, type);
-        }
-
-        private Role ParseRole(JToken json)
-        {
-            var id = json["id"].Value<string>();
-            var name = json["name"].Value<string>();
-
-            return new Role(id, name);
-        }
-
-        private Attachment ParseAttachment(JToken json)
-        {
-            var id = json["id"].Value<string>();
-            var url = json["url"].Value<string>();
-            var width = json["width"]?.Value<int>();
-            var height = json["height"]?.Value<int>();
-            var fileName = json["filename"].Value<string>();
-            var fileSizeBytes = json["size"].Value<long>();
-
-            var fileSize = ByteSize.FromBytes(fileSizeBytes);
-
-            return new Attachment(id, width, height, url, fileName, fileSize);
-        }
-
-        private EmbedAuthor ParseEmbedAuthor(JToken json)
-        {
-            var name = json["name"]?.Value<string>();
-            var url = json["url"]?.Value<string>();
-            var iconUrl = json["icon_url"]?.Value<string>();
-
-            return new EmbedAuthor(name, url, iconUrl);
-        }
-
-        private EmbedField ParseEmbedField(JToken json)
-        {
-            var name = json["name"].Value<string>();
-            var value = json["value"].Value<string>();
-            var isInline = json["inline"]?.Value<bool>() ?? false;
-
-            return new EmbedField(name, value, isInline);
-        }
-
-        private EmbedImage ParseEmbedImage(JToken json)
-        {
-            var url = json["url"]?.Value<string>();
-            var width = json["width"]?.Value<int>();
-            var height = json["height"]?.Value<int>();
-
-            return new EmbedImage(url, width, height);
-        }
-
-        private EmbedFooter ParseEmbedFooter(JToken json)
-        {
-            var text = json["text"].Value<string>();
-            var iconUrl = json["icon_url"]?.Value<string>();
-
-            return new EmbedFooter(text, iconUrl);
-        }
-
-        private Embed ParseEmbed(JToken json)
-        {
-            // Get basic data
-            var title = json["title"]?.Value<string>();
-            var description = json["description"]?.Value<string>();
-            var url = json["url"]?.Value<string>();
-            var timestamp = json["timestamp"]?.Value<DateTime>();
-
-            // Get color
-            var color = json["color"] != null
-                ? Color.FromArgb(json["color"].Value<int>()).ResetAlpha()
-                : Color.FromArgb(79, 84, 92); // default color
-
-            // Get author
-            var author = json["author"] != null ? ParseEmbedAuthor(json["author"]) : null;
-
-            // Get fields
-            var fields = json["fields"].EmptyIfNull().Select(ParseEmbedField).ToArray();
-
-            // Get thumbnail
-            var thumbnail = json["thumbnail"] != null ? ParseEmbedImage(json["thumbnail"]) : null;
-
-            // Get image
-            var image = json["image"] != null ? ParseEmbedImage(json["image"]) : null;
-
-            // Get footer
-            var footer = json["footer"] != null ? ParseEmbedFooter(json["footer"]) : null;
-
-            return new Embed(title, url, timestamp, color, author, description, fields, thumbnail, image, footer);
-        }
-
-        private Emoji ParseEmoji(JToken json)
-        {
-            var id = json["id"]?.Value<string>();
-            var name = json["name"]?.Value<string>();
-            var isAnimated = json["animated"]?.Value<bool>() ?? false;
-
-            return new Emoji(id, name, isAnimated);
-        }
-
-        private Reaction ParseReaction(JToken json)
-        {
-            var count = json["count"].Value<int>();
-            var emoji = ParseEmoji(json["emoji"]);
-
-            return new Reaction(count, emoji);
-        }
-
-        private Message ParseMessage(JToken json)
-        {
-            // Get basic data
-            var id = json["id"].Value<string>();
-            var channelId = json["channel_id"].Value<string>();
-            var timestamp = json["timestamp"].Value<DateTime>();
-            var editedTimestamp = json["edited_timestamp"]?.Value<DateTime?>();
-            var content = json["content"].Value<string>();
-            var type = (MessageType) json["type"].Value<int>();
-
-            // Workarounds for non-default types
-            if (type == MessageType.RecipientAdd)
-                content = "Added a recipient.";
-            else if (type == MessageType.RecipientRemove)
-                content = "Removed a recipient.";
-            else if (type == MessageType.Call)
-                content = "Started a call.";
-            else if (type == MessageType.ChannelNameChange)
-                content = "Changed the channel name.";
-            else if (type == MessageType.ChannelIconChange)
-                content = "Changed the channel icon.";
-            else if (type == MessageType.ChannelPinnedMessage)
-                content = "Pinned a message.";
-            else if (type == MessageType.GuildMemberJoin)
-                content = "Joined the server.";
-
-            // Get author
-            var author = ParseUser(json["author"]);
-
-            // Get attachments
-            var attachments = json["attachments"].EmptyIfNull().Select(ParseAttachment).ToArray();
-
-            // Get embeds
-            var embeds = json["embeds"].EmptyIfNull().Select(ParseEmbed).ToArray();
-
-            // Get reactions
-            var reactions = json["reactions"].EmptyIfNull().Select(ParseReaction).ToArray();
-
-            // Get mentioned users
-            var mentionedUsers = json["mentions"].EmptyIfNull().Select(ParseUser).ToArray();
-
-            return new Message(id, channelId, type, author, timestamp, editedTimestamp, content, attachments, embeds,
-                reactions, mentionedUsers);
-        }
-    }
-}
@@ -1,257 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Exceptions;
-using DiscordChatExporter.Core.Models;
-using Newtonsoft.Json.Linq;
-using DiscordChatExporter.Core.Internal;
-using Failsafe;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class DataService : IDisposable
-    {
-        private readonly HttpClient _httpClient = new HttpClient();
-
-        private async Task<JToken> GetApiResponseAsync(AuthToken token, string resource, string endpoint,
-            params string[] parameters)
-        {
-            // Create retry policy
-            var retry = Retry.Create()
-                .Catch<HttpErrorStatusCodeException>(false, e => e.StatusCode == HttpStatusCode.ServiceUnavailable)
-                .Catch<HttpErrorStatusCodeException>(false, e => (int) e.StatusCode == 429)
-                .WithMaxTryCount(10)
-                .WithDelay(TimeSpan.FromSeconds(0.4));
-
-            // Send request
-            return await retry.ExecuteAsync(async () =>
-            {
-                // Create request
-                const string apiRoot = "https://discordapp.com/api/v6";
-                using (var request = new HttpRequestMessage(HttpMethod.Get, $"{apiRoot}/{resource}/{endpoint}"))
-                {
-                    // Set authorization header
-                    request.Headers.Authorization = token.Type == AuthTokenType.Bot
-                        ? new AuthenticationHeaderValue("Bot", token.Value)
-                        : new AuthenticationHeaderValue(token.Value);
-
-                    // Add parameters
-                    foreach (var parameter in parameters.ExceptBlank())
-                    {
-                        var key = parameter.SubstringUntil("=");
-                        var value = parameter.SubstringAfter("=");
-
-                        // Skip empty values
-                        if (value.IsBlank())
-                            continue;
-
-                        request.RequestUri = request.RequestUri.SetQueryParameter(key, value);
-                    }
-
-                    // Get response
-                    using (var response = await _httpClient.SendAsync(request))
-                    {
-                        // Check status code
-                        // We throw our own exception here because default one doesn't have status code
-                        if (!response.IsSuccessStatusCode)
-                            throw new HttpErrorStatusCodeException(response.StatusCode, response.ReasonPhrase);
-
-                        // Get content
-                        var raw = await response.Content.ReadAsStringAsync();
-
-                        // Parse
-                        return JToken.Parse(raw);
-                    }
-                }
-            });
-        }
-
-        public async Task<Guild> GetGuildAsync(AuthToken token, string guildId)
-        {
-            // Special case for direct messages pseudo-guild
-            if (guildId == Guild.DirectMessages.Id)
-                return Guild.DirectMessages;
-
-            var response = await GetApiResponseAsync(token, "guilds", guildId);
-            var guild = ParseGuild(response);
-
-            return guild;
-        }
-
-        public async Task<Channel> GetChannelAsync(AuthToken token, string channelId)
-        {
-            var response = await GetApiResponseAsync(token, "channels", channelId);
-            var channel = ParseChannel(response);
-
-            return channel;
-        }
-
-        public async Task<IReadOnlyList<Guild>> GetUserGuildsAsync(AuthToken token)
-        {
-            var response = await GetApiResponseAsync(token, "users", "@me/guilds", "limit=100");
-            var guilds = response.Select(ParseGuild).ToArray();
-
-            return guilds;
-        }
-
-        public async Task<IReadOnlyList<Channel>> GetDirectMessageChannelsAsync(AuthToken token)
-        {
-            var response = await GetApiResponseAsync(token, "users", "@me/channels");
-            var channels = response.Select(ParseChannel).ToArray();
-
-            return channels;
-        }
-
-        public async Task<IReadOnlyList<Channel>> GetGuildChannelsAsync(AuthToken token, string guildId)
-        {
-            var response = await GetApiResponseAsync(token, "guilds", $"{guildId}/channels");
-            var channels = response.Select(ParseChannel).ToArray();
-
-            return channels;
-        }
-
-        public async Task<IReadOnlyList<Role>> GetGuildRolesAsync(AuthToken token, string guildId)
-        {
-            var response = await GetApiResponseAsync(token, "guilds", $"{guildId}/roles");
-            var roles = response.Select(ParseRole).ToArray();
-
-            return roles;
-        }
-
-        public async Task<IReadOnlyList<Message>> GetChannelMessagesAsync(AuthToken token, string channelId,
-            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
-        {
-            var result = new List<Message>();
-
-            // Get the last message
-            var response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
-                "limit=1", $"before={to?.ToSnowflake()}");
-            var lastMessage = response.Select(ParseMessage).FirstOrDefault();
-
-            // If the last message doesn't exist or it's outside of range - return
-            if (lastMessage == null || lastMessage.Timestamp < from)
-            {
-                progress?.Report(1);
-                return result;
-            }
-
-            // Get other messages
-            var offsetId = from?.ToSnowflake() ?? "0";
-            while (true)
-            {
-                // Get message batch
-                response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
-                    "limit=100", $"after={offsetId}");
-
-                // Parse
-                var messages = response
-                    .Select(ParseMessage)
-                    .Reverse() // reverse because messages appear newest first
-                    .ToArray();
-
-                // Break if there are no messages (can happen if messages are deleted during execution)
-                if (!messages.Any())
-                    break;
-
-                // Trim messages to range (until last message)
-                var messagesInRange = messages
-                    .TakeWhile(m => m.Id != lastMessage.Id && m.Timestamp < lastMessage.Timestamp)
-                    .ToArray();
-
-                // Add to result
-                result.AddRange(messagesInRange);
-
-                // Break if messages were trimmed (which means the last message was encountered)
-                if (messagesInRange.Length != messages.Length)
-                    break;
-
-                // Report progress (based on the time range of parsed messages compared to total)
-                progress?.Report((result.Last().Timestamp - result.First().Timestamp).TotalSeconds /
-                                 (lastMessage.Timestamp - result.First().Timestamp).TotalSeconds);
-
-                // Move offset
-                offsetId = result.Last().Id;
-            }
-
-            // Add last message
-            result.Add(lastMessage);
-
-            // Report progress
-            progress?.Report(1);
-
-            return result;
-        }
-
-        public async Task<Mentionables> GetMentionablesAsync(AuthToken token, string guildId,
-            IEnumerable<Message> messages)
-        {
-            // Get channels and roles
-            var channels = guildId != Guild.DirectMessages.Id
-                ? await GetGuildChannelsAsync(token, guildId)
-                : Array.Empty<Channel>();
-            var roles = guildId != Guild.DirectMessages.Id
-                ? await GetGuildRolesAsync(token, guildId)
-                : Array.Empty<Role>();
-
-            // Get users
-            var userMap = new Dictionary<string, User>();
-            foreach (var message in messages)
-            {
-                // Author
-                userMap[message.Author.Id] = message.Author;
-
-                // Mentioned users
-                foreach (var mentionedUser in message.MentionedUsers)
-                    userMap[mentionedUser.Id] = mentionedUser;
-            }
-
-            var users = userMap.Values.ToArray();
-
-            return new Mentionables(users, channels, roles);
-        }
-
-        public async Task<ChatLog> GetChatLogAsync(AuthToken token, Guild guild, Channel channel,
-            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
-        {
-            // Get messages
-            var messages = await GetChannelMessagesAsync(token, channel.Id, from, to, progress);
-
-            // Get mentionables
-            var mentionables = await GetMentionablesAsync(token, guild.Id, messages);
-
-            return new ChatLog(guild, channel, from, to, messages, mentionables);
-        }
-
-        public async Task<ChatLog> GetChatLogAsync(AuthToken token, Channel channel,
-            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
-        {
-            // Get guild
-            var guild = channel.GuildId == Guild.DirectMessages.Id
-                ? Guild.DirectMessages
-                : await GetGuildAsync(token, channel.GuildId);
-
-            // Get the chat log
-            return await GetChatLogAsync(token, guild, channel, from, to, progress);
-        }
-
-        public async Task<ChatLog> GetChatLogAsync(AuthToken token, string channelId,
-            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
-        {
-            // Get channel
-            var channel = await GetChannelAsync(token, channelId);
-
-            // Get the chat log
-            return await GetChatLogAsync(token, channel, from, to, progress);
-        }
-
-        public void Dispose()
-        {
-            _httpClient.Dispose();
-        }
-    }
-}
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private class MessageGroup
-        {
-            public User Author { get; }
-
-            public DateTime Timestamp { get; }
-
-            public IReadOnlyList<Message> Messages { get; }
-
-            public MessageGroup(User author, DateTime timestamp, IReadOnlyList<Message> messages)
-            {
-                Author = author;
-                Timestamp = timestamp;
-                Messages = messages;
-            }
-        }
-    }
-}
@@ -1,37 +0,0 @@
-using System.Reflection;
-using DiscordChatExporter.Core.Models;
-using Scriban;
-using Scriban.Parsing;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private class TemplateLoader : ITemplateLoader
-        {
-            private const string ResourceRootNamespace = "DiscordChatExporter.Core.Resources.ExportTemplates";
-
-            public string GetPath(TemplateContext context, SourceSpan callerSpan, string templateName)
-            {
-                return $"{ResourceRootNamespace}.{templateName}";
-            }
-
-            public string GetPath(ExportFormat format)
-            {
-                return $"{ResourceRootNamespace}.{format}.Template.{format.GetFileExtension()}";
-            }
-
-            public string Load(TemplateContext context, SourceSpan callerSpan, string templatePath)
-            {
-                return Assembly.GetExecutingAssembly().GetManifestResourceString(templatePath);
-            }
-
-            public string Load(ExportFormat format)
-            {
-                return Assembly.GetExecutingAssembly().GetManifestResourceString(GetPath(format));
-            }
-        }
-    }
-}
@@ -1,254 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using DiscordChatExporter.Core.Internal;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Models;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private class TemplateModel
-        {
-            private readonly ExportFormat _format;
-            private readonly ChatLog _log;
-            private readonly string _dateFormat;
-            private readonly int _messageGroupLimit;
-
-            public TemplateModel(ExportFormat format, ChatLog log, string dateFormat, int messageGroupLimit)
-            {
-                _format = format;
-                _log = log;
-                _dateFormat = dateFormat;
-                _messageGroupLimit = messageGroupLimit;
-            }
-
-            private IEnumerable<MessageGroup> GroupMessages(IEnumerable<Message> messages)
-            {
-                // Group adjacent messages by timestamp and author
-                var buffer = new List<Message>();
-                foreach (var message in messages)
-                {
-                    // Get first message of the group
-                    var groupFirstMessage = buffer.FirstOrDefault();
-
-                    // Group break condition
-                    var breakCondition =
-                        groupFirstMessage != null &&
-                        (
-                            message.Author.Id != groupFirstMessage.Author.Id || // when author changes
-                            (message.Timestamp - groupFirstMessage.Timestamp).TotalHours > 1 || // when difference in timestamps is an hour or more
-                            message.Timestamp.Hour != groupFirstMessage.Timestamp.Hour || // when the timestamp's hour changes
-                            buffer.Count >= _messageGroupLimit // when group is full
-                        );
-
-                    // If condition is true - flush buffer
-                    if (breakCondition)
-                    {
-                        var group = new MessageGroup(groupFirstMessage.Author, groupFirstMessage.Timestamp, buffer);
-
-                        // Reset the buffer instead of clearing to avoid mutations on existing references
-                        buffer = new List<Message>();
-
-                        yield return group;
-                    }
-
-                    // Add message to buffer
-                    buffer.Add(message);
-                }
-
-                // Add what's remaining in buffer
-                if (buffer.Any())
-                {
-                    var groupFirstMessage = buffer.First();
-                    var group = new MessageGroup(groupFirstMessage.Author, groupFirstMessage.Timestamp, buffer);
-
-                    yield return group;
-                }
-            }
-
-            private string Format(IFormattable obj, string format) =>
-                obj.ToString(format, CultureInfo.InvariantCulture);
-
-            private string FormatDate(DateTime dateTime) => Format(dateTime, _dateFormat);
-
-            private string FormatMarkdownPlainText(IReadOnlyList<Node> nodes)
-            {
-                var buffer = new StringBuilder();
-
-                foreach (var node in nodes)
-                {
-                    if (node is FormattedNode formattedNode)
-                    {
-                        var innerText = FormatMarkdownPlainText(formattedNode.Children);
-                        buffer.Append($"{formattedNode.Token}{innerText}{formattedNode.Token}");
-                    }
-
-                    else if (node is MentionNode mentionNode && mentionNode.Type != MentionType.Meta)
-                    {
-                        if (mentionNode.Type == MentionType.User)
-                        {
-                            var user = _log.Mentionables.GetUser(mentionNode.Id);
-                            buffer.Append($"@{user.Name}");
-                        }
-
-                        else if (mentionNode.Type == MentionType.Channel)
-                        {
-                            var channel = _log.Mentionables.GetChannel(mentionNode.Id);
-                            buffer.Append($"#{channel.Name}");
-                        }
-
-                        else if (mentionNode.Type == MentionType.Role)
-                        {
-                            var role = _log.Mentionables.GetRole(mentionNode.Id);
-                            buffer.Append($"@{role.Name}");
-                        }
-                    }
-
-                    else if (node is EmojiNode emojiNode)
-                    {
-                        buffer.Append(emojiNode.IsCustomEmoji ? $":{emojiNode.Name}:" : node.Lexeme);
-                    }
-
-                    else
-                    {
-                        buffer.Append(node.Lexeme);
-                    }
-                }
-
-                return buffer.ToString();
-            }
-
-            private string FormatMarkdownPlainText(string input)
-                => FormatMarkdownPlainText(MarkdownParser.Parse(input));
-
-            private string FormatMarkdownHtml(IReadOnlyList<Node> nodes, int depth = 0)
-            {
-                var buffer = new StringBuilder();
-
-                foreach (var node in nodes)
-                {
-                    if (node is TextNode textNode)
-                    {
-                        buffer.Append(textNode.Text.HtmlEncode());
-                    }
-
-                    else if (node is FormattedNode formattedNode)
-                    {
-                        var innerHtml = FormatMarkdownHtml(formattedNode.Children, depth + 1);
-
-                        if (formattedNode.Formatting == TextFormatting.Bold)
-                            buffer.Append($"<strong>{innerHtml}</strong>");
-
-                        else if (formattedNode.Formatting == TextFormatting.Italic)
-                            buffer.Append($"<em>{innerHtml}</em>");
-
-                        else if (formattedNode.Formatting == TextFormatting.Underline)
-                            buffer.Append($"<u>{innerHtml}</u>");
-
-                        else if (formattedNode.Formatting == TextFormatting.Strikethrough)
-                            buffer.Append($"<s>{innerHtml}</s>");
-
-                        else if (formattedNode.Formatting == TextFormatting.Spoiler)
-                            buffer.Append($"<span class=\"spoiler\">{innerHtml}</span>");
-                    }
-
-                    else if (node is InlineCodeBlockNode inlineCodeBlockNode)
-                    {
-                        buffer.Append($"<span class=\"pre pre--inline\">{inlineCodeBlockNode.Code.HtmlEncode()}</span>");
-                    }
-
-                    else if (node is MultilineCodeBlockNode multilineCodeBlockNode)
-                    {
-                        // Set language class for syntax highlighting
-                        var languageCssClass = multilineCodeBlockNode.Language.IsNotBlank()
-                            ? "language-" + multilineCodeBlockNode.Language
-                            : null;
-
-                        buffer.Append(
-                            $"<div class=\"pre pre--multiline {languageCssClass}\">{multilineCodeBlockNode.Code.HtmlEncode()}</div>");
-                    }
-
-                    else if (node is MentionNode mentionNode)
-                    {
-                        if (mentionNode.Type == MentionType.Meta)
-                        {
-                            buffer.Append($"<span class=\"mention\">@{mentionNode.Id.HtmlEncode()}</span>");
-                        }
-
-                        else if (mentionNode.Type == MentionType.User)
-                        {
-                            var user = _log.Mentionables.GetUser(mentionNode.Id);
-                            buffer.Append($"<span class=\"mention\" title=\"{user.FullName}\">@{user.Name.HtmlEncode()}</span>");
-                        }
-
-                        else if (mentionNode.Type == MentionType.Channel)
-                        {
-                            var channel = _log.Mentionables.GetChannel(mentionNode.Id);
-                            buffer.Append($"<span class=\"mention\">#{channel.Name.HtmlEncode()}</span>");
-                        }
-
-                        else if (mentionNode.Type == MentionType.Role)
-                        {
-                            var role = _log.Mentionables.GetRole(mentionNode.Id);
-                            buffer.Append($"<span class=\"mention\">@{role.Name.HtmlEncode()}</span>");
-                        }
-                    }
-
-                    else if (node is EmojiNode emojiNode)
-                    {
-                        // Get emoji image URL
-                        var emojiImageUrl = new Emoji(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated).ImageUrl;
-
-                        // Emoji can be jumboable if it's the only top-level node
-                        var jumboableCssClass = depth == 0 && nodes.Count == 1
-                            ? "emoji--large"
-                            : null;
-
-                        buffer.Append($"<img class=\"emoji {jumboableCssClass}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />");
-                    }
-
-                    else if (node is LinkNode linkNode)
-                    {
-                        var escapedUrl = Uri.EscapeUriString(linkNode.Url);
-                        buffer.Append($"<a href=\"{escapedUrl}\">{linkNode.Title.HtmlEncode()}</a>");
-                    }
-                }
-
-                return buffer.ToString();
-            }
-
-            private string FormatMarkdownHtml(string input) 
-                => FormatMarkdownHtml(MarkdownParser.Parse(input));
-
-            private string FormatMarkdown(string input)
-            {
-                return _format == ExportFormat.HtmlDark || _format == ExportFormat.HtmlLight
-                    ? FormatMarkdownHtml(input)
-                    : FormatMarkdownPlainText(input);
-            }
-
-            public ScriptObject GetScriptObject()
-            {
-                // Create instance
-                var scriptObject = new ScriptObject();
-
-                // Import model
-                scriptObject.SetValue("Model", _log, true);
-
-                // Import functions
-                scriptObject.Import(nameof(GroupMessages), new Func<IEnumerable<Message>, IEnumerable<MessageGroup>>(GroupMessages));
-                scriptObject.Import(nameof(Format), new Func<IFormattable, string, string>(Format));
-                scriptObject.Import(nameof(FormatDate), new Func<DateTime, string>(FormatDate));
-                scriptObject.Import(nameof(FormatMarkdown), new Func<string, string>(FormatMarkdown));
-
-                return scriptObject;
-            }
-        }
-    }
-}
@@ -1,130 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using DiscordChatExporter.Core.Models;
-using Scriban;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private readonly SettingsService _settingsService;
-
-        public ExportService(SettingsService settingsService)
-        {
-            _settingsService = settingsService;
-        }
-
-        private void ExportChatLogSingle(ChatLog chatLog, string filePath, ExportFormat format)
-        {
-            // Create template loader
-            var loader = new TemplateLoader();
-
-            // Get template
-            var templateCode = loader.Load(format);
-            var template = Template.Parse(templateCode);
-
-            // Create template context
-            var context = new TemplateContext
-            {
-                TemplateLoader = loader,
-                MemberRenamer = m => m.Name,
-                MemberFilter = m => true,
-                LoopLimit = int.MaxValue,
-                StrictVariables = true
-            };
-
-            // Create template model
-            var templateModel = new TemplateModel(format, chatLog,
-                _settingsService.DateFormat, _settingsService.MessageGroupLimit);
-
-            context.PushGlobal(templateModel.GetScriptObject());
-
-            // Create directory
-            var dirPath = Path.GetDirectoryName(filePath);
-            if (dirPath.IsNotBlank())
-                Directory.CreateDirectory(dirPath);
-
-            // Render output
-            using (var output = File.CreateText(filePath))
-            {
-                // Configure output
-                context.PushOutput(new TextWriterOutput(output));
-
-                // Render output
-                context.Evaluate(template.Page);
-            }
-        }
-
-        private void ExportChatLogPartitioned(IReadOnlyList<ChatLog> partitions, string filePath, ExportFormat format)
-        {
-            // Split file path into components
-            var dirPath = Path.GetDirectoryName(filePath);
-            var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
-            var fileExt = Path.GetExtension(filePath);
-
-            // Export each partition separately
-            var partitionNumber = 1;
-            foreach (var partition in partitions)
-            {
-                // Compose new file name
-                var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Count}]{fileExt}";
-
-                // Compose full file path
-                if (dirPath.IsNotBlank())
-                    partitionFilePath = Path.Combine(dirPath, partitionFilePath);
-
-                // Export
-                ExportChatLogSingle(partition, partitionFilePath, format);
-
-                // Increment partition number
-                partitionNumber++;
-            }
-        }
-
-        private IReadOnlyList<ChatLog> SplitIntoPartitions(ChatLog chatLog, int partitionLimit)
-        {
-            var result = new List<ChatLog>();
-
-            // Loop through all messages with an increment of partition limit
-            for (var i = 0; i < chatLog.Messages.Count; i += partitionLimit)
-            {
-                // Calculate how many messages left in total
-                var remainingMessageCount = chatLog.Messages.Count - i;
-
-                // Decide how many messages are going into this partition
-                // Each partition will have the same number of messages except the last one that might have fewer (all remaining messages)
-                var partitionMessageCount = partitionLimit.ClampMax(remainingMessageCount);
-
-                // Get messages that belong to this partition
-                var partitionMessages = new List<Message>();
-                for (var j = i; j < i + partitionMessageCount; j++)
-                    partitionMessages.Add(chatLog.Messages[j]);
-
-                // Create a partition and add to list
-                var partition = new ChatLog(chatLog.Guild, chatLog.Channel, chatLog.From, chatLog.To, partitionMessages,
-                    chatLog.Mentionables);
-                result.Add(partition);
-            }
-
-            return result;
-        }
-
-        public void ExportChatLog(ChatLog chatLog, string filePath, ExportFormat format,
-            int? partitionLimit = null)
-        {
-            // If partitioning is disabled or there are fewer messages in chat log than the limit - process it without partitioning
-            if (partitionLimit == null || partitionLimit <= 0 || chatLog.Messages.Count <= partitionLimit)
-            {
-                ExportChatLogSingle(chatLog, filePath, format);
-            }
-            // Otherwise split into partitions and export separately
-            else
-            {
-                var partitions = SplitIntoPartitions(chatLog, partitionLimit.Value);
-                ExportChatLogPartitioned(partitions, filePath, format);
-            }
-        }
-    }
-}
@@ -1,60 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Onova;
-using Onova.Services;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public class UpdateService
-    {
-        private readonly SettingsService _settingsService;
-
-        private readonly IUpdateManager _updateManager = new UpdateManager(
-            new GithubPackageResolver("Tyrrrz", "DiscordChatExporter", "DiscordChatExporter.zip"),
-            new ZipPackageExtractor());
-
-        private Version _updateVersion;
-        private bool _updaterLaunched;
-
-        public UpdateService(SettingsService settingsService)
-        {
-            _settingsService = settingsService;
-        }
-
-        public async Task<Version> CheckPrepareUpdateAsync()
-        {
-            // If auto-update is disabled - don't check for updates
-            if (!_settingsService.IsAutoUpdateEnabled)
-                return null;
-
-            // Cleanup leftover files
-            _updateManager.Cleanup();
-
-            // Check for updates
-            var check = await _updateManager.CheckForUpdatesAsync();
-            if (!check.CanUpdate)
-                return null;
-
-            // Prepare the update
-            if (!_updateManager.IsUpdatePrepared(check.LastVersion))
-                await _updateManager.PrepareUpdateAsync(check.LastVersion);
-
-            return _updateVersion = check.LastVersion;
-        }
-
-        public void FinalizeUpdate(bool needRestart)
-        {
-            // Check if an update is pending
-            if (_updateVersion == null)
-                return;
-
-            // Check if the updater has already been launched
-            if (_updaterLaunched)
-                return;
-
-            // Launch the updater
-            _updateManager.LaunchUpdater(_updateVersion, needRestart);
-            _updaterLaunched = true;
-        }
-    }
-}
@@ -0,0 +1,27 @@
+using System.Net.Http.Headers;
+
+namespace DiscordChatExporter.Domain.Discord
+{
+    public enum AuthTokenType { User, Bot }
+
+    public class AuthToken
+    {
+        public AuthTokenType Type { get; }
+
+        public string Value { get; }
+
+        public AuthToken(AuthTokenType type, string value)
+        {
+            Type = type;
+            Value = value;
+        }
+
+        public AuthenticationHeaderValue GetAuthorizationHeader() => Type switch
+        {
+            AuthTokenType.Bot => new AuthenticationHeaderValue("Bot", Value),
+            _ => new AuthenticationHeaderValue(Value)
+        };
+
+        public override string ToString() => Value;
+    }
+}
@@ -0,0 +1,273 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Exceptions;
+using DiscordChatExporter.Domain.Internal;
+using DiscordChatExporter.Domain.Utilities;
+using JsonExtensions.Http;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Domain.Discord
+{
+    public class DiscordClient
+    {
+        private readonly HttpClient _httpClient;
+        private readonly AuthToken _token;
+
+        private readonly Uri _baseUri = new("https://discord.com/api/v8/", UriKind.Absolute);
+
+        public DiscordClient(HttpClient httpClient, AuthToken token)
+        {
+            _httpClient = httpClient;
+            _token = token;
+        }
+
+        public DiscordClient(AuthToken token)
+            : this(Http.Client, token) {}
+
+        private async ValueTask<HttpResponseMessage> GetResponseAsync(string url) =>
+            await Http.ResponsePolicy.ExecuteAsync(async () =>
+            {
+                using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
+                request.Headers.Authorization = _token.GetAuthorizationHeader();
+
+                return await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+            });
+
+        private async ValueTask<JsonElement> GetJsonResponseAsync(string url)
+        {
+            using var response = await GetResponseAsync(url);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                throw response.StatusCode switch
+                {
+                    HttpStatusCode.Unauthorized => DiscordChatExporterException.Unauthorized(),
+                    HttpStatusCode.Forbidden => DiscordChatExporterException.Forbidden(),
+                    HttpStatusCode.NotFound => DiscordChatExporterException.NotFound(),
+                    _ => DiscordChatExporterException.FailedHttpRequest(response)
+                };
+            }
+
+            return await response.Content.ReadAsJsonAsync();
+        }
+
+        private async ValueTask<JsonElement?> TryGetJsonResponseAsync(string url)
+        {
+            using var response = await GetResponseAsync(url);
+
+            return response.IsSuccessStatusCode
+                ? await response.Content.ReadAsJsonAsync()
+                : (JsonElement?) null;
+        }
+
+        public async IAsyncEnumerable<Guild> GetUserGuildsAsync()
+        {
+            yield return Guild.DirectMessages;
+
+            var currentAfter = Snowflake.Zero;
+
+            while (true)
+            {
+                var url = new UrlBuilder()
+                    .SetPath("users/@me/guilds")
+                    .SetQueryParameter("limit", "100")
+                    .SetQueryParameter("after", currentAfter.ToString())
+                    .Build();
+
+                var response = await GetJsonResponseAsync(url);
+
+                var isEmpty = true;
+                foreach (var guild in response.EnumerateArray().Select(Guild.Parse))
+                {
+                    yield return guild;
+
+                    currentAfter = guild.Id;
+                    isEmpty = false;
+                }
+
+                if (isEmpty)
+                    yield break;
+            }
+        }
+
+        public async ValueTask<Guild> GetGuildAsync(Snowflake guildId)
+        {
+            if (guildId == Guild.DirectMessages.Id)
+                return Guild.DirectMessages;
+
+            var response = await GetJsonResponseAsync($"guilds/{guildId}");
+            return Guild.Parse(response);
+        }
+
+        public async IAsyncEnumerable<Channel> GetGuildChannelsAsync(Snowflake guildId)
+        {
+            if (guildId == Guild.DirectMessages.Id)
+            {
+                var response = await GetJsonResponseAsync("users/@me/channels");
+                foreach (var channelJson in response.EnumerateArray())
+                    yield return Channel.Parse(channelJson);
+            }
+            else
+            {
+                var response = await GetJsonResponseAsync($"guilds/{guildId}/channels");
+
+                var orderedResponse = response
+                    .EnumerateArray()
+                    .OrderBy(j => j.GetProperty("position").GetInt32())
+                    .ThenBy(j => ulong.Parse(j.GetProperty("id").GetString()));
+
+                var categories = orderedResponse
+                    .Where(j => j.GetProperty("type").GetInt32() == (int)ChannelType.GuildCategory)
+                    .Select((j, index) => ChannelCategory.Parse(j, index + 1))
+                    .ToDictionary(j => j.Id.ToString());
+
+                var position = 0;
+
+                foreach (var channelJson in orderedResponse)
+                {
+                    var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetString();
+                    var category = !string.IsNullOrWhiteSpace(parentId)
+                        ? categories.GetValueOrDefault(parentId)
+                        : null;
+                    
+                    var channel = Channel.Parse(channelJson, category, position);
+
+                    // Skip non-text channels
+                    if (!channel.IsTextChannel)
+                        continue;
+
+                    position++;
+
+                    yield return channel;
+                }
+            }
+        }
+
+        public async IAsyncEnumerable<Role> GetGuildRolesAsync(Snowflake guildId)
+        {
+            if (guildId == Guild.DirectMessages.Id)
+                yield break;
+
+            var response = await GetJsonResponseAsync($"guilds/{guildId}/roles");
+
+            foreach (var roleJson in response.EnumerateArray())
+                yield return Role.Parse(roleJson);
+        }
+
+        public async ValueTask<Member?> TryGetGuildMemberAsync(Snowflake guildId, User user)
+        {
+            if (guildId == Guild.DirectMessages.Id)
+                return Member.CreateForUser(user);
+
+            var response = await TryGetJsonResponseAsync($"guilds/{guildId}/members/{user.Id}");
+            return response?.Pipe(Member.Parse);
+        }
+
+        public async ValueTask<ChannelCategory> GetChannelCategoryAsync(Snowflake channelId)
+        {
+            try
+            {
+                var response = await GetJsonResponseAsync($"channels/{channelId}");
+                return ChannelCategory.Parse(response);
+            }
+            /***
+             * In some cases, the Discord API returns an empty body when requesting some channel category info.
+             * Instead, we use an empty channel category as a fallback.
+             */
+            catch (DiscordChatExporterException)
+            {
+                return ChannelCategory.Empty;
+            }
+
+        }
+
+        public async ValueTask<Channel> GetChannelAsync(Snowflake channelId)
+        {
+            var response = await GetJsonResponseAsync($"channels/{channelId}");
+
+            var parentId = response.GetPropertyOrNull("parent_id")?.GetString().Pipe(Snowflake.Parse);
+
+            var category = parentId != null
+                ? await GetChannelCategoryAsync(parentId.Value)
+                : null;
+
+            return Channel.Parse(response, category);
+        }
+
+        private async ValueTask<Message?> TryGetLastMessageAsync(Snowflake channelId, Snowflake? before = null)
+        {
+            var url = new UrlBuilder()
+                .SetPath($"channels/{channelId}/messages")
+                .SetQueryParameter("limit", "1")
+                .SetQueryParameter("before", before?.ToString())
+                .Build();
+
+            var response = await GetJsonResponseAsync(url);
+            return response.EnumerateArray().Select(Message.Parse).LastOrDefault();
+        }
+
+        public async IAsyncEnumerable<Message> GetMessagesAsync(
+            Snowflake channelId,
+            Snowflake? after = null,
+            Snowflake? before = null,
+            IProgress<double>? progress = null)
+        {
+            // Get the last message in the specified range.
+            // This snapshots the boundaries, which means that messages posted after the exported started
+            // will not appear in the output.
+            // Additionally, it provides the date of the last message, which is used to calculate progress.
+            var lastMessage = await TryGetLastMessageAsync(channelId, before);
+            if (lastMessage == null || lastMessage.Timestamp < after?.ToDate())
+                yield break;
+
+            // Keep track of first message in range in order to calculate progress
+            var firstMessage = default(Message);
+            var currentAfter = after ?? Snowflake.Zero;
+
+            while (true)
+            {
+                var url = new UrlBuilder()
+                    .SetPath($"channels/{channelId}/messages")
+                    .SetQueryParameter("limit", "100")
+                    .SetQueryParameter("after", currentAfter.ToString())
+                    .Build();
+
+                var response = await GetJsonResponseAsync(url);
+
+                var messages = response
+                    .EnumerateArray()
+                    .Select(Message.Parse)
+                    .Reverse() // reverse because messages appear newest first
+                    .ToArray();
+
+                // Break if there are no messages (can happen if messages are deleted during execution)
+                if (!messages.Any())
+                    yield break;
+
+                foreach (var message in messages)
+                {
+                    firstMessage ??= message;
+
+                    // Ensure messages are in range (take into account that last message could have been deleted)
+                    if (message.Timestamp > lastMessage.Timestamp)
+                        yield break;
+
+                    // Report progress based on the duration of parsed messages divided by total
+                    progress?.Report(
+                        (message.Timestamp - firstMessage.Timestamp) /
+                        (lastMessage.Timestamp - firstMessage.Timestamp)
+                    );
+
+                    yield return message;
+                    currentAfter = message.Id;
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Utilities;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/channel#attachment-object
+    public partial class Attachment : IHasId
+    {
+        public Snowflake Id { get; }
+
+        public string Url { get; }
+
+        public string FileName { get; }
+
+        public int? Width { get; }
+
+        public int? Height { get; }
+
+        public bool IsImage => ImageFileExtensions.Contains(Path.GetExtension(FileName));
+
+        public bool IsVideo => VideoFileExtensions.Contains(Path.GetExtension(FileName));
+
+        public bool IsAudio => AudioFileExtensions.Contains(Path.GetExtension(FileName));
+
+        public bool IsSpoiler =>
+            (IsImage || IsVideo || IsAudio) && FileName.StartsWith("SPOILER_", StringComparison.Ordinal);
+
+        public FileSize FileSize { get; }
+
+        public Attachment(Snowflake id, string url, string fileName, int? width, int? height, FileSize fileSize)
+        {
+            Id = id;
+            Url = url;
+            FileName = fileName;
+            Width = width;
+            Height = height;
+            FileSize = fileSize;
+        }
+
+        public override string ToString() => FileName;
+    }
+
+    public partial class Attachment
+    {
+        private static readonly HashSet<string> ImageFileExtensions = new(StringComparer.OrdinalIgnoreCase)
+            {".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp"};
+
+        private static readonly HashSet<string> VideoFileExtensions = new(StringComparer.OrdinalIgnoreCase)
+            {".mp4", ".webm"};
+
+        private static readonly HashSet<string> AudioFileExtensions = new(StringComparer.OrdinalIgnoreCase)
+            {".mp3", ".wav", ".ogg", ".flac", ".m4a"};
+
+        public static Attachment Parse(JsonElement json)
+        {
+            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+            var url = json.GetProperty("url").GetString();
+            var width = json.GetPropertyOrNull("width")?.GetInt32();
+            var height = json.GetPropertyOrNull("height")?.GetInt32();
+            var fileName = json.GetProperty("filename").GetString();
+            var fileSize = json.GetProperty("size").GetInt64().Pipe(FileSize.FromBytes);
+
+            return new Attachment(id, url, fileName, width, height, fileSize);
+        }
+    }
+}
@@ -0,0 +1,105 @@
+using System;
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Utilities;
+using JsonExtensions.Reading;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // 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 ChannelType
+    {
+        GuildTextChat,
+        DirectTextChat,
+        GuildVoiceChat,
+        DirectGroupTextChat,
+        GuildCategory,
+        GuildNews,
+        GuildStore
+    }
+
+    // https://discord.com/developers/docs/resources/channel#channel-object
+    public partial class Channel : IHasIdAndPosition
+    {
+        public Snowflake Id { get; }
+
+        public ChannelType Type { get; }
+
+        public bool IsTextChannel =>
+            Type == ChannelType.GuildTextChat ||
+            Type == ChannelType.DirectTextChat ||
+            Type == ChannelType.DirectGroupTextChat ||
+            Type == ChannelType.GuildNews ||
+            Type == ChannelType.GuildStore;
+
+        public Snowflake GuildId { get; }
+
+        public ChannelCategory Category { get; }
+
+        public string Name { get; }
+
+        public int? Position { get; }
+
+        public string? Topic { get; }
+
+        public Channel(Snowflake id, ChannelType type, Snowflake guildId, ChannelCategory? category, string name, int? position, string? topic)
+        {
+            Id = id;
+            Type = type;
+            GuildId = guildId;
+            Category = category ?? GetDefaultCategory(type);
+            Name = name;
+            Position = position;
+            Topic = topic;
+        }
+
+        public override string ToString() => Name;
+
+    }
+
+    public partial class Channel
+    {
+        private static ChannelCategory GetDefaultCategory(ChannelType channelType) => new(
+                Snowflake.Zero,
+                channelType switch
+                {
+                    ChannelType.GuildTextChat => "Text",
+                    ChannelType.DirectTextChat => "Private",
+                    ChannelType.DirectGroupTextChat => "Group",
+                    ChannelType.GuildNews => "News",
+                    ChannelType.GuildStore => "Store",
+                    _ => "Default"
+                },
+                0
+            );
+
+        public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? position = null)
+        {
+            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+            var guildId = json.GetPropertyOrNull("guild_id")?.GetString().Pipe(Snowflake.Parse);
+            var topic = json.GetPropertyOrNull("topic")?.GetString();
+
+            var type = (ChannelType)json.GetProperty("type").GetInt32();
+
+            var name =
+                json.GetPropertyOrNull("name")?.GetString() ??
+                json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name).JoinToString(", ") ??
+                id.ToString();
+
+            position ??= json.GetPropertyOrNull("position")?.GetInt32();
+
+            return new Channel(
+                id,
+                type,
+                guildId ?? Guild.DirectMessages.Id,
+                category ?? GetDefaultCategory(type),
+                name,
+                position,
+                topic
+            );
+        }
+    }
+}
@@ -0,0 +1,50 @@
+using System;
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Utilities;
+using JsonExtensions.Reading;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    public partial class ChannelCategory : IHasIdAndPosition
+    {
+        public Snowflake Id { get; }
+
+        public string Name { get; }
+
+        public int? Position { get; }
+
+        public ChannelCategory(Snowflake id, string name, int? position)
+        {
+            Id = id;
+            Name = name;
+            Position = position;
+        }
+
+        public override string ToString() => Name;
+
+    }
+
+    public partial class ChannelCategory
+    {
+        public static ChannelCategory Parse(JsonElement json, int? position = null)
+        {
+            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+            position ??= json.GetPropertyOrNull("position")?.GetInt32();
+
+            var name = json.GetPropertyOrNull("name")?.GetString() ??
+                json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name).JoinToString(", ") ??
+                id.ToString();
+
+            return new ChannelCategory(
+                id,
+                name,
+                position
+            );
+        }
+
+        public static ChannelCategory Empty { get; } = new(Snowflake.Zero, "Missing", 0);
+    }
+}
@@ -0,0 +1,65 @@
+using System;
+
+namespace DiscordChatExporter.Domain.Discord.Models.Common
+{
+    // Loosely based on https://github.com/omar/ByteSize (MIT license)
+    public readonly partial struct FileSize
+    {
+        public long TotalBytes { get; }
+
+        public double TotalKiloBytes => TotalBytes / 1024.0;
+        public double TotalMegaBytes => TotalKiloBytes / 1024.0;
+        public double TotalGigaBytes => TotalMegaBytes / 1024.0;
+        public double TotalTeraBytes => TotalGigaBytes / 1024.0;
+        public double TotalPetaBytes => TotalTeraBytes / 1024.0;
+
+        public FileSize(long bytes) => TotalBytes = bytes;
+
+        private double GetLargestWholeNumberValue()
+        {
+            if (Math.Abs(TotalPetaBytes) >= 1)
+                return TotalPetaBytes;
+
+            if (Math.Abs(TotalTeraBytes) >= 1)
+                return TotalTeraBytes;
+
+            if (Math.Abs(TotalGigaBytes) >= 1)
+                return TotalGigaBytes;
+
+            if (Math.Abs(TotalMegaBytes) >= 1)
+                return TotalMegaBytes;
+
+            if (Math.Abs(TotalKiloBytes) >= 1)
+                return TotalKiloBytes;
+
+            return TotalBytes;
+        }
+
+        private string GetLargestWholeNumberSymbol()
+        {
+            if (Math.Abs(TotalPetaBytes) >= 1)
+                return "PB";
+
+            if (Math.Abs(TotalTeraBytes) >= 1)
+                return "TB";
+
+            if (Math.Abs(TotalGigaBytes) >= 1)
+                return "GB";
+
+            if (Math.Abs(TotalMegaBytes) >= 1)
+                return "MB";
+
+            if (Math.Abs(TotalKiloBytes) >= 1)
+                return "KB";
+
+            return "bytes";
+        }
+
+        public override string ToString() => $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}";
+    }
+
+    public partial struct FileSize
+    {
+        public static FileSize FromBytes(long bytes) => new(bytes);
+    }
+}
--- a/Show More
+++ b/Show More