Update version

Update NuGet packages
Add wiki to issue templates
2026-07-07 06:39:33 +02:00 · 2021-04-24 21:26:49 +03:00 · 2021-04-24 21:08:57 +03:00 · 2021-04-22 21:48:45 +03:00 · 2021-04-22 21:47:05 +03:00 · 2021-04-22 21:40:47 +03:00
199 changed files with 5947 additions and 4305 deletions
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "xamlstyler.console": {
-      "version": "3.2001.0",
+      "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,42 @@
+name: "\U0001F41E Bug report"
+description: Report broken functionality.
+labels: [bug]
+body:
+- type: markdown
+  attributes:
+    value: |
+      - Please check existing issues (both opened and closed) to ensure that this bug hasn't been reported before.
+      - Refer to the [contribution guidelines](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Contributing.md) for info on how to file a good issue.
+      - If you want to ask a question instead of reporting a bug, use [**discussions**](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) instead.
+
+- type: input
+  attributes:
+    label: Version
+    description: "Which version(s) of DiscordChatExporter does this bug affect?"
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Flavor
+    description: "Which flavor(s) of DiscordChatExporter does this bug affect?"
+    multiple: true
+    options:
+    - GUI (Graphical User Interface)
+    - CLI (Command Line Interface)
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Details
+    description: "Clear and thorough explanation of the bug. If relevant, include screenshots or screen recordings."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: "Minimum steps required to reproduce the bug."
+  validations:
+    required: true
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: "\U0001F4D6 Read the wiki"
+    url: https://github.com/Tyrrrz/DiscordChatExporter/wiki
+    about: Find answers to most common questions.
+  - name: "\U0001F5E8 Ask a question"
+    url: https://github.com/Tyrrrz/DiscordChatExporter/discussions/new
+    about: Please ask and answer questions here.
@@ -0,0 +1,26 @@
+name: "\U00002728 Feature request"
+description: Request a new feature.
+labels: [enhancement]
+body:
+- type: markdown
+  attributes:
+    value: |
+      - Please check existing issues (both opened and closed) to ensure that this feature hasn't been requested before.
+      - Refer to the [contribution guidelines](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Contributing.md) for info on how to file a good issue.
+      - If you want to ask a question instead of requesting a feature, use [**discussions**](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) instead.
+
+- type: dropdown
+  attributes:
+    label: Flavor
+    description: "Which flavor(s) of DiscordChatExporter does this feature request apply to?"
+    multiple: true
+    options:
+    - GUI (Graphical User Interface)
+    - CLI (Command Line Interface)
+
+- type: textarea
+  attributes:
+    label: Details
+    description: "Clear and thorough explanation of the feature you have in mind."
+  validations:
+    required: true
@@ -3,64 +3,69 @@ name: CD
 on:
  push:
    tags:
-    - '*'
+      - "*"

 jobs:
  build:
    runs-on: windows-latest

    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2.3.3

-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v1.4.0
-      with:
-        dotnet-version: 3.1.100
+      - name: Install .NET (v3.1)
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: 3.1.x

-    - name: Build & publish (CLI)
-      run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
+      - name: Install .NET (v5.0)
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: 5.0.x

-    - name: Build & publish (GUI)
-      run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release
+      - name: Build & publish (CLI)
+        run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/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: Build & publish (GUI)
+        run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release

-    - name: Pack (GUI)
-      run: Compress-Archive -Path DiscordChatExporter.Gui/bin/Publish/* -DestinationPath DiscordChatExporter.Gui/bin/Publish/Archive.zip -Force
-      shell: pwsh
+      - name: Pack (CLI)
+        run: Compress-Archive -Path DiscordChatExporter.Cli/bin/Publish/* -DestinationPath DiscordChatExporter.Cli/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: Pack (GUI)
+        run: Compress-Archive -Path DiscordChatExporter.Gui/bin/Publish/* -DestinationPath DiscordChatExporter.Gui/bin/Publish/Archive.zip -Force
+        shell: pwsh

-    - 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: 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 (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
+      - 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
@@ -7,28 +7,33 @@ jobs:
    runs-on: windows-latest

    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2.3.3

-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v1.4.0
-      with:
-        dotnet-version: 3.1.100
+      - name: Install .NET (v3.1)
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: 3.1.x

-    - name: Build & publish (CLI)
-      run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
+      - name: Install .NET (v5.0)
+        uses: actions/setup-dotnet@v1.7.2
+        with:
+          dotnet-version: 5.0.x

-    - name: Build & publish (GUI)
-      run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release
+      - name: Build & publish (CLI)
+        run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release

-    - name: Upload build artifacts (CLI)
-      uses: actions/upload-artifact@v1
-      with:
-        name: DiscordChatExporter.CLI
-        path: DiscordChatExporter.Cli/bin/Publish/
+      - name: Build & publish (GUI)
+        run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release

-    - name: Upload build artifact (GUI)
-      uses: actions/upload-artifact@v1
-      with:
-        name: DiscordChatExporter
-        path: DiscordChatExporter.Gui/bin/Publish/
+      - 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,100 @@
+### v2.27 (24-Apr-2021)
+
+- Added partitioning by file size. You can now use values such as `10mb` to indicate a size-based cut off point, in addition to values like `10` to indicate a number of messages. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- [CLI] Improved formatting and progress reporting.
+- [CLI] Changed `export` command so that it can accept multiple channel IDs passed to `-c|--channel` option. This makes it possible to export multiple channels at once while benefiting from parallelization.
+- [JSON] Added `color` field to message author. This is a hex string that represents user's color, inherited from their roles. (Thanks [@rtm516](https://github.com/rtm516))
+- [JSON] Added `categoryId` field to the root. This represents the ID of the category channel that the currently exported channel belongs to. (Thanks [@rtm516](https://github.com/rtm516))
+- [JSON] Fixed an issue where user discriminator was written without leading zeroes. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- [JSON] Fixed an issue where the application sometimes crashed with an error saying `']' invalid without a matching open`, which was just a validation message that masked the actual error behind the failure. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- Fixed an issue where progress was not reported correctly if the channel didn't have any messages in the specified time range.
+
+### v2.26.1 (06-Feb-2021)
+
+- [CLI] Added support for file name templates, which allow you to dynamically generate output file names based on channel and guild metadata. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- Fixed an issue where the application sometimes crashed with `Invalid snowflake` message when exporting chat logs that contained invalid or outdated mentions. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+
+### v2.26 (29-Dec-2020)
+
+- [HTML] Added support for replies. (Thanks [@Sanqui](https://github.com/Sanqui))
+- [HTML] Improved styling of non-media attachments (regular files, i.e. not video, audio, or image). (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- [HTML] Improved initial export performance.
+- [JSON] Relaxed escaping rules for unicode characters. (Thanks [@Sanqui](https://github.com/Sanqui))
+- [JSON] Added support for replies. (Thanks [@Sanqui](https://github.com/Sanqui))
+- [CLI] Added channel names to errors shown on failures when exporting multiple channels. (Thanks [@Sanqui](https://github.com/Sanqui))
+- [CLI] Added support for passing message IDs (snowflakes) to `--after` and `--before` options. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- Files downloaded by the "download referenced media" option now have their dates set according to the `Last-Modified` header provided by Discord CDN. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- Fixed an issue where the application sometimes crashed with `NullReferenceException` when retrying a failed HTTP request.
+- Migrated to Discord API v8.
+
+### v2.25 (23-Nov-2020)
+
+- [JSON] Added `mentions` property to the output. This contains users referenced inside the message text, but doesn't include mentions in embeds. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- [HTML] Added better previews for attached video and audio. They are now rendered using a browser native player element. The actual file path can still be retrieved by right clicking and selecting "Copy file path". (Thanks [@sas41](https://github.com/sas41))
+- [CLI] Fixed an issue where using `--media` option without providing a rooted path via `--output` option triggered an error.
+- [CLI] Fixed an issue where using `--reuse-media` option without also providing `--media` option was accepted, but didn't actually do anything. Now this produces an error instead. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+
+### v2.24 (24-Oct-2020)
+
+- [CLI] Updated to [CliFx v1.5](https://github.com/Tyrrrz/CliFx), which brings some UX improvements.
+- [GUI] Added dark mode, which can be enabled in settings. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- [GUI] Improved the UX in a few minor places.
+- [JSON] Added `embed.color` property to the output. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- Added additional date formats: `unix` to write dates as a unix timestamp and `unixms` for the milliseconds version. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- Added retry policy for downloading media content. This is mostly a workaround for transient failures that sometimes may occur when downloading assets referenced from embeds. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- Added an option to reuse already downloaded media to avoid redundant network requests. It can be enabled in settings in GUI, or by passing `--reuse-media` in CLI. To facilitate this feature, the file name strategy has been changed as well -- now instead of relying on the original file name and adding `(n)` to the end in case of duplicates, a URL hash is injected in every file name. This also means that when the "reuse media" option is disabled, existing files inside the media directory may be overwritten. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+
+### v2.23 (14-Sep-2020)
+
+- [CLI] Added a command to export all channels across all servers. Use `exportall` to do it. (Thanks [@wyattscarpenter](https://github.com/wyattscarpenter))
+- [HTML] Fixed an issue where Whitney fonts were not being loaded properly, causing the browser to fall back to Helvetica.
+- Fixed an issue where self-contained export crashed occasionally. This usually happened when the server hosting the file did not serve the stream properly. Such files are now ignored after the first failed attempt.
+
+### v2.22 (12-Aug-2020)
+
+- [GUI] Improved the channel list by adding collapsible category groups. (Thanks [@CarJem Generations](https://github.com/CarJem))
+- [GUI] Improved exporting options by adding a set of controls that can be used to limit the date range of the export down to minutes. Previously it was only possible to configure the date range without the time component. (Thanks [@CarJem Generations](https://github.com/CarJem))
+- [HTML] Fixed an issue where the export didn't reflect changes in nicknames between messages sent by bots. This affected chat logs that contained interactions with the Tupperbox bot. (Thanks [@CarJem Generations](https://github.com/CarJem))
+- [CLI] Fixed an issue where the application crashed if there were two environment variables defined that had the same name but in different case.
+
+### v2.21.2 (30-Jul-2020)
+
+- [GUI] When copy-pasting token, any surrounding spaces are now discarded, in addition to double quotes.
+- [HTML] Changed underlying templating engine to provide higher performance and better error messages. New templating engine adds a small cold start, but any export after the first should be faster.
+- Changed naming schema for downloaded media so that it follows `<original filename> (nn)` format rather than `<original filename>-salt`.
+- [HTML] Fixed an issue where downloaded media was sometimes inaccessible due to reserved characters appearing in the URL.
+- Fixed an issue where the application crashed when trying to download media with a file name that exceeds system's maximum allowed length.
+- Fixed an issue where the application crashed when trying to download media with illegal characters in the file name.
+
+### v2.21.1 (19-Jul-2020)
+
+- Fixed an issue where the export crashed if an embedded image has been deleted. Such media files are now ignored.
+- Changed the naming convention for downloaded media files so that the original file names are used when possible.
+
+### v2.21 (18-Jul-2020)
+
+- Added a new option that enables self-contained exports for all output formats. You can turn it on in the export setup dialog in GUI or using the `--media` option in CLI. When using this, the application will additionally download any media content directly referenced from the exported file instead of linking back to Discord CDN. The files which are downloaded include: guild icons, user avatars, attachments, embedded images, reaction 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.
@@ -0,0 +1,56 @@
+# Contributing
+
+DiscordChatExporter accepts contributions in the form of issues and pull requests.
+
+## Creating issues
+
+If you have a feature suggestion or want to report a bug, you are welcome to create an issue.
+
+Guidelines:
+
+- Avoid creating an issue if a similar one already exists. Look through existing open and closed issues first.
+- Keep your issue focused on one specific problem. If you have multiple suggestions or bug reports, please create separate issues for them.
+- Provide a descriptive title for your issue. Don't use generic titles like "A couple suggestions" or "Not working".
+- Provide more context in the body of the issue. If relevant, attach screenshots or screen recordings.
+- Remain civil and respectful when participating in discussions.
+
+## Creating pull requests
+
+If you want to contribute code to the project, you can do so by creating a pull request.
+
+Guidelines:
+
+- Make sure that there is an existing issue that describes the problem solved by your pull request. If there isn't one, please create it first.
+- Add a comment to the issue indicating that you want to submit a pull request for it. This can be a good opportunity to discuss possible solutions, finalize requirements, or ask questions.
+- Keep your pull request focused and as small as possible. If you want to contribute multiple unrelated changes, please create separate pull requests for them.
+- Follow the coding style and conventions already established by the project. When in doubt which style to use, ask in comments to your pull request.
+- If you want to start a discussion regarding a specific change you made, add a review comment to your own code. This can be used to highlight something important or to seek input from others.
+
+## Building the project locally
+
+Prerequisites:
+
+- [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
+- [.NET 3.1 SDK](https://dotnet.microsoft.com/download/dotnet/3.1) (temporarily as the app still targets .NET 3.1, but requires .NET 5.0 to build)
+- _(Optional)_ C#/.NET IDE, such as [JetBrains Rider](https://www.jetbrains.com/rider), [VS Code](https://code.visualstudio.com/docs/languages/csharp), or [Visual Studio](https://visualstudio.microsoft.com).
+
+To build the entire solution run the following command in the root of the repository:
+
+```sh
+> dotnet build
+```
+
+This will generate runtime artifacts for each project:
+
+```plaintext
+./DiscordChatExporter.Gui/bin/[Debug|Release]/[runtime]/*
+./DiscordChatExporter.Cli/bin/[Debug|Release]/[runtime]/*
+```
+
+You can also build and run a specific project directly.
+To do that, navigate to its directory and use `dotnet run`:
+
+```sh
+> cd DiscordChatExporter.Gui
+> dotnet run
+```
@@ -2,11 +2,12 @@

  <PropertyGroup>
    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>2.19</Version>
+    <Version>2.27</Version>
    <Company>Tyrrrz</Company>
    <Copyright>Copyright (c) Alexey Golub</Copyright>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
    <Nullable>enable</Nullable>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
  </PropertyGroup>

-</Project>
+</Project>
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Exceptions;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Utils.Extensions;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exceptions;
+using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Exporting.Partitioning;
+using DiscordChatExporter.Core.Utils.Extensions;
+using Tyrrrz.Extensions;
+
+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, each limited to this number of messages (e.g. 100) or file size (e.g. 10mb).")]
+        public PartitionLimit PartitionLimit { get; init; } = NullPartitionLimit.Instance;
+
+        [CommandOption("parallel", Description = "Limits how many channels can be exported in parallel.")]
+        public int ParallelLimit { get; init; } = 1;
+
+        [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";
+
+        private ChannelExporter? _channelExporter;
+        protected ChannelExporter Exporter => _channelExporter ??= new ChannelExporter(Discord);
+
+        protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Channel> channels)
+        {
+            await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
+
+            var errors = new ConcurrentDictionary<Channel, string>();
+
+            // Wrap everything in a progress ticker
+            await console.CreateProgressTicker().StartAsync(async progressContext =>
+            {
+                await channels.ParallelForEachAsync(async channel =>
+                {
+                    // Export
+                    try
+                    {
+                        await progressContext.StartTaskAsync($"{channel.Category} / {channel.Name}", async progress =>
+                        {
+                            var guild = await Discord.GetGuildAsync(channel.GuildId);
+
+                            var request = new ExportRequest(
+                                guild,
+                                channel,
+                                OutputPath,
+                                ExportFormat,
+                                After,
+                                Before,
+                                PartitionLimit,
+                                ShouldDownloadMedia,
+                                ShouldReuseMedia,
+                                DateFormat
+                            );
+
+                            await Exporter.ExportChannelAsync(request, progress);
+                        });
+                    }
+                    catch (DiscordChatExporterException ex) when (!ex.IsCritical)
+                    {
+                        errors[channel] = ex.Message;
+                    }
+                }, ParallelLimit.ClampMin(1));
+            });
+
+            // Print result
+            using (console.WithForegroundColor(ConsoleColor.White))
+            {
+                await console.Output.WriteLineAsync(
+                    $"Successfully exported {channels.Count - errors.Count} channel(s)."
+                );
+            }
+
+            // Print errors
+            if (errors.Any())
+            {
+                await console.Output.WriteLineAsync();
+
+                using (console.WithForegroundColor(ConsoleColor.Red))
+                {
+                    await console.Output.WriteLineAsync(
+                        $"Failed to export {errors.Count} channel(s):"
+                    );
+                }
+
+                foreach (var (channel, error) in errors)
+                {
+                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}: ");
+
+                    using (console.WithForegroundColor(ConsoleColor.Red))
+                        await console.Output.WriteLineAsync(error);
+                }
+
+                await console.Output.WriteLineAsync();
+            }
+
+            // Fail the command if ALL channels failed to export.
+            // Having some of the channels fail to export is fine and expected.
+            if (errors.Count >= channels.Count)
+            {
+                throw new CommandException("Export failed.");
+            }
+
+            await console.Output.WriteLineAsync("Done.");
+        }
+
+        public override ValueTask ExecuteAsync(IConsole console)
+        {
+            if (ShouldReuseMedia && !ShouldDownloadMedia)
+            {
+                throw new CommandException("Option --reuse-media cannot be used without --media.");
+            }
+
+            return default;
+        }
+    }
+}
@@ -0,0 +1,29 @@
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Core.Discord;
+
+namespace DiscordChatExporter.Cli.Commands.Base
+{
+    public abstract class TokenCommandBase : ICommand
+    {
+        [CommandOption("token", 't', IsRequired = true, EnvironmentVariable = "DISCORD_TOKEN", Description = "Authentication token.")]
+        public string TokenValue { get; init; } = "";
+
+        [CommandOption("bot", 'b', EnvironmentVariable = "DISCORD_TOKEN_BOT", Description = "Authenticate as a bot.")]
+        public bool IsBotToken { get; init; }
+
+        private AuthToken GetAuthToken() => new(
+            IsBotToken
+                ? AuthTokenType.Bot
+                : AuthTokenType.User,
+            TokenValue
+        );
+
+        private DiscordClient? _discordClient;
+        protected DiscordClient Discord => _discordClient ??= new DiscordClient(GetAuthToken());
+
+        public abstract ValueTask ExecuteAsync(IConsole console);
+    }
+}
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("exportall", Description = "Export all accessible channels.")]
+    public class ExportAllCommand : ExportCommandBase
+    {
+        [CommandOption("include-dm", Description = "Include direct message channels.")]
+        public bool IncludeDirectMessages { get; init; } = true;
+
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            await base.ExecuteAsync(console);
+
+            // Get channel metadata
+            await console.Output.WriteLineAsync("Fetching channels...");
+
+            var channels = new List<Channel>();
+
+            // Aggregate channels from all guilds
+            await foreach (var guild in Discord.GetUserGuildsAsync())
+            {
+                // Skip DMs if instructed to
+                if (!IncludeDirectMessages && guild.Id == Guild.DirectMessages.Id)
+                    continue;
+
+                await foreach (var channel in Discord.GetGuildChannelsAsync(guild.Id))
+                {
+                    channels.Add(channel);
+                }
+            }
+
+            // Export
+            await ExportAsync(console, channels);
+        }
+    }
+}
@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Commands
-{
-    [Command("export", Description = "Export a channel.")]
-    public class ExportChannelCommand : ExportCommandBase
-    {
-        [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID.")]
-        public string ChannelId { get; set; } = "";
-
-        public ExportChannelCommand(SettingsService settingsService, DataService dataService, ExportService exportService)
-            : base(settingsService, dataService, exportService)
-        {
-        }
-
-        public override async ValueTask ExecuteAsync(IConsole console) => await ExportAsync(console, ChannelId);
-    }
-}
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("export", Description = "Export one or multiple channels.")]
+    public class ExportChannelsCommand : ExportCommandBase
+    {
+        // TODO: change this to plural (breaking change)
+        [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID(s).")]
+        public IReadOnlyList<Snowflake> ChannelIds { get; init; } = Array.Empty<Snowflake>();
+
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            await base.ExecuteAsync(console);
+
+            // Get channel metadata
+            await console.Output.WriteLineAsync("Fetching channel(s)...");
+
+            var channels = new List<Channel>();
+
+            foreach (var channelId in ChannelIds)
+            {
+                var channel = await Discord.GetChannelAsync(channelId);
+                channels.Add(channel);
+            }
+
+            // Export
+            await ExportAsync(console, channels);
+        }
+    }
+}
@@ -1,71 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using CliFx.Utilities;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Commands
-{
-    public abstract class ExportCommandBase : TokenCommandBase
-    {
-        protected SettingsService SettingsService { get; }
-
-        protected ExportService ExportService { get; }
-
-        [CommandOption("format", 'f', Description = "Output file format.")]
-        public ExportFormat ExportFormat { get; set; } = ExportFormat.HtmlDark;
-
-        [CommandOption("output", 'o', Description = "Output file or directory path.")]
-        public string OutputPath { get; set; } = Directory.GetCurrentDirectory();
-
-        [CommandOption("after", Description = "Limit to messages sent after this date.")]
-        public DateTimeOffset? After { get; set; }
-
-        [CommandOption("before", Description = "Limit to messages sent before this date.")]
-        public DateTimeOffset? Before { get; set; }
-
-        [CommandOption("partition", 'p', Description = "Split output into partitions limited to this number of messages.")]
-        public int? PartitionLimit { get; set; }
-
-        [CommandOption("dateformat", Description = "Date format used in output.")]
-        public string? DateFormat { get; set; }
-
-        protected ExportCommandBase(SettingsService settingsService, DataService dataService, ExportService exportService)
-            : base(dataService)
-        {
-            SettingsService = settingsService;
-            ExportService = exportService;
-        }
-
-        protected async ValueTask ExportAsync(IConsole console, Guild guild, Channel channel)
-        {
-            if (!string.IsNullOrWhiteSpace(DateFormat))
-                SettingsService.DateFormat = DateFormat;
-
-            console.Output.Write($"Exporting channel [{channel.Name}]... ");
-            var progress = console.CreateProgressTicker();
-
-            await ExportService.ExportChatLogAsync(Token, guild, channel,
-                OutputPath, ExportFormat, PartitionLimit,
-                After, Before, progress);
-
-            console.Output.WriteLine();
-            console.Output.WriteLine("Done.");
-        }
-
-        protected async ValueTask ExportAsync(IConsole console, Channel channel)
-        {
-            var guild = await DataService.GetGuildAsync(Token, channel.GuildId);
-            await ExportAsync(console, guild, channel);
-        }
-
-        protected async ValueTask ExportAsync(IConsole console, string channelId)
-        {
-            var channel = await DataService.GetChannelAsync(Token, channelId);
-            await ExportAsync(console, channel);
-        }
-    }
-}
@@ -1,25 +1,25 @@
-using System.Linq;
-using System.Threading.Tasks;
-using CliFx;
+using System.Threading.Tasks;
 using CliFx.Attributes;
-using DiscordChatExporter.Core.Services;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
    [Command("exportdm", Description = "Export all direct message channels.")]
-    public class ExportDirectMessagesCommand : ExportMultipleCommandBase
+    public class ExportDirectMessagesCommand : ExportCommandBase
    {
-        public ExportDirectMessagesCommand(SettingsService settingsService, DataService dataService, ExportService exportService)
-            : base(settingsService, dataService, exportService)
-        {
-        }
-
        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var directMessageChannels = await DataService.GetDirectMessageChannelsAsync(Token);
-            var channels = directMessageChannels.OrderBy(c => c.Name).ToArray();
+            await base.ExecuteAsync(console);

-            await ExportMultipleAsync(console, channels);
+            // Get channel metadata
+            await console.Output.WriteLineAsync("Fetching channels...");
+            var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id);
+
+            // Export
+            await ExportAsync(console, channels);
        }
    }
 }
@@ -1,33 +1,28 @@
-using System.Linq;
-using System.Threading.Tasks;
-using CliFx;
+using System.Threading.Tasks;
 using CliFx.Attributes;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
    [Command("exportguild", Description = "Export all channels within specified guild.")]
-    public class ExportGuildCommand : ExportMultipleCommandBase
+    public class ExportGuildCommand : ExportCommandBase
    {
        [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
-        public string GuildId { get; set; } = "";
-
-        public ExportGuildCommand(SettingsService settingsService, DataService dataService, ExportService exportService)
-            : base(settingsService, dataService, exportService)
-        {
-        }
+        public Snowflake GuildId { get; init; }

        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var guildChannels = await DataService.GetGuildChannelsAsync(Token, GuildId);
+            await base.ExecuteAsync(console);

-            var channels = guildChannels
-                .Where(c => c.Type.IsExportable())
-                .OrderBy(c => c.Name)
-                .ToArray();
+            // Get channel metadata
+            await console.Output.WriteLineAsync("Fetching channels...");
+            var channels = await Discord.GetGuildChannelsAsync(GuildId);

-            await ExportMultipleAsync(console, channels);
+            // Export
+            await ExportAsync(console, channels);
        }
    }
 }
@@ -1,92 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using CliFx.Utilities;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Models.Exceptions;
-using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Exceptions;
-using Gress;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.Commands
-{
-    public abstract class ExportMultipleCommandBase : ExportCommandBase
-    {
-        [CommandOption("parallel", Description = "Export this number of separate channels in parallel.")]
-        public int ParallelLimit { get; set; } = 1;
-
-        protected ExportMultipleCommandBase(SettingsService settingsService, DataService dataService, ExportService exportService)
-            : base(settingsService, dataService, exportService)
-        {
-        }
-
-        protected async ValueTask ExportMultipleAsync(IConsole console, IReadOnlyList<Channel> channels)
-        {
-            // This uses a separate route from ExportCommandBase because the progress ticker is not thread-safe
-            // Ugly code ahead. Will need to refactor.
-
-            if (!string.IsNullOrWhiteSpace(DateFormat))
-                SettingsService.DateFormat = DateFormat;
-
-            // Progress
-            console.Output.Write($"Exporting {channels.Count} channels... ");
-            var ticker = console.CreateProgressTicker();
-
-            // TODO: refactor this after improving Gress
-            var progressManager = new ProgressManager();
-            progressManager.PropertyChanged += (sender, args) => ticker.Report(progressManager.Progress);
-
-            var operations = progressManager.CreateOperations(channels.Count);
-
-            // Export channels
-            using var semaphore = new SemaphoreSlim(ParallelLimit.ClampMin(1));
-
-            var errors = new List<string>();
-
-            await Task.WhenAll(channels.Select(async (channel, i) =>
-            {
-                var operation = operations[i];
-                await semaphore.WaitAsync();
-
-                var guild = await DataService.GetGuildAsync(Token, channel.GuildId);
-
-                try
-                {
-                    await ExportService.ExportChatLogAsync(Token, guild, channel,
-                        OutputPath, ExportFormat, PartitionLimit,
-                        After, Before, operation);
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
-                {
-                    errors.Add("You don't have access to this channel.");
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
-                {
-                    errors.Add("This channel doesn't exist.");
-                }
-                catch (DomainException ex)
-                {
-                    errors.Add(ex.Message);
-                }
-                finally
-                {
-                    semaphore.Release();
-                    operation.Dispose();
-                }
-            }));
-
-            ticker.Report(1);
-            console.Output.WriteLine();
-
-            foreach (var error in errors)
-                console.Error.WriteLine(error);
-
-            console.Output.WriteLine("Done.");
-        }
-    }
-}
@@ -1,34 +1,39 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
-using CliFx;
 using CliFx.Attributes;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
-    [Command("channels", Description = "Get the list of channels in specified guild.")]
+    [Command("channels", Description = "Get the list of channels in a guild.")]
    public class GetChannelsCommand : TokenCommandBase
    {
        [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
-        public string GuildId { get; set; } = "";
-
-        public GetChannelsCommand(DataService dataService)
-            : base(dataService)
-        {
-        }
+        public Snowflake GuildId { get; init; }

        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var guildChannels = await DataService.GetGuildChannelsAsync(Token, GuildId);
+            var channels = await Discord.GetGuildChannelsAsync(GuildId);

-            var channels = guildChannels
-                .Where(c => c.Type.IsExportable())
-                .OrderBy(c => c.Name)
-                .ToArray();
+            foreach (var channel in channels.OrderBy(c => c.Category.Position).ThenBy(c => c.Name))
+            {
+                // Channel ID
+                await console.Output.WriteAsync(channel.Id.ToString());

-            foreach (var channel in channels)
-                console.Output.WriteLine($"{channel.Id} | {channel.Name}");
+                // Separator
+                using (console.WithForegroundColor(ConsoleColor.DarkGray))
+                    await console.Output.WriteAsync(" | ");
+
+                // Channel category / name
+                using (console.WithForegroundColor(ConsoleColor.White))
+                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}");
+
+                await console.Output.WriteLineAsync();
+            }
        }
    }
 }
@@ -1,26 +1,36 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
-using CliFx;
 using CliFx.Attributes;
-using DiscordChatExporter.Core.Services;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
    [Command("dm", Description = "Get the list of direct message channels.")]
    public class GetDirectMessageChannelsCommand : TokenCommandBase
    {
-        public GetDirectMessageChannelsCommand(DataService dataService)
-            : base(dataService)
-        {
-        }
-
        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var directMessageChannels = await DataService.GetDirectMessageChannelsAsync(Token);
-            var channels = directMessageChannels.OrderBy(c => c.Name).ToArray();
+            var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id);

-            foreach (var channel in channels)
-                console.Output.WriteLine($"{channel.Id} | {channel.Name}");
+            foreach (var channel in channels.OrderBy(c => c.Name))
+            {
+                // Channel ID
+                await console.Output.WriteAsync(channel.Id.ToString());
+
+                // Separator
+                using (console.WithForegroundColor(ConsoleColor.DarkGray))
+                    await console.Output.WriteAsync(" | ");
+
+                // Channel category / name
+                using (console.WithForegroundColor(ConsoleColor.White))
+                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}");
+
+                await console.Output.WriteLineAsync();
+            }
        }
    }
 }
@@ -1,25 +1,35 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
-using CliFx;
 using CliFx.Attributes;
-using DiscordChatExporter.Core.Services;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
    [Command("guilds", Description = "Get the list of accessible guilds.")]
    public class GetGuildsCommand : TokenCommandBase
    {
-        public GetGuildsCommand(DataService dataService)
-            : base(dataService)
-        {
-        }
-
        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var guilds = await DataService.GetUserGuildsAsync(Token);
+            var guilds = await Discord.GetUserGuildsAsync();

            foreach (var guild in guilds.OrderBy(g => g.Name))
-                console.Output.WriteLine($"{guild.Id} | {guild.Name}");
+            {
+                // Guild ID
+                await console.Output.WriteAsync(guild.Id.ToString());
+
+                // Separator
+                using (console.WithForegroundColor(ConsoleColor.DarkGray))
+                    await console.Output.WriteAsync(" | ");
+
+                // Guild name
+                using (console.WithForegroundColor(ConsoleColor.White))
+                    await console.Output.WriteAsync(guild.Name);
+
+                await console.Output.WriteLineAsync();
+            }
        }
    }
 }
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
+using CliFx.Infrastructure;

 namespace DiscordChatExporter.Cli.Commands
 {
@@ -10,24 +11,30 @@ namespace DiscordChatExporter.Cli.Commands
    {
        public ValueTask ExecuteAsync(IConsole console)
        {
-            console.WithForegroundColor(ConsoleColor.White, () => console.Output.WriteLine("To get user token:"));
+            using (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://discordapp.com\" on the left");
+            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:"));
+            using (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:"));
+            using (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");
@@ -35,7 +42,9 @@ namespace DiscordChatExporter.Cli.Commands
            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:"));
+            using (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");
@@ -44,8 +53,11 @@ namespace DiscordChatExporter.Cli.Commands
            console.Output.WriteLine(" 6. Copy the first long sequence of numbers inside the URL");
            console.Output.WriteLine();

-            console.Output.WriteLine("If you still have unanswered questions, check out the wiki:");
-            console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");
+            using (console.WithForegroundColor(ConsoleColor.White))
+                console.Output.WriteLine("For more information, check out the wiki:");
+
+            using (console.WithForegroundColor(ConsoleColor.DarkCyan))
+                console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");

            return default;
        }
@@ -1,28 +0,0 @@
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Commands
-{
-    public abstract class TokenCommandBase : ICommand
-    {
-        protected DataService DataService { get; }
-
-        [CommandOption("token", 't', IsRequired = true, Description = "Authorization token.")]
-        public string TokenValue { get; set; } = "";
-
-        [CommandOption("bot", 'b', Description = "Whether this authorization token belongs to a bot.")]
-        public bool IsBotToken { get; set; }
-
-        protected AuthToken Token => new AuthToken(IsBotToken ? AuthTokenType.Bot : AuthTokenType.User, TokenValue);
-
-        protected TokenCommandBase(DataService dataService)
-        {
-            DataService = dataService;
-        }
-
-        public abstract ValueTask ExecuteAsync(IConsole console);
-    }
-}
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />

  <PropertyGroup>
    <OutputType>Exe</OutputType>
@@ -7,15 +6,14 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CliFx" Version="1.0.0" />
-    <PackageReference Include="Gress" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="CliFx" Version="2.0.4" />
+    <PackageReference Include="Spectre.Console" Version="0.39.0" />
+    <PackageReference Include="Gress" Version="1.2.0" />
    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
  </ItemGroup>

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

 </Project>
@@ -1,45 +1,14 @@
-using System;
-using System.Drawing;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using CliFx;
-using DiscordChatExporter.Cli.Commands;
-using DiscordChatExporter.Core.Services;
-using Microsoft.Extensions.DependencyInjection;

 namespace DiscordChatExporter.Cli
 {
    public static class Program
    {
-        private static IServiceProvider ConfigureServices()
-        {
-            var services = new ServiceCollection();
-
-            // Register services
-            services.AddSingleton<DataService>();
-            services.AddSingleton<ExportService>();
-            services.AddSingleton<SettingsService>();
-
-            // Register commands
-            services.AddTransient<ExportChannelCommand>();
-            services.AddTransient<ExportDirectMessagesCommand>();
-            services.AddTransient<ExportGuildCommand>();
-            services.AddTransient<GetChannelsCommand>();
-            services.AddTransient<GetDirectMessageChannelsCommand>();
-            services.AddTransient<GetGuildsCommand>();
-            services.AddTransient<GuideCommand>();
-
-            return services.BuildServiceProvider();
-        }
-
-        public static async Task<int> Main(string[] args)
-        {
-            var serviceProvider = ConfigureServices();
-
-            return await new CliApplicationBuilder()
+        public static async Task<int> Main(string[] args) =>
+            await new CliApplicationBuilder()
                .AddCommandsFromThisAssembly()
-                .UseTypeActivator(serviceProvider.GetService)
                .Build()
                .RunAsync(args);
-        }
    }
 }
@@ -0,0 +1,48 @@
+using System;
+using System.Threading.Tasks;
+using CliFx.Infrastructure;
+using Spectre.Console;
+
+namespace DiscordChatExporter.Cli.Utils.Extensions
+{
+    internal static class ConsoleExtensions
+    {
+        public static IAnsiConsole CreateAnsiConsole(this IConsole console) => AnsiConsole.Create(
+            new AnsiConsoleSettings
+            {
+                Ansi = AnsiSupport.Detect,
+                ColorSystem = ColorSystemSupport.Detect,
+                Out = new AnsiConsoleOutput(console.Output)
+            }
+        );
+
+        public static Progress CreateProgressTicker(this IConsole console) => console
+            .CreateAnsiConsole()
+            .Progress()
+            .AutoClear(false)
+            .AutoRefresh(true)
+            .HideCompleted(false)
+            .Columns(
+                new TaskDescriptionColumn {Alignment = Justify.Left},
+                new ProgressBarColumn(),
+                new PercentageColumn()
+            );
+
+        public static async ValueTask StartTaskAsync(
+            this ProgressContext progressContext,
+            string description,
+            Func<ProgressTask, ValueTask> performOperationAsync)
+        {
+            var progressTask = progressContext.AddTask(description, new ProgressTaskSettings {MaxValue = 1});
+
+            try
+            {
+                await performOperationAsync(progressTask);
+            }
+            finally
+            {
+                progressTask.StopTask();
+            }
+        }
+    }
+}
@@ -0,0 +1,9 @@
+// ReSharper disable CheckNamespace
+// TODO: remove after moving to .NET 5
+
+namespace System.Runtime.CompilerServices
+{
+    internal static class IsExternalInit
+    {
+    }
+}
@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Markdown.Ast
-{
-    public class FormattedNode : Node
-    {
-        public TextFormatting Formatting { get; }
-
-        public IReadOnlyList<Node> Children { get; }
-
-        public FormattedNode(TextFormatting formatting, IReadOnlyList<Node> children)
-        {
-            Formatting = formatting;
-            Children = children;
-        }
-
-        public override string ToString() => $"<{Formatting}> ({Children.Count} direct children)";
-    }
-}
@@ -1,10 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Ast
-{
-    public enum MentionType
-    {
-        Meta,
-        User,
-        Channel,
-        Role
-    }
-}
@@ -1,12 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Ast
-{
-    public enum TextFormatting
-    {
-        Bold,
-        Italic,
-        Underline,
-        Strikethrough,
-        Spoiler,
-        Quote
-    }
-}
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
-  </ItemGroup>
-
-</Project>
@@ -1,7 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Internal
-{
-    internal interface IMatcher<T>
-    {
-        ParsedMatch<T>? Match(StringPart stringPart);
-    }
-}
@@ -1,50 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#attachment-object
-
-    public partial class Attachment : IHasId
-    {
-        public string Id { get; }
-
-        public string Url { get; }
-
-        public int? Width { get; }
-
-        public int? Height { get; }
-
-        public string FileName { get; }
-
-        public bool IsImage { get; }
-
-        public FileSize FileSize { get; }
-
-        public Attachment(string id, int? width, int? height, string url, string fileName, FileSize fileSize)
-        {
-            Id = id;
-            Url = url;
-            Width = width;
-            Height = height;
-            FileName = fileName;
-            FileSize = fileSize;
-
-            IsImage = GetIsImage(fileName);
-        }
-
-        public override string ToString() => FileName;
-    }
-
-    public partial class Attachment
-    {
-        private static readonly string[] ImageFileExtensions = { ".jpg", ".jpeg", ".png", ".gif", ".bmp" };
-
-        public static bool GetIsImage(string fileName)
-        {
-            var fileExtension = Path.GetExtension(fileName);
-            return ImageFileExtensions.Contains(fileExtension, StringComparer.OrdinalIgnoreCase);
-        }
-    }
-}
@@ -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 : IHasId
-    {
-        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, "unknown-guild", "deleted-channel", null, ChannelType.GuildTextChat);
-    }
-}
@@ -1,16 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.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
-    }
-}
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
-  </ItemGroup>
-
-</Project>
@@ -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 DateTimeOffset? 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, DateTimeOffset? 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 ?? "<untitled embed>";
-    }
-}
@@ -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 ?? "<unnamed author>";
-    }
-}
@@ -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,12 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Core.Models.Exceptions
-{
-    public class DomainException : Exception
-    {
-        public DomainException(string message)
-            : base(message)
-        {
-        }
-    }
-}
@@ -1,11 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    public enum ExportFormat
-    {
-        PlainText,
-        HtmlDark,
-        HtmlLight,
-        Csv,
-        Json
-    }
-}
@@ -1,36 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public static class Extensions
-    {
-        public static bool IsExportable(this ChannelType channelType) =>
-            channelType == ChannelType.GuildTextChat ||
-            channelType == ChannelType.DirectTextChat ||
-            channelType == ChannelType.DirectGroupTextChat ||
-            channelType == ChannelType.GuildNews ||
-            channelType == ChannelType.GuildStore;
-
-        public static string GetFileExtension(this ExportFormat format) =>
-            format switch
-            {
-                ExportFormat.PlainText => "txt",
-                ExportFormat.HtmlDark => "html",
-                ExportFormat.HtmlLight => "html",
-                ExportFormat.Csv => "csv",
-                ExportFormat.Json => "json",
-                _ => throw new ArgumentOutOfRangeException(nameof(format))
-            };
-
-        public static string GetDisplayName(this ExportFormat format) =>
-            format switch
-            {
-                ExportFormat.PlainText => "TXT",
-                ExportFormat.HtmlDark => "HTML (Dark)",
-                ExportFormat.HtmlLight => "HTML (Light)",
-                ExportFormat.Csv => "CSV",
-                ExportFormat.Json => "JSON",
-                _ => throw new ArgumentOutOfRangeException(nameof(format))
-            };
-    }
-}
@@ -1,82 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // Loosely based on https://github.com/omar/ByteSize (MIT license)
-
-    public struct FileSize
-    {
-        public const long BytesInKiloByte = 1024;
-        public const long BytesInMegaByte = 1024 * BytesInKiloByte;
-        public const long BytesInGigaByte = 1024 * BytesInMegaByte;
-        public const long BytesInTeraByte = 1024 * BytesInGigaByte;
-        public const long BytesInPetaByte = 1024 * BytesInTeraByte;
-
-        public const string ByteSymbol = "B";
-        public const string KiloByteSymbol = "KB";
-        public const string MegaByteSymbol = "MB";
-        public const string GigaByteSymbol = "GB";
-        public const string TeraByteSymbol = "TB";
-        public const string PetaByteSymbol = "PB";
-
-        public double Bytes { get; }
-        public double KiloBytes => Bytes / BytesInKiloByte;
-        public double MegaBytes => Bytes / BytesInMegaByte;
-        public double GigaBytes => Bytes / BytesInGigaByte;
-        public double TeraBytes => Bytes / BytesInTeraByte;
-        public double PetaBytes => Bytes / BytesInPetaByte;
-
-        public string LargestWholeNumberSymbol
-        {
-            get
-            {
-                if (Math.Abs(PetaBytes) >= 1)
-                    return PetaByteSymbol;
-
-                if (Math.Abs(TeraBytes) >= 1)
-                    return TeraByteSymbol;
-
-                if (Math.Abs(GigaBytes) >= 1)
-                    return GigaByteSymbol;
-
-                if (Math.Abs(MegaBytes) >= 1)
-                    return MegaByteSymbol;
-
-                if (Math.Abs(KiloBytes) >= 1)
-                    return KiloByteSymbol;
-
-                return ByteSymbol;
-            }
-        }
-
-        public double LargestWholeNumberValue
-        {
-            get
-            {
-                if (Math.Abs(PetaBytes) >= 1)
-                    return PetaBytes;
-
-                if (Math.Abs(TeraBytes) >= 1)
-                    return TeraBytes;
-
-                if (Math.Abs(GigaBytes) >= 1)
-                    return GigaBytes;
-
-                if (Math.Abs(MegaBytes) >= 1)
-                    return MegaBytes;
-
-                if (Math.Abs(KiloBytes) >= 1)
-                    return KiloBytes;
-
-                return Bytes;
-            }
-        }
-
-        public FileSize(double bytes)
-        {
-            Bytes = bytes;
-        }
-
-        public override string ToString() => $"{LargestWholeNumberValue:0.##} {LargestWholeNumberSymbol}";
-    }
-}
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/guild#guild-object
-
-    public partial class Guild : IHasId
-    {
-        public string Id { get; }
-
-        public string Name { get; }
-
-        public string? IconHash { get; }
-
-        public IReadOnlyList<Role> Roles { get; }
-
-        public Dictionary<string, Member?> Members { get; }
-
-        public string IconUrl { get; }
-
-        public Guild(string id, string name, IReadOnlyList<Role> roles, string? iconHash)
-        {
-            Id = id;
-            Name = name;
-            IconHash = iconHash;
-            Roles = roles;
-            Members = new Dictionary<string, Member?>();
-
-            IconUrl = GetIconUrl(id, iconHash);
-        }
-
-        public override string ToString() => Name;
-    }
-
-    public partial class Guild
-    {
-        public static string GetUserColor(Guild guild, User user) =>
-            guild.Members.GetValueOrDefault(user.Id, null)
-                ?.Roles
-                .Select(r => guild.Roles.FirstOrDefault(role => r == role.Id))
-                .Where(r => r != null)
-                .Where(r => r.Color != Color.Black)
-                .Where(r => r.Color.R + r.Color.G + r.Color.B > 0)
-                .Aggregate<Role, Role?>(null, (a, b) => (a?.Position ?? 0) > b.Position ? a : b)
-                ?.ColorAsHex ?? "";
-
-        public static string GetUserNick(Guild guild, User user) => guild.Members.GetValueOrDefault(user.Id)?.Nick ?? user.Name;
-
-        public static string GetIconUrl(string id, string? iconHash) =>
-            !string.IsNullOrWhiteSpace(iconHash)
-                ? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png"
-                : "https://cdn.discordapp.com/embed/avatars/0.png";
-
-        public static Guild DirectMessages { get; } = new Guild("@me", "Direct Messages", Array.Empty<Role>(), null);
-    }
-}
@@ -1,7 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    public interface IHasId
-    {
-        string Id { get; }
-    }
-}
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public partial class IdBasedEqualityComparer : IEqualityComparer<IHasId>
-    {
-        public bool Equals(IHasId? x, IHasId? y) => StringComparer.Ordinal.Equals(x?.Id, y?.Id);
-
-        public int GetHashCode(IHasId obj) => StringComparer.Ordinal.GetHashCode(obj.Id);
-    }
-
-    public partial class IdBasedEqualityComparer
-    {
-        public static IdBasedEqualityComparer Instance { get; } = new IdBasedEqualityComparer();
-    }
-}
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/guild#guild-member-object
-
-    public class Member
-    {
-        public string UserId { get; }
-
-        public string? Nick { get; }
-
-        public IReadOnlyList<string> Roles { get; }
-
-        public Member(string userId, string? nick, IReadOnlyList<string> roles)
-        {
-            UserId = userId;
-            Nick = nick;
-            Roles = roles;
-        }
-    }
-}
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#message-object
-
-    public class Message : IHasId
-    {
-        public string Id { get; }
-
-        public string ChannelId { get; }
-
-        public MessageType Type { get; }
-
-        public User Author { get; }
-
-        public DateTimeOffset Timestamp { get; }
-
-        public DateTimeOffset? EditedTimestamp { get; }
-
-        public bool IsPinned { 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,
-            DateTimeOffset timestamp, DateTimeOffset? editedTimestamp, bool isPinned,
-            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;
-            IsPinned = isPinned;
-            Content = content;
-            Attachments = attachments;
-            Embeds = embeds;
-            Reactions = reactions;
-            MentionedUsers = mentionedUsers;
-        }
-
-        public override string ToString() => Content ?? "<message without content>";
-    }
-}
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // Used for grouping contiguous messages in HTML export
-
-    public class MessageGroup
-    {
-        public User Author { get; }
-
-        public DateTimeOffset Timestamp { get; }
-
-        public IReadOnlyList<Message> Messages { get; }
-
-        public MessageGroup(User author, DateTimeOffset timestamp, IReadOnlyList<Message> messages)
-        {
-            Author = author;
-            Timestamp = timestamp;
-            Messages = messages;
-        }
-    }
-}
@@ -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,36 +0,0 @@
-using System.Drawing;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/topics/permissions#role-object
-
-    public partial class Role : IHasId
-    {
-        public string Id { get; }
-
-        public string Name { get; }
-
-        public Color Color { get; }
-
-        public string ColorAsHex => $"#{Color.ToArgb() & 0xffffff:X6}";
-
-        public string ColorAsRgb => $"{Color.R}, {Color.G}, {Color.B}";
-
-        public int Position { get; }
-
-        public Role(string id, string name, Color color, int position)
-        {
-            Id = id;
-            Name = name;
-            Color = color;
-            Position = position;
-        }
-
-        public override string ToString() => Name;
-    }
-
-    public partial class Role
-    {
-        public static Role CreateDeletedRole(string id) => new Role(id, "deleted-role", Color.Black, -1);
-    }
-}
@@ -1,61 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/topics/permissions#role-object
-
-    public partial class User : IHasId
-    {
-        public string Id { get; }
-
-        public int Discriminator { get; }
-
-        public string Name { get; }
-
-        public string FullName { get; }
-
-        public string? AvatarHash { get; }
-
-        public string AvatarUrl { get; }
-
-        public bool IsBot { get; }
-
-        public User(string id, int discriminator, string name, string? avatarHash, bool isBot)
-        {
-            Id = id;
-            Discriminator = discriminator;
-            Name = name;
-            AvatarHash = avatarHash;
-            IsBot = isBot;
-
-            FullName = GetFullName(name, discriminator);
-            AvatarUrl = GetAvatarUrl(id, discriminator, avatarHash);
-        }
-
-        public override string ToString() => FullName;
-    }
-
-    public partial class User
-    {
-        public static string GetFullName(string name, int discriminator) => $"{name}#{discriminator:0000}";
-
-        public static string GetAvatarUrl(string id, int discriminator, string? avatarHash)
-        {
-            // Custom avatar
-            if (!string.IsNullOrWhiteSpace(avatarHash))
-            {
-                // Animated
-                if (avatarHash.StartsWith("a_", StringComparison.Ordinal))
-                    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/{discriminator % 5}.png";
-        }
-
-        public static User CreateUnknownUser(string id) => new User(id, 0, "Unknown", null, false);
-    }
-}
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />
-
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\HtmlCore.css" />
-    <EmbeddedResource Include="Resources\HtmlDark.css" />
-    <EmbeddedResource Include="Resources\HtmlLight.css" />
-    <EmbeddedResource Include="Resources\HtmlLayoutTemplate.html" />
-    <EmbeddedResource Include="Resources\HtmlMessageGroupTemplate.html" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Scriban" Version="2.1.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj" />
-    <ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,34 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering.Logic;
-
-namespace DiscordChatExporter.Core.Rendering.Formatters
-{
-    public class CsvMessageWriter : MessageWriterBase
-    {
-        private readonly TextWriter _writer;
-
-        public CsvMessageWriter(Stream stream, RenderContext context)
-            : base(stream, context)
-        {
-            _writer = new StreamWriter(stream);
-        }
-
-        public override async Task WritePreambleAsync()
-        {
-            await _writer.WriteLineAsync(CsvRenderingLogic.FormatHeader(Context));
-        }
-
-        public override async Task WriteMessageAsync(Message message)
-        {
-            await _writer.WriteLineAsync(CsvRenderingLogic.FormatMessage(Context, message));
-        }
-
-        public override async ValueTask DisposeAsync()
-        {
-            await _writer.DisposeAsync();
-            await base.DisposeAsync();
-        }
-    }
-}
@@ -1,175 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering.Logic;
-using Scriban;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Rendering.Formatters
-{
-    public partial class HtmlMessageWriter : MessageWriterBase
-    {
-        private readonly TextWriter _writer;
-        private readonly string _themeName;
-        private readonly List<Message> _messageGroupBuffer = new List<Message>();
-
-        private readonly Template _preambleTemplate;
-        private readonly Template _messageGroupTemplate;
-        private readonly Template _postambleTemplate;
-
-        private long _messageCount;
-
-        public HtmlMessageWriter(Stream stream, RenderContext context, string themeName)
-            : base(stream, context)
-        {
-            _writer = new StreamWriter(stream);
-            _themeName = themeName;
-
-            _preambleTemplate = Template.Parse(GetPreambleTemplateCode());
-            _messageGroupTemplate = Template.Parse(GetMessageGroupTemplateCode());
-            _postambleTemplate = Template.Parse(GetPostambleTemplateCode());
-        }
-
-        private MessageGroup GetCurrentMessageGroup()
-        {
-            var firstMessage = _messageGroupBuffer.First();
-            return new MessageGroup(firstMessage.Author, firstMessage.Timestamp, _messageGroupBuffer);
-        }
-
-        private TemplateContext CreateTemplateContext(IReadOnlyDictionary<string, object>? constants = null)
-        {
-            // Template context
-            var templateContext = new TemplateContext
-            {
-                MemberRenamer = m => m.Name,
-                MemberFilter = m => true,
-                LoopLimit = int.MaxValue,
-                StrictVariables = true
-            };
-
-            // Model
-            var scriptObject = new ScriptObject();
-
-            // Constants
-            scriptObject.SetValue("Context", Context, true);
-            scriptObject.SetValue("CoreStyleSheet", GetCoreStyleSheetCode(), true);
-            scriptObject.SetValue("ThemeStyleSheet", GetThemeStyleSheetCode(_themeName), true);
-            scriptObject.SetValue("HighlightJsStyleName", $"solarized-{_themeName.ToLowerInvariant()}", true);
-
-            // Additional constants
-            if (constants != null)
-            {
-                foreach (var (member, value) in constants)
-                    scriptObject.SetValue(member, value, true);
-            }
-
-            // Functions
-            scriptObject.Import("FormatDate",
-                new Func<DateTimeOffset, string>(d => SharedRenderingLogic.FormatDate(d, Context.DateFormat)));
-
-            scriptObject.Import("FormatMarkdown",
-                new Func<string, string>(m => HtmlRenderingLogic.FormatMarkdown(Context, m)));
-
-            scriptObject.Import("GetUserColor", new Func<Guild, User, string>(Guild.GetUserColor));
-            
-            scriptObject.Import("GetUserNick", new Func<Guild, User, string>(Guild.GetUserNick));
-
-            // Push model
-            templateContext.PushGlobal(scriptObject);
-
-            // Push output
-            templateContext.PushOutput(new TextWriterOutput(_writer));
-
-            return templateContext;
-        }
-
-        private async Task RenderCurrentMessageGroupAsync()
-        {
-            var templateContext = CreateTemplateContext(new Dictionary<string, object>
-            {
-                ["MessageGroup"] = GetCurrentMessageGroup()
-            });
-
-            await templateContext.EvaluateAsync(_messageGroupTemplate.Page);
-        }
-
-        public override async Task WritePreambleAsync()
-        {
-            var templateContext = CreateTemplateContext();
-            await templateContext.EvaluateAsync(_preambleTemplate.Page);
-        }
-
-        public override async Task WriteMessageAsync(Message message)
-        {
-            // If message group is empty or the given message can be grouped, buffer the given message
-            if (!_messageGroupBuffer.Any() || HtmlRenderingLogic.CanBeGrouped(_messageGroupBuffer.Last(), message))
-            {
-                _messageGroupBuffer.Add(message);
-            }
-            // Otherwise, flush the group and render messages
-            else
-            {
-                await RenderCurrentMessageGroupAsync();
-
-                _messageGroupBuffer.Clear();
-                _messageGroupBuffer.Add(message);
-            }
-
-            // Increment message count
-            _messageCount++;
-        }
-
-        public override async Task WritePostambleAsync()
-        {
-            // Flush current message group
-            if (_messageGroupBuffer.Any())
-                await RenderCurrentMessageGroupAsync();
-
-            var templateContext = CreateTemplateContext(new Dictionary<string, object>
-            {
-                ["MessageCount"] = _messageCount
-            });
-
-            await templateContext.EvaluateAsync(_postambleTemplate.Page);
-        }
-
-        public override async ValueTask DisposeAsync()
-        {
-            await _writer.DisposeAsync();
-            await base.DisposeAsync();
-        }
-    }
-
-    public partial class HtmlMessageWriter
-    {
-        private static readonly Assembly ResourcesAssembly = typeof(HtmlRenderingLogic).Assembly;
-        private static readonly string ResourcesNamespace = $"{ResourcesAssembly.GetName().Name}.Resources";
-
-        private static string GetCoreStyleSheetCode() =>
-            ResourcesAssembly
-                .GetManifestResourceString($"{ResourcesNamespace}.HtmlCore.css");
-
-        private static string GetThemeStyleSheetCode(string themeName) =>
-            ResourcesAssembly
-                .GetManifestResourceString($"{ResourcesNamespace}.Html{themeName}.css");
-
-        private static string GetPreambleTemplateCode() =>
-            ResourcesAssembly
-                .GetManifestResourceString($"{ResourcesNamespace}.HtmlLayoutTemplate.html")
-                .SubstringUntil("{{~ %SPLIT% ~}}");
-
-        private static string GetMessageGroupTemplateCode() =>
-            ResourcesAssembly
-                .GetManifestResourceString($"{ResourcesNamespace}.HtmlMessageGroupTemplate.html");
-
-        private static string GetPostambleTemplateCode() =>
-            ResourcesAssembly
-                .GetManifestResourceString($"{ResourcesNamespace}.HtmlLayoutTemplate.html")
-                .SubstringAfter("{{~ %SPLIT% ~}}");
-    }
-}
@@ -1,222 +0,0 @@
-using System.IO;
-using System.Text.Json;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering.Internal;
-using DiscordChatExporter.Core.Rendering.Logic;
-
-namespace DiscordChatExporter.Core.Rendering.Formatters
-{
-    public class JsonMessageWriter : MessageWriterBase
-    {
-        private readonly Utf8JsonWriter _writer;
-
-        private long _messageCount;
-
-        public JsonMessageWriter(Stream stream, RenderContext context)
-            : base(stream, context)
-        {
-            _writer = new Utf8JsonWriter(stream, new JsonWriterOptions
-            {
-                Indented = true
-            });
-        }
-
-        public override async Task WritePreambleAsync()
-        {
-            // Root object (start)
-            _writer.WriteStartObject();
-
-            // Guild
-            _writer.WriteStartObject("guild");
-            _writer.WriteString("id", Context.Guild.Id);
-            _writer.WriteString("name", Context.Guild.Name);
-            _writer.WriteString("iconUrl", Context.Guild.IconUrl);
-            _writer.WriteEndObject();
-
-            // Channel
-            _writer.WriteStartObject("channel");
-            _writer.WriteString("id", Context.Channel.Id);
-            _writer.WriteString("type", Context.Channel.Type.ToString());
-            _writer.WriteString("name", Context.Channel.Name);
-            _writer.WriteString("topic", Context.Channel.Topic);
-            _writer.WriteEndObject();
-
-            // Date range
-            _writer.WriteStartObject("dateRange");
-            _writer.WriteString("after", Context.After);
-            _writer.WriteString("before", Context.Before);
-            _writer.WriteEndObject();
-
-            // Message array (start)
-            _writer.WriteStartArray("messages");
-
-            await _writer.FlushAsync();
-        }
-
-        public override async Task WriteMessageAsync(Message message)
-        {
-            _writer.WriteStartObject();
-
-            // Metadata
-            _writer.WriteString("id", message.Id);
-            _writer.WriteString("type", message.Type.ToString());
-            _writer.WriteString("timestamp", message.Timestamp);
-            _writer.WriteString("timestampEdited", message.EditedTimestamp);
-            _writer.WriteBoolean("isPinned", message.IsPinned);
-
-            // Content
-            var content = PlainTextRenderingLogic.FormatMessageContent(Context, message);
-            _writer.WriteString("content", content);
-
-            // Author
-            _writer.WriteStartObject("author");
-            _writer.WriteString("id", message.Author.Id);
-            _writer.WriteString("name", message.Author.Name);
-            _writer.WriteString("discriminator", $"{message.Author.Discriminator:0000}");
-            _writer.WriteBoolean("isBot", message.Author.IsBot);
-            _writer.WriteString("avatarUrl", message.Author.AvatarUrl);
-            _writer.WriteEndObject();
-
-            // Attachments
-            _writer.WriteStartArray("attachments");
-
-            foreach (var attachment in message.Attachments)
-            {
-                _writer.WriteStartObject();
-
-                _writer.WriteString("id", attachment.Id);
-                _writer.WriteString("url", attachment.Url);
-                _writer.WriteString("fileName", attachment.FileName);
-                _writer.WriteNumber("fileSizeBytes", (long) attachment.FileSize.Bytes);
-
-                _writer.WriteEndObject();
-            }
-
-            _writer.WriteEndArray();
-
-            // Embeds
-            _writer.WriteStartArray("embeds");
-
-            foreach (var embed in message.Embeds)
-            {
-                _writer.WriteStartObject();
-
-                _writer.WriteString("title", embed.Title);
-                _writer.WriteString("url", embed.Url);
-                _writer.WriteString("timestamp", embed.Timestamp);
-                _writer.WriteString("description", embed.Description);
-
-                // Author
-                if (embed.Author != null)
-                {
-                    _writer.WriteStartObject("author");
-                    _writer.WriteString("name", embed.Author.Name);
-                    _writer.WriteString("url", embed.Author.Url);
-                    _writer.WriteString("iconUrl", embed.Author.IconUrl);
-                    _writer.WriteEndObject();
-                }
-
-                // Thumbnail
-                if (embed.Thumbnail != null)
-                {
-                    _writer.WriteStartObject("thumbnail");
-                    _writer.WriteString("url", embed.Thumbnail.Url);
-                    _writer.WriteNumber("width", embed.Thumbnail.Width);
-                    _writer.WriteNumber("height", embed.Thumbnail.Height);
-                    _writer.WriteEndObject();
-                }
-
-                // Image
-                if (embed.Image != null)
-                {
-                    _writer.WriteStartObject("image");
-                    _writer.WriteString("url", embed.Image.Url);
-                    _writer.WriteNumber("width", embed.Image.Width);
-                    _writer.WriteNumber("height", embed.Image.Height);
-                    _writer.WriteEndObject();
-                }
-
-                // Footer
-                if (embed.Footer != null)
-                {
-                    _writer.WriteStartObject("footer");
-                    _writer.WriteString("text", embed.Footer.Text);
-                    _writer.WriteString("iconUrl", embed.Footer.IconUrl);
-                    _writer.WriteEndObject();
-                }
-
-                // Fields
-                _writer.WriteStartArray("fields");
-
-                foreach (var field in embed.Fields)
-                {
-                    _writer.WriteStartObject();
-
-                    _writer.WriteString("name", field.Name);
-                    _writer.WriteString("value", field.Value);
-                    _writer.WriteBoolean("isInline", field.IsInline);
-
-                    _writer.WriteEndObject();
-                }
-
-                _writer.WriteEndArray();
-
-                _writer.WriteEndObject();
-            }
-
-            _writer.WriteEndArray();
-
-            // Reactions
-            _writer.WriteStartArray("reactions");
-
-            foreach (var reaction in message.Reactions)
-            {
-                _writer.WriteStartObject();
-
-                // Emoji
-                _writer.WriteStartObject("emoji");
-                _writer.WriteString("id", reaction.Emoji.Id);
-                _writer.WriteString("name", reaction.Emoji.Name);
-                _writer.WriteBoolean("isAnimated", reaction.Emoji.IsAnimated);
-                _writer.WriteString("imageUrl", reaction.Emoji.ImageUrl);
-                _writer.WriteEndObject();
-
-                // Count
-                _writer.WriteNumber("count", reaction.Count);
-
-                _writer.WriteEndObject();
-            }
-
-            _writer.WriteEndArray();
-
-            _writer.WriteEndObject();
-
-            _messageCount++;
-
-            // Flush every 100 messages
-            if (_messageCount % 100 == 0)
-                await _writer.FlushAsync();
-        }
-
-        public override async Task WritePostambleAsync()
-        {
-            // Message array (end)
-            _writer.WriteEndArray();
-
-            // Message count
-            _writer.WriteNumber("messageCount", _messageCount);
-
-            // Root object (end)
-            _writer.WriteEndObject();
-
-            await _writer.FlushAsync();
-        }
-
-        public override async ValueTask DisposeAsync()
-        {
-            await _writer.DisposeAsync();
-            await base.DisposeAsync();
-        }
-    }
-}
@@ -1,28 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Rendering.Formatters
-{
-    public abstract class MessageWriterBase : IAsyncDisposable
-    {
-        protected Stream Stream { get; }
-
-        protected RenderContext Context { get; }
-
-        protected MessageWriterBase(Stream stream, RenderContext context)
-        {
-            Stream = stream;
-            Context = context;
-        }
-
-        public virtual Task WritePreambleAsync() => Task.CompletedTask;
-
-        public abstract Task WriteMessageAsync(Message message);
-
-        public virtual Task WritePostambleAsync() => Task.CompletedTask;
-
-        public virtual async ValueTask DisposeAsync() => await Stream.DisposeAsync();
-    }
-}
@@ -1,45 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering.Logic;
-
-namespace DiscordChatExporter.Core.Rendering.Formatters
-{
-    public class PlainTextMessageWriter : MessageWriterBase
-    {
-        private readonly TextWriter _writer;
-
-        private long _messageCount;
-
-        public PlainTextMessageWriter(Stream stream, RenderContext context)
-            : base(stream, context)
-        {
-            _writer = new StreamWriter(stream);
-        }
-
-        public override async Task WritePreambleAsync()
-        {
-            await _writer.WriteLineAsync(PlainTextRenderingLogic.FormatPreamble(Context));
-        }
-
-        public override async Task WriteMessageAsync(Message message)
-        {
-            await _writer.WriteLineAsync(PlainTextRenderingLogic.FormatMessage(Context, message));
-            await _writer.WriteLineAsync();
-
-            _messageCount++;
-        }
-
-        public override async Task WritePostambleAsync()
-        {
-            await _writer.WriteLineAsync();
-            await _writer.WriteLineAsync(PlainTextRenderingLogic.FormatPostamble(_messageCount));
-        }
-
-        public override async ValueTask DisposeAsync()
-        {
-            await _writer.DisposeAsync();
-            await base.DisposeAsync();
-        }
-    }
-}
@@ -1,43 +0,0 @@
-using System;
-using System.Text;
-using System.Text.Json;
-
-namespace DiscordChatExporter.Core.Rendering.Internal
-{
-    internal static class Extensions
-    {
-        public static StringBuilder AppendLineIfNotEmpty(this StringBuilder builder, string value) =>
-            !string.IsNullOrWhiteSpace(value) ? builder.AppendLine(value) : builder;
-
-        public static StringBuilder Trim(this StringBuilder builder)
-        {
-            while (builder.Length > 0 && char.IsWhiteSpace(builder[0]))
-                builder.Remove(0, 1);
-
-            while (builder.Length > 0 && char.IsWhiteSpace(builder[^1]))
-                builder.Remove(builder.Length - 1, 1);
-
-            return builder;
-        }
-
-        public static void WriteString(this Utf8JsonWriter writer, string propertyName, DateTimeOffset? value)
-        {
-            writer.WritePropertyName(propertyName);
-
-            if (value != null)
-                writer.WriteStringValue(value.Value);
-            else
-                writer.WriteNullValue();
-        }
-
-        public static void WriteNumber(this Utf8JsonWriter writer, string propertyName, int? value)
-        {
-            writer.WritePropertyName(propertyName);
-
-            if (value != null)
-                writer.WriteNumberValue(value.Value);
-            else
-                writer.WriteNullValue();
-        }
-    }
-}
@@ -1,39 +0,0 @@
-using System.Linq;
-using System.Text;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-using static DiscordChatExporter.Core.Rendering.Logic.SharedRenderingLogic;
-
-namespace DiscordChatExporter.Core.Rendering.Logic
-{
-    public static class CsvRenderingLogic
-    {
-        // Header is always the same
-        public static string FormatHeader(RenderContext context) => "AuthorID,Author,Date,Content,Attachments,Reactions";
-
-        private static string EncodeValue(string value)
-        {
-            value = value.Replace("\"", "\"\"");
-            return $"\"{value}\"";
-        }
-
-        public static string FormatMarkdown(RenderContext context, string markdown) =>
-            PlainTextRenderingLogic.FormatMarkdown(context, markdown);
-
-        public static string FormatMessage(RenderContext context, Message message)
-        {
-            var buffer = new StringBuilder();
-
-            buffer
-                .Append(EncodeValue(message.Author.Id)).Append(',')
-                .Append(EncodeValue(message.Author.FullName)).Append(',')
-                .Append(EncodeValue(FormatDate(message.Timestamp, context.DateFormat))).Append(',')
-                .Append(EncodeValue(FormatMarkdown(context, message.Content ?? ""))).Append(',')
-                .Append(EncodeValue(message.Attachments.Select(a => a.Url).JoinToString(","))).Append(',')
-                .Append(EncodeValue(message.Reactions.Select(r => $"{r.Emoji.Name} ({r.Count})").JoinToString(",")));
-
-            return buffer.ToString();
-        }
-    }
-}
@@ -1,167 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Net;
-using System.Text.RegularExpressions;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Markdown.Ast;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Rendering.Logic
-{
-    internal static class HtmlRenderingLogic
-    {
-        public static bool CanBeGrouped(Message message1, Message message2)
-        {
-            if (message1.Author.Id != message2.Author.Id)
-                return false;
-
-            if ((message2.Timestamp - message1.Timestamp).Duration().TotalMinutes > 7)
-                return false;
-
-            return true;
-        }
-
-        private static string HtmlEncode(string s) => WebUtility.HtmlEncode(s);
-
-        private static string FormatMarkdownNode(RenderContext context, Node node, bool isJumbo)
-        {
-            // Text node
-            if (node is TextNode textNode)
-            {
-                // Return HTML-encoded text
-                return HtmlEncode(textNode.Text);
-            }
-
-            // Formatted node
-            if (node is FormattedNode formattedNode)
-            {
-                // Recursively get inner html
-                var innerHtml = FormatMarkdownNodes(context, formattedNode.Children, false);
-
-                // Bold
-                if (formattedNode.Formatting == TextFormatting.Bold)
-                    return $"<strong>{innerHtml}</strong>";
-
-                // Italic
-                if (formattedNode.Formatting == TextFormatting.Italic)
-                    return $"<em>{innerHtml}</em>";
-
-                // Underline
-                if (formattedNode.Formatting == TextFormatting.Underline)
-                    return $"<u>{innerHtml}</u>";
-
-                // Strikethrough
-                if (formattedNode.Formatting == TextFormatting.Strikethrough)
-                    return $"<s>{innerHtml}</s>";
-
-                // Spoiler
-                if (formattedNode.Formatting == TextFormatting.Spoiler)
-                    return $"<span class=\"spoiler\">{innerHtml}</span>";
-
-                // Quote
-                if (formattedNode.Formatting == TextFormatting.Quote)
-                    return $"<div class=\"quote\">{innerHtml}</div>";
-            }
-
-            // Inline code block node
-            if (node is InlineCodeBlockNode inlineCodeBlockNode)
-            {
-                return $"<span class=\"pre pre--inline\">{HtmlEncode(inlineCodeBlockNode.Code)}</span>";
-            }
-
-            // Multi-line code block node
-            if (node is MultiLineCodeBlockNode multilineCodeBlockNode)
-            {
-                // Set CSS class for syntax highlighting
-                var highlightCssClass = !string.IsNullOrWhiteSpace(multilineCodeBlockNode.Language)
-                    ? $"language-{multilineCodeBlockNode.Language}"
-                    : "nohighlight";
-
-                return $"<div class=\"pre pre--multiline {highlightCssClass}\">{HtmlEncode(multilineCodeBlockNode.Code)}</div>";
-            }
-
-            // Mention node
-            if (node is MentionNode mentionNode)
-            {
-                // Meta mention node
-                if (mentionNode.Type == MentionType.Meta)
-                {
-                    return $"<span class=\"mention\">@{HtmlEncode(mentionNode.Id)}</span>";
-                }
-
-                // User mention node
-                if (mentionNode.Type == MentionType.User)
-                {
-                    var user = context.MentionableUsers.FirstOrDefault(u => u.Id == mentionNode.Id) ??
-                               User.CreateUnknownUser(mentionNode.Id);
-
-                    var nick = Guild.GetUserNick(context.Guild, user);
-
-                    return $"<span class=\"mention\" title=\"{HtmlEncode(user.FullName)}\">@{HtmlEncode(nick)}</span>";
-                }
-
-                // Channel mention node
-                if (mentionNode.Type == MentionType.Channel)
-                {
-                    var channel = context.MentionableChannels.FirstOrDefault(c => c.Id == mentionNode.Id) ??
-                                  Channel.CreateDeletedChannel(mentionNode.Id);
-
-                    return $"<span class=\"mention\">#{HtmlEncode(channel.Name)}</span>";
-                }
-
-                // Role mention node
-                if (mentionNode.Type == MentionType.Role)
-                {
-                    var role = context.MentionableRoles.FirstOrDefault(r => r.Id == mentionNode.Id) ??
-                               Role.CreateDeletedRole(mentionNode.Id);
-                    string style = "";
-                    if (role.Color != Color.Black)
-                        style = $"style=\"color: {role.ColorAsHex}; background-color: rgba({role.ColorAsRgb}, 0.1); font-weight: 400;\"";
-
-                    return $"<span class=\"mention\" {style}>@{HtmlEncode(role.Name)}</span>";
-                }
-            }
-
-            // Emoji node
-            if (node is EmojiNode emojiNode)
-            {
-                // Get emoji image URL
-                var emojiImageUrl = Emoji.GetImageUrl(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated);
-
-                // Make emoji large if it's jumbo
-                var jumboableCssClass = isJumbo ? "emoji--large" : null;
-
-                return
-                    $"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />";
-            }
-
-            // Link node
-            if (node is LinkNode linkNode)
-            {
-                // Extract message ID if the link points to a Discord message
-                var linkedMessageId = Regex.Match(linkNode.Url, "^https?://discordapp.com/channels/.*?/(\\d+)/?$").Groups[1].Value;
-
-                return string.IsNullOrWhiteSpace(linkedMessageId)
-                    ? $"<a href=\"{Uri.EscapeUriString(linkNode.Url)}\">{HtmlEncode(linkNode.Title)}</a>"
-                    : $"<a href=\"{Uri.EscapeUriString(linkNode.Url)}\" onclick=\"scrollToMessage(event, '{linkedMessageId}')\">{HtmlEncode(linkNode.Title)}</a>";
-            }
-
-            // Throw on unexpected nodes
-            throw new InvalidOperationException($"Unexpected node [{node.GetType()}].");
-        }
-
-        private static string FormatMarkdownNodes(RenderContext context, IReadOnlyList<Node> nodes, bool isTopLevel)
-        {
-            // Emojis are jumbo if all top-level nodes are emoji nodes or whitespace text nodes
-            var isJumbo = isTopLevel && nodes.All(n => n is EmojiNode || n is TextNode textNode && string.IsNullOrWhiteSpace(textNode.Text));
-
-            return nodes.Select(n => FormatMarkdownNode(context, n, isJumbo)).JoinToString("");
-        }
-
-        public static string FormatMarkdown(RenderContext context, string markdown) =>
-            FormatMarkdownNodes(context, MarkdownParser.Parse(markdown), true);
-    }
-}
@@ -1,246 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Markdown.Ast;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering.Internal;
-using Tyrrrz.Extensions;
-
-using static DiscordChatExporter.Core.Rendering.Logic.SharedRenderingLogic;
-
-namespace DiscordChatExporter.Core.Rendering.Logic
-{
-    public static class PlainTextRenderingLogic
-    {
-        public static string FormatPreamble(RenderContext context)
-        {
-            var buffer = new StringBuilder();
-
-            buffer.Append('=', 62).AppendLine();
-            buffer.AppendLine($"Guild: {context.Guild.Name}");
-            buffer.AppendLine($"Channel: {context.Channel.Name}");
-
-            if (!string.IsNullOrWhiteSpace(context.Channel.Topic))
-                buffer.AppendLine($"Topic: {context.Channel.Topic}");
-
-            if (context.After != null)
-                buffer.AppendLine($"After: {FormatDate(context.After.Value, context.DateFormat)}");
-
-            if (context.Before != null)
-                buffer.AppendLine($"Before: {FormatDate(context.Before.Value, context.DateFormat)}");
-
-            buffer.Append('=', 62).AppendLine();
-
-            return buffer.ToString();
-        }
-
-        public static string FormatPostamble(long messageCount)
-        {
-            var buffer = new StringBuilder();
-
-            buffer.Append('=', 62).AppendLine();
-            buffer.AppendLine($"Exported {messageCount:N0} message(s)");
-            buffer.Append('=', 62).AppendLine();
-
-            return buffer.ToString();
-        }
-
-        private static string FormatMarkdownNode(RenderContext context, Node node)
-        {
-            // Text node
-            if (node is TextNode textNode)
-            {
-                return textNode.Text;
-            }
-
-            // Mention node
-            if (node is MentionNode mentionNode)
-            {
-                // Meta mention node
-                if (mentionNode.Type == MentionType.Meta)
-                {
-                    return $"@{mentionNode.Id}";
-                }
-
-                // User mention node
-                if (mentionNode.Type == MentionType.User)
-                {
-                    var user = context.MentionableUsers.FirstOrDefault(u => u.Id == mentionNode.Id) ??
-                               User.CreateUnknownUser(mentionNode.Id);
-
-                    return $"@{user.Name}";
-                }
-
-                // Channel mention node
-                if (mentionNode.Type == MentionType.Channel)
-                {
-                    var channel = context.MentionableChannels.FirstOrDefault(c => c.Id == mentionNode.Id) ??
-                                  Channel.CreateDeletedChannel(mentionNode.Id);
-
-                    return $"#{channel.Name}";
-                }
-
-                // Role mention node
-                if (mentionNode.Type == MentionType.Role)
-                {
-                    var role = context.MentionableRoles.FirstOrDefault(r => r.Id == mentionNode.Id) ??
-                               Role.CreateDeletedRole(mentionNode.Id);
-
-                    return $"@{role.Name}";
-                }
-            }
-
-            // Emoji node
-            if (node is EmojiNode emojiNode)
-            {
-                return emojiNode.IsCustomEmoji ? $":{emojiNode.Name}:" : emojiNode.Name;
-            }
-
-            // Throw on unexpected nodes
-            throw new InvalidOperationException($"Unexpected node [{node.GetType()}].");
-        }
-
-        public static string FormatMarkdown(RenderContext context, string markdown) =>
-            MarkdownParser.ParseMinimal(markdown).Select(n => FormatMarkdownNode(context, n)).JoinToString("");
-
-        public static string FormatMessageHeader(RenderContext context, Message message)
-        {
-            var buffer = new StringBuilder();
-
-            // Timestamp & author
-            buffer
-                .Append($"[{FormatDate(message.Timestamp, context.DateFormat)}]")
-                .Append(' ')
-                .Append($"{message.Author.FullName}");
-
-            // Whether the message is pinned
-            if (message.IsPinned)
-            {
-                buffer.Append(' ').Append("(pinned)");
-            }
-
-            return buffer.ToString();
-        }
-
-        public static string FormatMessageContent(RenderContext context, Message message)
-        {
-            if (string.IsNullOrWhiteSpace(message.Content))
-                return "";
-
-            return FormatMarkdown(context, message.Content);
-        }
-
-        public static string FormatAttachments(IReadOnlyList<Attachment> attachments)
-        {
-            if (!attachments.Any())
-                return "";
-
-            var buffer = new StringBuilder();
-
-            buffer
-                .AppendLine("{Attachments}")
-                .AppendJoin(Environment.NewLine, attachments.Select(a => a.Url))
-                .AppendLine();
-
-            return buffer.ToString();
-        }
-
-        public static string FormatEmbeds(RenderContext context, IReadOnlyList<Embed> embeds)
-        {
-            if (!embeds.Any())
-                return "";
-
-            var buffer = new StringBuilder();
-
-            foreach (var embed in embeds)
-            {
-                buffer.AppendLine("{Embed}");
-
-                // Author name
-                if (!string.IsNullOrWhiteSpace(embed.Author?.Name))
-                    buffer.AppendLine(embed.Author.Name);
-
-                // URL
-                if (!string.IsNullOrWhiteSpace(embed.Url))
-                    buffer.AppendLine(embed.Url);
-
-                // Title
-                if (!string.IsNullOrWhiteSpace(embed.Title))
-                    buffer.AppendLine(FormatMarkdown(context, embed.Title));
-
-                // Description
-                if (!string.IsNullOrWhiteSpace(embed.Description))
-                    buffer.AppendLine(FormatMarkdown(context, embed.Description));
-
-                // Fields
-                foreach (var field in embed.Fields)
-                {
-                    // Name
-                    if (!string.IsNullOrWhiteSpace(field.Name))
-                        buffer.AppendLine(field.Name);
-
-                    // Value
-                    if (!string.IsNullOrWhiteSpace(field.Value))
-                        buffer.AppendLine(field.Value);
-                }
-
-                // Thumbnail URL
-                if (!string.IsNullOrWhiteSpace(embed.Thumbnail?.Url))
-                    buffer.AppendLine(embed.Thumbnail?.Url);
-
-                // Image URL
-                if (!string.IsNullOrWhiteSpace(embed.Image?.Url))
-                    buffer.AppendLine(embed.Image?.Url);
-
-                // Footer text
-                if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
-                    buffer.AppendLine(embed.Footer?.Text);
-
-                buffer.AppendLine();
-            }
-
-            return buffer.ToString();
-        }
-
-        public static string FormatReactions(IReadOnlyList<Reaction> reactions)
-        {
-            if (!reactions.Any())
-                return "";
-
-            var buffer = new StringBuilder();
-
-            buffer.AppendLine("{Reactions}");
-
-            foreach (var reaction in reactions)
-            {
-                buffer.Append(reaction.Emoji.Name);
-
-                if (reaction.Count > 1)
-                    buffer.Append($" ({reaction.Count})");
-
-                buffer.Append(" ");
-            }
-
-            buffer.AppendLine();
-
-            return buffer.ToString();
-        }
-
-        public static string FormatMessage(RenderContext context, Message message)
-        {
-            var buffer = new StringBuilder();
-
-            buffer
-                .AppendLine(FormatMessageHeader(context, message))
-                .AppendLineIfNotEmpty(FormatMessageContent(context, message))
-                .AppendLine()
-                .AppendLineIfNotEmpty(FormatAttachments(message.Attachments))
-                .AppendLineIfNotEmpty(FormatEmbeds(context, message.Embeds))
-                .AppendLineIfNotEmpty(FormatReactions(message.Reactions));
-
-            return buffer.Trim().ToString();
-        }
-    }
-}
@@ -1,11 +0,0 @@
-using System;
-using System.Globalization;
-
-namespace DiscordChatExporter.Core.Rendering.Logic
-{
-    public static class SharedRenderingLogic
-    {
-        public static string FormatDate(DateTimeOffset date, string dateFormat) =>
-            date.ToLocalTime().ToString(dateFormat, CultureInfo.InvariantCulture);
-    }
-}
@@ -1,124 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering.Formatters;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public partial class MessageRenderer : IAsyncDisposable
-    {
-        private readonly RenderOptions _options;
-        private readonly RenderContext _context;
-
-        private long _renderedMessageCount;
-        private int _partitionIndex;
-        private MessageWriterBase? _writer;
-
-        public MessageRenderer(RenderOptions options, RenderContext context)
-        {
-            _options = options;
-            _context = context;
-        }
-
-        private async Task InitializeWriterAsync()
-        {
-            // Get partition file path
-            var filePath = GetPartitionFilePath(_options.BaseFilePath, _partitionIndex);
-
-            // Create output directory
-            var dirPath = Path.GetDirectoryName(_options.BaseFilePath);
-            if (!string.IsNullOrWhiteSpace(dirPath))
-                Directory.CreateDirectory(dirPath);
-
-            // Create writer
-            _writer = CreateMessageWriter(filePath, _options.Format, _context);
-
-            // Write preamble
-            await _writer.WritePreambleAsync();
-        }
-
-        private async Task ResetWriterAsync()
-        {
-            if (_writer != null)
-            {
-                // Write postamble
-                await _writer.WritePostambleAsync();
-
-                // Flush
-                await _writer.DisposeAsync();
-                _writer = null;
-            }
-        }
-
-        public async Task RenderMessageAsync(Message message)
-        {
-            // Ensure underlying writer is initialized
-            if (_writer == null)
-                await InitializeWriterAsync();
-
-            // Render the actual message
-            await _writer!.WriteMessageAsync(message);
-
-            // Increment count
-            _renderedMessageCount++;
-
-            // Shift partition if necessary
-            if (_options.PartitionLimit != null &&
-                _options.PartitionLimit != 0 &&
-                _renderedMessageCount % _options.PartitionLimit == 0)
-            {
-                await ResetWriterAsync();
-                _partitionIndex++;
-            }
-        }
-
-        public async ValueTask DisposeAsync() => await ResetWriterAsync();
-    }
-
-    public partial class MessageRenderer
-    {
-        private static string GetPartitionFilePath(string baseFilePath, int partitionIndex)
-        {
-            // First partition - no changes
-            if (partitionIndex <= 0)
-                return baseFilePath;
-
-            // Inject partition index into file name
-            var fileNameWithoutExt = Path.GetFileNameWithoutExtension(baseFilePath);
-            var fileExt = Path.GetExtension(baseFilePath);
-            var fileName = $"{fileNameWithoutExt} [part {partitionIndex + 1}]{fileExt}";
-
-            // Generate new path
-            var dirPath = Path.GetDirectoryName(baseFilePath);
-            if (!string.IsNullOrWhiteSpace(dirPath))
-                return Path.Combine(dirPath, fileName);
-
-            return fileName;
-        }
-
-        private static MessageWriterBase CreateMessageWriter(string filePath, ExportFormat format, RenderContext context)
-        {
-            // Create a stream (it will get disposed by the writer)
-            var stream = File.Create(filePath);
-
-            // Create formatter
-            if (format == ExportFormat.PlainText)
-                return new PlainTextMessageWriter(stream, context);
-
-            if (format == ExportFormat.Csv)
-                return new CsvMessageWriter(stream, context);
-
-            if (format == ExportFormat.HtmlDark)
-                return new HtmlMessageWriter(stream, context, "Dark");
-
-            if (format == ExportFormat.HtmlLight)
-                return new HtmlMessageWriter(stream, context, "Light");
-
-            if (format == ExportFormat.Json)
-                return new JsonMessageWriter(stream, context);
-
-            throw new InvalidOperationException($"Unknown export format [{format}].");
-        }
-    }
-}
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public class RenderContext
-    {
-        public Guild Guild { get; }
-
-        public Channel Channel { get; }
-
-        public DateTimeOffset? After { get; }
-
-        public DateTimeOffset? Before { get; }
-
-        public string DateFormat { get; }
-
-        public IReadOnlyCollection<User> MentionableUsers { get; }
-
-        public IReadOnlyCollection<Channel> MentionableChannels { get; }
-
-        public IReadOnlyCollection<Role> MentionableRoles { get; }
-
-        public RenderContext(Guild guild, Channel channel, DateTimeOffset? after, DateTimeOffset? before, string dateFormat,
-            IReadOnlyCollection<User> mentionableUsers, IReadOnlyCollection<Channel> mentionableChannels, IReadOnlyCollection<Role> mentionableRoles)
-        {
-            Guild = guild;
-            Channel = channel;
-            After = after;
-            Before = before;
-            DateFormat = dateFormat;
-            MentionableUsers = mentionableUsers;
-            MentionableChannels = mentionableChannels;
-            MentionableRoles = mentionableRoles;
-        }
-    }
-}
@@ -1,20 +0,0 @@
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public class RenderOptions
-    {
-        public string BaseFilePath { get; }
-
-        public ExportFormat Format { get; }
-
-        public int? PartitionLimit { get; }
-
-        public RenderOptions(string baseFilePath, ExportFormat format, int? partitionLimit)
-        {
-            BaseFilePath = baseFilePath;
-            Format = format;
-            PartitionLimit = partitionLimit;
-        }
-    }
-}
@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    {{~ # Metadata ~}}
-    <title>{{ Context.Guild.Name | html.escape }} - {{ Context.Channel.Name | html.escape }}</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width" />
-
-    {{~ # Styles ~}}
-    <style>
-        {{ CoreStyleSheet }}
-    </style>
-    <style>
-        {{ ThemeStyleSheet }}
-    </style>
-
-    {{~ # Syntax highlighting ~}}
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/{{HighlightJsStyleName}}.min.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
-    <script>
-        document.addEventListener('DOMContentLoaded', () => {
-            document.querySelectorAll('.pre--multiline').forEach(block => hljs.highlightBlock(block));
-        });
-    </script>
-
-    {{~ # Local scripts ~}}
-    <script>
-        function scrollToMessage(event, id) {
-            var element = document.getElementById('message-' + id);
-
-            if (element) {
-                event.preventDefault();
-
-                element.classList.add('chatlog__message--highlighted');
-
-                window.scrollTo({
-                    top: element.getBoundingClientRect().top - document.body.getBoundingClientRect().top - (window.innerHeight / 2),
-                    behavior: 'smooth'
-                });
-
-                window.setTimeout(function() {
-                    element.classList.remove('chatlog__message--highlighted');
-                }, 2000);
-            }
-        }
-    </script>
-</head>
-<body>
-
-{{~ # Preamble ~}}
-<div class="preamble">
-    <div class="preamble__guild-icon-container">
-        <img class="preamble__guild-icon" src="{{ Context.Guild.IconUrl }}" alt="Guild icon" />
-    </div>
-    <div class="preamble__entries-container">
-        <div class="preamble__entry">{{ Context.Guild.Name | html.escape }}</div>
-        <div class="preamble__entry">{{ Context.Channel.Name | html.escape }}</div>
-
-        {{~ if Context.Channel.Topic ~}}
-            <div class="preamble__entry preamble__entry--small">{{ Context.Channel.Topic | html.escape }}</div>
-        {{~ end ~}}
-
-        {{~ if Context.After || Context.Before ~}}
-            <div class="preamble__entry preamble__entry--small">
-                {{~ if Context.After && Context.Before ~}}
-                    Between {{ Context.After | FormatDate | html.escape }} and {{ Context.Before | FormatDate | html.escape }}
-                {{~ else if Context.After ~}}
-                    After {{ Context.After | FormatDate | html.escape }}
-                {{~ else if Context.Before ~}}
-                    Before {{ Context.Before | FormatDate | html.escape }}
-                {{~ end ~}}
-            </div>
-        {{~ end ~}}
-    </div>
-</div>
-
-{{~ # Log ~}}
-<div class="chatlog">
-    {{~ %SPLIT% ~}}
-</div>
-
-{{~ # Postamble ~}}
-<div class="postamble">
-    <div class="postamble__entry">Exported {{ MessageCount | object.format "N0" }} message(s)</div>
-</div>
-
-</body>
-</html>
@@ -1,170 +0,0 @@
-<div class="chatlog__message-group">
-    {{~ # Avatar ~}}
-    <div class="chatlog__author-avatar-container">
-        <img class="chatlog__author-avatar" src="{{ MessageGroup.Author.AvatarUrl }}" alt="Avatar" />
-    </div>
-    <div class="chatlog__messages">
-        {{~ # Author name and timestamp ~}}
-    <span class="chatlog__author-name" title="{{ MessageGroup.Author.FullName | html.escape }}" data-user-id="{{ MessageGroup.Author.Id | html.escape }}" style="color: {{ GetUserColor Context.Guild MessageGroup.Author }}">{{ GetUserNick Context.Guild MessageGroup.Author | html.escape }}</span>
-
-        {{~ # Bot tag ~}}
-        {{~ if MessageGroup.Author.IsBot ~}}
-            <span class="chatlog__bot-tag">BOT</span>
-        {{~ end ~}}
-
-        <span class="chatlog__timestamp">{{ MessageGroup.Timestamp | FormatDate | html.escape }}</span>
-
-        {{~ # Messages ~}}
-        {{~ for message in MessageGroup.Messages ~}}
-            <div class="chatlog__message {{if message.IsPinned }}chatlog__message--pinned{{ end }}" data-message-id="{{ message.Id }}" id="message-{{ message.Id }}">
-            {{~ # 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 }}" alt="Attachment" />
-                        {{~ # Non-image ~}}
-                        {{~ else ~}}
-                            Attachment: {{ attachment.FileName }} ({{ attachment.FileSize }})
-                        {{~ end ~}}
-                    </a>
-                </div>
-            {{~ end ~}}
-
-            {{~ # Embeds ~}}
-            {{~ for embed in message.Embeds ~}}
-            <div class="chatlog__embed">
-                {{~ if embed.Color ~}}
-                <div class="chatlog__embed-color-pill" style="background-color: rgba({{ embed.Color.R }},{{ embed.Color.G }},{{ embed.Color.B }},{{ embed.Color.A }})"></div>
-                {{~ else ~}}
-                <div class="chatlog__embed-color-pill chatlog__embed-color-pill--default"></div>
-                {{~ end ~}}
-                <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 }}" alt="Author icon" />
-                                {{~ 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 }}" alt="Thumbnail" />
-                            </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 }}" alt="Image" />
-                        </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 }}" alt="Footer icon" />
-                        {{~ 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" alt="{{ reaction.Emoji.Name }}" title="{{ reaction.Emoji.Name }}" src="{{ reaction.Emoji.ImageUrl }}" />
-                            <span class="chatlog__reaction-count">{{ reaction.Count }}</span>
-                        </div>
-                    {{~ end ~}}
-                </div>
-            {{~ end ~}}
-            </div>
-        {{~ end ~}}
-    </div>
-</div>
@@ -1,228 +0,0 @@
-using System;
-using System.Drawing;
-using System.Linq;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services.Internal;
-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>();
-            var isBot = json["bot"]?.Value<bool>() ?? false;
-
-            return new User(id, discriminator, name, avatarHash, isBot);
-        }
-
-        private Member ParseMember(JToken json)
-        {
-            var userId = ParseUser(json["user"]!).Id;
-            var nick = json["nick"]?.Value<string>();
-            var roles = (json["roles"] ?? Enumerable.Empty<JToken>()).Select(j => j.Value<string>()).ToArray();
-
-            return new Member(userId, nick, roles);
-        }
-
-        private Guild ParseGuild(JToken json)
-        {
-            var id = json["id"]!.Value<string>();
-            var name = json["name"]!.Value<string>();
-            var iconHash = json["icon"]!.Value<string>();
-            var roles = (json["roles"] ?? Enumerable.Empty<JToken>()).Select(ParseRole).ToArray();
-
-            return new Guild(id, name, roles, 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 (string.IsNullOrWhiteSpace(guildId))
-                guildId = Guild.DirectMessages.Id;
-
-            // Try to extract name
-            var name = json["name"]?.Value<string>();
-
-            // If the name is blank, it's direct messages
-            if (string.IsNullOrWhiteSpace(name))
-                name = json["recipients"]?.Select(ParseUser).Select(u => u.Name).JoinToString(", ");
-
-            // If the name is still blank for some reason, fallback to ID
-            // (blind fix to https://github.com/Tyrrrz/DiscordChatExporter/issues/227)
-            if (string.IsNullOrWhiteSpace(name))
-                name = id;
-
-            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>();
-            var color = json["color"]!.Value<int>();
-            var position = json["position"]!.Value<int>();
-
-            return new Role(id, name, Color.FromArgb(color), position);
-        }
-
-        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 = new FileSize(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>().ToDateTimeOffset();
-
-            // Get color
-            var color = json["color"] != null
-                ? Color.FromArgb(json["color"]!.Value<int>()).ResetAlpha()
-                : default(Color?);
-
-            // Get author
-            var author = json["author"] != null ? ParseEmbedAuthor(json["author"]!) : null;
-
-            // Get fields
-            var fields = (json["fields"] ?? Enumerable.Empty<JToken>()).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>().ToDateTimeOffset();
-            var editedTimestamp = json["edited_timestamp"]?.Value<DateTime?>()?.ToDateTimeOffset();
-            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"] ?? Enumerable.Empty<JToken>()).Select(ParseAttachment).ToArray();
-
-            // Get embeds
-            var embeds = (json["embeds"] ?? Enumerable.Empty<JToken>()).Select(ParseEmbed).ToArray();
-
-            // Get reactions
-            var reactions = (json["reactions"] ?? Enumerable.Empty<JToken>()).Select(ParseReaction).ToArray();
-
-            // Get mentions
-            var mentionedUsers = (json["mentions"] ?? Enumerable.Empty<JToken>()).Select(ParseUser).ToArray();
-
-            // Get whether this message is pinned
-            var isPinned = json["pinned"]!.Value<bool>();
-
-            return new Message(id, channelId, type, author, timestamp, editedTimestamp, isPinned, content, attachments, embeds,
-                reactions, mentionedUsers);
-        }
-    }
-}
@@ -1,220 +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.Models;
-using DiscordChatExporter.Core.Services.Exceptions;
-using DiscordChatExporter.Core.Services.Internal;
-using Newtonsoft.Json.Linq;
-using Polly;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class DataService : IDisposable
-    {
-        private readonly HttpClient _httpClient = new HttpClient();
-        private readonly IAsyncPolicy<HttpResponseMessage> _httpPolicy;
-
-        public DataService()
-        {
-            _httpClient.BaseAddress = new Uri("https://discordapp.com/api/v6");
-
-            // Discord seems to always respond 429 on our first request with unreasonable wait time (10+ minutes).
-            // For that reason the policy will start respecting their retry-after header only after Nth failed response.
-            _httpPolicy = Policy
-                .HandleResult<HttpResponseMessage>(m => m.StatusCode == HttpStatusCode.TooManyRequests)
-                .OrResult(m => m.StatusCode >= HttpStatusCode.InternalServerError)
-                .WaitAndRetryAsync(6,
-                    (i, result, ctx) =>
-                    {
-                        if (i <= 3)
-                            return TimeSpan.FromSeconds(2 * i);
-
-                        if (i <= 5)
-                            return TimeSpan.FromSeconds(5 * i);
-
-                        return result.Result.Headers.RetryAfter.Delta ?? TimeSpan.FromSeconds(10 * i);
-                    },
-                    (response, timespan, retryCount, context) => Task.CompletedTask);
-        }
-
-        private async Task<JToken> GetApiResponseAsync(AuthToken token, string route)
-        {
-            return (await GetApiResponseAsync(token, route, true))!;
-        }
-
-        private async Task<JToken?> GetApiResponseAsync(AuthToken token, string route, bool errorOnFail)
-        {
-            using var response = await _httpPolicy.ExecuteAsync(async () =>
-            {
-                using var request = new HttpRequestMessage(HttpMethod.Get, route);
-
-                request.Headers.Authorization = token.Type == AuthTokenType.Bot
-                    ? new AuthenticationHeaderValue("Bot", token.Value)
-                    : new AuthenticationHeaderValue(token.Value);
-
-                return await _httpClient.SendAsync(request);
-            });
-
-            // We throw our own exception here because default one doesn't have status code
-            if (!response.IsSuccessStatusCode)
-            {
-                if (errorOnFail) throw new HttpErrorStatusCodeException(response.StatusCode, response.ReasonPhrase);
-                else return null;
-            }
-
-            var jsonRaw = await response.Content.ReadAsStringAsync();
-            return JToken.Parse(jsonRaw);
-        }
-
-        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<Member?> GetGuildMemberAsync(AuthToken token, string guildId, string userId)
-        {
-            var response = await GetApiResponseAsync(token, $"guilds/{guildId}/members/{userId}", false);
-            if (response == null) return null;
-            var member = ParseMember(response);
-
-            return member;
-        }
-
-        public async Task<Channel> GetChannelAsync(AuthToken token, string channelId)
-        {
-            var response = await GetApiResponseAsync(token, $"channels/{channelId}");
-            var channel = ParseChannel(response);
-
-            return channel;
-        }
-
-        public async IAsyncEnumerable<Guild> GetUserGuildsAsync(AuthToken token)
-        {
-            var afterId = "";
-
-            while (true)
-            {
-                var route = "users/@me/guilds?limit=100";
-                if (!string.IsNullOrWhiteSpace(afterId))
-                    route += $"&after={afterId}";
-
-                var response = await GetApiResponseAsync(token, route);
-
-                if (!response.HasValues)
-                    yield break;
-
-                // Get full guild object
-                foreach (var guildId in response.Select(j => j["id"]!.Value<string>()))
-                {
-                    yield return await GetGuildAsync(token, guildId);
-                    afterId = guildId;
-                }
-            }
-        }
-
-        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)
-        {
-            // Special case for direct messages pseudo-guild
-            if (guildId == Guild.DirectMessages.Id)
-                return Array.Empty<Channel>();
-
-            var response = await GetApiResponseAsync(token, $"guilds/{guildId}/channels");
-            var channels = response.Select(ParseChannel).ToArray();
-
-            return channels;
-        }
-
-        private async Task<Message> GetLastMessageAsync(AuthToken token, string channelId, DateTimeOffset? before = null)
-        {
-            var route = $"channels/{channelId}/messages?limit=1";
-            if (before != null)
-                route += $"&before={before.Value.ToSnowflake()}";
-
-            var response = await GetApiResponseAsync(token, route);
-
-            return response.Select(ParseMessage).FirstOrDefault();
-        }
-
-        public async IAsyncEnumerable<Message> GetMessagesAsync(AuthToken token, string channelId,
-            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double>? progress = null)
-        {
-            // Get the last message
-            var lastMessage = await GetLastMessageAsync(token, channelId, before);
-
-            // If the last message doesn't exist or it's outside of range - return
-            if (lastMessage == null || lastMessage.Timestamp < after)
-            {
-                progress?.Report(1);
-                yield break;
-            }
-
-            // Get other messages
-            var firstMessage = default(Message);
-            var afterId = after?.ToSnowflake() ?? "0";
-            while (true)
-            {
-                // Get message batch
-                var route = $"channels/{channelId}/messages?limit=100&after={afterId}";
-                var response = await GetApiResponseAsync(token, route);
-
-                // 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();
-
-                // Yield messages
-                foreach (var message in messagesInRange)
-                {
-                    // Set first message if it's not set
-                    firstMessage ??= message;
-
-                    // Report progress (based on the time range of parsed messages compared to total)
-                    progress?.Report((message.Timestamp - firstMessage.Timestamp).TotalSeconds /
-                                     (lastMessage.Timestamp - firstMessage.Timestamp).TotalSeconds);
-
-                    yield return message;
-                    afterId = message.Id;
-                }
-
-                // Break if messages were trimmed (which means the last message was encountered)
-                if (messagesInRange.Length != messages.Length)
-                    break;
-            }
-
-            // Yield last message
-            yield return lastMessage;
-            progress?.Report(1);
-        }
-
-        public void Dispose() => _httpClient.Dispose();
-    }
-}
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Onova" Version="2.5.2" />
-    <PackageReference Include="Polly" Version="7.2.0" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
-    <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj" />
-    <ProjectReference Include="..\DiscordChatExporter.Core.Rendering\DiscordChatExporter.Core.Rendering.csproj" />
-  </ItemGroup>
-
-</Project>
@@ -1,19 +0,0 @@
-using System;
-using System.Net;
-
-namespace DiscordChatExporter.Core.Services.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,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Models.Exceptions;
-using DiscordChatExporter.Core.Rendering;
-using DiscordChatExporter.Core.Services.Logic;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private readonly SettingsService _settingsService;
-        private readonly DataService _dataService;
-
-        public ExportService(SettingsService settingsService, DataService dataService)
-        {
-            _settingsService = settingsService;
-            _dataService = dataService;
-        }
-
-        public async Task ExportChatLogAsync(AuthToken token, Guild guild, Channel channel,
-            string outputPath, ExportFormat format, int? partitionLimit,
-            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double>? progress = null)
-        {
-            // Get base file path from output path
-            var baseFilePath = GetFilePathFromOutputPath(outputPath, format, guild, channel, after, before);
-
-            // Create options
-            var options = new RenderOptions(baseFilePath, format, partitionLimit);
-
-            // Create context
-            var mentionableUsers = new HashSet<User>(IdBasedEqualityComparer.Instance);
-            var mentionableChannels = await _dataService.GetGuildChannelsAsync(token, guild.Id);
-            var mentionableRoles = guild.Roles;
-
-            var context = new RenderContext
-            (
-                guild, channel, after, before, _settingsService.DateFormat,
-                mentionableUsers, mentionableChannels, mentionableRoles
-            );
-
-            // Create renderer
-            await using var renderer = new MessageRenderer(options, context);
-
-            // Render messages
-            var renderedAnything = false;
-            await foreach (var message in _dataService.GetMessagesAsync(token, channel.Id, after, before, progress))
-            {
-                // Add encountered users to the list of mentionable users
-                var encounteredUsers = new List<User>();
-                encounteredUsers.Add(message.Author);
-                encounteredUsers.AddRange(message.MentionedUsers);
-
-                mentionableUsers.AddRange(encounteredUsers);
-
-                foreach (User u in encounteredUsers)
-                {
-                    if(!guild.Members.ContainsKey(u.Id))
-                    {
-                        var member = await _dataService.GetGuildMemberAsync(token, guild.Id, u.Id);
-                        guild.Members[u.Id] = member;
-                    }
-                }
-
-
-                // Render message
-                await renderer.RenderMessageAsync(message);
-                renderedAnything = true;
-            }
-
-            // Throw if no messages were rendered
-            if (!renderedAnything)
-                throw new DomainException($"Channel [{channel.Name}] contains no messages for specified period");
-        }
-    }
-
-    public partial class ExportService
-    {
-        private static string GetFilePathFromOutputPath(string outputPath, ExportFormat format, Guild guild, Channel channel,
-            DateTimeOffset? after, DateTimeOffset? before)
-        {
-            // Output is a directory
-            if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath)))
-            {
-                var fileName = ExportLogic.GetDefaultExportFileName(format, guild, channel, after, before);
-                return Path.Combine(outputPath, fileName);
-            }
-
-            // Output is a file
-            return outputPath;
-        }
-    }
-}
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public static class Extensions
-    {
-        private static async ValueTask<IReadOnlyList<T>> AggregateAsync<T>(this IAsyncEnumerable<T> asyncEnumerable)
-        {
-            var list = new List<T>();
-
-            await foreach (var i in asyncEnumerable)
-                list.Add(i);
-
-            return list;
-        }
-
-        public static ValueTaskAwaiter<IReadOnlyList<T>> GetAwaiter<T>(this IAsyncEnumerable<T> asyncEnumerable) =>
-            asyncEnumerable.AggregateAsync().GetAwaiter();
-    }
-}
@@ -1,18 +0,0 @@
-using System;
-using System.Drawing;
-
-namespace DiscordChatExporter.Core.Services.Internal
-{
-    internal static class Extensions
-    {
-        public static DateTimeOffset ToDateTimeOffset(this DateTime dateTime) => new DateTimeOffset(dateTime);
-
-        public static string ToSnowflake(this DateTimeOffset dateTime)
-        {
-            var value = ((ulong) dateTime.ToUnixTimeMilliseconds() - 1420070400000UL) << 22;
-            return value.ToString();
-        }
-
-        public static Color ResetAlpha(this Color color) => Color.FromArgb(1, color);
-    }
-}
@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Services.Logic
-{
-    public static class ExportLogic
-    {
-        public static string GetDefaultExportFileName(ExportFormat format,
-            Guild guild, Channel channel,
-            DateTimeOffset? after = null, DateTimeOffset? before = null)
-        {
-            var buffer = new StringBuilder();
-
-            // Append guild and channel names
-            buffer.Append($"{guild.Name} - {channel.Name} [{channel.Id}]");
-
-            // Append date range
-            if (after != null || before != null)
-            {
-                buffer.Append(" (");
-
-                // Both 'after' and 'before' are set
-                if (after != null && before != null)
-                {
-                    buffer.Append($"{after:yyyy-MM-dd} to {before:yyyy-MM-dd}");
-                }
-                // Only 'after' is set
-                else if (after != null)
-                {
-                    buffer.Append($"after {after:yyyy-MM-dd}");
-                }
-                // Only 'before' is set
-                else
-                {
-                    buffer.Append($"before {before:yyyy-MM-dd}");
-                }
-
-                buffer.Append(")");
-            }
-
-            // Append extension
-            buffer.Append($".{format.GetFileExtension()}");
-
-            // Replace invalid chars
-            foreach (var invalidChar in Path.GetInvalidFileNameChars())
-                buffer.Replace(invalidChar, '_');
-
-            return buffer.ToString();
-        }
-    }
-}
@@ -0,0 +1,27 @@
+using System.Net.Http.Headers;
+
+namespace DiscordChatExporter.Core.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 GetAuthenticationHeader() => Type switch
+        {
+            AuthTokenType.Bot => new AuthenticationHeaderValue("Bot", Value),
+            _ => new AuthenticationHeaderValue(Value)
+        };
+
+        public override string ToString() => Value;
+    }
+}
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // 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,111 @@
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
+    // Order of enum fields needs to match the order in the docs.
+    public enum ChannelType
+    {
+        GuildTextChat,
+        DirectTextChat,
+        GuildVoiceChat,
+        DirectGroupTextChat,
+        GuildCategory,
+        GuildNews,
+        GuildStore
+    }
+
+    // https://discord.com/developers/docs/resources/channel#channel-object
+    public partial class Channel : IHasId, IHasPosition
+    {
+        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 ?? GetFallbackCategory(type);
+            Name = name;
+            Position = position;
+            Topic = topic;
+        }
+
+        public override string ToString() => Name;
+
+    }
+
+    public partial class Channel
+    {
+        private static ChannelCategory GetFallbackCategory(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 ?? GetFallbackCategory(type),
+                name,
+                position,
+                topic
+            );
+        }
+    }
+}
@@ -0,0 +1,49 @@
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    public partial class ChannelCategory : IHasId, IHasPosition
+    {
+        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, "<unknown category>", 0);
+    }
+}
@@ -0,0 +1,51 @@
+using System;
+
+namespace DiscordChatExporter.Core.Discord.Data.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 FileSize(long bytes) => TotalBytes = bytes;
+
+        private double GetLargestWholeNumberValue()
+        {
+            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(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);
+    }
+}
@@ -0,0 +1,7 @@
+namespace DiscordChatExporter.Core.Discord.Data.Common
+{
+    public interface IHasId
+    {
+        Snowflake Id { get; }
+    }
+}
@@ -0,0 +1,7 @@
+namespace DiscordChatExporter.Core.Discord.Data.Common
+{
+    public interface IHasPosition
+    {
+        int? Position { get; }
+    }
+}
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace DiscordChatExporter.Core.Discord.Data.Common
+{
+    public partial class IdBasedEqualityComparer : IEqualityComparer<IHasId>
+    {
+        public bool Equals(IHasId? x, IHasId? y) => x?.Id == y?.Id;
+
+        public int GetHashCode(IHasId obj) => obj.Id.GetHashCode();
+    }
+
+    public partial class IdBasedEqualityComparer
+    {
+        public static IdBasedEqualityComparer Instance { get; } = new();
+    }
+}
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/channel#embed-object
+    public partial class Embed
+    {
+        public string? Title { get; }
+
+        public string? Url { get; }
+
+        public DateTimeOffset? 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,
+            DateTimeOffset? 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 ?? "<untitled embed>";
+    }
+
+    public partial class Embed
+    {
+        public static Embed Parse(JsonElement json)
+        {
+            var title = json.GetPropertyOrNull("title")?.GetString();
+            var description = json.GetPropertyOrNull("description")?.GetString();
+            var url = json.GetPropertyOrNull("url")?.GetString();
+            var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffset();
+            var color = json.GetPropertyOrNull("color")?.GetInt32().Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
+
+            var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
+            var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);
+            var image = json.GetPropertyOrNull("image")?.Pipe(EmbedImage.Parse);
+            var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse);
+
+            var fields =
+                json.GetPropertyOrNull("fields")?.EnumerateArray().Select(EmbedField.Parse).ToArray() ??
+                Array.Empty<EmbedField>();
+
+            return new Embed(
+                title,
+                url,
+                timestamp,
+                color,
+                author,
+                description,
+                fields,
+                thumbnail,
+                image,
+                footer
+            );
+        }
+    }
+}
@@ -0,0 +1,36 @@
+using System.Text.Json;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
+    public partial 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 ?? "<unnamed author>";
+    }
+
+    public partial class EmbedAuthor
+    {
+        public static EmbedAuthor Parse(JsonElement json)
+        {
+            var name = json.GetPropertyOrNull("name")?.GetString();
+            var url = json.GetPropertyOrNull("url")?.GetString();
+            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetString();
+
+            return new EmbedAuthor(name, url, iconUrl);
+        }
+    }
+}
@@ -0,0 +1,36 @@
+using System.Text.Json;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
+    public partial 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}";
+    }
+
+    public partial class EmbedField
+    {
+        public static EmbedField Parse(JsonElement json)
+        {
+            var name = json.GetProperty("name").GetString();
+            var value = json.GetProperty("value").GetString();
+            var isInline = json.GetPropertyOrNull("inline")?.GetBoolean() ?? false;
+
+            return new EmbedField(name, value, isInline);
+        }
+    }
+}
@@ -0,0 +1,32 @@
+using System.Text.Json;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
+    public partial 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;
+    }
+
+    public partial class EmbedFooter
+    {
+        public static EmbedFooter Parse(JsonElement json)
+        {
+            var text = json.GetProperty("text").GetString();
+            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetString();
+
+            return new EmbedFooter(text, iconUrl);
+        }
+    }
+}
@@ -0,0 +1,34 @@
+using System.Text.Json;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
+    public partial 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;
+        }
+    }
+
+    public partial class EmbedImage
+    {
+        public static EmbedImage Parse(JsonElement json)
+        {
+            var url = json.GetPropertyOrNull("url")?.GetString();
+            var width = json.GetPropertyOrNull("width")?.GetInt32();
+            var height = json.GetPropertyOrNull("height")?.GetInt32();
+
+            return new EmbedImage(url, width, height);
+        }
+    }
+}
@@ -1,12 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json;
+using JsonExtensions.Reading;
 using Tyrrrz.Extensions;

-namespace DiscordChatExporter.Core.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
-    // https://discordapp.com/developers/docs/resources/emoji#emoji-object
-
+    // https://discord.com/developers/docs/resources/emoji#emoji-object
    public partial class Emoji
    {
        public string? Id { get; }
@@ -25,6 +26,8 @@ namespace DiscordChatExporter.Core.Models

            ImageUrl = GetImageUrl(id, name, isAnimated);
        }
+
+        public override string ToString() => Name;
    }

    public partial class Emoji
@@ -58,17 +61,19 @@ namespace DiscordChatExporter.Core.Models
                return $"https://cdn.discordapp.com/emojis/{id}.png";
            }

-            // Standard unicode emoji
+            // Standard emoji
            var emojiRunes = GetRunes(name).ToArray();
-            if (emojiRunes.Any())
-            {
-                // Get corresponding Twemoji image
-                var twemojiName = GetTwemojiName(emojiRunes);
-                return $"https://twemoji.maxcdn.com/2/72x72/{twemojiName}.png";
-            }
+            var twemojiName = GetTwemojiName(emojiRunes);
+            return $"https://twemoji.maxcdn.com/2/72x72/{twemojiName}.png";
+        }

-            // Fallback in case of failure
-            return name;
+        public static Emoji Parse(JsonElement json)
+        {
+            var id = json.GetPropertyOrNull("id")?.GetString();
+            var name = json.GetProperty("name").GetString();
+            var isAnimated = json.GetPropertyOrNull("animated")?.GetBoolean() ?? false;
+
+            return new Emoji(id, name, isAnimated);
        }
    }
 }
@@ -0,0 +1,53 @@
+using System.Text.Json;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/guild#guild-object
+    public partial class Guild : IHasId
+    {
+        public Snowflake Id { get; }
+
+        public string Name { get; }
+
+        public string IconUrl { get; }
+
+        public Guild(Snowflake id, string name, string iconUrl)
+        {
+            Id = id;
+            Name = name;
+            IconUrl = iconUrl;
+        }
+
+        public override string ToString() => Name;
+    }
+
+    public partial class Guild
+    {
+        public static Guild DirectMessages { get; } = new(
+            Snowflake.Zero,
+            "Direct Messages",
+            GetDefaultIconUrl()
+        );
+
+        private static string GetDefaultIconUrl() =>
+            "https://cdn.discordapp.com/embed/avatars/0.png";
+
+        private static string GetIconUrl(Snowflake id, string iconHash) =>
+            $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png";
+
+        public static Guild Parse(JsonElement json)
+        {
+            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+            var name = json.GetProperty("name").GetString();
+            var iconHash = json.GetProperty("icon").GetString();
+
+            var iconUrl = !string.IsNullOrWhiteSpace(iconHash)
+                ? GetIconUrl(id, iconHash)
+                : GetDefaultIconUrl();
+
+            return new Guild(id, name, iconUrl);
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tyrrrz	eb49d0bd16	Update version	2021-04-24 21:26:49 +03:00
Tyrrrz	e7c2564f6f	Update NuGet packages	2021-04-24 21:08:57 +03:00
Tyrrrz	d1b70cf5f6	Add wiki to issue templates	2021-04-22 21:48:45 +03:00
Tyrrrz	b73d6a78a9	Fix issue templates	2021-04-22 21:47:05 +03:00
Tyrrrz	b9f04bc4d9	Use issue forms	2021-04-22 21:40:47 +03:00
Tyrrrz	d01ed13041	Update NuGet packages	2021-04-18 19:32:59 +03:00
Tyrrrz	ed35a36eaa	Update NuGet.config	2021-04-17 21:25:52 +03:00
Tyrrrz	2ddfb46c31	Add IFormatProvider to FileSize.TryParse(...) and PartitionLimit.Parse(...)	2021-04-17 14:07:07 +03:00
rtm516	3c5beeba79	Export channel category id to JSON (#554 )	2021-04-17 13:56:27 +03:00
Tyrrrz	ed915443e6	Update contribution guidelines	2021-04-17 00:21:23 +03:00
Tyrrrz	f8d55f406c	[GUI] Cleanup ExportSetupViewModel & RootViewModel	2021-04-16 23:39:36 +03:00
Tyrrrz	15b605f5a7	Fix typo	2021-04-16 23:29:19 +03:00
Tyrrrz	511af1e35c	Refactor	2021-04-16 23:09:08 +03:00
rtm516	2fea455c64	[JSON] Write user color (#552 )	2021-04-15 19:21:16 +03:00
Tyrrrz	c64133f717	Add contribution guidelines	2021-04-14 21:42:41 +03:00
Alexey Golub	d18d2e0307	Update readme	2021-04-14 15:04:42 +03:00
Alexey Golub	86633b858c	Update readme Fixes #551	2021-04-14 15:02:06 +03:00
Tyrrrz	c390c64316	Remove GHA workarounds	2021-04-13 22:33:06 +03:00
Tyrrrz	af3a59ce0f	Add NuGet.config	2021-04-13 22:23:14 +03:00
Andrew Kolos	eb89ea5b40	Add partition by file size (#497 )	2021-04-12 13:50:32 +03:00
Tyrrrz	ad3655396f	[CLI] Remove redundant whitespace	2021-03-25 00:44:21 +02:00
Tyrrrz	1b8af364d3	[CLI] Cleanup	2021-03-24 22:39:27 +02:00
Tyrrrz	58464d8708	Improve error messages	2021-03-24 22:39:01 +02:00
Tyrrrz	026927265a	[CLI] Remove ExportMultipleCommandBase and allow multiple channel IDs in ExportChannelCommand	2021-03-24 03:04:46 +02:00
Tyrrrz	390735032e	[CLI] Hack Spectre.Console so that it properly supports CliFx encoding	2021-03-24 02:51:11 +02:00
Tyrrrz	461d474498	[CLI] Update CliFx	2021-03-24 02:50:54 +02:00
Tyrrrz	017ed5ae6d	[CLI] Update CliFx and use Spectre.Console for progress reporting	2021-03-23 22:38:44 +02:00
Tyrrrz	6f90c367b9	Clamp progress in DiscordClient.GetMessagesAsync(...)	2021-03-23 21:41:37 +02:00
Tyrrrz	f866c16355	Update NuGet packages	2021-03-23 18:43:09 +02:00
Tyrrrz	072d4c1fe6	Use MiniRazor.CodeGen instead of MiniRazor	2021-03-23 00:48:56 +02:00
Lucas LaBuff	6365e0a080	Fix JSON discriminator and nickname fields (#524 )	2021-03-19 16:58:28 +02:00
Tyrrrz	7b140fd450	Try to fix nullability warning	2021-03-18 02:13:15 +02:00
Tyrrrz	e237e00600	Fix CI/CD Windows issue	2021-03-16 01:24:00 +02:00
Tyrrrz	3aef7faa1e	Use `is null`/`is not null`	2021-03-09 21:57:26 +02:00
Tyrrrz	ebe4d58a42	Cleanup	2021-02-22 03:15:22 +02:00
Lucas LaBuff	bed0ade732	[JSON] Skip validation (#499 )	2021-02-15 01:07:28 +02:00
Alexey Golub	06e89538cb	Drop xs:code	2021-02-10 08:28:27 +02:00
Alexey Golub	7903869f9f	Update Readme.md	2021-02-10 02:44:55 +02:00
Tyrrrz	32443c5a5b	Update readme	2021-02-10 02:26:58 +02:00
Tyrrrz	d477159907	Update readme	2021-02-10 02:05:08 +02:00
Tyrrrz	93578abe24	Normalize snackbar style	2021-02-09 00:50:18 +02:00
Tyrrrz	f22b048d32	Update version	2021-02-06 21:22:42 +02:00
Lucas LaBuff	a8031ad3aa	Fix crash when parsing position on DM channels (#496 )	2021-02-06 17:00:29 +02:00
Frederic Portaria-Janicki	e49cf997ea	[CLI] Fix missing channel category bug when API returns empty string (#492 )	2021-02-02 14:42:04 +02:00
Lucas LaBuff	8b9afe45b9	[CLI] Fix sorting by channel/category position (#490 )	2021-01-31 17:23:46 +02:00
Lucas LaBuff	77b7977324	Formatting output paths (#472 )	2021-01-28 22:01:13 +02:00
Lucas LaBuff	915f4c8d9f	Fix crash on encountering invalid snowflake (#479 )	2021-01-18 19:21:22 +02:00
Tyrrrz	0872d6d44b	Update screenshots	2020-12-29 21:06:45 +02:00
Tyrrrz	3aa90bb27b	Update version	2020-12-29 21:02:46 +02:00
Tyrrrz	51acffc92e	[HTML] Fix up replies	2020-12-29 20:49:34 +02:00
Tyrrrz	39a33538fe	Cleanup last PR	2020-12-28 22:10:46 +02:00
Sanqui	07ac805677	Add support for replies (#455 )	2020-12-28 22:03:30 +02:00
Alexey Golub	097a75e326	Update readme	2020-12-28 18:38:22 +02:00
Tyrrrz	3d9ee3b339	Embrace Snowflake as first class citizen	2020-12-27 19:42:21 +02:00
multisignature	4ff7990967	Fix grammar in readme (#466 )	2020-12-23 21:00:33 +02:00
Andrew Kolos	730fed075f	[CLI] Allow passing after and before message ids instead of dates (#462 )	2020-12-22 17:41:40 +02:00
Alexey Golub	600c354ab2	Use Discord API v8	2020-12-19 18:37:38 +02:00
Alexey Golub	d8dc12b3f7	Update readme	2020-12-19 18:22:03 +02:00
Alexey Golub	33a6d49d76	Use .NET 5.0 SDK in Docker	2020-12-19 18:11:31 +02:00
Tyrrrz	3861dba60c	Refactor last PR	2020-12-17 17:49:35 +02:00
Andrew Kolos	69acb5bf76	Set last write time on downloaded media to the value provided in the Last-Modified header (#459 )	2020-12-17 17:13:47 +02:00
Tyrrrz	0e67dcbf2e	Update readme	2020-12-15 17:47:00 +02:00
Tyrrrz	45d2be549d	Install dotnet 5 on CI/CD so that source generators work	2020-12-15 16:17:37 +02:00
Tyrrrz	9394824943	Update MiniRazor to use build-time template compilation	2020-12-15 03:44:13 +02:00
Sanqui	43c50324d8	[JSON] Don't escape Unicode characters when possible (#453 ) While UnsafeRelaxedJsonEscaping sounds scary, there is no risk here since the JSON data is saved directly into a file. See #450	2020-12-14 21:57:48 +02:00
Alexey Golub	a6353de2a7	Use preview language version	2020-12-14 18:48:34 +02:00
Sanqui	d020652f50	[CLI] Display channel name for errors during ExportMultipleAsync (#452 )	2020-12-14 18:48:11 +02:00
Tyrrrz	63803f98aa	Use C#9 features	2020-12-14 17:45:42 +02:00
Tyrrrz	9dda9cfc27	Use floating dotnet versions on CI/CD	2020-12-14 17:37:49 +02:00
Tyrrrz	61d0ddeced	Update project structure	2020-12-10 16:52:05 +02:00
Tyrrrz	4c64977b71	Expect null result in WaitAndRetry logic in http retry handler Fixes #447	2020-12-07 16:24:33 +02:00
Tyrrrz	8bc5b547ef	Remove gitattributes and simplify gitignore	2020-12-07 16:23:53 +02:00
Lucas LaBuff	286981d9f8	[HTML] Prettier attachment preview for non-media files (#448 )	2020-12-07 16:20:38 +02:00
Tyrrrz	5a62ce6af9	Update JsonExtensions to 1.0.1	2020-11-29 00:42:05 +02:00
Tyrrrz	d72fe594b4	Use JsonExtensions package	2020-11-29 00:17:58 +02:00
Tyrrrz	9df98b0405	Update version	2020-11-23 17:04:08 +02:00
Tyrrrz	0d2b9e8bc0	Refactor last PR	2020-11-23 16:53:22 +02:00
Andrew Kolos	53cebd82eb	[CLI] Print error and exit if reuse-media option is used without media option (#433 )	2020-11-22 20:45:19 +02:00
Tyrrrz	37fcee2f21	Fix relative path extraction in ExportContext when base directory is empty Fixes #437 Fixes #434	2020-11-20 16:56:30 +02:00
Tyrrrz	047dccef7f	Refactor last PR	2020-11-18 19:04:53 +02:00
sas41	cb47902d10	[HTML] Rich rendering support for audio and video embeds (#432 )	2020-11-16 15:49:57 +02:00
Alexey Golub	dca8b8ceb2	Update .NET runtime links	2020-11-11 15:23:43 +02:00
Tyrrrz	a8e7c85b99	Update docker image references	2020-11-11 01:56:53 +02:00
Tyrrrz	edd51e0838	Revert last change, .net5 doesn't work	2020-11-11 00:02:56 +02:00
Tyrrrz	5e04accdff	Update build infra	2020-11-10 23:58:05 +02:00
Andrew Kolos	547bf0a463	[JSON] Add core user mentions to output (#416 )	2020-10-25 23:00:30 +02:00
Tyrrrz	948fab7c86	Update readme	2020-10-25 01:53:32 +03:00
Tyrrrz	5038b8541e	Update version	2020-10-24 21:26:34 +03:00
Tyrrrz	1da80956dd	Refactor	2020-10-24 21:15:58 +03:00
Tyrrrz	0763a99765	[JSON] Fix incorrect embed color output	2020-10-24 17:45:54 +03:00
Tyrrrz	eda5b21684	Update github actions	2020-10-24 00:02:32 +03:00
Tyrrrz	2c7b054c24	Update nuget packages	2020-10-24 00:02:32 +03:00
Andrew Kolos	520e023aff	Stop redundantly downloading media when re-exporting (#395 )	2020-10-23 16:38:15 +03:00
Alexey Golub	949c9d3f1e	Update readme	2020-10-17 20:25:21 +03:00
Andrew Kolos	fa825fce47	[GUI] Fix content bg color on first screen to match the second screen (#411 )	2020-10-16 14:20:58 +03:00
Andrew Kolos	09acfcff59	Add retry policy to MediaDownloader to accommodate short network outages during download (#404 )	2020-10-12 23:03:14 +03:00
Andrew Kolos	ddb4856516	Add "unix" and "unixms" options for date format (#405 )	2020-10-12 13:41:49 +03:00
Andrew Kolos	c4007d4a80	[JSON] Add embed color (#403 )	2020-10-10 16:10:56 +03:00
Alexey Golub	2a432c0ed2	Treat nullability warnings as errors	2020-10-07 15:33:59 +03:00
Alexey Golub	c5eeb5f464	Update nuget packages	2020-10-07 15:33:47 +03:00
Alexey Golub	a6bf546e79	[GUI] Clean up the UI	2020-10-05 17:41:09 +03:00
Alexey Golub	239c47c06e	[GUI] Clean up theme management	2020-10-05 17:10:00 +03:00
Andrew Kolos	19f678ca01	[GUI] Add dark theme (#388 )	2020-10-05 16:31:37 +03:00
Pegasis	08442f21b7	Add AUR package to README (#379 )	2020-09-20 15:52:44 +03:00
Alexey Golub	921f348769	Update version	2020-09-14 15:37:36 +03:00
Alexey Golub	a25e809671	Extend try/catch in media downloading to OperationCanceledException Closes #372	2020-09-14 15:09:57 +03:00
Alexey Golub	fa80c82468	Cleanup	2020-09-05 17:10:15 +03:00
Alexey Golub	91f4f02a35	Refactor last commit	2020-09-05 17:05:18 +03:00
wyattscarpenter	6d2880ce26	[CLI] Add command to export all channels across all guilds (#373 )	2020-09-05 00:23:06 +03:00
Ahmed Massoud	355b8cb8cf	Add call time for call status messages (#365 )	2020-08-22 22:14:13 +03:00
Alexey Golub	82945ac3cf	[HTML] Use CDN for Whitney fonts Related to #322	2020-08-21 20:36:59 +03:00
Alexey Golub	5009b90a3e	Update screenshots	2020-08-15 13:47:47 +03:00
Alexey Golub	1495ed9b90	Update version	2020-08-12 19:21:24 +03:00
Alexey Golub	be66c74c08	Update nuget packages	2020-08-12 19:11:18 +03:00
Alexey Golub	6f54c09d96	[GUI] Refactor sorting	2020-08-12 19:09:12 +03:00
Alexey Golub	45926b0990	Refactor last commit	2020-08-07 21:41:10 +03:00
CarJem Generations	25d29dc079	[GUI] Add controls to configure export time limits in addition to dates (#355 )	2020-08-07 21:06:49 +03:00
Alexey Golub	efde9931c9	Refactor & optimize changes in last commit	2020-08-07 21:00:43 +03:00
CarJem Generations	2c3b461d49	[GUI] Make categories collapsible in channel list (#354 )	2020-08-07 19:42:59 +03:00
CarJem Generations	b405052fd6	[HTML] Workaround for Tupperbox nicknames (#352 )	2020-08-05 21:58:17 +03:00
Alexey Golub	da6d903f36	Update version	2020-07-30 16:03:27 +03:00
Alexey Golub	e1b1755fba	Don't escape media URL on non-HTML formats	2020-07-30 16:02:00 +03:00
Alexey Golub	1ff026eba6	[GUI] Trim spaces in token input	2020-07-29 20:58:49 +03:00
Alexey Golub	1fe4ecb3af	Truncate long file names in MediaDownloader Fixes #344	2020-07-29 20:58:38 +03:00
Alexey Golub	47a1518cd9	Update nuget packages	2020-07-29 20:49:08 +03:00
Alexey Golub	d78c10ebb7	Remove default cap on MakeUniqueFilePath	2020-07-29 20:47:58 +03:00
Alexey Golub	3db29b520c	Switch from RazorLight to MiniRazor	2020-07-29 20:08:51 +03:00
Alexey Golub	752003abc3	Fix media downloading	2020-07-28 23:07:31 +03:00
Alexey Golub	e26a0660d1	Use Razor instead of Scriban	2020-07-28 22:43:45 +03:00
Alexey Golub	7dfc3b2723	Add link to extra services in readme	2020-07-26 15:54:30 +03:00
Alexey Golub	06c33373de	Sanitize file names when exporting media Fixes #332	2020-07-25 21:17:05 +03:00
Alexey Golub	563f5cb67b	Update version	2020-07-19 19:09:45 +03:00
Alexey Golub	1f20915b4d	Use original file names for downloaded media Closes #327	2020-07-19 14:19:40 +03:00
Alexey Golub	e58c7aefff	Ignore failures when downloading media	2020-07-18 22:08:06 +03:00
Alexey Golub	ac5ccc3fa4	Update version	2020-07-18 16:32:02 +03:00
Alexey Golub	2fc0aa43e8	Change "discordapp.com" to "discord.com" where appropriate	2020-07-18 16:04:47 +03:00
Alexey Golub	ba66b52fa4	Use ValueTask instead of Task where possible	2020-07-18 15:57:51 +03:00
Alexey Golub	ac64d9943a	Self-contained export (#321 )	2020-07-18 15:45:09 +03:00
Alexey Golub	94a85cdb01	Update nuget packages	2020-05-11 21:50:38 +03:00
Alexey Golub	a1d34e8fb6	Update version	2020-04-27 13:24:31 +03:00
Alexey Golub	4a35a7b530	Cleanup and minor fixes	2020-04-27 13:24:20 +03:00
Alexey Golub	247f3a9c5b	Include channel category in default export file name Closes #188	2020-04-27 00:02:55 +03:00
Alexey Golub	be73f0b92c	[CLI] Show channel categories Closes 195	2020-04-27 00:01:37 +03:00
Alexey Golub	d03be8b1dd	More refactoring	2020-04-26 23:55:31 +03:00
Alexey Golub	9d0d7cd5dd	More refactoring	2020-04-23 00:32:48 +03:00
Alexey Golub	b2a48d338a	Update nuget packages	2020-04-23 00:30:37 +03:00
Alexey Golub	88a4fa792b	Refactor more	2020-04-22 21:59:10 +03:00
Alexey Golub	dc79813ad7	Refactor	2020-04-22 20:44:14 +03:00
Alexey Golub	6a430cdc76	[HTML] Fix unclosed tags and inconsistencies	2020-04-22 19:38:49 +03:00
Alexey Golub	2a02894d64	[HTML] Fix weird inline code block behavior with two backticks	2020-04-22 19:23:56 +03:00
Alexey Golub	8685a3d7e3	Rework architecture	2020-04-22 19:23:31 +03:00
Alexey Golub	130c0b6fe2	Use System.Text.Json instead of Newtonsoft.Json	2020-04-21 18:15:28 +03:00
Alexey Golub	f153aad3f1	Simplify FileSize	2020-04-21 14:38:09 +03:00
Alexey Golub	6f1c944cb3	[HTML] Split message group if usernames are different Closes #290	2020-04-17 18:47:06 +03:00
Alexey Golub	de9e7caaeb	[HTML] Fix repeated single quotes behavior with nested formatting Closes #288	2020-04-15 13:22:20 +03:00
Alexey Golub	9711a8cca4	[HTML] Match repeated single quotes as a multiline quote Closes #288	2020-04-14 22:27:29 +03:00
Alexey Golub	4ab6607e78	[HTML] Update quote style	2020-04-14 22:26:50 +03:00
Alexey Golub	d74e6453f6	[CLI] Use environment variable fallbacks for token	2020-04-07 16:10:12 +03:00
Alexey Golub	ca7fc4d8d1	[HTML] Fix a few more issues	2020-04-06 19:50:53 +03:00
Alexey Golub	81ed85a3e0	[HTML] Clean up a bit	2020-04-06 15:44:03 +03:00
FM-96	18979c6a38	[HTML] Full spoiler support (#285 )	2020-04-05 21:30:15 +03:00
Alexey Golub	5bce4b52ff	[GUI] Add a link to project's wiki Closes #284	2020-04-05 00:31:01 +03:00
Alexey Golub	dac7c664d9	[GUI] Ensure update has been prepared before attempting to install it	2020-04-02 20:08:16 +03:00
Alexey Golub	6a8579787d	Update XamlStyler	2020-03-30 10:09:13 +03:00