Update version

Closes #327

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "xamlstyler.console": {
+      "version": "3.2003.9",
+      "commands": [
+        "xstyler"
+      ]
+    }
+  }
+}

.github/workflows/CD.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v1.4.0
       with:
         dotnet-version: 3.1.100
 
@@ -34,17 +34,19 @@ jobs:
 
     - name: Create release
       id: create_release
-      uses: actions/create-release@v1.0.0
+      uses: actions/create-release@v1.0.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: ${{ github.ref }}
         release_name: ${{ github.ref }}
+        body: |
+          [Changelog](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Changelog.md)
         draft: false
         prerelease: false
 
     - name: Upload release asset (CLI)
-      uses: actions/upload-release-asset@v1.0.1
+      uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -54,7 +56,7 @@ jobs:
         asset_content_type: application/zip
 
     - name: Upload release asset (GUI)
-      uses: actions/upload-release-asset@v1.0.1
+      uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

.github/workflows/CI.yml

@@ -8,10 +8,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v1.4.0
       with:
         dotnet-version: 3.1.100
 
@@ -22,13 +22,13 @@ jobs:
       run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release
 
     - name: Upload build artifacts (CLI)
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v1
       with:
         name: DiscordChatExporter.CLI
         path: DiscordChatExporter.Cli/bin/Publish/
 
     - name: Upload build artifact (GUI)
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v1
       with:
         name: DiscordChatExporter
         path: DiscordChatExporter.Gui/bin/Publish/

Changelog.md

@@ -1,10 +1,61 @@
+### v2.21.1 (19-Jul-2020)
+
+- Fixed an issue where the export crashed if an embedded image has been deleted. Such media files are now ignored.
+- Changed the naming convention for downloaded media files so that the original file names are used when possible.
+
+### v2.21 (18-Jul-2020)
+
+- Added a new option that enables self-contained exports for all output formats. You can turn it on in the export setup dialog in GUI or using the `--media` option in CLI. When using this, the application will additionally download any media content directly referenced from the exported file instead of linking back to Discord CDN. The files which are downloaded include: guild icons, user avatars, attachments, embedded images, reaction emojis. Note that only files which are actually referenced by the export are downloaded, which means that, for example, user avatars will not be downloaded when using plain text export format. This option is not meant to enable complete offline viewing for HTML exports, but rather to make it easier to archive media content that may eventually get deleted from Discord servers. Also keep in mind that this option may make the export drastically slower and the total file size larger.
+- Changed "discordapp.com" to "discord.com" where applicable as Discord is migrating to a new domain. CDN will remain on "cdn.discordapp.com" for the foreseeable future.
+
+Note that all existing and current HTML exports will likely not render accurately because Discord enabled CORS for their font resources, which prevents them from loading locally. Please refer to [issue #322](https://github.com/Tyrrrz/DiscordChatExporter/issues/322) for discussion on this topic. 
+
+### v2.20 (27-Apr-2020)
+
+- [CLI] Added environment variables as fallback for `--token` and `--bot` options. They are `DISCORD_TOKEN` and `DISCORD_TOKEN_BOT` respectively.
+- [GUI] Fixed a crash that occurred if the application was closed in the middle of an auto-update.
+- [GUI] Added a link to project's wiki in the usage guide.
+- [HTML] Added full spoiler support for text and images. To spoil the hidden content you now need to click on it, similarly to how it works in Discord. (Thanks [@FM-96](https://github.com/FM-96))
+- [HTML] Updated grammar for consecutive single-line quotes. Previously they appeared separately, now they're grouped together as if it was one multi-line quote instead.
+- [HTML] Fixed an issue where messages sent by the same bot but with different usernames were grouped together when they shouldn't be.
+- [HTML] Updated grammar for single-line code blocks to accept double backticks as synonymous with single backticks. This change makes code blocks appear the same, whether they were inserted manually or using Discord's buggy markdown preview mode.
+- [HTML] Fixed styling inconsistencies and other minor issues.
+- [TXT/JSON] Fixed an issue where markdown was not parsed correctly in embed fields.
+- [HTML] Changed markdown formatting in embeds so it follows the same set of rules as in Discord.
+- Added channel category to the default file name used when exporting chat logs.
+- [HTML/TXT/JSON] Added channel category to exported metadata.
+- [CLI] Updated commands to also show channel category as well as channel name wherever relevant.
+- Starting with this release, Docker images will have new tags: `stable` for latest stable release and `2.20` for a specific version.
+
+### v2.19 (26-Mar-2020)
+
+- Added parallel exporting. This option allows you to export multiple channels faster by doing it in parallel. You can configure the parallel limit in settings (GUI) or with the `--parallel` option (CLI). Default value is `1`, which means there is no parallelization. Warning: be careful when using this option, as this will result in higher volume of concurrent HTTP requests sent to Discord, which might get you flagged. Use at your own risk.
+- [HTML] Added support for user colors. User names are now appropriately colored according to the assigned guild roles.
+- [HTML] Added support for nicknames. User names are replaced with nicknames where it's applicable. It's still possible to see the full user name by hovering your mouse over the nickname.
+- [HTML] Improved styling for mentions to bring it more in line with how it looks in Discord.
+
+### v2.18 (04-Feb-2020)
+
+- Added JSON export format. It's a structured data format which is easy to parse. If you're using DiscordChatExporter to export chat logs for further ingestion by another tool, this is most likely the format you will want to use.
+- [GUI] You can now quickly jump to a specific channel in a list. For example, if you want to jump to a channel named "General", you can simply press the 'g' key in the channel list view. You can also press 'g', 'e' and 'n' in quick succession which will jump to the next channel that starts with "gen". This mechanic is consistent with other Windows applications.
+- [CLI] Improved help text screen.
+
+### v2.17 (12-Jan-2020)
+
+- Fixed an issue where an empty file was produced when exporting a channel with no messages (for specified period). With the new behavior, no file will be created and instead a message will be shown to the user informing of the failure.
+- [HTML/TXT] Added message count to the bottom of the file. This number shows how many messages were exported as part of the current file. Prior to 2.16 this number was present along with the rest of the metadata at the top, then removed due to changes in the exporter, and now brought back at the end of the file instead.
+- [HTML] Fixed an issue where some emojis were not properly rendered.
+- [GUI] Added a setting that lets you configure whether to remember the last used token. Previously it was the default behavior, but now you can disable it if you don't want the token persisted on your system.
+
 ### v2.16 (08-Dec-2019)
 
 - Migrated from .NET Framework to .NET Core. To run this and future versions of DiscordChatExporter you will need [.NET Core runtime for desktop apps](https://dotnet.microsoft.com/download/dotnet-core/3.1/runtime) (for GUI/CLI version on Windows) or [.NET Core base runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1) (for CLI version on Windows, Linux or macOS).
-- Reworked the exporter engine to render output using streaming data source. This means that only a very small portion of messages are cached in memory when exporting. In other words, you are only limited by storage space and not how much RAM you have, so you can now export terrabytes of chat logs without hitting out of memory exceptions. I still recommend using partitions if you're exporting very large chat logs (250k+ messages) to HTML, unless you want your computer to catch fire when you try to open the export in browser.
+- Reworked the exporter engine to render output using streaming data source. This means that only a very small portion of messages are cached in memory when exporting. In other words, you are only limited by storage space and not how much RAM you have, so you can now export terabytes of chat logs without hitting out of memory exceptions. I still recommend using partitions if you're exporting very large chat logs (250k+ messages) to HTML, unless you want your computer to catch fire when you try to open the export in browser.
+- Changed how partitioned files are named, due to the fact that total number of partitions is no longer known ahead of time.
 - Added a warning about automating user accounts to the usage guide in both GUI and CLI versions.
 - Added support for announcement (news) channels. You will now be able to see them in the list and export them.
 - Fixed various issues that resulted in exceptions during export process.
+- [HTML/TXT] Removed message count from the metadata. Due to the fact that the messages are exported as they are streamed, total number of messages is not known ahead of time.
 - [HTML] Changed default color of the embed color pill to match the theme.
 - [HTML] Changed emoji parser to be less greedy. As a result it should match fewer character sequences that look like emojis but really aren't, but on the other hand it might miss some actual emojis. This means that some standard emojis (i.e. not custom server emojis) may not look like in Discord. This is a compromise I'm willing to take because detecting emojis in text is really hard to get right and not worth it at all.
 - [HTML] Some other minor styling adjustments.

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using CliFx.Utilities;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Exporting;
+
+namespace DiscordChatExporter.Cli.Commands.Base
+{
+    public abstract class ExportCommandBase : TokenCommandBase
+    {
+        [CommandOption("output", 'o', Description = "Output file or directory path.")]
+        public string OutputPath { get; set; } = Directory.GetCurrentDirectory();
+
+        [CommandOption("format", 'f', Description = "Output file format.")]
+        public ExportFormat ExportFormat { get; set; } = ExportFormat.HtmlDark;
+
+        [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("media", Description = "Download referenced media content.")]
+        public bool ShouldDownloadMedia { get; set; }
+
+        [CommandOption("dateformat", Description = "Date format used in output.")]
+        public string DateFormat { get; set; } = "dd-MMM-yy hh:mm tt";
+
+        protected ChannelExporter GetChannelExporter() => new ChannelExporter(GetDiscordClient());
+
+        protected async ValueTask ExportAsync(IConsole console, Guild guild, Channel channel)
+        {
+            console.Output.Write($"Exporting channel '{channel.Category} / {channel.Name}'... ");
+            var progress = console.CreateProgressTicker();
+
+            var request = new ExportRequest(
+                guild,
+                channel,
+                OutputPath,
+                ExportFormat,
+                After,
+                Before,
+                PartitionLimit,
+                ShouldDownloadMedia,
+                DateFormat
+            );
+
+            await GetChannelExporter().ExportChannelAsync(request, progress);
+
+            console.Output.WriteLine();
+            console.Output.WriteLine("Done.");
+        }
+
+        protected async ValueTask ExportAsync(IConsole console, Channel channel)
+        {
+            var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId);
+            await ExportAsync(console, guild, channel);
+        }
+
+        protected async ValueTask ExportAsync(IConsole console, string channelId)
+        {
+            var channel = await GetDiscordClient().GetChannelAsync(channelId);
+            await ExportAsync(console, channel);
+        }
+    }
+}

DiscordChatExporter.Cli/Commands/Base/ExportMultipleCommandBase.cs

@@ -0,0 +1,76 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using CliFx.Utilities;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Exceptions;
+using DiscordChatExporter.Domain.Exporting;
+using DiscordChatExporter.Domain.Utilities;
+using Gress;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Cli.Commands.Base
+{
+    public abstract class ExportMultipleCommandBase : ExportCommandBase
+    {
+        [CommandOption("parallel", Description = "Export this number of channels in parallel.")]
+        public int ParallelLimit { get; set; } = 1;
+
+        protected async ValueTask ExportMultipleAsync(IConsole console, IReadOnlyList<Channel> channels)
+        {
+            // HACK: this uses a separate route from ExportCommandBase because the progress ticker is not thread-safe
+
+            console.Output.Write($"Exporting {channels.Count} channels... ");
+            var progress = console.CreateProgressTicker();
+
+            var operations = progress.Wrap().CreateOperations(channels.Count);
+
+            var errors = new List<string>();
+
+            var successfulExportCount = 0;
+            await channels.Zip(operations).ParallelForEachAsync(async tuple =>
+            {
+                var (channel, operation) = tuple;
+
+                try
+                {
+                    var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId);
+
+                    var request = new ExportRequest(
+                        guild,
+                        channel,
+                        OutputPath,
+                        ExportFormat,
+                        After,
+                        Before,
+                        PartitionLimit,
+                        ShouldDownloadMedia,
+                        DateFormat
+                    );
+
+                    await GetChannelExporter().ExportChannelAsync(request, operation);
+
+                    Interlocked.Increment(ref successfulExportCount);
+                }
+                catch (DiscordChatExporterException ex) when (!ex.IsCritical)
+                {
+                    errors.Add(ex.Message);
+                }
+                finally
+                {
+                    operation.Dispose();
+                }
+            }, ParallelLimit.ClampMin(1));
+
+            console.Output.WriteLine();
+
+            foreach (var error in errors)
+                console.Error.WriteLine(error);
+
+            console.Output.WriteLine($"Successfully exported {successfulExportCount} channel(s).");
+        }
+    }
+}

DiscordChatExporter.Cli/Commands/Base/TokenCommandBase.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Attributes;
+using DiscordChatExporter.Domain.Discord;
+
+namespace DiscordChatExporter.Cli.Commands.Base
+{
+    public abstract class TokenCommandBase : ICommand
+    {
+        [CommandOption("token", 't', IsRequired = true, EnvironmentVariableName = "DISCORD_TOKEN",
+            Description = "Authorization token.")]
+        public string TokenValue { get; set; } = "";
+
+        [CommandOption("bot", 'b', EnvironmentVariableName = "DISCORD_TOKEN_BOT",
+            Description = "Whether this authorization token belongs to a bot.")]
+        public bool IsBotToken { get; set; }
+
+        protected AuthToken GetAuthToken() => new AuthToken(IsBotToken ? AuthTokenType.Bot : AuthTokenType.User, TokenValue);
+
+        protected DiscordClient GetDiscordClient() => new DiscordClient(GetAuthToken());
+
+        public abstract ValueTask ExecuteAsync(IConsole console);
+    }
+}

DiscordChatExporter.Cli/Commands/ExportChannelCommand.cs

@@ -1,21 +1,16 @@
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
-using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Cli.Commands.Base;
 
 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; }
+        [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 Task ExecuteAsync(IConsole console) => await ExportAsync(console, ChannelId);
+        public override async ValueTask ExecuteAsync(IConsole console) => await ExportAsync(console, ChannelId);
     }
 }

DiscordChatExporter.Cli/Commands/ExportCommandBase.cs

@@ -1,71 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using CliFx.Attributes;
-using CliFx.Services;
-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; }
-
-        [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 Task 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();
-
-            var outputPath = OutputPath ?? Directory.GetCurrentDirectory();
-            await ExportService.ExportChatLogAsync(GetToken(), guild, channel,
-                outputPath, ExportFormat, PartitionLimit,
-                After, Before, progress);
-
-            console.Output.WriteLine();
-        }
-
-        protected async Task ExportAsync(IConsole console, Channel channel)
-        {
-            var guild = await DataService.GetGuildAsync(GetToken(), channel.GuildId);
-            await ExportAsync(console, guild, channel);
-        }
-
-        protected async Task ExportAsync(IConsole console, string channelId)
-        {
-            var channel = await DataService.GetChannelAsync(GetToken(), channelId);
-            await ExportAsync(console, channel);
-        }
-    }
-}

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -1,45 +1,19 @@
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
-using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Exceptions;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Utilities;
 
 namespace DiscordChatExporter.Cli.Commands
 {
     [Command("exportdm", Description = "Export all direct message channels.")]
-    public class ExportDirectMessagesCommand : ExportCommandBase
+    public class ExportDirectMessagesCommand : ExportMultipleCommandBase
     {
-        public ExportDirectMessagesCommand(SettingsService settingsService, DataService dataService, ExportService exportService)
-            : base(settingsService, dataService, exportService)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-        }
-
-        public override async Task ExecuteAsync(IConsole console)
-        {
-            // Get channels
-            var channels = await DataService.GetDirectMessageChannelsAsync(GetToken());
-
-            // Order channels
-            channels = channels.OrderBy(c => c.Name).ToArray();
-
-            // Loop through channels
-            foreach (var channel in channels)
-            {
-                try
-                {
-                    await ExportAsync(console, channel);
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
-                {
-                    console.Error.WriteLine("You don't have access to this channel.");
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
-                {
-                    console.Error.WriteLine("This channel doesn't exist.");
-                }
-            }
+            var dmChannels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
+            await ExportMultipleAsync(console, dmChannels);
         }
     }
 }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -1,49 +1,21 @@
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Exceptions;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Utilities;
 
 namespace DiscordChatExporter.Cli.Commands
 {
     [Command("exportguild", Description = "Export all channels within specified guild.")]
-    public class ExportGuildCommand : ExportCommandBase
+    public class ExportGuildCommand : ExportMultipleCommandBase
     {
         [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
-        public string GuildId { get; set; }
+        public string GuildId { get; set; } = "";
 
-        public ExportGuildCommand(SettingsService settingsService, DataService dataService, ExportService exportService)
-            : base(settingsService, dataService, exportService)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-        }
-
-        public override async Task ExecuteAsync(IConsole console)
-        {
-            // Get channels
-            var channels = await DataService.GetGuildChannelsAsync(GetToken(), GuildId);
-
-            // Filter and order channels
-            channels = channels.Where(c => c.Type.IsExportable()).OrderBy(c => c.Name).ToArray();
-
-            // Loop through channels
-            foreach (var channel in channels)
-            {
-                try
-                {
-                    await ExportAsync(console, channel);
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
-                {
-                    console.Error.WriteLine("You don't have access to this channel.");
-                }
-                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
-                {
-                    console.Error.WriteLine("This channel doesn't exist.");
-                }
-            }
+            var guildChannels = await GetDiscordClient().GetGuildChannelsAsync(GuildId);
+            await ExportMultipleAsync(console, guildChannels);
         }
     }
 }

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -1,9 +1,9 @@
 using System.Linq;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Utilities;
 
 namespace DiscordChatExporter.Cli.Commands
 {
@@ -11,24 +11,14 @@ namespace DiscordChatExporter.Cli.Commands
     public class GetChannelsCommand : TokenCommandBase
     {
         [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
-        public string GuildId { get; set; }
+        public string GuildId { get; set; } = "";
 
-        public GetChannelsCommand(DataService dataService)
-            : base(dataService)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-        }
+            var guildChannels = await GetDiscordClient().GetGuildChannelsAsync(GuildId);
 
-        public override async Task ExecuteAsync(IConsole console)
-        {
-            // Get channels
-            var channels = await DataService.GetGuildChannelsAsync(GetToken(), GuildId);
-
-            // Filter and order channels
-            channels = channels.Where(c => c.Type.IsExportable()).OrderBy(c => c.Name).ToArray();
-
-            // Print result
-            foreach (var channel in channels)
-                console.Output.WriteLine($"{channel.Id} | {channel.Name}");
+            foreach (var channel in guildChannels.OrderBy(c => c.Category).ThenBy(c => c.Name))
+                console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
         }
     }
 }

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -1,30 +1,22 @@
 using System.Linq;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
-using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Utilities;
 
 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 dmChannels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
 
-        public override async Task ExecuteAsync(IConsole console)
-        {
-            // Get channels
-            var channels = await DataService.GetDirectMessageChannelsAsync(GetToken());
-
-            // Order channels
-            channels = channels.OrderBy(c => c.Name).ToArray();
-
-            // Print result
-            foreach (var channel in channels)
-                console.Output.WriteLine($"{channel.Id} | {channel.Name}");
+            foreach (var channel in dmChannels.OrderBy(c => c.Category).ThenBy(c => c.Name))
+                console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
         }
     }
 }

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -1,29 +1,20 @@
 using System.Linq;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
-using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Domain.Utilities;
 
 namespace DiscordChatExporter.Cli.Commands
 {
     [Command("guilds", Description = "Get the list of accessible guilds.")]
     public class GetGuildsCommand : TokenCommandBase
     {
-        public GetGuildsCommand(DataService dataService)
-            : base(dataService)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-        }
+            var guilds = await GetDiscordClient().GetUserGuildsAsync();
 
-        public override async Task ExecuteAsync(IConsole console)
-        {
-            // Get guilds
-            var guilds = await DataService.GetUserGuildsAsync(GetToken());
-
-            // Order guilds
-            guilds = guilds.OrderBy(g => g.Name).ToArray();
-
-            // Print result
-            foreach (var guild in guilds)
+            foreach (var guild in guilds.OrderBy(g => g.Name))
                 console.Output.WriteLine($"{guild.Id} | {guild.Name}");
         }
     }

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -2,20 +2,19 @@
 using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
 
 namespace DiscordChatExporter.Cli.Commands
 {
     [Command("guide", Description = "Explains how to obtain token, guild or channel ID.")]
     public class GuideCommand : ICommand
     {
-        public Task ExecuteAsync(IConsole console)
+        public ValueTask ExecuteAsync(IConsole console)
         {
             console.WithForegroundColor(ConsoleColor.White, () => console.Output.WriteLine("To get user token:"));
             console.Output.WriteLine(" 1. Open Discord");
             console.Output.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
             console.Output.WriteLine(" 3. Navigate to the Application tab");
-            console.Output.WriteLine(" 4. Select \"Local Storage\" > \"https://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.");
@@ -45,10 +44,10 @@ 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("For more information, check out the wiki:");
             console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");
 
-            return Task.CompletedTask;
+            return default;
         }
     }
 }

DiscordChatExporter.Cli/Commands/TokenCommandBase.cs

@@ -1,29 +0,0 @@
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using CliFx.Services;
-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 TokenCommandBase(DataService dataService)
-        {
-            DataService = dataService;
-        }
-
-        protected AuthToken GetToken() => new AuthToken(IsBotToken ? AuthTokenType.Bot : AuthTokenType.User, TokenValue);
-
-        public abstract Task ExecuteAsync(IConsole console);
-    }
-}

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -7,14 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="0.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
+    <PackageReference Include="CliFx" Version="1.2.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.Domain\DiscordChatExporter.Domain.csproj" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Cli/Program.cs

@@ -1,44 +1,14 @@
-using System;
-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 Task<int> Main(string[] args)
-        {
-            var serviceProvider = ConfigureServices();
-
-            return new CliApplicationBuilder()
+        public static async Task<int> Main(string[] args) =>
+            await new CliApplicationBuilder()
                 .AddCommandsFromThisAssembly()
-                .UseCommandFactory(schema => (ICommand) serviceProvider.GetService(schema.Type))
                 .Build()
                 .RunAsync(args);
-        }
     }
 }

DiscordChatExporter.Core.Markdown/DiscordChatExporter.Core.Markdown.csproj

@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
-  </ItemGroup>
-
-</Project>

DiscordChatExporter.Core.Markdown/Internal/IMatcher.cs

@@ -1,7 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Internal
-{
-    internal interface IMatcher<T>
-    {
-        ParsedMatch<T>? Match(StringPart stringPart);
-    }
-}

DiscordChatExporter.Core.Markdown/Nodes/FormattedNode.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Markdown.Nodes
-{
-    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)";
-    }
-}

DiscordChatExporter.Core.Markdown/Nodes/MentionType.cs

@@ -1,10 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
-{
-    public enum MentionType
-    {
-        Meta,
-        User,
-        Channel,
-        Role
-    }
-}

DiscordChatExporter.Core.Markdown/Nodes/Node.cs

@@ -1,6 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
-{
-    public abstract class Node
-    {
-    }
-}

DiscordChatExporter.Core.Markdown/Nodes/TextFormatting.cs

@@ -1,12 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
-{
-    public enum TextFormatting
-    {
-        Bold,
-        Italic,
-        Underline,
-        Strikethrough,
-        Spoiler,
-        Quote
-    }
-}

DiscordChatExporter.Core.Models/Attachment.cs

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

DiscordChatExporter.Core.Models/AuthToken.cs

@@ -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;
-        }
-    }
-}

DiscordChatExporter.Core.Models/AuthTokenType.cs

@@ -1,8 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    public enum AuthTokenType
-    {
-        User,
-        Bot
-    }
-}

DiscordChatExporter.Core.Models/Channel.cs

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

DiscordChatExporter.Core.Models/ChannelType.cs

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

DiscordChatExporter.Core.Models/DiscordChatExporter.Core.Models.csproj

@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../DiscordChatExporter.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
-  </ItemGroup>
-
-</Project>

DiscordChatExporter.Core.Models/Embed.cs

@@ -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>";
-    }
-}

DiscordChatExporter.Core.Models/EmbedAuthor.cs

@@ -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>";
-    }
-}

DiscordChatExporter.Core.Models/EmbedField.cs

@@ -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}";
-    }
-}

DiscordChatExporter.Core.Models/EmbedFooter.cs

@@ -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;
-    }
-}

DiscordChatExporter.Core.Models/EmbedImage.cs

@@ -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;
-        }
-    }
-}

DiscordChatExporter.Core.Models/Emoji.cs

@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/emoji#emoji-object
-
-    public partial class Emoji
-    {
-        public string? Id { get; }
-
-        public string Name { get; }
-
-        public bool IsAnimated { get; }
-
-        public string ImageUrl { get; }
-
-        public Emoji(string? id, string name, bool isAnimated)
-        {
-            Id = id;
-            Name = name;
-            IsAnimated = isAnimated;
-
-            ImageUrl = GetImageUrl(id, name, isAnimated);
-        }
-    }
-
-    public partial class Emoji
-    {
-        private static IEnumerable<int> GetCodePoints(string emoji)
-        {
-            for (var i = 0; i < emoji.Length; i += char.IsHighSurrogate(emoji[i]) ? 2 : 1)
-                yield return char.ConvertToUtf32(emoji, i);
-        }
-
-        private static string GetTwemojiName(string emoji) =>
-            GetCodePoints(emoji).Select(i => i.ToString("x")).JoinToString("-");
-
-        public static string GetImageUrl(string? id, string name, bool isAnimated)
-        {
-            // Custom emoji
-            if (!string.IsNullOrWhiteSpace(id))
-            {
-                // Animated
-                if (isAnimated)
-                    return $"https://cdn.discordapp.com/emojis/{id}.gif";
-
-                // Non-animated
-                return $"https://cdn.discordapp.com/emojis/{id}.png";
-            }
-
-            // Standard unicode emoji (via twemoji)
-            var twemojiName = GetTwemojiName(name);
-            return $"https://twemoji.maxcdn.com/2/72x72/{twemojiName}.png";
-        }
-    }
-}

DiscordChatExporter.Core.Models/ExportFormat.cs

@@ -1,10 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    public enum ExportFormat
-    {
-        PlainText,
-        HtmlDark,
-        HtmlLight,
-        Csv
-    }
-}

DiscordChatExporter.Core.Models/Extensions.cs

@@ -1,34 +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",
-                _ => throw new ArgumentOutOfRangeException(nameof(format))
-            };
-
-        public static string GetDisplayName(this ExportFormat format) =>
-            format switch
-            {
-                ExportFormat.PlainText => "Plain Text",
-                ExportFormat.HtmlDark => "HTML (Dark)",
-                ExportFormat.HtmlLight => "HTML (Light)",
-                ExportFormat.Csv => "Comma Separated Values (CSV)",
-                _ => throw new ArgumentOutOfRangeException(nameof(format))
-            };
-    }
-}

DiscordChatExporter.Core.Models/FileSize.cs

@@ -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}";
-    }
-}

DiscordChatExporter.Core.Models/Guild.cs

@@ -1,38 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.string.IsNullOrWhiteSpace(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 string IconUrl { get; }
-
-        public Guild(string id, string name, string? iconHash)
-        {
-            Id = id;
-            Name = name;
-            IconHash = iconHash;
-
-            IconUrl = GetIconUrl(id, iconHash);
-        }
-
-        public override string ToString() => Name;
-    }
-
-    public partial class Guild
-    {
-        public static string GetIconUrl(string id, string? iconHash)
-        {
-            return !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", null);
-    }
-}

DiscordChatExporter.Core.Models/Message.cs

@@ -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>";
-    }
-}

DiscordChatExporter.Core.Models/MessageGroup.cs

@@ -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;
-        }
-    }
-}

DiscordChatExporter.Core.Models/MessageType.cs

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

DiscordChatExporter.Core.Models/Reaction.cs

@@ -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;
-        }
-    }
-}

DiscordChatExporter.Core.Models/Role.cs

@@ -1,24 +0,0 @@
-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 Role(string id, string name)
-        {
-            Id = id;
-            Name = name;
-        }
-
-        public override string ToString() => Name;
-    }
-
-    public partial class Role
-    {
-        public static Role CreateDeletedRole(string id) => new Role(id, "deleted-role");
-    }
-}

DiscordChatExporter.Core.Models/User.cs

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

DiscordChatExporter.Core.Rendering/CsvMessageRenderer.cs

@@ -1,28 +0,0 @@
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering.Logic;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public class CsvMessageRenderer : MessageRendererBase
-    {
-        private bool _isHeaderRendered;
-
-        public CsvMessageRenderer(string filePath, RenderContext context)
-            : base(filePath, context)
-        {
-        }
-
-        public override async Task RenderMessageAsync(Message message)
-        {
-            // Render header if it's the first entry
-            if (!_isHeaderRendered)
-            {
-                await Writer.WriteLineAsync(CsvRenderingLogic.FormatHeader(Context));
-                _isHeaderRendered = true;
-            }
-
-            await Writer.WriteLineAsync(CsvRenderingLogic.FormatMessage(Context, message));
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/DiscordChatExporter.Core.Rendering.csproj

@@ -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.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj" />
-    <ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj" />
-  </ItemGroup>
-
-</Project>

DiscordChatExporter.Core.Rendering/IMessageRenderer.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public interface IMessageRenderer : IAsyncDisposable
-    {
-        Task RenderMessageAsync(Message message);
-    }
-}

DiscordChatExporter.Core.Rendering/Internal/Extensions.cs

@@ -1,21 +0,0 @@
-using System.Text;
-
-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;
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/Logic/CsvRenderingLogic.cs

@@ -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();
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/Logic/HtmlRenderingLogic.cs

@@ -1,160 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text.RegularExpressions;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Markdown.Nodes;
-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);
-
-                    return $"<span class=\"mention\" title=\"{HtmlEncode(user.FullName)}\">@{HtmlEncode(user.Name)}</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);
-
-                    return $"<span class=\"mention\">@{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);
-    }
-}

DiscordChatExporter.Core.Rendering/Logic/PlainTextRenderingLogic.cs

@@ -1,235 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Markdown.Nodes;
-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.AppendLine('='.Repeat(62));
-            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.AppendLine('='.Repeat(62));
-
-            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(RenderContext context, 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(RenderContext context, 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(context, message.Attachments))
-                .AppendLineIfNotEmpty(FormatEmbeds(context, message.Embeds))
-                .AppendLineIfNotEmpty(FormatReactions(context, message.Reactions));
-
-            return buffer.Trim().ToString();
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/Logic/SharedRenderingLogic.cs

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

DiscordChatExporter.Core.Rendering/MessageRendererBase.cs

@@ -1,23 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public abstract class MessageRendererBase : IMessageRenderer
-    {
-        protected TextWriter Writer { get; }
-
-        protected RenderContext Context { get; }
-
-        protected MessageRendererBase(string filePath, RenderContext context)
-        {
-            Writer = File.CreateText(filePath);
-            Context = context;
-        }
-
-        public abstract Task RenderMessageAsync(Message message);
-
-        public virtual ValueTask DisposeAsync() => Writer.DisposeAsync();
-    }
-}

DiscordChatExporter.Core.Rendering/PlainTextMessageRenderer.cs

@@ -1,29 +0,0 @@
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering.Logic;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public class PlainTextMessageRenderer : MessageRendererBase
-    {
-        private bool _isPreambleRendered;
-
-        public PlainTextMessageRenderer(string filePath, RenderContext context)
-            : base(filePath, context)
-        {
-        }
-
-        public override async Task RenderMessageAsync(Message message)
-        {
-            // Render preamble if it's the first entry
-            if (!_isPreambleRendered)
-            {
-                await Writer.WriteLineAsync(PlainTextRenderingLogic.FormatPreamble(Context));
-                _isPreambleRendered = true;
-            }
-
-            await Writer.WriteLineAsync(PlainTextRenderingLogic.FormatMessage(Context, message));
-            await Writer.WriteLineAsync();
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/RenderContext.cs

@@ -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;
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/Resources/HtmlLayoutTemplate.html

@@ -1,84 +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>
-
-{{~ # Info ~}}
-<div class="info">
-    <div class="info__guild-icon-container">
-        <img class="info__guild-icon" src="{{ Context.Guild.IconUrl }}" />
-    </div>
-    <div class="info__metadata">
-        <div class="info__guild-name">{{ Context.Guild.Name | html.escape }}</div>
-        <div class="info__channel-name">{{ Context.Channel.Name | html.escape }}</div>
-
-        {{~ if Context.Channel.Topic ~}}
-            <div class="info__channel-topic">{{ Context.Channel.Topic | html.escape }}</div>
-        {{~ end ~}}
-
-        {{~ if Context.After || Context.Before ~}}
-            <div class="info__channel-date-range">
-                {{~ 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>
-
-</body>
-</html>

DiscordChatExporter.Core.Services/DataService.Parsers.cs

@@ -1,216 +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 Guild ParseGuild(JToken json)
-        {
-            var id = json["id"]!.Value<string>();
-            var name = json["name"]!.Value<string>();
-            var iconHash = json["icon"]!.Value<string>();
-
-            return new Guild(id, name, iconHash);
-        }
-
-        private Channel ParseChannel(JToken json)
-        {
-            // Get basic data
-            var id = json["id"]!.Value<string>();
-            var parentId = json["parent_id"]?.Value<string>();
-            var type = (ChannelType) json["type"]!.Value<int>();
-            var topic = json["topic"]?.Value<string>();
-
-            // Try to extract guild ID
-            var guildId = json["guild_id"]?.Value<string>();
-
-            // If the guild ID is blank, it's direct messages
-            if (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>();
-
-            return new Role(id, name);
-        }
-
-        private Attachment ParseAttachment(JToken json)
-        {
-            var id = json["id"]!.Value<string>();
-            var url = json["url"]!.Value<string>();
-            var width = json["width"]?.Value<int>();
-            var height = json["height"]?.Value<int>();
-            var fileName = json["filename"]!.Value<string>();
-            var fileSizeBytes = json["size"]!.Value<long>();
-
-            var fileSize = 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);
-        }
-    }
-}

DiscordChatExporter.Core.Services/DataService.cs

@@ -1,214 +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)
-        {
-            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)
-                throw new HttpErrorStatusCodeException(response.StatusCode, response.ReasonPhrase);
-
-            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<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;
-
-                foreach (var guild in response.Select(ParseGuild))
-                {
-                    yield return guild;
-                    afterId = guild.Id;
-                }
-            }
-        }
-
-        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;
-        }
-
-        public async Task<IReadOnlyList<Role>> GetGuildRolesAsync(AuthToken token, string guildId)
-        {
-            // Special case for direct messages pseudo-guild
-            if (guildId == Guild.DirectMessages.Id)
-                return Array.Empty<Role>();
-
-            var response = await GetApiResponseAsync(token, $"guilds/{guildId}/roles");
-            var roles = response.Select(ParseRole).ToArray();
-
-            return roles;
-        }
-
-        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();
-    }
-}

DiscordChatExporter.Core.Services/DiscordChatExporter.Core.Services.csproj

@@ -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.1" />
-    <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>

DiscordChatExporter.Core.Services/Exceptions/HttpErrorStatusCodeException.cs

@@ -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;
-        }
-    }
-}

DiscordChatExporter.Core.Services/ExportService.cs

@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Rendering;
-using DiscordChatExporter.Core.Services.Logic;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public class ExportService
-    {
-        private readonly SettingsService _settingsService;
-        private readonly DataService _dataService;
-
-        public ExportService(SettingsService settingsService, DataService dataService)
-        {
-            _settingsService = settingsService;
-            _dataService = dataService;
-        }
-
-        private string GetFilePathFromOutputPath(string outputPath, ExportFormat format, RenderContext context)
-        {
-            // Output is a directory
-            if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath)))
-            {
-                var fileName = ExportLogic.GetDefaultExportFileName(format, context.Guild, context.Channel, context.After, context.Before);
-                return Path.Combine(outputPath, fileName);
-            }
-
-            // Output is a file
-            return outputPath;
-        }
-
-        private IMessageRenderer CreateRenderer(string outputPath, int partitionIndex, ExportFormat format, RenderContext context)
-        {
-            var filePath = ExportLogic.GetExportPartitionFilePath(
-                GetFilePathFromOutputPath(outputPath, format, context),
-                partitionIndex);
-
-            // Create output directory
-            var dirPath = Path.GetDirectoryName(filePath);
-            if (!string.IsNullOrWhiteSpace(dirPath))
-                Directory.CreateDirectory(dirPath);
-
-            // Create renderer
-
-            if (format == ExportFormat.PlainText)
-                return new PlainTextMessageRenderer(filePath, context);
-
-            if (format == ExportFormat.Csv)
-                return new CsvMessageRenderer(filePath, context);
-
-            if (format == ExportFormat.HtmlDark)
-                return new HtmlMessageRenderer(filePath, context, "Dark");
-
-            if (format == ExportFormat.HtmlLight)
-                return new HtmlMessageRenderer(filePath, context, "Light");
-
-            throw new InvalidOperationException($"Unknown export format [{format}].");
-        }
-
-        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)
-        {
-            // Create context
-            var mentionableUsers = new HashSet<User>(IdBasedEqualityComparer.Instance);
-            var mentionableChannels = await _dataService.GetGuildChannelsAsync(token, guild.Id);
-            var mentionableRoles = await _dataService.GetGuildRolesAsync(token, guild.Id);
-
-            var context = new RenderContext
-            (
-                guild, channel, after, before, _settingsService.DateFormat,
-                mentionableUsers, mentionableChannels, mentionableRoles
-            );
-
-            // Render messages
-            var partitionIndex = 0;
-            var partitionMessageCount = 0;
-            var renderer = CreateRenderer(outputPath, partitionIndex, format, context);
-
-            await foreach (var message in _dataService.GetMessagesAsync(token, channel.Id, after, before, progress))
-            {
-                // Add encountered users to the list of mentionable users
-                mentionableUsers.Add(message.Author);
-                mentionableUsers.AddRange(message.MentionedUsers);
-
-                // If new partition is required, reset renderer
-                if (partitionLimit != null && partitionLimit > 0 && partitionMessageCount >= partitionLimit)
-                {
-                    partitionIndex++;
-                    partitionMessageCount = 0;
-
-                    // Flush old renderer and create a new one
-                    await renderer.DisposeAsync();
-                    renderer = CreateRenderer(outputPath, partitionIndex, format, context);
-                }
-
-                // Render message
-                await renderer.RenderMessageAsync(message);
-                partitionMessageCount++;
-            }
-
-            // Flush last renderer
-            await renderer.DisposeAsync();
-        }
-    }
-}

DiscordChatExporter.Core.Services/Extensions.cs

@@ -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();
-    }
-}

DiscordChatExporter.Core.Services/Internal/Extensions.cs

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

DiscordChatExporter.Core.Services/Logic/ExportLogic.cs

@@ -1,72 +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();
-        }
-
-        public static string GetExportPartitionFilePath(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;
-        }
-    }
-}

DiscordChatExporter.Domain/Discord/AuthToken.cs

@@ -0,0 +1,27 @@
+using System.Net.Http.Headers;
+
+namespace DiscordChatExporter.Domain.Discord
+{
+    public enum AuthTokenType { User, Bot }
+
+    public class AuthToken
+    {
+        public AuthTokenType Type { get; }
+
+        public string Value { get; }
+
+        public AuthToken(AuthTokenType type, string value)
+        {
+            Type = type;
+            Value = value;
+        }
+
+        public AuthenticationHeaderValue GetAuthorizationHeader() => Type switch
+        {
+            AuthTokenType.Bot => new AuthenticationHeaderValue("Bot", Value),
+            _ => new AuthenticationHeaderValue(Value)
+        };
+
+        public override string ToString() => Value;
+    }
+}

DiscordChatExporter.Domain/Discord/DiscordClient.cs

@@ -0,0 +1,267 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Exceptions;
+using DiscordChatExporter.Domain.Internal;
+using DiscordChatExporter.Domain.Internal.Extensions;
+using Polly;
+
+namespace DiscordChatExporter.Domain.Discord
+{
+    public class DiscordClient
+    {
+        private readonly AuthToken _token;
+        private readonly HttpClient _httpClient = Singleton.HttpClient;
+        private readonly IAsyncPolicy<HttpResponseMessage> _httpRequestPolicy;
+
+        private readonly Uri _baseUri = new Uri("https://discord.com/api/v6/", UriKind.Absolute);
+
+        public DiscordClient(AuthToken token)
+        {
+            _token = token;
+
+            // Discord seems to always respond with 429 on the first request with unreasonable wait time (10+ minutes).
+            // For that reason the policy will ignore such errors at first, then wait a constant amount of time, and
+            // finally wait the specified amount of time, based on how many requests have failed in a row.
+            _httpRequestPolicy = 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 ValueTask<HttpResponseMessage> GetResponseAsync(string url) => await _httpRequestPolicy.ExecuteAsync(async () =>
+        {
+            using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
+            request.Headers.Authorization = _token.GetAuthorizationHeader();
+
+            return await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
+        });
+
+        private async ValueTask<JsonElement> GetJsonResponseAsync(string url)
+        {
+            using var response = await GetResponseAsync(url);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                throw response.StatusCode switch
+                {
+                    HttpStatusCode.Unauthorized => DiscordChatExporterException.Unauthorized(),
+                    HttpStatusCode.Forbidden => DiscordChatExporterException.Forbidden(),
+                    HttpStatusCode.NotFound => DiscordChatExporterException.NotFound(),
+                    _ => DiscordChatExporterException.FailedHttpRequest(response)
+                };
+            }
+
+            return await response.Content.ReadAsJsonAsync();
+        }
+
+        private async ValueTask<JsonElement?> TryGetJsonResponseAsync(string url)
+        {
+            using var response = await GetResponseAsync(url);
+
+            return response.IsSuccessStatusCode
+                ? await response.Content.ReadAsJsonAsync()
+                : (JsonElement?) null;
+        }
+
+        public async IAsyncEnumerable<Guild> GetUserGuildsAsync()
+        {
+            yield return Guild.DirectMessages;
+
+            var afterId = "";
+            while (true)
+            {
+                var url = new UrlBuilder()
+                    .SetPath("users/@me/guilds")
+                    .SetQueryParameter("limit", "100")
+                    .SetQueryParameter("after", afterId)
+                    .Build();
+
+                var response = await GetJsonResponseAsync(url);
+
+                var isEmpty = true;
+                foreach (var guild in response.EnumerateArray().Select(Guild.Parse))
+                {
+                    yield return guild;
+
+                    afterId = guild.Id;
+                    isEmpty = false;
+                }
+
+                if (isEmpty)
+                    yield break;
+            }
+        }
+
+        public async ValueTask<Guild> GetGuildAsync(string guildId)
+        {
+            if (guildId == Guild.DirectMessages.Id)
+                return Guild.DirectMessages;
+
+            var response = await GetJsonResponseAsync($"guilds/{guildId}");
+            return Guild.Parse(response);
+        }
+
+        public async IAsyncEnumerable<Channel> GetGuildChannelsAsync(string guildId)
+        {
+            if (guildId == Guild.DirectMessages.Id)
+            {
+                var response = await GetJsonResponseAsync("users/@me/channels");
+                foreach (var channelJson in response.EnumerateArray())
+                    yield return Channel.Parse(channelJson);
+            }
+            else
+            {
+                var response = await GetJsonResponseAsync($"guilds/{guildId}/channels");
+
+                var categories = response
+                    .EnumerateArray()
+                    .ToDictionary(
+                        j => j.GetProperty("id").GetString(),
+                        j => j.GetProperty("name").GetString()
+                    );
+
+                foreach (var channelJson in response.EnumerateArray())
+                {
+                    var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetString();
+                    var category = !string.IsNullOrWhiteSpace(parentId)
+                        ? categories.GetValueOrDefault(parentId)
+                        : null;
+
+                    var channel = Channel.Parse(channelJson, category);
+
+                    // Skip non-text channels
+                    if (!channel.IsTextChannel)
+                        continue;
+
+                    yield return channel;
+                }
+            }
+        }
+
+        public async IAsyncEnumerable<Role> GetGuildRolesAsync(string guildId)
+        {
+            if (guildId == Guild.DirectMessages.Id)
+                yield break;
+
+            var response = await GetJsonResponseAsync($"guilds/{guildId}/roles");
+
+            foreach (var roleJson in response.EnumerateArray())
+                yield return Role.Parse(roleJson);
+        }
+
+        public async ValueTask<Member?> TryGetGuildMemberAsync(string guildId, User user)
+        {
+            if (guildId == Guild.DirectMessages.Id)
+                return Member.CreateForUser(user);
+
+            var response = await TryGetJsonResponseAsync($"guilds/{guildId}/members/{user.Id}");
+            return response?.Pipe(Member.Parse);
+        }
+
+        private async ValueTask<string> GetChannelCategoryAsync(string channelParentId)
+        {
+            var response = await GetJsonResponseAsync($"channels/{channelParentId}");
+            return response.GetProperty("name").GetString();
+        }
+
+        public async ValueTask<Channel> GetChannelAsync(string channelId)
+        {
+            var response = await GetJsonResponseAsync($"channels/{channelId}");
+
+            var parentId = response.GetPropertyOrNull("parent_id")?.GetString();
+            var category = !string.IsNullOrWhiteSpace(parentId)
+                ? await GetChannelCategoryAsync(parentId)
+                : null;
+
+            return Channel.Parse(response, category);
+        }
+
+        private async ValueTask<Message?> TryGetLastMessageAsync(string channelId, DateTimeOffset? before = null)
+        {
+            var url = new UrlBuilder()
+                .SetPath($"channels/{channelId}/messages")
+                .SetQueryParameter("limit", "1")
+                .SetQueryParameter("before", before?.ToSnowflake())
+                .Build();
+
+            var response = await GetJsonResponseAsync(url);
+            return response.EnumerateArray().Select(Message.Parse).LastOrDefault();
+        }
+
+        public async IAsyncEnumerable<Message> GetMessagesAsync(
+            string channelId,
+            DateTimeOffset? after = null,
+            DateTimeOffset? before = null,
+            IProgress<double>? progress = null)
+        {
+            // Get the last message in the specified range.
+            // This snapshots the boundaries, which means that messages posted after the exported started
+            // will not appear in the output.
+            // Additionally, it provides the date of the last message, which is used to calculate progress.
+            var lastMessage = await TryGetLastMessageAsync(channelId, before);
+            if (lastMessage == null || lastMessage.Timestamp < after)
+                yield break;
+
+            // Keep track of first message in range in order to calculate progress
+            var firstMessage = default(Message);
+            var afterId = after?.ToSnowflake() ?? "0";
+
+            while (true)
+            {
+                var url = new UrlBuilder()
+                    .SetPath($"channels/{channelId}/messages")
+                    .SetQueryParameter("limit", "100")
+                    .SetQueryParameter("after", afterId)
+                    .Build();
+
+                var response = await GetJsonResponseAsync(url);
+
+                var messages = response
+                    .EnumerateArray()
+                    .Select(Message.Parse)
+                    .Reverse() // reverse because messages appear newest first
+                    .ToArray();
+
+                // Break if there are no messages (can happen if messages are deleted during execution)
+                if (!messages.Any())
+                    yield break;
+
+                foreach (var message in messages)
+                {
+                    firstMessage ??= message;
+
+                    // Ensure messages are in range (take into account that last message could have been deleted)
+                    if (message.Timestamp > lastMessage.Timestamp)
+                        yield break;
+
+                    // Report progress based on the duration of parsed messages divided by total
+                    progress?.Report(
+                        (message.Timestamp - firstMessage.Timestamp) /
+                        (lastMessage.Timestamp - firstMessage.Timestamp)
+                    );
+
+                    yield return message;
+                    afterId = message.Id;
+                }
+            }
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Attachment.cs

@@ -0,0 +1,60 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/channel#attachment-object
+    public partial class Attachment : IHasId
+    {
+        public string 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), StringComparer.OrdinalIgnoreCase);
+
+        public bool IsSpoiler =>
+            IsImage && FileName.StartsWith("SPOILER_", StringComparison.Ordinal);
+
+        public FileSize FileSize { get; }
+
+        public Attachment(string 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 string[] ImageFileExtensions = {".jpg", ".jpeg", ".png", ".gif", ".bmp"};
+
+        public static Attachment Parse(JsonElement json)
+        {
+            var id = json.GetProperty("id").GetString();
+            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);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Channel.cs

@@ -0,0 +1,92 @@
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Internal.Extensions;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
+    // Order of enum fields needs to match the order in the docs.
+    public enum ChannelType
+    {
+        GuildTextChat,
+        DirectTextChat,
+        GuildVoiceChat,
+        DirectGroupTextChat,
+        GuildCategory,
+        GuildNews,
+        GuildStore
+    }
+
+    // https://discord.com/developers/docs/resources/channel#channel-object
+    public partial class Channel : IHasId
+    {
+        public string 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 string GuildId { get; }
+
+        public string Category { get; }
+
+        public string Name { get; }
+
+        public string? Topic { get; }
+
+        public Channel(string id, ChannelType type, string guildId, string category, string name, string? topic)
+        {
+            Id = id;
+            Type = type;
+            GuildId = guildId;
+            Category = category;
+            Name = name;
+            Topic = topic;
+        }
+
+        public override string ToString() => Name;
+    }
+
+    public partial class Channel
+    {
+        private static string GetDefaultCategory(ChannelType channelType) => channelType switch
+        {
+            ChannelType.GuildTextChat => "Text",
+            ChannelType.DirectTextChat => "Private",
+            ChannelType.DirectGroupTextChat => "Group",
+            ChannelType.GuildNews => "News",
+            ChannelType.GuildStore => "Store",
+            _ => "Default"
+        };
+
+        public static Channel Parse(JsonElement json, string? category = null)
+        {
+            var id = json.GetProperty("id").GetString();
+            var guildId = json.GetPropertyOrNull("guild_id")?.GetString();
+            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;
+
+            return new Channel(
+                id,
+                type,
+                guildId ?? Guild.DirectMessages.Id,
+                category ?? GetDefaultCategory(type),
+                name,
+                topic
+            );
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Common/FileSize.cs

@@ -0,0 +1,65 @@
+using System;
+
+namespace DiscordChatExporter.Domain.Discord.Models.Common
+{
+    // Loosely based on https://github.com/omar/ByteSize (MIT license)
+    public readonly partial struct FileSize
+    {
+        public long TotalBytes { get; }
+
+        public double TotalKiloBytes => TotalBytes / 1024.0;
+        public double TotalMegaBytes => TotalKiloBytes / 1024.0;
+        public double TotalGigaBytes => TotalMegaBytes / 1024.0;
+        public double TotalTeraBytes => TotalGigaBytes / 1024.0;
+        public double TotalPetaBytes => TotalTeraBytes / 1024.0;
+
+        public FileSize(long bytes) => TotalBytes = bytes;
+
+        private double GetLargestWholeNumberValue()
+        {
+            if (Math.Abs(TotalPetaBytes) >= 1)
+                return TotalPetaBytes;
+
+            if (Math.Abs(TotalTeraBytes) >= 1)
+                return TotalTeraBytes;
+
+            if (Math.Abs(TotalGigaBytes) >= 1)
+                return TotalGigaBytes;
+
+            if (Math.Abs(TotalMegaBytes) >= 1)
+                return TotalMegaBytes;
+
+            if (Math.Abs(TotalKiloBytes) >= 1)
+                return TotalKiloBytes;
+
+            return TotalBytes;
+        }
+
+        private string GetLargestWholeNumberSymbol()
+        {
+            if (Math.Abs(TotalPetaBytes) >= 1)
+                return "PB";
+
+            if (Math.Abs(TotalTeraBytes) >= 1)
+                return "TB";
+
+            if (Math.Abs(TotalGigaBytes) >= 1)
+                return "GB";
+
+            if (Math.Abs(TotalMegaBytes) >= 1)
+                return "MB";
+
+            if (Math.Abs(TotalKiloBytes) >= 1)
+                return "KB";
+
+            return "B";
+        }
+
+        public override string ToString() => $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}";
+    }
+
+    public partial struct FileSize
+    {
+        public static FileSize FromBytes(long bytes) => new FileSize(bytes);
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Common/IHasId.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Models
+namespace DiscordChatExporter.Domain.Discord.Models.Common
 {
     public interface IHasId
     {

DiscordChatExporter.Domain/Discord/Models/Common/IdBasedEqualityComparer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Core.Models
+namespace DiscordChatExporter.Domain.Discord.Models.Common
 {
     public partial class IdBasedEqualityComparer : IEqualityComparer<IHasId>
     {

DiscordChatExporter.Domain/Discord/Models/Embed.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // 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
+            );
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/EmbedAuthor.cs

@@ -0,0 +1,36 @@
+using System.Text.Json;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // 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);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/EmbedField.cs

@@ -0,0 +1,36 @@
+using System.Text.Json;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // 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);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/EmbedFooter.cs

@@ -0,0 +1,32 @@
+using System.Text.Json;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // 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);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/EmbedImage.cs

@@ -0,0 +1,34 @@
+using System.Text.Json;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // 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);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Emoji.cs

@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Internal.Extensions;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/emoji#emoji-object
+    public partial class Emoji
+    {
+        public string? Id { get; }
+
+        public string Name { get; }
+
+        public bool IsAnimated { get; }
+
+        public string ImageUrl { get; }
+
+        public Emoji(string? id, string name, bool isAnimated)
+        {
+            Id = id;
+            Name = name;
+            IsAnimated = isAnimated;
+
+            ImageUrl = GetImageUrl(id, name, isAnimated);
+        }
+
+        public override string ToString() => Name;
+    }
+
+    public partial class Emoji
+    {
+        private static IEnumerable<Rune> GetRunes(string emoji)
+        {
+            var lastIndex = 0;
+            while (lastIndex < emoji.Length && Rune.TryGetRuneAt(emoji, lastIndex, out var rune))
+            {
+                // Skip variant selector rune
+                if (rune.Value != 0xfe0f)
+                    yield return rune;
+
+                lastIndex += rune.Utf16SequenceLength;
+            }
+        }
+
+        private static string GetTwemojiName(IEnumerable<Rune> runes) =>
+            runes.Select(r => r.Value.ToString("x")).JoinToString("-");
+
+        public static string GetImageUrl(string? id, string name, bool isAnimated)
+        {
+            // Custom emoji
+            if (!string.IsNullOrWhiteSpace(id))
+            {
+                // Animated
+                if (isAnimated)
+                    return $"https://cdn.discordapp.com/emojis/{id}.gif";
+
+                // Non-animated
+                return $"https://cdn.discordapp.com/emojis/{id}.png";
+            }
+
+            // Standard emoji
+            var emojiRunes = GetRunes(name).ToArray();
+            var twemojiName = GetTwemojiName(emojiRunes);
+            return $"https://twemoji.maxcdn.com/2/72x72/{twemojiName}.png";
+        }
+
+        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);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Guild.cs

@@ -0,0 +1,49 @@
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/guild#guild-object
+    public partial class Guild : IHasId
+    {
+        public string Id { get; }
+
+        public string Name { get; }
+
+        public string IconUrl { get; }
+
+        public Guild(string 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 Guild("@me", "Direct Messages", GetDefaultIconUrl());
+
+        private static string GetDefaultIconUrl() =>
+            "https://cdn.discordapp.com/embed/avatars/0.png";
+
+        private static string GetIconUrl(string id, string iconHash) =>
+            $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png";
+
+        public static Guild Parse(JsonElement json)
+        {
+            var id = json.GetProperty("id").GetString();
+            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);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Member.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/guild#guild-member-object
+    public partial class Member : IHasId
+    {
+        public string Id => User.Id;
+
+        public User User { get; }
+
+        public string Nick { get; }
+
+        public IReadOnlyList<string> RoleIds { get; }
+
+        public Member(User user, string? nick, IReadOnlyList<string> roleIds)
+        {
+            User = user;
+            Nick = nick ?? user.Name;
+            RoleIds = roleIds;
+        }
+
+        public override string ToString() => Nick;
+    }
+
+    public partial class Member
+    {
+        public static Member CreateForUser(User user) =>
+            new Member(user, null, Array.Empty<string>());
+
+        public static Member Parse(JsonElement json)
+        {
+            var user = json.GetProperty("user").Pipe(User.Parse);
+            var nick = json.GetPropertyOrNull("nick")?.GetString();
+
+            var roleIds =
+                json.GetPropertyOrNull("roles")?.EnumerateArray().Select(j => j.GetString()).ToArray() ??
+                Array.Empty<string>();
+
+            return new Member(
+                user,
+                nick,
+                roleIds
+            );
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Message.cs

@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/channel#message-object-message-types
+    public enum MessageType
+    {
+        Default,
+        RecipientAdd,
+        RecipientRemove,
+        Call,
+        ChannelNameChange,
+        ChannelIconChange,
+        ChannelPinnedMessage,
+        GuildMemberJoin
+    }
+
+    // https://discord.com/developers/docs/resources/channel#message-object
+    public partial class Message : IHasId
+    {
+        public string Id { 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,
+            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;
+            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;
+    }
+
+    public partial class Message
+    {
+        public static Message Parse(JsonElement json)
+        {
+            var id = json.GetProperty("id").GetString();
+            var author = json.GetProperty("author").Pipe(User.Parse);
+            var timestamp = json.GetProperty("timestamp").GetDateTimeOffset();
+            var editedTimestamp = json.GetPropertyOrNull("edited_timestamp")?.GetDateTimeOffset();
+            var type = (MessageType) json.GetProperty("type").GetInt32();
+            var isPinned = json.GetPropertyOrNull("pinned")?.GetBoolean() ?? false;
+
+            var content = type switch
+            {
+                MessageType.RecipientAdd => "Added a recipient.",
+                MessageType.RecipientRemove => "Removed a recipient.",
+                MessageType.Call => "Started a call.",
+                MessageType.ChannelNameChange => "Changed the channel name.",
+                MessageType.ChannelIconChange => "Changed the channel icon.",
+                MessageType.ChannelPinnedMessage => "Pinned a message.",
+                MessageType.GuildMemberJoin => "Joined the server.",
+                _ => json.GetPropertyOrNull("content")?.GetString() ?? ""
+            };
+
+            var attachments =
+                json.GetPropertyOrNull("attachments")?.EnumerateArray().Select(Attachment.Parse).ToArray() ??
+                Array.Empty<Attachment>();
+
+            var embeds =
+                json.GetPropertyOrNull("embeds")?.EnumerateArray().Select(Embed.Parse).ToArray() ??
+                Array.Empty<Embed>();
+
+            var reactions =
+                json.GetPropertyOrNull("reactions")?.EnumerateArray().Select(Reaction.Parse).ToArray() ??
+                Array.Empty<Reaction>();
+
+            var mentionedUsers =
+                json.GetPropertyOrNull("mentions")?.EnumerateArray().Select(User.Parse).ToArray() ??
+                Array.Empty<User>();
+
+            return new Message(
+                id,
+                type,
+                author,
+                timestamp,
+                editedTimestamp,
+                isPinned,
+                content,
+                attachments,
+                embeds,
+                reactions,
+                mentionedUsers
+            );
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Reaction.cs

@@ -0,0 +1,32 @@
+using System.Text.Json;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/channel#reaction-object
+    public partial class Reaction
+    {
+        public Emoji Emoji { get; }
+
+        public int Count { get; }
+
+        public Reaction(Emoji emoji, int count)
+        {
+            Emoji = emoji;
+            Count = count;
+        }
+
+        public override string ToString() => $"{Emoji} ({Count})";
+    }
+
+    public partial class Reaction
+    {
+        public static Reaction Parse(JsonElement json)
+        {
+            var count = json.GetProperty("count").GetInt32();
+            var emoji = json.GetProperty("emoji").Pipe(Emoji.Parse);
+
+            return new Reaction(emoji, count);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/Role.cs

@@ -0,0 +1,46 @@
+using System.Drawing;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/topics/permissions#role-object
+    public partial class Role
+    {
+        public string Id { get; }
+
+        public string Name { get; }
+
+        public int Position { get; }
+
+        public Color? Color { get; }
+
+        public Role(string id, string name, int position, Color? color)
+        {
+            Id = id;
+            Name = name;
+            Position = position;
+            Color = color;
+        }
+
+        public override string ToString() => Name;
+    }
+
+    public partial class Role
+    {
+        public static Role Parse(JsonElement json)
+        {
+            var id = json.GetProperty("id").GetString();
+            var name = json.GetProperty("name").GetString();
+            var position = json.GetProperty("position").GetInt32();
+
+            var color = json.GetPropertyOrNull("color")?
+                .GetInt32()
+                .Pipe(System.Drawing.Color.FromArgb)
+                .ResetAlpha()
+                .NullIf(c => c.ToRgb() <= 0);
+
+            return new Role(id, name, position, color);
+        }
+    }
+}

DiscordChatExporter.Domain/Discord/Models/User.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Text.Json;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Discord.Models
+{
+    // https://discord.com/developers/docs/resources/user#user-object
+    public partial class User : IHasId
+    {
+        public string Id { get; }
+
+        public bool IsBot { get; }
+
+        public int Discriminator { get; }
+
+        public string Name { get; }
+
+        public string FullName => $"{Name}#{Discriminator:0000}";
+
+        public string AvatarUrl { get; }
+
+        public User(string id, bool isBot, int discriminator, string name, string avatarUrl)
+        {
+            Id = id;
+            IsBot = isBot;
+            Discriminator = discriminator;
+            Name = name;
+            AvatarUrl = avatarUrl;
+        }
+
+        public override string ToString() => FullName;
+    }
+
+    public partial class User
+    {
+        private static string GetDefaultAvatarUrl(int discriminator) =>
+            $"https://cdn.discordapp.com/embed/avatars/{discriminator % 5}.png";
+
+        private static string GetAvatarUrl(string id, string 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";
+        }
+
+        public static User Parse(JsonElement json)
+        {
+            var id = json.GetProperty("id").GetString();
+            var discriminator = json.GetProperty("discriminator").GetString().Pipe(int.Parse);
+            var name = json.GetProperty("username").GetString();
+            var avatarHash = json.GetProperty("avatar").GetString();
+            var isBot = json.GetPropertyOrNull("bot")?.GetBoolean() ?? false;
+
+            var avatarUrl = !string.IsNullOrWhiteSpace(avatarHash)
+                ? GetAvatarUrl(id, avatarHash)
+                : GetDefaultAvatarUrl(discriminator);
+
+            return new User(id, isBot, discriminator, name, avatarUrl);
+        }
+    }
+}

DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../DiscordChatExporter.props" />
+
+  <ItemGroup>
+    <PackageReference Include="Polly" Version="7.2.1" />
+    <PackageReference Include="Scriban" Version="2.1.2" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Exporting\Writers\Html\Core.css" />
+    <EmbeddedResource Include="Exporting\Writers\Html\Dark.css" />
+    <EmbeddedResource Include="Exporting\Writers\Html\LayoutTemplate.html" />
+    <EmbeddedResource Include="Exporting\Writers\Html\Light.css" />
+    <EmbeddedResource Include="Exporting\Writers\Html\MessageGroupTemplate.html" />
+  </ItemGroup>
+
+</Project>

DiscordChatExporter.Domain/Exceptions/DiscordChatExporterException.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Net.Http;
+
+namespace DiscordChatExporter.Domain.Exceptions
+{
+    public partial class DiscordChatExporterException : Exception
+    {
+        public bool IsCritical { get; }
+
+        public DiscordChatExporterException(string message, bool isCritical = false)
+            : base(message)
+        {
+            IsCritical = isCritical;
+        }
+    }
+
+    public partial class DiscordChatExporterException
+    {
+        internal static DiscordChatExporterException FailedHttpRequest(HttpResponseMessage response)
+        {
+            var message = $@"
+Failed to perform an HTTP request.
+
+{response.RequestMessage}
+
+{response}";
+
+            return new DiscordChatExporterException(message.Trim(), true);
+        }
+
+        internal static DiscordChatExporterException Unauthorized()
+        {
+            const string message = "Authentication token is invalid.";
+            return new DiscordChatExporterException(message);
+        }
+
+        internal static DiscordChatExporterException Forbidden()
+        {
+            const string message = "Access is forbidden.";
+            return new DiscordChatExporterException(message);
+        }
+
+        internal static DiscordChatExporterException NotFound()
+        {
+            const string message = "Requested resource does not exist.";
+            return new DiscordChatExporterException(message);
+        }
+
+        internal static DiscordChatExporterException ChannelIsEmpty(string channel)
+        {
+            var message = $"Channel '{channel}' contains no messages for the specified period.";
+            return new DiscordChatExporterException(message);
+        }
+    }
+}

DiscordChatExporter.Domain/Exporting/ChannelExporter.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Domain.Discord;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Discord.Models.Common;
+using DiscordChatExporter.Domain.Exceptions;
+using DiscordChatExporter.Domain.Utilities;
+
+namespace DiscordChatExporter.Domain.Exporting
+{
+    public class ChannelExporter
+    {
+        private readonly DiscordClient _discord;
+
+        public ChannelExporter(DiscordClient discord) => _discord = discord;
+
+        public ChannelExporter(AuthToken token) : this(new DiscordClient(token)) {}
+
+        public async ValueTask ExportChannelAsync(ExportRequest request, IProgress<double>? progress = null)
+        {
+            // Build context
+            var contextMembers = new HashSet<Member>(IdBasedEqualityComparer.Instance);
+            var contextChannels = await _discord.GetGuildChannelsAsync(request.Guild.Id);
+            var contextRoles = await _discord.GetGuildRolesAsync(request.Guild.Id);
+
+            var context = new ExportContext(
+                request,
+                contextMembers,
+                contextChannels,
+                contextRoles
+            );
+
+            // Export messages
+            await using var messageExporter = new MessageExporter(context);
+
+            var exportedAnything = false;
+            var encounteredUsers = new HashSet<User>(IdBasedEqualityComparer.Instance);
+            await foreach (var message in _discord.GetMessagesAsync(request.Channel.Id, request.After, request.Before, progress))
+            {
+                // Resolve members for referenced users
+                foreach (var referencedUser in message.MentionedUsers.Prepend(message.Author))
+                {
+                    if (!encounteredUsers.Add(referencedUser))
+                        continue;
+
+                    var member =
+                        await _discord.TryGetGuildMemberAsync(request.Guild.Id, referencedUser) ??
+                        Member.CreateForUser(referencedUser);
+
+                    contextMembers.Add(member);
+                }
+
+                // Export message
+                await messageExporter.ExportMessageAsync(message);
+                exportedAnything = true;
+            }
+
+            // Throw if no messages were exported
+            if (!exportedAnything)
+                throw DiscordChatExporterException.ChannelIsEmpty(request.Channel.Name);
+        }
+    }
+}

DiscordChatExporter.Domain/Exporting/ExportContext.cs

@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using DiscordChatExporter.Domain.Discord.Models;
+
+namespace DiscordChatExporter.Domain.Exporting
+{
+    internal class ExportContext
+    {
+        private readonly MediaDownloader _mediaDownloader;
+
+        public ExportRequest Request { get; }
+
+        public IReadOnlyCollection<Member> Members { get; }
+
+        public IReadOnlyCollection<Channel> Channels { get; }
+
+        public IReadOnlyCollection<Role> Roles { get; }
+
+        public ExportContext(
+            ExportRequest request,
+            IReadOnlyCollection<Member> members,
+            IReadOnlyCollection<Channel> channels,
+            IReadOnlyCollection<Role> roles)
+        {
+            Request = request;
+            Members = members;
+            Channels = channels;
+            Roles = roles;
+
+            _mediaDownloader = new MediaDownloader(request.OutputMediaDirPath);
+        }
+
+        public Member? TryGetMember(string id) =>
+            Members.FirstOrDefault(m => m.Id == id);
+
+        public Channel? TryGetChannel(string id) =>
+            Channels.FirstOrDefault(c => c.Id == id);
+
+        public Role? TryGetRole(string id) =>
+            Roles.FirstOrDefault(r => r.Id == id);
+
+        public Color? TryGetUserColor(User user)
+        {
+            var member = TryGetMember(user.Id);
+            var roles = member?.RoleIds.Join(Roles, i => i, r => r.Id, (_, role) => role);
+
+            return roles?
+                .Where(r => r.Color != null)
+                .OrderByDescending(r => r.Position)
+                .Select(r => r.Color)
+                .FirstOrDefault();
+        }
+
+        // HACK: ConfigureAwait() is crucial here to enable sync-over-async in HtmlMessageWriter
+        public async ValueTask<string> ResolveMediaUrlAsync(string url)
+        {
+            if (!Request.ShouldDownloadMedia)
+                return url;
+
+            try
+            {
+                var filePath = await _mediaDownloader.DownloadAsync(url).ConfigureAwait(false);
+
+                // Return relative path so that the output files can be copied around without breaking
+                return Path.GetRelativePath(Request.OutputBaseDirPath, filePath);
+            }
+            catch (HttpRequestException)
+            {
+                // We don't want this to crash the exporting process in case of failure
+                return url;
+            }
+        }
+    }
+}

DiscordChatExporter.Domain/Exporting/ExportFormat.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace DiscordChatExporter.Domain.Exporting
+{
+    public enum ExportFormat
+    {
+        PlainText,
+        HtmlDark,
+        HtmlLight,
+        Csv,
+        Json
+    }
+
+    public static class ExportFormatExtensions
+    {
+        public static string GetFileExtension(this ExportFormat format) => format switch
+        {
+            ExportFormat.PlainText => "txt",
+            ExportFormat.HtmlDark => "html",
+            ExportFormat.HtmlLight => "html",
+            ExportFormat.Csv => "csv",
+            ExportFormat.Json => "json",
+            _ => throw new ArgumentOutOfRangeException(nameof(format))
+        };
+
+        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))
+        };
+    }
+}

DiscordChatExporter.Domain/Exporting/ExportRequest.cs

@@ -0,0 +1,136 @@
+using System;
+using System.IO;
+using System.Text;
+using DiscordChatExporter.Domain.Discord.Models;
+
+namespace DiscordChatExporter.Domain.Exporting
+{
+    public partial class ExportRequest
+    {
+        public Guild Guild { get; }
+
+        public Channel Channel { get; }
+
+        public string OutputPath { get; }
+
+        public string OutputBaseFilePath { get; }
+
+        public string OutputBaseDirPath { get; }
+
+        public string OutputMediaDirPath { get; }
+
+        public ExportFormat Format { get; }
+
+        public DateTimeOffset? After { get; }
+
+        public DateTimeOffset? Before { get; }
+
+        public int? PartitionLimit { get; }
+
+        public bool ShouldDownloadMedia { get; }
+
+        public string DateFormat { get; }
+
+        public ExportRequest(
+            Guild guild,
+            Channel channel,
+            string outputPath,
+            ExportFormat format,
+            DateTimeOffset? after,
+            DateTimeOffset? before,
+            int? partitionLimit,
+            bool shouldDownloadMedia,
+            string dateFormat)
+        {
+            Guild = guild;
+            Channel = channel;
+            OutputPath = outputPath;
+            Format = format;
+            After = after;
+            Before = before;
+            PartitionLimit = partitionLimit;
+            ShouldDownloadMedia = shouldDownloadMedia;
+            DateFormat = dateFormat;
+
+            OutputBaseFilePath = GetOutputBaseFilePath(
+                guild,
+                channel,
+                outputPath,
+                format,
+                after,
+                before
+            );
+
+            OutputBaseDirPath = Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath;
+            OutputMediaDirPath = $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
+        }
+    }
+
+    public partial class ExportRequest
+    {
+        private static string GetOutputBaseFilePath(
+            Guild guild,
+            Channel channel,
+            string outputPath,
+            ExportFormat format,
+            DateTimeOffset? after = null,
+            DateTimeOffset? before = null)
+        {
+            // Output is a directory
+            if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath)))
+            {
+                var fileName = GetDefaultOutputFileName(guild, channel, format, after, before);
+                return Path.Combine(outputPath, fileName);
+            }
+
+            // Output is a file
+            return outputPath;
+        }
+
+        public static string GetDefaultOutputFileName(
+            Guild guild,
+            Channel channel,
+            ExportFormat format,
+            DateTimeOffset? after = null,
+            DateTimeOffset? before = null)
+        {
+            var buffer = new StringBuilder();
+
+            // Guild and channel names
+            buffer.Append($"{guild.Name} - {channel.Category} - {channel.Name} [{channel.Id}]");
+
+            // 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(")");
+            }
+
+            // File extension
+            buffer.Append($".{format.GetFileExtension()}");
+
+            // Replace invalid chars
+            foreach (var invalidChar in Path.GetInvalidFileNameChars())
+                buffer.Replace(invalidChar, '_');
+
+            return buffer.ToString();
+        }
+    }
+}

DiscordChatExporter.Domain/Exporting/MediaDownloader.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DiscordChatExporter.Domain.Internal;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Exporting
+{
+    internal class MediaDownloader
+    {
+        private readonly HttpClient _httpClient = Singleton.HttpClient;
+        private readonly string _workingDirPath;
+
+        private readonly Dictionary<string, string> _pathMap = new Dictionary<string, string>();
+
+        public MediaDownloader(string workingDirPath)
+        {
+            _workingDirPath = workingDirPath;
+        }
+
+        private string GetRandomSuffix() => Guid.NewGuid().ToString().Replace("-", "").Substring(0, 8);
+
+        private string GetFileNameFromUrl(string url)
+        {
+            var originalFileName = Regex.Match(url, @".+/([^?]*)").Groups[1].Value;
+
+            if (string.IsNullOrWhiteSpace(originalFileName))
+                return GetRandomSuffix();
+
+            return $"{Path.GetFileNameWithoutExtension(originalFileName)}-{GetRandomSuffix()}{Path.GetExtension(originalFileName)}";
+        }
+
+        // HACK: ConfigureAwait() is crucial here to enable sync-over-async in HtmlMessageWriter
+        public async ValueTask<string> DownloadAsync(string url)
+        {
+            if (_pathMap.TryGetValue(url, out var cachedFilePath))
+                return cachedFilePath;
+
+            var fileName = GetFileNameFromUrl(url);
+            var filePath = Path.Combine(_workingDirPath, fileName);
+
+            Directory.CreateDirectory(_workingDirPath);
+
+            await _httpClient.DownloadAsync(url, filePath).ConfigureAwait(false);
+
+            return _pathMap[url] = filePath;
+        }
+    }
+}

DiscordChatExporter.Domain/Exporting/MessageExporter.cs

@@ -0,0 +1,110 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Exporting.Writers;
+
+namespace DiscordChatExporter.Domain.Exporting
+{
+    internal partial class MessageExporter : IAsyncDisposable
+    {
+        private readonly ExportContext _context;
+
+        private long _messageCount;
+        private int _partitionIndex;
+        private MessageWriter? _writer;
+
+        public MessageExporter(ExportContext context)
+        {
+            _context = context;
+        }
+
+        private bool IsPartitionLimitReached() =>
+            _messageCount > 0 &&
+            _context.Request.PartitionLimit != null &&
+            _context.Request.PartitionLimit != 0 &&
+            _messageCount % _context.Request.PartitionLimit == 0;
+
+        private async ValueTask ResetWriterAsync()
+        {
+            if (_writer != null)
+            {
+                await _writer.WritePostambleAsync();
+                await _writer.DisposeAsync();
+                _writer = null;
+            }
+        }
+
+        private async ValueTask<MessageWriter> GetWriterAsync()
+        {
+            // Ensure partition limit has not been exceeded
+            if (IsPartitionLimitReached())
+            {
+                await ResetWriterAsync();
+                _partitionIndex++;
+            }
+
+            // Writer is still valid - return
+            if (_writer != null)
+                return _writer;
+
+            var filePath = GetPartitionFilePath(_context.Request.OutputBaseFilePath, _partitionIndex);
+
+            var dirPath = Path.GetDirectoryName(_context.Request.OutputBaseFilePath);
+            if (!string.IsNullOrWhiteSpace(dirPath))
+                Directory.CreateDirectory(dirPath);
+
+            var writer = CreateMessageWriter(filePath, _context.Request.Format, _context);
+            await writer.WritePreambleAsync();
+
+            return _writer = writer;
+        }
+
+        public async ValueTask ExportMessageAsync(Message message)
+        {
+            var writer = await GetWriterAsync();
+            await writer.WriteMessageAsync(message);
+            _messageCount++;
+        }
+
+        public async ValueTask DisposeAsync() => await ResetWriterAsync();
+    }
+
+    internal partial class MessageExporter
+    {
+        private static string GetPartitionFilePath(string baseFilePath, int partitionIndex)
+        {
+            // First partition - don't change file name
+            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 MessageWriter CreateMessageWriter(string filePath, ExportFormat format, ExportContext context)
+        {
+            // Stream will be disposed by the underlying writer
+            var stream = File.Create(filePath);
+
+            return format switch
+            {
+                ExportFormat.PlainText => new PlainTextMessageWriter(stream, context),
+                ExportFormat.Csv => new CsvMessageWriter(stream, context),
+                ExportFormat.HtmlDark => new HtmlMessageWriter(stream, context, "Dark"),
+                ExportFormat.HtmlLight => new HtmlMessageWriter(stream, context, "Light"),
+                ExportFormat.Json => new JsonMessageWriter(stream, context),
+                _ => throw new ArgumentOutOfRangeException(nameof(format), $"Unknown export format '{format}'.")
+            };
+        }
+    }
+}

DiscordChatExporter.Domain/Exporting/Writers/CsvMessageWriter.cs

@@ -0,0 +1,103 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors;
+using DiscordChatExporter.Domain.Internal.Extensions;
+
+namespace DiscordChatExporter.Domain.Exporting.Writers
+{
+    internal partial class CsvMessageWriter : MessageWriter
+    {
+        private readonly TextWriter _writer;
+
+        public CsvMessageWriter(Stream stream, ExportContext context)
+            : base(stream, context)
+        {
+            _writer = new StreamWriter(stream);
+        }
+
+        private string FormatMarkdown(string? markdown) =>
+            PlainTextMarkdownVisitor.Format(Context, markdown ?? "");
+
+        public override async ValueTask WritePreambleAsync() =>
+            await _writer.WriteLineAsync("AuthorID,Author,Date,Content,Attachments,Reactions");
+
+        private async ValueTask WriteAttachmentsAsync(IReadOnlyList<Attachment> attachments)
+        {
+            var buffer = new StringBuilder();
+
+            foreach (var attachment in attachments)
+            {
+                buffer
+                    .AppendIfNotEmpty(',')
+                    .Append(await Context.ResolveMediaUrlAsync(attachment.Url));
+            }
+
+            await _writer.WriteAsync(CsvEncode(buffer.ToString()));
+        }
+
+        private async ValueTask WriteReactionsAsync(IReadOnlyList<Reaction> reactions)
+        {
+            var buffer = new StringBuilder();
+
+            foreach (var reaction in reactions)
+            {
+                buffer
+                    .AppendIfNotEmpty(',')
+                    .Append(reaction.Emoji.Name)
+                    .Append(' ')
+                    .Append('(')
+                    .Append(reaction.Count)
+                    .Append(')');
+            }
+
+            await _writer.WriteAsync(CsvEncode(buffer.ToString()));
+        }
+
+        public override async ValueTask WriteMessageAsync(Message message)
+        {
+            // Author ID
+            await _writer.WriteAsync(CsvEncode(message.Author.Id));
+            await _writer.WriteAsync(',');
+
+            // Author name
+            await _writer.WriteAsync(CsvEncode(message.Author.FullName));
+            await _writer.WriteAsync(',');
+
+            // Message timestamp
+            await _writer.WriteAsync(CsvEncode(message.Timestamp.ToLocalString(Context.Request.DateFormat)));
+            await _writer.WriteAsync(',');
+
+            // Message content
+            await _writer.WriteAsync(CsvEncode(FormatMarkdown(message.Content)));
+            await _writer.WriteAsync(',');
+
+            // Attachments
+            await WriteAttachmentsAsync(message.Attachments);
+            await _writer.WriteAsync(',');
+
+            // Reactions
+            await WriteReactionsAsync(message.Reactions);
+
+            // Finish row
+            await _writer.WriteLineAsync();
+        }
+
+        public override async ValueTask DisposeAsync()
+        {
+            await _writer.DisposeAsync();
+            await base.DisposeAsync();
+        }
+    }
+
+    internal partial class CsvMessageWriter
+    {
+        private static string CsvEncode(string value)
+        {
+            value = value.Replace("\"", "\"\"");
+            return $"\"{value}\"";
+        }
+    }
+}

DiscordChatExporter.Domain/Exporting/Writers/Html/Core.css

@@ -1,32 +1,32 @@
-/* === GENERAL === */
+/* General */
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/6c6374bad0b0b6d204d8d6dc4a18d820.woff);
+    src: url(https://discord.com/assets/6c6374bad0b0b6d204d8d6dc4a18d820.woff);
     font-weight: 300;
 }
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/e8acd7d9bf6207f99350ca9f9e23b168.woff);
+    src: url(https://discord.com/assets/e8acd7d9bf6207f99350ca9f9e23b168.woff);
     font-weight: 400;
 }
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/3bdef1251a424500c1b3a78dea9b7e57.woff);
+    src: url(https://discord.com/assets/3bdef1251a424500c1b3a78dea9b7e57.woff);
     font-weight: 500;
 }
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/be0060dafb7a0e31d2a1ca17c0708636.woff);
+    src: url(https://discord.com/assets/be0060dafb7a0e31d2a1ca17c0708636.woff);
     font-weight: 600;
 }
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/8e12fb4f14d9c4592eb8ec9f22337b04.woff);
+    src: url(https://discord.com/assets/8e12fb4f14d9c4592eb8ec9f22337b04.woff);
     font-weight: 700;
 }
 
@@ -48,20 +48,71 @@ img {
 }
 
 .markdown {
+    max-width: 100%;
     white-space: pre-wrap;
     line-height: 1.3;
     overflow-wrap: break-word;
 }
 
 .spoiler {
+    width: fit-content;
+}
+
+.spoiler--hidden {
+    cursor: pointer;
+}
+
+.spoiler-text {
     border-radius: 3px;
 }
 
+.spoiler--hidden .spoiler-text {
+    color: rgba(0, 0, 0, 0);
+}
+
+.spoiler--hidden .spoiler-text::selection {
+    color: rgba(0, 0, 0, 0);
+}
+
+.spoiler-image {
+    position: relative;
+    overflow: hidden;
+    border-radius: 3px;
+}
+
+.spoiler--hidden .spoiler-image {
+    box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+.spoiler--hidden .spoiler-image img {
+    filter: blur(44px);
+}
+
+.spoiler--hidden .spoiler-image:after {
+    content: "SPOILER";
+    color: #dcddde;
+    background-color: rgba(0, 0, 0, 0.6);
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    font-weight: 600;
+    padding: 0.5em 0.7em;
+    border-radius: 20px;
+    letter-spacing: 0.05em;
+    font-size: 0.9em;
+}
+
+.spoiler--hidden:hover .spoiler-image:after {
+    color: #fff;
+    background-color: rgba(0, 0, 0, 0.9);
+}
+
 .quote {
+    margin: 0.1em 0;
+    padding-left: 0.6em;
     border-left: 4px solid;
     border-radius: 3px;
-    margin: 8px 0;
-    padding-left: 10px;
 }
 
 .pre {
@@ -69,8 +120,8 @@ img {
 }
 
 .pre--multiline {
-    margin-top: 4px;
-    padding: 8px;
+    margin-top: 0.25em;
+    padding: 0.5em;
     border: 2px solid;
     border-radius: 5px;
 }
@@ -78,88 +129,81 @@ img {
 .pre--inline {
     padding: 2px;
     border-radius: 3px;
-    font-size: 85%;
+    font-size: 0.85em;
 }
 
 .mention {
+    border-radius: 3px;
+    padding: 0 2px;
+    color: #7289da;
+    background: rgba(114, 137, 218, .1);
     font-weight: 500;
 }
 
 .emoji {
-    width: 1.45em;
-    height: 1.45em;
-    margin: 0 1px;
+    width: 1.25em;
+    height: 1.25em;
+    margin: 0 0.06em;
     vertical-align: -0.4em;
 }
 
 .emoji--small {
-    width: 1rem;
-    height: 1rem;
+    width: 1em;
+    height: 1em;
 }
 
 .emoji--large {
-    width: 2rem;
-    height: 2rem;
+    width: 2.8em;
+    height: 2.8em;
 }
 
-/* === INFO === */
+/* Preamble */
 
-.info {
-    display: flex;
+.preamble {
+    display: grid;
+    margin: 0 0.3em 0.6em 0.3em;
     max-width: 100%;
-    margin: 0 5px 10px 5px;
+    grid-template-columns: auto 1fr;
 }
 
-.info__guild-icon-container {
-    flex: 0;
+.preamble__guild-icon-container {
+    grid-column: 1;
 }
 
-.info__guild-icon {
+.preamble__guild-icon {
     max-width: 88px;
     max-height: 88px;
 }
 
-.info__metadata {
-    flex: 1;
-    margin-left: 10px;
+.preamble__entries-container {
+    grid-column: 2;
+    margin-left: 0.6em;
 }
 
-.info__guild-name {
+.preamble__entry {
     font-size: 1.4em;
 }
 
-.info__channel-name {
-    font-size: 1.2em;
+.preamble__entry--small {
+    font-size: 1em;
 }
 
-.info__channel-topic {
-    margin-top: 2px;
-}
-
-.info__channel-message-count {
-    margin-top: 2px;
-}
-
-.info__channel-date-range {
-    margin-top: 2px;
-}
-
-/* === CHATLOG === */
+/* Chatlog */
 
 .chatlog {
     max-width: 100%;
-    margin-bottom: 24px;
 }
 
 .chatlog__message-group {
-    display: flex;
-    margin: 0 10px;
-    padding: 15px 0;
+    display: grid;
+    margin: 0 0.6em;
+    padding: 0.9em 0;
     border-top: 1px solid;
+    grid-template-columns: auto 1fr;
 }
 
 .chatlog__author-avatar-container {
-    flex: 0;
+    grid-column: 1;
     width: 40px;
     height: 40px;
 }
@@ -171,55 +215,57 @@ img {
 }
 
 .chatlog__messages {
-    flex: 1;
+    grid-column: 2;
+    margin-left: 1.2em;
     min-width: 50%;
-    margin-left: 20px;
 }
 
 .chatlog__author-name {
-    font-size: 1em;
     font-weight: 500;
 }
 
 .chatlog__timestamp {
-    margin-left: 5px;
-    font-size: .75em;
+    margin-left: 0.3em;
+    font-size: 0.75em;
 }
 
 .chatlog__message {
-    padding: 2px 5px;
-    margin-right: -5px;
-    margin-left: -5px;
+    padding: 0.1em 0.3em;
+    margin: 0 -0.3em;
     background-color: transparent;
     transition: background-color 1s ease;
 }
 
 .chatlog__content {
-    font-size: .9375em;
+    font-size: 0.95em;
     word-wrap: break-word;
 }
 
 .chatlog__edited-timestamp {
-    margin-left: 3px;
-    font-size: .8em;
+    margin-left: 0.15em;
+    font-size: 0.8em;
+}
+
+.chatlog__attachment {
+    margin-top: 0.3em;
 }
 
 .chatlog__attachment-thumbnail {
-    margin-top: 5px;
-    max-width: 50%;
+    vertical-align: top;
+    max-width: 45vw;
     max-height: 500px;
     border-radius: 3px;
 }
 
 .chatlog__embed {
-    margin-top: 5px;
     display: flex;
+    margin-top: 0.3em;
     max-width: 520px;
 }
 
 .chatlog__embed-color-pill {
     flex-shrink: 0;
-    width: 4px;
+    width: 0.25em;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
 }
@@ -227,15 +273,15 @@ img {
 .chatlog__embed-content-container {
     display: flex;
     flex-direction: column;
-    padding: 8px 10px;
+    padding: 0.5em 0.6em;
     border: 1px solid;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
 }
 
 .chatlog__embed-content {
-    width: 100%;
     display: flex;
+    width: 100%;
 }
 
 .chatlog__embed-text {
@@ -244,31 +290,31 @@ img {
 
 .chatlog__embed-author {
     display: flex;
+    margin-bottom: 0.3em;
     align-items: center;
-    margin-bottom: 5px;
 }
 
 .chatlog__embed-author-icon {
+    margin-right: 0.5em;
     width: 20px;
     height: 20px;
-    margin-right: 9px;
     border-radius: 50%;
 }
 
 .chatlog__embed-author-name {
-    font-size: .875em;
+    font-size: 0.875em;
     font-weight: 600;
 }
 
 .chatlog__embed-title {
-    margin-bottom: 4px;
-    font-size: .875em;
+    margin-bottom: 0.2em;
+    font-size: 0.875em;
     font-weight: 600;
 }
 
 .chatlog__embed-description {
     font-weight: 500;
-    font-size: 14px;
+    font-size: 0.85em;
 }
 
 .chatlog__embed-fields {
@@ -280,7 +326,8 @@ img {
     flex: 0;
     min-width: 100%;
     max-width: 506px;
-    padding-top: 10px;
+    padding-top: 0.6em;
+    font-size: 0.875em;
 }
 
 .chatlog__embed-field--inline {
@@ -290,26 +337,24 @@ img {
 }
 
 .chatlog__embed-field-name {
-    margin-bottom: 4px;
-    font-size: .875em;
+    margin-bottom: 0.2em;
     font-weight: 600;
 }
 
 .chatlog__embed-field-value {
-    font-size: .875em;
     font-weight: 500;
 }
 
 .chatlog__embed-thumbnail {
     flex: 0;
-    margin-left: 20px;
+    margin-left: 1.2em;
     max-width: 80px;
     max-height: 80px;
     border-radius: 3px;
 }
 
 .chatlog__embed-image-container {
-    margin-top: 10px;
+    margin-top: 0.6em;
 }
 
 .chatlog__embed-image {
@@ -319,11 +364,11 @@ img {
 }
 
 .chatlog__embed-footer {
-    margin-top: 10px;
+    margin-top: 0.6em;
 }
 
 .chatlog__embed-footer-icon {
-    margin-right: 4px;
+    margin-right: 0.2em;
     width: 20px;
     height: 20px;
     border-radius: 50%;
@@ -331,8 +376,8 @@ img {
 }
 
 .chatlog__embed-footer-text {
+    font-size: 0.75em;
     font-weight: 500;
-    font-size: .75em;
 }
 
 .chatlog__reactions {
@@ -342,27 +387,35 @@ img {
 .chatlog__reaction {
     display: flex;
     align-items: center;
-    margin: 6px 2px 2px 2px;
-    padding: 3px 6px;
+    margin: 0.35em 0.1em 0.1em 0.1em;
+    padding: 0.2em 0.35em;
     border-radius: 3px;
 }
 
 .chatlog__reaction-count {
     min-width: 9px;
-    margin-left: 6px;
-    font-size: .875em;
+    margin-left: 0.35em;
+    font-size: 0.875em;
 }
 
 .chatlog__bot-tag {
+    position: relative;
+    top: -.2em;
     margin-left: 0.3em;
+    padding: 0.05em 0.3em;
+    border-radius: 3px;
+    vertical-align: middle;
+    line-height: 1.3;
     background: #7289da;
     color: #ffffff;
     font-size: 0.625em;
     font-weight: 500;
-    padding: 1px 2px;
-    border-radius: 3px;
-    vertical-align: middle;
-    line-height: 1.3;
-    position: relative;
-    top: -.2em;
+}
+
+/* Postamble */
+
+.postamble {
+    margin: 1.4em 0.3em 0.6em 0.3em;
+    padding: 1em;
+    border-top: 1px solid;
 }

DiscordChatExporter.Domain/Exporting/Writers/Html/Dark.css

@@ -1,4 +1,4 @@
-/* === GENERAL === */
+/* General */
 
 body {
     background-color: #36393e;
@@ -9,10 +9,18 @@ a {
     color: #0096cf;
 }
 
-.spoiler {
+.spoiler-text {
     background-color: rgba(255, 255, 255, 0.1);
 }
 
+.spoiler--hidden .spoiler-text {
+    background-color: #202225;
+}
+
+.spoiler--hidden:hover .spoiler-text {
+    background-color: rgba(32, 34, 37, 0.8);
+}
+
 .quote {
     border-color: #4f545c;
 }
@@ -26,25 +34,13 @@ a {
     color: #b9bbbe !important;
 }
 
-.mention {
-    color: #7289da;
-}
+/* === Preamble === */
 
-/* === INFO === */
-
-.info__guild-name {
+.preamble__entry {
     color: #ffffff;
 }
 
-.info__channel-name {
-    color: #ffffff;
-}
-
-.info__channel-topic {
-    color: #ffffff;
-}
-
-/* === CHATLOG === */
+/* Chatlog */
 
 .chatlog__message-group {
     border-color: rgba(255, 255, 255, 0.1);
@@ -113,4 +109,14 @@ a {
 
 .chatlog__reaction-count {
     color: rgba(255, 255, 255, 0.3);
+}
+
+/* Postamble */
+
+.postamble {
+    border-color: rgba(255, 255, 255, 0.1);
+}
+
+.postamble__entry {
+    color: #ffffff;
 }

DiscordChatExporter.Domain/Exporting/Writers/Html/LayoutTemplate.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    {{~ # Metadata ~}}
+    <title>{{ Context.Request.Guild.Name | html.escape }} - {{ Context.Request.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);
+            }
+        }
+
+        function showSpoiler(event, element) {
+            if (element && element.classList.contains('spoiler--hidden')) {
+                event.preventDefault();
+                element.classList.remove('spoiler--hidden');
+            }
+        }
+    </script>
+</head>
+<body>
+
+{{~ # Preamble ~}}
+<div class="preamble">
+    <div class="preamble__guild-icon-container">
+        <img class="preamble__guild-icon" src="{{ Context.Request.Guild.IconUrl | ResolveUrl }}" alt="Guild icon">
+    </div>
+    <div class="preamble__entries-container">
+        <div class="preamble__entry">{{ Context.Request.Guild.Name | html.escape }}</div>
+        <div class="preamble__entry">{{ Context.Request.Channel.Category | html.escape }} / {{ Context.Request.Channel.Name | html.escape }}</div>
+
+        {{~ if Context.Request.Channel.Topic ~}}
+        <div class="preamble__entry preamble__entry--small">{{ Context.Request.Channel.Topic | html.escape }}</div>
+        {{~ end ~}}
+
+        {{~ if Context.Request.After || Context.Request.Before ~}}
+        <div class="preamble__entry preamble__entry--small">
+            {{~ if Context.Request.After && Context.Request.Before ~}}
+                Between {{ Context.Request.After | FormatDate | html.escape }} and {{ Context.Request.Before | FormatDate | html.escape }}
+            {{~ else if Context.Request.After ~}}
+                After {{ Context.Request.After | FormatDate | html.escape }}
+            {{~ else if Context.Request.Before ~}}
+                Before {{ Context.Request.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>

DiscordChatExporter.Domain/Exporting/Writers/Html/Light.css

@@ -1,4 +1,4 @@
-/* === GENERAL === */
+/* General */
 
 body {
     background-color: #ffffff;
@@ -10,10 +10,18 @@ a {
     color: #00b0f4;
 }
 
-.spoiler {
+.spoiler-text {
     background-color: rgba(0, 0, 0, 0.1);
 }
 
+.spoiler--hidden .spoiler-text {
+    background-color: #b9bbbe;
+}
+
+.spoiler--hidden:hover .spoiler-text {
+    background-color: rgba(185, 187, 190, 0.8);
+}
+
 .quote {
     border-color: #c7ccd1;
 }
@@ -27,26 +35,13 @@ a {
     color: #657b83 !important;
 }
 
-.mention {
-    background-color: #f1f3fb;
-    color: #7289da;
-}
+/* Preamble */
 
-/* === INFO === */
-
-.info__guild-name {
+.preamble__entry {
     color: #2f3136;
 }
 
-.info__channel-name {
-    color: #2f3136;
-}
-
-.info__channel-topic {
-    color: #2f3136;
-}
-
-/* === CHATLOG === */
+/* Chatlog */
 
 .chatlog__message-group {
     border-color: #eceeef;
@@ -116,4 +111,14 @@ a {
 
 .chatlog__reaction-count {
     color: #747f8d;
+}
+
+/* Postamble */
+
+.postamble {
+    border-color: #eceeef;
+}
+
+.postamble__entry {
+    color: #2f3136;
 }

DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroup.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using DiscordChatExporter.Domain.Discord.Models;
+
+namespace DiscordChatExporter.Domain.Exporting.Writers.Html
+{
+    // Used for grouping contiguous messages in HTML export
+    internal partial 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;
+        }
+    }
+
+    internal partial class MessageGroup
+    {
+        public static bool CanJoin(Message message1, Message message2) =>
+            string.Equals(message1.Author.Id, message2.Author.Id, StringComparison.Ordinal) &&
+            string.Equals(message1.Author.FullName, message2.Author.FullName, StringComparison.Ordinal) &&
+            (message2.Timestamp - message1.Timestamp).Duration().TotalMinutes <= 7;
+
+        public static MessageGroup Join(IReadOnlyList<Message> messages)
+        {
+            var first = messages.First();
+
+            return new MessageGroup(
+                first.Author,
+                first.Timestamp,
+                messages
+            );
+        }
+    }
+}

DiscordChatExporter.Domain/Exporting/Writers/Html/MessageGroupTemplate.html

@@ -1,46 +1,60 @@
 <div class="chatlog__message-group">
     {{~ # Avatar ~}}
     <div class="chatlog__author-avatar-container">
-        <img class="chatlog__author-avatar" src="{{ MessageGroup.Author.AvatarUrl }}" />
+        <img class="chatlog__author-avatar" src="{{ MessageGroup.Author.AvatarUrl | ResolveUrl }}" 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 }}">{{ MessageGroup.Author.Name | html.escape }}</span>
+        {{~ userColor = TryGetUserColor MessageGroup.Author | FormatColorRgb ~}}
+        <span class="chatlog__author-name" title="{{ MessageGroup.Author.FullName | html.escape }}" data-user-id="{{ MessageGroup.Author.Id | html.escape }}" {{ if userColor }} style="color: {{ userColor }}" {{ end }}>{{ (TryGetUserNick MessageGroup.Author ?? MessageGroup.Author.Name) | html.escape }}</span>
 
         {{~ # Bot tag ~}}
         {{~ if MessageGroup.Author.IsBot ~}}
-            <span class="chatlog__bot-tag">BOT</span>
+        <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 }}">
+            <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>
+                    <div class="markdown">
+                        {{- message.Content | FormatMarkdown -}}
 
-                    {{~ # Edited timestamp ~}}
-                    {{~ if message.EditedTimestamp ~}}
-                        <span class="chatlog__edited-timestamp" title="{{ message.EditedTimestamp | FormatDate | html.escape }}">(edited)</span>
-                    {{~ end ~}}
+                        {{- # Edited timestamp -}}
+                        {{- if message.EditedTimestamp -}}
+                            {{-}}<span class="chatlog__edited-timestamp" title="{{ message.EditedTimestamp | FormatDate | html.escape }}">(edited)</span>{{-}}
+                        {{- end -}}
+                    </div>
                 </div>
             {{~ end ~}}
 
             {{~ # Attachments ~}}
             {{~ for attachment in message.Attachments ~}}
                 <div class="chatlog__attachment">
-                    <a href="{{ attachment.Url }}">
-                        {{ # Image }}
+                    {{ # Spoiler image }}
+                    {{~ if attachment.IsSpoiler ~}}
+                    <div class="spoiler spoiler--hidden" onclick="showSpoiler(event, this)">
+                        <div class="spoiler-image">
+                            <a href="{{ attachment.Url | ResolveUrl }}">
+                                <img class="chatlog__attachment-thumbnail" src="{{ attachment.Url | ResolveUrl }}" alt="Attachment">
+                            </a>
+                        </div>
+                    </div>
+                    {{~ else ~}}
+                    <a href="{{ attachment.Url | ResolveUrl }}">
+                        {{ # Non-spoiler image }}
                         {{~ if attachment.IsImage ~}}
-                            <img class="chatlog__attachment-thumbnail" src="{{ attachment.Url }}" />
+                            <img class="chatlog__attachment-thumbnail" src="{{ attachment.Url | ResolveUrl }}" alt="Attachment">
                         {{~ # Non-image ~}}
                         {{~ else ~}}
                             Attachment: {{ attachment.FileName }} ({{ attachment.FileSize }})
                         {{~ end ~}}
                     </a>
+                    {{~ end ~}}
                 </div>
             {{~ end ~}}
 
@@ -59,7 +73,7 @@
                             {{~ if embed.Author ~}}
                             <div class="chatlog__embed-author">
                                 {{~ if embed.Author.IconUrl ~}}
-                                <img class="chatlog__embed-author-icon" src="{{ embed.Author.IconUrl }}" />
+                                <img class="chatlog__embed-author-icon" src="{{ embed.Author.IconUrl | ResolveUrl }}" alt="Author icon">
                                 {{~ end ~}}
 
                                 {{~ if embed.Author.Name ~}}
@@ -78,16 +92,16 @@
                             {{~ 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>
+                                <a class="chatlog__embed-title-link" href="{{ embed.Url }}"><div class="markdown">{{ embed.Title | FormatEmbedMarkdown }}</div></a>
                                 {{~ else ~}}
-                                <span class="markdown">{{ embed.Title | FormatMarkdown }}</span>
+                                <div class="markdown">{{ embed.Title | FormatEmbedMarkdown }}</div>
                                 {{~ end ~}}
                             </div>
                             {{~ end ~}}
 
                             {{~ # Description ~}}
                             {{~ if embed.Description ~}}
-                            <div class="chatlog__embed-description"><span class="markdown">{{ embed.Description | FormatMarkdown }}</span></div>
+                            <div class="chatlog__embed-description"><div class="markdown">{{ embed.Description | FormatEmbedMarkdown }}</div></div>
                             {{~ end ~}}
 
                             {{~ # Fields ~}}
@@ -96,10 +110,10 @@
                                 {{~ 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>
+                                    <div class="chatlog__embed-field-name"><div class="markdown">{{ field.Name | FormatEmbedMarkdown }}</div></div>
                                     {{~ end ~}}
                                     {{~ if field.Value ~}}
-                                    <div class="chatlog__embed-field-value"><span class="markdown">{{ field.Value | FormatMarkdown }}</span></div>
+                                    <div class="chatlog__embed-field-value"><div class="markdown">{{ field.Value | FormatEmbedMarkdown }}</div></div>
                                     {{~ end ~}}
                                 </div>
                                 {{~ end ~}}
@@ -110,8 +124,8 @@
                         {{~ # Thumbnail ~}}
                         {{~ if embed.Thumbnail ~}}
                         <div class="chatlog__embed-thumbnail-container">
-                            <a class="chatlog__embed-thumbnail-link" href="{{ embed.Thumbnail.Url }}">
-                                <img class="chatlog__embed-thumbnail" src="{{ embed.Thumbnail.Url }}" />
+                            <a class="chatlog__embed-thumbnail-link" href="{{ embed.Thumbnail.Url | ResolveUrl }}">
+                                <img class="chatlog__embed-thumbnail" src="{{ embed.Thumbnail.Url | ResolveUrl }}" alt="Thumbnail">
                             </a>
                         </div>
                         {{~ end ~}}
@@ -120,8 +134,8 @@
                     {{~ # Image ~}}
                     {{~ if embed.Image ~}}
                     <div class="chatlog__embed-image-container">
-                        <a class="chatlog__embed-image-link" href="{{ embed.Image.Url }}">
-                            <img class="chatlog__embed-image" src="{{ embed.Image.Url }}" />
+                        <a class="chatlog__embed-image-link" href="{{ embed.Image.Url | ResolveUrl }}">
+                            <img class="chatlog__embed-image" src="{{ embed.Image.Url | ResolveUrl }}" alt="Image">
                         </a>
                     </div>
                     {{~ end ~}}
@@ -131,7 +145,7 @@
                     <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 }}" />
+                        <img class="chatlog__embed-footer-icon" src="{{ embed.Footer.IconUrl | ResolveUrl }}" alt="Footer icon">
                         {{~ end ~}}
                         {{~ end ~}}
 
@@ -158,7 +172,7 @@
                 <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 }}" />
+                            <img class="emoji emoji--small" alt="{{ reaction.Emoji.Name }}" title="{{ reaction.Emoji.Name }}" src="{{ reaction.Emoji.ImageUrl | ResolveUrl }}">
                             <span class="chatlog__reaction-count">{{ reaction.Count }}</span>
                         </div>
                     {{~ end ~}}