Update version

This reverts commit ee27167998.

.config/dotnet-tools.json

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

.github/FUNDING.yml

@@ -1,4 +1,3 @@
 github: Tyrrrz
 patreon: Tyrrrz
-open_collective: Tyrrrz
-custom: ['buymeacoffee.com/Tyrrrz']
+custom: ['buymeacoffee.com/Tyrrrz', 'tyrrrz.me/donate']

.github/workflows/CD.yml

@@ -0,0 +1,66 @@
+name: CD
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v1.4.0
+      with:
+        dotnet-version: 3.1.100
+
+    - name: Build & publish (CLI)
+      run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
+
+    - name: Build & publish (GUI)
+      run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release
+
+    - name: Pack (CLI)
+      run: Compress-Archive -Path DiscordChatExporter.Cli/bin/Publish/* -DestinationPath DiscordChatExporter.Cli/bin/Publish/Archive.zip -Force
+      shell: pwsh
+
+    - name: Pack (GUI)
+      run: Compress-Archive -Path DiscordChatExporter.Gui/bin/Publish/* -DestinationPath DiscordChatExporter.Gui/bin/Publish/Archive.zip -Force
+      shell: pwsh
+
+    - name: Create release
+      id: create_release
+      uses: actions/create-release@v1.0.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: ${{ github.ref }}
+        body: |
+          [Changelog](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Changelog.md)
+        draft: false
+        prerelease: false
+
+    - name: Upload release asset (CLI)
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: DiscordChatExporter.Cli/bin/Publish/Archive.zip
+        asset_name: DiscordChatExporter.CLI.zip
+        asset_content_type: application/zip
+
+    - name: Upload release asset (GUI)
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: DiscordChatExporter.Gui/bin/Publish/Archive.zip
+        asset_name: DiscordChatExporter.zip
+        asset_content_type: application/zip

.github/workflows/CI.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v1.4.0
+      with:
+        dotnet-version: 3.1.100
+
+    - name: Build & publish (CLI)
+      run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
+
+    - name: Build & publish (GUI)
+      run: dotnet publish DiscordChatExporter.Gui/ -o DiscordChatExporter.Gui/bin/Publish/ --configuration Release
+
+    - name: Upload build artifacts (CLI)
+      uses: actions/upload-artifact@v1
+      with:
+        name: DiscordChatExporter.CLI
+        path: DiscordChatExporter.Cli/bin/Publish/
+
+    - name: Upload build artifact (GUI)
+      uses: actions/upload-artifact@v1
+      with:
+        name: DiscordChatExporter
+        path: DiscordChatExporter.Gui/bin/Publish/

Changelog.md

@@ -1,8 +1,44 @@
+### v2.19 (26-Mar-2020)
+
+- Added parallel exporting. This option allows you to export multiple channels faster by doing it in parallel. You can configure the parallel limit in settings (GUI) or with the `--parallel` option (CLI). Default value is `1`, which means there is no parallelization. Warning: be careful when using this option, as this will result in higher volume of concurrent HTTP requests sent to Discord, which might get you flagged. Use at your own risk.
+- [HTML] Added support for user colors. User names are now appropriately colored according to the assigned guild roles.
+- [HTML] Added support for nicknames. User names are replaced with nicknames where it's applicable. It's still possible to see the full user name by hovering your mouse over the nickname.
+- [HTML] Improved styling for mentions to bring it more in line with how it looks in Discord.
+
+### v2.18 (04-Feb-2020)
+
+- Added JSON export format. It's a structured data format which is easy to parse. If you're using DiscordChatExporter to export chat logs for further ingestion by another tool, this is most likely the format you will want to use.
+- [GUI] You can now quickly jump to a specific channel in a list. For example, if you want to jump to a channel named "General", you can simply press the 'g' key in the channel list view. You can also press 'g', 'e' and 'n' in quick succession which will jump to the next channel that starts with "gen". This mechanic is consistent with other Windows applications.
+- [CLI] Improved help text screen.
+
+### v2.17 (12-Jan-2020)
+
+- Fixed an issue where an empty file was produced when exporting a channel with no messages (for specified period). With the new behavior, no file will be created and instead a message will be shown to the user informing of the failure.
+- [HTML/TXT] Added message count to the bottom of the file. This number shows how many messages were exported as part of the current file. Prior to 2.16 this number was present along with the rest of the metadata at the top, then removed due to changes in the exporter, and now brought back at the end of the file instead.
+- [HTML] Fixed an issue where some emojis were not properly rendered.
+- [GUI] Added a setting that lets you configure whether to remember the last used token. Previously it was the default behavior, but now you can disable it if you don't want the token persisted on your system.
+
+### v2.16 (08-Dec-2019)
+
+- Migrated from .NET Framework to .NET Core. To run this and future versions of DiscordChatExporter you will need [.NET Core runtime for desktop apps](https://dotnet.microsoft.com/download/dotnet-core/3.1/runtime) (for GUI/CLI version on Windows) or [.NET Core base runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1) (for CLI version on Windows, Linux or macOS).
+- Reworked the exporter engine to render output using streaming data source. This means that only a very small portion of messages are cached in memory when exporting. In other words, you are only limited by storage space and not how much RAM you have, so you can now export terabytes of chat logs without hitting out of memory exceptions. I still recommend using partitions if you're exporting very large chat logs (250k+ messages) to HTML, unless you want your computer to catch fire when you try to open the export in browser.
+- Changed how partitioned files are named, due to the fact that total number of partitions is no longer known ahead of time.
+- Added a warning about automating user accounts to the usage guide in both GUI and CLI versions.
+- Added support for announcement (news) channels. You will now be able to see them in the list and export them.
+- Fixed various issues that resulted in exceptions during export process.
+- [HTML/TXT] Removed message count from the metadata. Due to the fact that the messages are exported as they are streamed, total number of messages is not known ahead of time.
+- [HTML] Changed default color of the embed color pill to match the theme.
+- [HTML] Changed emoji parser to be less greedy. As a result it should match fewer character sequences that look like emojis but really aren't, but on the other hand it might miss some actual emojis. This means that some standard emojis (i.e. not custom server emojis) may not look like in Discord. This is a compromise I'm willing to take because detecting emojis in text is really hard to get right and not worth it at all.
+- [HTML] Some other minor styling adjustments.
+- [CSV] Replaced semicolons (;) with (,) as separators.
+
+Please note that CSV export is most likely not going to receive future updates and will remain only as an option for those who wish to use it for text analysis. In other words, it won't contain any of the rich media features like embeds. If you're currently using CSV as a structured output to feed into your program, JSON output will replace that in the future.
+
 ### v2.15 (15-Sep-2019)
 
 - Improved markdown parser and made it even faster for non-HTML formats.
 - [HTML] Added support for block quotes.
-- [HTML] Links pointing to a Discord message will now navigate to the linked message inside exported chat log if it's there. 
+- [HTML] Links pointing to a Discord message will now navigate to the linked message inside exported chat log if it's there.
 - [HTML] Updated light theme to match how it looks in Discord after recent changes.
 - [HTML] Added indication for when a message is pinned. Pinned messages now have a tinted background.
 - [HTML] Fixed an issue where multiline code blocks sometimes had incorrect formatting applied to them.

Deploy/Prepare.ps1

@@ -1,21 +0,0 @@
-New-Item "$PSScriptRoot\Portable\bin" -ItemType Directory -Force
-
-# --- GUI ---
-
-# Get files
-$files = @()
-$files += Get-Item -Path "$PSScriptRoot\..\License.txt"
-$files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Gui\bin\Release\*" -Include "*.exe", "*.dll", "*.config"
-
-# Pack into archive
-$files | Compress-Archive -DestinationPath "$PSScriptRoot\Portable\bin\DiscordChatExporter.zip" -Force
-
-# --- CLI ---
-
-# Get files
-$files = @()
-$files += Get-Item -Path "$PSScriptRoot\..\License.txt"
-$files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Cli\bin\Release\net46\*" -Include "*.exe", "*.dll", "*.config"
-
-# Pack into archive
-$files | Compress-Archive -DestinationPath "$PSScriptRoot\Portable\bin\DiscordChatExporter.CLI.zip" -Force

DiscordChatExporter.Cli/Commands/ExportChannelCommand.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
 using DiscordChatExporter.Core.Services;
 
 namespace DiscordChatExporter.Cli.Commands
@@ -8,21 +8,14 @@ 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)
-        {
-            // Get channel
-            var channel = await DataService.GetChannelAsync(GetToken(), ChannelId);
-
-            // Export
-            await ExportChannelAsync(console, channel);
-        }
+        public override async ValueTask ExecuteAsync(IConsole console) => await ExportAsync(console, ChannelId);
     }
 }

DiscordChatExporter.Cli/Commands/ExportCommandBase.cs

@@ -1,13 +1,11 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
-using DiscordChatExporter.Cli.Internal;
+using CliFx.Utilities;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Helpers;
-using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands
 {
@@ -17,24 +15,23 @@ namespace DiscordChatExporter.Cli.Commands
 
         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; }
+        public string OutputPath { get; set; } = Directory.GetCurrentDirectory();
 
-        [CommandOption("after",Description = "Limit to messages sent after this date.")]
+        [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.")]
+        [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; }
+        public string? DateFormat { get; set; }
 
         protected ExportCommandBase(SettingsService settingsService, DataService dataService, ExportService exportService)
             : base(dataService)
@@ -43,36 +40,32 @@ namespace DiscordChatExporter.Cli.Commands
             ExportService = exportService;
         }
 
-        protected async Task ExportChannelAsync(IConsole console, Channel channel)
+        protected async ValueTask ExportAsync(IConsole console, Guild guild, Channel channel)
         {
-            // Configure settings
-            if (!DateFormat.IsNullOrWhiteSpace())
+            if (!string.IsNullOrWhiteSpace(DateFormat))
                 SettingsService.DateFormat = DateFormat;
 
             console.Output.Write($"Exporting channel [{channel.Name}]... ");
-            using (var progress = new InlineProgress(console))
-            {
-                // Get chat log
-                var chatLog = await DataService.GetChatLogAsync(GetToken(), channel, After, Before, progress);
+            var progress = console.CreateProgressTicker();
 
-                // Generate file path if not set or is a directory
-                var filePath = OutputPath;
-                if (filePath.IsNullOrWhiteSpace() || ExportHelper.IsDirectoryPath(filePath))
-                {
-                    // Generate default file name
-                    var fileName = ExportHelper.GetDefaultExportFileName(ExportFormat, chatLog.Guild,
-                        chatLog.Channel, After, Before);
+            await ExportService.ExportChatLogAsync(Token, guild, channel,
+                OutputPath, ExportFormat, PartitionLimit,
+                After, Before, progress);
 
-                    // Combine paths
-                    filePath = Path.Combine(filePath ?? "", fileName);
-                }
+            console.Output.WriteLine();
+            console.Output.WriteLine("Done.");
+        }
 
-                // Export
-                await ExportService.ExportChatLogAsync(chatLog, filePath, ExportFormat, PartitionLimit);
+        protected async ValueTask ExportAsync(IConsole console, Channel channel)
+        {
+            var guild = await DataService.GetGuildAsync(Token, channel.GuildId);
+            await ExportAsync(console, guild, channel);
+        }
 
-                // Report successful completion
-                progress.ReportCompletion();
-            }
+        protected async ValueTask ExportAsync(IConsole console, string channelId)
+        {
+            var channel = await DataService.GetChannelAsync(Token, channelId);
+            await ExportAsync(console, channel);
         }
     }
 }

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -1,45 +1,25 @@
 using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
 using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Exceptions;
 
 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 Task ExecuteAsync(IConsole console)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-            // Get channels
-            var channels = await DataService.GetDirectMessageChannelsAsync(GetToken());
+            var directMessageChannels = await DataService.GetDirectMessageChannelsAsync(Token);
+            var channels = directMessageChannels.OrderBy(c => c.Name).ToArray();
 
-            // Order channels
-            channels = channels.OrderBy(c => c.Name).ToArray();
-
-            // Loop through channels
-            foreach (var channel in channels)
-            {
-                try
-                {
-                    await ExportChannelAsync(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.");
-                }
-            }
+            await ExportMultipleAsync(console, channels);
         }
     }
 }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -1,49 +1,33 @@
 using System.Linq;
-using System.Net;
 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;
 
 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 Task ExecuteAsync(IConsole console)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-            // Get channels
-            var channels = await DataService.GetGuildChannelsAsync(GetToken(), GuildId);
+            var guildChannels = await DataService.GetGuildChannelsAsync(Token, GuildId);
 
-            // Filter and order channels
-            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
+            var channels = guildChannels
+                .Where(c => c.Type.IsExportable())
+                .OrderBy(c => c.Name)
+                .ToArray();
 
-            // Loop through channels
-            foreach (var channel in channels)
-            {
-                try
-                {
-                    await ExportChannelAsync(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.");
-                }
-            }
+            await ExportMultipleAsync(console, channels);
         }
     }
 }

DiscordChatExporter.Cli/Commands/ExportMultipleCommandBase.cs

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

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
 
@@ -11,22 +11,22 @@ 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 Task ExecuteAsync(IConsole console)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-            // Get channels
-            var channels = await DataService.GetGuildChannelsAsync(GetToken(), GuildId);
+            var guildChannels = await DataService.GetGuildChannelsAsync(Token, GuildId);
 
-            // Filter and order channels
-            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
+            var channels = guildChannels
+                .Where(c => c.Type.IsExportable())
+                .OrderBy(c => c.Name)
+                .ToArray();
 
-            // Print result
             foreach (var channel in channels)
                 console.Output.WriteLine($"{channel.Id} | {channel.Name}");
         }

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
 using DiscordChatExporter.Core.Services;
 
 namespace DiscordChatExporter.Cli.Commands
@@ -14,15 +14,11 @@ namespace DiscordChatExporter.Cli.Commands
         {
         }
 
-        public override async Task ExecuteAsync(IConsole console)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-            // Get channels
-            var channels = await DataService.GetDirectMessageChannelsAsync(GetToken());
+            var directMessageChannels = await DataService.GetDirectMessageChannelsAsync(Token);
+            var channels = directMessageChannels.OrderBy(c => c.Name).ToArray();
 
-            // Order channels
-            channels = channels.OrderBy(c => c.Name).ToArray();
-
-            // Print result
             foreach (var channel in channels)
                 console.Output.WriteLine($"{channel.Id} | {channel.Name}");
         }

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
 using DiscordChatExporter.Core.Services;
 
 namespace DiscordChatExporter.Cli.Commands
@@ -14,16 +14,11 @@ namespace DiscordChatExporter.Cli.Commands
         {
         }
 
-        public override async Task ExecuteAsync(IConsole console)
+        public override async ValueTask ExecuteAsync(IConsole console)
         {
-            // Get guilds
-            var guilds = await DataService.GetUserGuildsAsync(GetToken());
+            var guilds = await DataService.GetUserGuildsAsync(Token);
 
-            // 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,14 +2,13 @@
 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");
@@ -18,6 +17,7 @@ namespace DiscordChatExporter.Cli.Commands
             console.Output.WriteLine(" 4. Select \"Local Storage\" > \"https://discordapp.com\" on the left");
             console.Output.WriteLine(" 5. Press Ctrl+R to reload");
             console.Output.WriteLine(" 6. Find \"token\" at the bottom and copy the value");
+            console.Output.WriteLine(" *  Automating user accounts is technically against TOS, use at your own risk.");
             console.Output.WriteLine();
 
             console.WithForegroundColor(ConsoleColor.White, () => console.Output.WriteLine("To get bot token:"));
@@ -47,7 +47,7 @@ namespace DiscordChatExporter.Cli.Commands
             console.Output.WriteLine("If you still have unanswered questions, check out the wiki:");
             console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");
 
-            return Task.CompletedTask;
+            return default;
         }
     }
 }

DiscordChatExporter.Cli/Commands/TokenCommandBase.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
-using CliFx.Services;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
 
@@ -12,18 +11,18 @@ namespace DiscordChatExporter.Cli.Commands
         protected DataService DataService { get; }
 
         [CommandOption("token", 't', IsRequired = true, Description = "Authorization token.")]
-        public string TokenValue { get; set; }
+        public string TokenValue { get; set; } = "";
 
         [CommandOption("bot", 'b', Description = "Whether this authorization token belongs to a bot.")]
         public bool IsBotToken { get; set; }
 
+        protected AuthToken Token => new AuthToken(IsBotToken ? AuthTokenType.Bot : AuthTokenType.User, TokenValue);
+
         protected TokenCommandBase(DataService dataService)
         {
             DataService = dataService;
         }
 
-        protected AuthToken GetToken() => new AuthToken(IsBotToken ? AuthTokenType.Bot : AuthTokenType.User, TokenValue);
-
-        public abstract Task ExecuteAsync(IConsole console);
+        public abstract ValueTask ExecuteAsync(IConsole console);
     }
 }

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -1,20 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../DiscordChatExporter.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
-    <Version>2.15</Version>
-    <Company>Tyrrrz</Company>
-    <Copyright>Copyright (c) Alexey Golub</Copyright>
     <ApplicationIcon>..\favicon.ico</ApplicationIcon>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="0.0.5" />
-    <PackageReference Include="Stylet" Version="1.2.0" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.2" />
+    <PackageReference Include="CliFx" Version="1.0.0" />
+    <PackageReference Include="Gress" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli/Internal/InlineProgress.cs

@@ -1,48 +0,0 @@
-using System;
-using CliFx.Services;
-
-namespace DiscordChatExporter.Cli.Internal
-{
-    internal class InlineProgress : IProgress<double>, IDisposable
-    {
-        private readonly IConsole _console;
-
-        private string _lastOutput = "";
-        private bool _isCompleted;
-
-        public InlineProgress(IConsole console)
-        {
-            _console = console;
-        }
-
-        private void ResetCursorPosition()
-        {
-            foreach (var c in _lastOutput)
-                _console.Output.Write('\b');
-        }
-
-        public void Report(double progress)
-        {
-            // If output is not redirected - reset cursor position and write progress
-            if (!_console.IsOutputRedirected)
-            {
-                ResetCursorPosition();
-                _console.Output.Write(_lastOutput = $"{progress:P1}");
-            }
-        }
-
-        public void ReportCompletion() => _isCompleted = true;
-
-        public void Dispose()
-        {
-            // If output is not redirected - reset cursor position
-            if (!_console.IsOutputRedirected)
-            {
-                ResetCursorPosition();
-            }
-
-            // Inform about completion
-            _console.Output.WriteLine(_isCompleted ? "Completed ✓" : "Failed X");
-        }
-    }
-}

DiscordChatExporter.Cli/Program.cs

@@ -1,33 +1,43 @@
-using System.Threading.Tasks;
+using System;
+using System.Drawing;
+using System.Threading.Tasks;
 using CliFx;
+using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Core.Services;
-using StyletIoC;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DiscordChatExporter.Cli
 {
     public static class Program
     {
-        private static IContainer BuildContainer()
+        private static IServiceProvider ConfigureServices()
         {
-            var builder = new StyletIoCBuilder();
+            var services = new ServiceCollection();
 
-            // Autobind the .Services assembly
-            builder.Autobind(typeof(DataService).Assembly);
+            // Register services
+            services.AddSingleton<DataService>();
+            services.AddSingleton<ExportService>();
+            services.AddSingleton<SettingsService>();
 
-            // Bind settings as singleton
-            builder.Bind<SettingsService>().ToSelf().InSingletonScope();
+            // Register commands
+            services.AddTransient<ExportChannelCommand>();
+            services.AddTransient<ExportDirectMessagesCommand>();
+            services.AddTransient<ExportGuildCommand>();
+            services.AddTransient<GetChannelsCommand>();
+            services.AddTransient<GetDirectMessageChannelsCommand>();
+            services.AddTransient<GetGuildsCommand>();
+            services.AddTransient<GuideCommand>();
 
-            // Set instance
-            return builder.BuildContainer();
+            return services.BuildServiceProvider();
         }
 
-        public static Task<int> Main(string[] args)
+        public static async Task<int> Main(string[] args)
         {
-            var container = BuildContainer();
+            var serviceProvider = ConfigureServices();
 
-            return new CliApplicationBuilder()
+            return await new CliApplicationBuilder()
                 .AddCommandsFromThisAssembly()
-                .UseCommandFactory(schema => (ICommand) container.Get(schema.Type))
+                .UseTypeActivator(serviceProvider.GetService)
                 .Build()
                 .RunAsync(args);
         }

DiscordChatExporter.Core.Markdown/Ast/EmojiNode.cs

@@ -1,18 +1,16 @@
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class EmojiNode : Node
     {
-        public string Id { get; }
+        public string? Id { get; }
 
         public string Name { get; }
 
         public bool IsAnimated { get; }
 
-        public bool IsCustomEmoji => !Id.IsNullOrWhiteSpace();
+        public bool IsCustomEmoji => !string.IsNullOrWhiteSpace(Id);
 
-        public EmojiNode(string id, string name, bool isAnimated)
+        public EmojiNode(string? id, string name, bool isAnimated)
         {
             Id = id;
             Name = name;

DiscordChatExporter.Core.Markdown/Ast/FormattedNode.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class FormattedNode : Node
     {

DiscordChatExporter.Core.Markdown/Ast/InlineCodeBlockNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class InlineCodeBlockNode : Node
     {

DiscordChatExporter.Core.Markdown/Ast/LinkNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class LinkNode : Node
     {

DiscordChatExporter.Core.Markdown/Ast/MentionNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class MentionNode : Node
     {

DiscordChatExporter.Core.Markdown/Ast/MentionType.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public enum MentionType
     {

DiscordChatExporter.Core.Markdown/Ast/MultiLineCodeBlockNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class MultiLineCodeBlockNode : Node
     {

DiscordChatExporter.Core.Markdown/Ast/Node.cs

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

DiscordChatExporter.Core.Markdown/Ast/TextFormatting.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public enum TextFormatting
     {

DiscordChatExporter.Core.Markdown/Ast/TextNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class TextNode : Node
     {

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

@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
+  <Import Project="../DiscordChatExporter.props" />
 
   <ItemGroup>
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.2" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core.Markdown/Internal/AggregateMatcher.cs

@@ -16,9 +16,9 @@ namespace DiscordChatExporter.Core.Markdown.Internal
         {
         }
 
-        public ParsedMatch<T> Match(StringPart stringPart)
+        public ParsedMatch<T>? Match(StringPart stringPart)
         {
-            ParsedMatch<T> earliestMatch = null;
+            ParsedMatch<T>? earliestMatch = null;
 
             // Try to match the input with each matcher and get the match with the lowest start index
             foreach (var matcher in _matchers)

DiscordChatExporter.Core.Markdown/Internal/Extensions.cs

@@ -1,20 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Markdown.Internal
 {
     internal static class Extensions
     {
-        public static StringPart Shrink(this StringPart stringPart, int newStartIndex, int newLength) =>
-            new StringPart(stringPart.Target, newStartIndex, newLength);
-
-        public static StringPart Shrink(this StringPart stringPart, int newStartIndex) =>
-            stringPart.Shrink(newStartIndex, stringPart.EndIndex - newStartIndex);
-
-        public static StringPart Shrink(this StringPart stringPart, Capture capture) =>
-            stringPart.Shrink(capture.Index, capture.Length);
-
         public static IEnumerable<ParsedMatch<T>> MatchAll<T>(this IMatcher<T> matcher, StringPart stringPart,
             Func<StringPart, T> fallbackTransform)
         {
@@ -23,7 +13,7 @@ namespace DiscordChatExporter.Core.Markdown.Internal
             while (currentIndex < stringPart.EndIndex)
             {
                 // Find a match within this segment
-                var match = matcher.Match(stringPart.Shrink(currentIndex, stringPart.EndIndex - currentIndex));
+                var match = matcher.Match(stringPart.Slice(currentIndex, stringPart.EndIndex - currentIndex));
 
                 // If there's no match - break
                 if (match == null)
@@ -32,7 +22,7 @@ namespace DiscordChatExporter.Core.Markdown.Internal
                 // If this match doesn't start immediately at current index - transform and yield fallback first
                 if (match.StringPart.StartIndex > currentIndex)
                 {
-                    var fallbackPart = stringPart.Shrink(currentIndex, match.StringPart.StartIndex - currentIndex);
+                    var fallbackPart = stringPart.Slice(currentIndex, match.StringPart.StartIndex - currentIndex);
                     yield return new ParsedMatch<T>(fallbackPart, fallbackTransform(fallbackPart));
                 }
 
@@ -46,7 +36,7 @@ namespace DiscordChatExporter.Core.Markdown.Internal
             // If EOL wasn't reached - transform and yield remaining part as fallback
             if (currentIndex < stringPart.EndIndex)
             {
-                var fallbackPart = stringPart.Shrink(currentIndex);
+                var fallbackPart = stringPart.Slice(currentIndex);
                 yield return new ParsedMatch<T>(fallbackPart, fallbackTransform(fallbackPart));
             }
         }

DiscordChatExporter.Core.Markdown/Internal/IMatcher.cs

@@ -2,6 +2,6 @@
 {
     internal interface IMatcher<T>
     {
-        ParsedMatch<T> Match(StringPart stringPart);
+        ParsedMatch<T>? Match(StringPart stringPart);
     }
 }

DiscordChatExporter.Core.Markdown/Internal/RegexMatcher.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
 using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Markdown.Internal
@@ -23,7 +19,7 @@ namespace DiscordChatExporter.Core.Markdown.Internal
         {
         }
 
-        public ParsedMatch<T> Match(StringPart stringPart)
+        public ParsedMatch<T>? Match(StringPart stringPart)
         {
             var match = _regex.Match(stringPart.Target, stringPart.StartIndex, stringPart.Length);
             if (!match.Success)
@@ -37,8 +33,8 @@ namespace DiscordChatExporter.Core.Markdown.Internal
             if (!_regex.IsMatch(stringPart.Target.Substring(0, stringPart.EndIndex), stringPart.StartIndex))
                 return null;
 
-            var stringPartShrunk = stringPart.Shrink(match.Index, match.Length);
-            return new ParsedMatch<T>(stringPartShrunk, _transform(stringPartShrunk, match));
+            var stringPartMatch = stringPart.Slice(match.Index, match.Length);
+            return new ParsedMatch<T>(stringPartMatch, _transform(stringPartMatch, match));
         }
     }
 }

DiscordChatExporter.Core.Markdown/Internal/StringMatcher.cs

@@ -20,14 +20,14 @@ namespace DiscordChatExporter.Core.Markdown.Internal
         {
         }
 
-        public ParsedMatch<T> Match(StringPart stringPart)
+        public ParsedMatch<T>? Match(StringPart stringPart)
         {
             var index = stringPart.Target.IndexOf(_needle, stringPart.StartIndex, stringPart.Length, _comparison);
 
             if (index >= 0)
             {
-                var stringPartShrunk = stringPart.Shrink(index, _needle.Length);
-                return new ParsedMatch<T>(stringPartShrunk, _transform(stringPartShrunk));
+                var stringPartMatch = stringPart.Slice(index, _needle.Length);
+                return new ParsedMatch<T>(stringPartMatch, _transform(stringPartMatch));
             }
 
             return null;

DiscordChatExporter.Core.Markdown/Internal/StringPart.cs

@@ -1,6 +1,8 @@
-namespace DiscordChatExporter.Core.Markdown.Internal
+using System.Text.RegularExpressions;
+
+namespace DiscordChatExporter.Core.Markdown.Internal
 {
-    internal class StringPart
+    internal readonly struct StringPart
     {
         public string Target { get; }
 
@@ -23,6 +25,12 @@
         {
         }
 
+        public StringPart Slice(int newStartIndex, int newLength) => new StringPart(Target, newStartIndex, newLength);
+
+        public StringPart Slice(int newStartIndex) => Slice(newStartIndex, EndIndex - newStartIndex);
+
+        public StringPart Slice(Capture capture) => Slice(capture.Index, capture.Length);
+
         public override string ToString() => Target.Substring(StartIndex, Length);
     }
 }

DiscordChatExporter.Core.Markdown/MarkdownParser.cs

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using DiscordChatExporter.Core.Markdown.Ast;
 using DiscordChatExporter.Core.Markdown.Internal;
-using DiscordChatExporter.Core.Markdown.Nodes;
-using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Markdown
 {
@@ -17,57 +16,57 @@ namespace DiscordChatExporter.Core.Markdown
         // Capture any character until the earliest double asterisk not followed by an asterisk
         private static readonly IMatcher<Node> BoldFormattedNodeMatcher = new RegexMatcher<Node>(
             new Regex("\\*\\*(.+?)\\*\\*(?!\\*)", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Bold, Parse(p.Shrink(m.Groups[1]))));
+            (p, m) => new FormattedNode(TextFormatting.Bold, Parse(p.Slice(m.Groups[1]))));
 
         // Capture any character until the earliest single asterisk not preceded or followed by an asterisk
         // Opening asterisk must not be followed by whitespace
         // Closing asterisk must not be preceded by whitespace
         private static readonly IMatcher<Node> ItalicFormattedNodeMatcher = new RegexMatcher<Node>(
             new Regex("\\*(?!\\s)(.+?)(?<!\\s|\\*)\\*(?!\\*)", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Italic, Parse(p.Shrink(m.Groups[1]))));
+            (p, m) => new FormattedNode(TextFormatting.Italic, Parse(p.Slice(m.Groups[1]))));
 
         // Capture any character until the earliest triple asterisk not followed by an asterisk
         private static readonly IMatcher<Node> ItalicBoldFormattedNodeMatcher = new RegexMatcher<Node>(
             new Regex("\\*(\\*\\*.+?\\*\\*)\\*(?!\\*)", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Italic, Parse(p.Shrink(m.Groups[1]), BoldFormattedNodeMatcher)));
+            (p, m) => new FormattedNode(TextFormatting.Italic, Parse(p.Slice(m.Groups[1]), BoldFormattedNodeMatcher)));
 
         // Capture any character except underscore until an underscore
         // Closing underscore must not be followed by a word character
         private static readonly IMatcher<Node> ItalicAltFormattedNodeMatcher = new RegexMatcher<Node>(
             new Regex("_([^_]+)_(?!\\w)", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Italic, Parse(p.Shrink(m.Groups[1]))));
+            (p, m) => new FormattedNode(TextFormatting.Italic, Parse(p.Slice(m.Groups[1]))));
 
         // Capture any character until the earliest double underscore not followed by an underscore
         private static readonly IMatcher<Node> UnderlineFormattedNodeMatcher = new RegexMatcher<Node>(
             new Regex("__(.+?)__(?!_)", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Underline, Parse(p.Shrink(m.Groups[1]))));
+            (p, m) => new FormattedNode(TextFormatting.Underline, Parse(p.Slice(m.Groups[1]))));
 
         // Capture any character until the earliest triple underscore not followed by an underscore
         private static readonly IMatcher<Node> ItalicUnderlineFormattedNodeMatcher = new RegexMatcher<Node>(
             new Regex("_(__.+?__)_(?!_)", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Italic, Parse(p.Shrink(m.Groups[1]), UnderlineFormattedNodeMatcher)));
+            (p, m) => new FormattedNode(TextFormatting.Italic, Parse(p.Slice(m.Groups[1]), UnderlineFormattedNodeMatcher)));
 
         // Capture any character until the earliest double tilde
         private static readonly IMatcher<Node> StrikethroughFormattedNodeMatcher = new RegexMatcher<Node>(
             new Regex("~~(.+?)~~", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Strikethrough, Parse(p.Shrink(m.Groups[1]))));
+            (p, m) => new FormattedNode(TextFormatting.Strikethrough, Parse(p.Slice(m.Groups[1]))));
 
         // Capture any character until the earliest double pipe
         private static readonly IMatcher<Node> SpoilerFormattedNodeMatcher = new RegexMatcher<Node>(
             new Regex("\\|\\|(.+?)\\|\\|", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Spoiler, Parse(p.Shrink(m.Groups[1]))));
+            (p, m) => new FormattedNode(TextFormatting.Spoiler, Parse(p.Slice(m.Groups[1]))));
 
         // Capture any character until the end of the line
         // Opening 'greater than' character must be followed by whitespace
         private static readonly IMatcher<Node> SingleLineQuoteNodeMatcher = new RegexMatcher<Node>(
             new Regex("^>\\s(.+)\r?\n?", DefaultRegexOptions),
-            (p, m) => new FormattedNode(TextFormatting.Quote, Parse(p.Shrink(m.Groups[1]))));
+            (p, m) => new FormattedNode(TextFormatting.Quote, Parse(p.Slice(m.Groups[1]))));
 
         // Capture any character until the end of the input
         // Opening 'greater than' characters must be followed by whitespace
         private static readonly IMatcher<Node> MultiLineQuoteNodeMatcher = new RegexMatcher<Node>(
             new Regex("^>>>\\s(.+)", DefaultRegexOptions | RegexOptions.Singleline),
-            (p, m) => new FormattedNode(TextFormatting.Quote, Parse(p.Shrink(m.Groups[1]))));
+            (p, m) => new FormattedNode(TextFormatting.Quote, Parse(p.Slice(m.Groups[1]))));
 
         /* Code blocks */
 
@@ -114,18 +113,18 @@ namespace DiscordChatExporter.Core.Markdown
         /* Emojis */
 
         // Capture any country flag emoji (two regional indicator surrogate pairs)
-        // ... or "symbol/other" character
+        // ... or "miscellaneous symbol" character
         // ... or surrogate pair
         // ... or digit followed by enclosing mark
         // (this does not match all emojis in Discord but it's reasonably accurate enough)
         private static readonly IMatcher<Node> StandardEmojiNodeMatcher = new RegexMatcher<Node>(
-            new Regex("((?:[\\uD83C][\\uDDE6-\\uDDFF]){2}|\\p{So}|\\p{Cs}{2}|\\d\\p{Me})", DefaultRegexOptions),
+            new Regex("((?:[\\uD83C][\\uDDE6-\\uDDFF]){2}|[\\u2600-\\u26FF]|\\p{Cs}{2}|\\d\\p{Me})", DefaultRegexOptions),
             m => new EmojiNode(m.Groups[1].Value));
 
         // Capture <:lul:123456> or <a:lul:123456>
         private static readonly IMatcher<Node> CustomEmojiNodeMatcher = new RegexMatcher<Node>(
             new Regex("<(a)?:(.+?):(\\d+?)>", DefaultRegexOptions),
-            m => new EmojiNode(m.Groups[3].Value, m.Groups[2].Value, !m.Groups[1].Value.IsNullOrWhiteSpace()));
+            m => new EmojiNode(m.Groups[3].Value, m.Groups[2].Value, !string.IsNullOrWhiteSpace(m.Groups[1].Value)));
 
         /* Links */
 
@@ -211,6 +210,7 @@ namespace DiscordChatExporter.Core.Markdown
             StandardEmojiNodeMatcher,
             CustomEmojiNodeMatcher);
 
+        // Minimal set of matchers for non-multimedia formats (e.g. plain text)
         private static readonly IMatcher<Node> MinimalAggregateNodeMatcher = new AggregateMatcher<Node>(
             // Mentions
             EveryoneMentionNodeMatcher,
@@ -220,7 +220,6 @@ namespace DiscordChatExporter.Core.Markdown
             RoleMentionNodeMatcher,
 
             // Emoji
-            StandardEmojiNodeMatcher,
             CustomEmojiNodeMatcher);
 
         private static IReadOnlyList<Node> Parse(StringPart stringPart, IMatcher<Node> matcher) =>

DiscordChatExporter.Core.Markdown/Nodes/Node.cs

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

DiscordChatExporter.Core.Models/Attachment.cs

@@ -6,7 +6,7 @@ namespace DiscordChatExporter.Core.Models
 {
     // https://discordapp.com/developers/docs/resources/channel#attachment-object
 
-    public partial class Attachment
+    public partial class Attachment : IHasId
     {
         public string Id { get; }
 

DiscordChatExporter.Core.Models/Channel.cs

@@ -2,21 +2,21 @@
 {
     // https://discordapp.com/developers/docs/resources/channel#channel-object
 
-    public partial class Channel
+    public partial class Channel : IHasId
     {
         public string Id { get; }
 
-        public string ParentId { get; }
+        public string? ParentId { get; }
 
         public string GuildId { get; }
 
         public string Name { get; }
 
-        public string Topic { get; }
+        public string? Topic { get; }
 
         public ChannelType Type { get; }
 
-        public Channel(string id, string parentId, string guildId, string name, string topic, ChannelType type)
+        public Channel(string id, string? parentId, string guildId, string name, string? topic, ChannelType type)
         {
             Id = id;
             ParentId = parentId;
@@ -32,6 +32,6 @@
     public partial class Channel
     {
         public static Channel CreateDeletedChannel(string id) =>
-            new Channel(id, null, null, "deleted-channel", null, ChannelType.GuildTextChat);
+            new Channel(id, null, "unknown-guild", "deleted-channel", null, ChannelType.GuildTextChat);
     }
 }

DiscordChatExporter.Core.Models/ChannelType.cs

@@ -1,6 +1,7 @@
 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
     {
@@ -8,6 +9,8 @@
         DirectTextChat,
         GuildVoiceChat,
         DirectGroupTextChat,
-        Category
+        GuildCategory,
+        GuildNews,
+        GuildStore
     }
 }

DiscordChatExporter.Core.Models/ChatLog.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public class ChatLog
-    {
-        public Guild Guild { get; }
-
-        public Channel Channel { get; }
-
-        public DateTimeOffset? After { get; }
-
-        public DateTimeOffset? Before { get; }
-
-        public IReadOnlyList<Message> Messages { get; }
-
-        public Mentionables Mentionables { get; }
-
-        public ChatLog(Guild guild, Channel channel, DateTimeOffset? after, DateTimeOffset? before,
-            IReadOnlyList<Message> messages, Mentionables mentionables)
-        {
-            Guild = guild;
-            Channel = channel;
-            After = after;
-            Before = before;
-            Messages = messages;
-            Mentionables = mentionables;
-        }
-
-        public override string ToString() => $"{Guild.Name} | {Channel.Name}";
-    }
-}

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

@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
+  <Import Project="../DiscordChatExporter.props" />
 
   <ItemGroup>
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.2" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core.Models/Embed.cs

@@ -8,28 +8,28 @@ namespace DiscordChatExporter.Core.Models
 
     public class Embed
     {
-        public string Title { get; }
+        public string? Title { get; }
 
-        public string Url { get; }
+        public string? Url { get; }
 
         public DateTimeOffset? Timestamp { get; }
 
-        public Color Color { get; }
+        public Color? Color { get; }
 
-        public EmbedAuthor Author { get; }
+        public EmbedAuthor? Author { get; }
 
-        public string Description { get; }
+        public string? Description { get; }
 
         public IReadOnlyList<EmbedField> Fields { get; }
 
-        public EmbedImage Thumbnail { get; }
+        public EmbedImage? Thumbnail { get; }
 
-        public EmbedImage Image { get; }
+        public EmbedImage? Image { get; }
 
-        public EmbedFooter Footer { 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)
+        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;
@@ -43,6 +43,6 @@ namespace DiscordChatExporter.Core.Models
             Footer = footer;
         }
 
-        public override string ToString() => Title;
+        public override string ToString() => Title ?? "<untitled embed>";
     }
 }

DiscordChatExporter.Core.Models/EmbedAuthor.cs

@@ -4,19 +4,19 @@ namespace DiscordChatExporter.Core.Models
 
     public class EmbedAuthor
     {
-        public string Name { get; }
+        public string? Name { get; }
 
-        public string Url { get; }
+        public string? Url { get; }
 
-        public string IconUrl { get; }
+        public string? IconUrl { get; }
 
-        public EmbedAuthor(string name, string url, string iconUrl)
+        public EmbedAuthor(string? name, string? url, string? iconUrl)
         {
             Name = name;
             Url = url;
             IconUrl = iconUrl;
         }
 
-        public override string ToString() => Name;
+        public override string ToString() => Name ?? "<unnamed author>";
     }
 }

DiscordChatExporter.Core.Models/EmbedFooter.cs

@@ -6,9 +6,9 @@ namespace DiscordChatExporter.Core.Models
     {
         public string Text { get; }
 
-        public string IconUrl { get; }
+        public string? IconUrl { get; }
 
-        public EmbedFooter(string text, string iconUrl)
+        public EmbedFooter(string text, string? iconUrl)
         {
             Text = text;
             IconUrl = iconUrl;

DiscordChatExporter.Core.Models/EmbedImage.cs

@@ -4,13 +4,13 @@ namespace DiscordChatExporter.Core.Models
 
     public class EmbedImage
     {
-        public string Url { get; }
+        public string? Url { get; }
 
         public int? Width { get; }
 
         public int? Height { get; }
 
-        public EmbedImage(string url, int? width, int? height)
+        public EmbedImage(string? url, int? width, int? height)
         {
             Url = url;
             Height = height;

DiscordChatExporter.Core.Models/Emoji.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Models
@@ -8,7 +9,7 @@ namespace DiscordChatExporter.Core.Models
 
     public partial class Emoji
     {
-        public string Id { get; }
+        public string? Id { get; }
 
         public string Name { get; }
 
@@ -16,7 +17,7 @@ namespace DiscordChatExporter.Core.Models
 
         public string ImageUrl { get; }
 
-        public Emoji(string id, string name, bool isAnimated)
+        public Emoji(string? id, string name, bool isAnimated)
         {
             Id = id;
             Name = name;
@@ -28,19 +29,26 @@ namespace DiscordChatExporter.Core.Models
 
     public partial class Emoji
     {
-        private static IEnumerable<int> GetCodePoints(string emoji)
+        private static IEnumerable<Rune> GetRunes(string emoji)
         {
-            for (var i = 0; i < emoji.Length; i += char.IsHighSurrogate(emoji[i]) ? 2 : 1)
-                yield return char.ConvertToUtf32(emoji, i);
+            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(string emoji) =>
-            GetCodePoints(emoji).Select(i => i.ToString("x")).JoinToString("-");
+        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)
+        public static string GetImageUrl(string? id, string name, bool isAnimated)
         {
             // Custom emoji
-            if (!id.IsNullOrWhiteSpace())
+            if (!string.IsNullOrWhiteSpace(id))
             {
                 // Animated
                 if (isAnimated)
@@ -50,9 +58,17 @@ namespace DiscordChatExporter.Core.Models
                 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";
+            // Standard unicode emoji
+            var emojiRunes = GetRunes(name).ToArray();
+            if (emojiRunes.Any())
+            {
+                // Get corresponding Twemoji image
+                var twemojiName = GetTwemojiName(emojiRunes);
+                return $"https://twemoji.maxcdn.com/2/72x72/{twemojiName}.png";
+            }
+
+            // Fallback in case of failure
+            return name;
         }
     }
 }

DiscordChatExporter.Core.Models/Exceptions/DomainException.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace DiscordChatExporter.Core.Models.Exceptions
+{
+    public class DomainException : Exception
+    {
+        public DomainException(string message)
+            : base(message)
+        {
+        }
+    }
+}

DiscordChatExporter.Core.Models/ExportFormat.cs

@@ -5,6 +5,7 @@
         PlainText,
         HtmlDark,
         HtmlLight,
-        Csv
+        Csv,
+        Json
     }
 }

DiscordChatExporter.Core.Models/Extensions.cs

@@ -4,32 +4,33 @@ namespace DiscordChatExporter.Core.Models
 {
     public static class Extensions
     {
-        public static string GetFileExtension(this ExportFormat format)
-        {
-            if (format == ExportFormat.PlainText)
-                return "txt";
-            if (format == ExportFormat.HtmlDark)
-                return "html";
-            if (format == ExportFormat.HtmlLight)
-                return "html";
-            if (format == ExportFormat.Csv)
-                return "csv";
+        public static bool IsExportable(this ChannelType channelType) =>
+            channelType == ChannelType.GuildTextChat ||
+            channelType == ChannelType.DirectTextChat ||
+            channelType == ChannelType.DirectGroupTextChat ||
+            channelType == ChannelType.GuildNews ||
+            channelType == ChannelType.GuildStore;
 
-            throw new ArgumentOutOfRangeException(nameof(format));
-        }
+        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)
-        {
-            if (format == ExportFormat.PlainText)
-                return "Plain Text";
-            if (format == ExportFormat.HtmlDark)
-                return "HTML (Dark)";
-            if (format == ExportFormat.HtmlLight)
-                return "HTML (Light)";
-            if (format == ExportFormat.Csv)
-                return "Comma Seperated Values (CSV)";
-
-            throw new ArgumentOutOfRangeException(nameof(format));
-        }
+        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.Core.Models/FileSize.cs

@@ -30,7 +30,6 @@ namespace DiscordChatExporter.Core.Models
         {
             get
             {
-                // Absolute value is used to deal with negative values
                 if (Math.Abs(PetaBytes) >= 1)
                     return PetaByteSymbol;
 
@@ -54,7 +53,6 @@ namespace DiscordChatExporter.Core.Models
         {
             get
             {
-                // Absolute value is used to deal with negative values
                 if (Math.Abs(PetaBytes) >= 1)
                     return PetaBytes;
 

DiscordChatExporter.Core.Models/Guild.cs

@@ -1,24 +1,33 @@
-using Tyrrrz.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
 
 namespace DiscordChatExporter.Core.Models
 {
     // https://discordapp.com/developers/docs/resources/guild#guild-object
 
-    public partial class Guild
+    public partial class Guild : IHasId
     {
         public string Id { get; }
 
         public string Name { get; }
 
-        public string IconHash { get; }
+        public string? IconHash { get; }
+
+        public IReadOnlyList<Role> Roles { get; }
+
+        public Dictionary<string, Member?> Members { get; }
 
         public string IconUrl { get; }
 
-        public Guild(string id, string name, string iconHash)
+        public Guild(string id, string name, IReadOnlyList<Role> roles, string? iconHash)
         {
             Id = id;
             Name = name;
             IconHash = iconHash;
+            Roles = roles;
+            Members = new Dictionary<string, Member?>();
 
             IconUrl = GetIconUrl(id, iconHash);
         }
@@ -28,13 +37,23 @@ namespace DiscordChatExporter.Core.Models
 
     public partial class Guild
     {
-        public static string GetIconUrl(string id, string iconHash)
-        {
-            return !iconHash.IsNullOrWhiteSpace()
+        public static string GetUserColor(Guild guild, User user) =>
+            guild.Members.GetValueOrDefault(user.Id, null)
+                ?.Roles
+                .Select(r => guild.Roles.FirstOrDefault(role => r == role.Id))
+                .Where(r => r != null)
+                .Where(r => r.Color != Color.Black)
+                .Where(r => r.Color.R + r.Color.G + r.Color.B > 0)
+                .Aggregate<Role, Role?>(null, (a, b) => (a?.Position ?? 0) > b.Position ? a : b)
+                ?.ColorAsHex ?? "";
+
+        public static string GetUserNick(Guild guild, User user) => guild.Members.GetValueOrDefault(user.Id)?.Nick ?? user.Name;
+
+        public static string GetIconUrl(string id, string? iconHash) =>
+            !string.IsNullOrWhiteSpace(iconHash)
                 ? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png"
                 : "https://cdn.discordapp.com/embed/avatars/0.png";
-        }
 
-        public static Guild DirectMessages { get; } = new Guild("@me", "Direct Messages", null);
+        public static Guild DirectMessages { get; } = new Guild("@me", "Direct Messages", Array.Empty<Role>(), null);
     }
 }

DiscordChatExporter.Core.Models/IHasId.cs

@@ -0,0 +1,7 @@
+namespace DiscordChatExporter.Core.Models
+{
+    public interface IHasId
+    {
+        string Id { get; }
+    }
+}

DiscordChatExporter.Core.Models/IdBasedEqualityComparer.cs

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

DiscordChatExporter.Core.Models/Member.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/guild#guild-member-object
+
+    public class Member
+    {
+        public string UserId { get; }
+
+        public string? Nick { get; }
+
+        public IReadOnlyList<string> Roles { get; }
+
+        public Member(string userId, string? nick, IReadOnlyList<string> roles)
+        {
+            UserId = userId;
+            Nick = nick;
+            Roles = roles;
+        }
+    }
+}

DiscordChatExporter.Core.Models/Mentionables.cs

@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public class Mentionables
-    {
-        public IReadOnlyList<User> Users { get; }
-
-        public IReadOnlyList<Channel> Channels { get; }
-
-        public IReadOnlyList<Role> Roles { get; }
-
-        public Mentionables(IReadOnlyList<User> users, IReadOnlyList<Channel> channels, IReadOnlyList<Role> roles)
-        {
-            Users = users;
-            Channels = channels;
-            Roles = roles;
-        }
-
-        public User GetUser(string id) =>
-            Users.FirstOrDefault(u => u.Id == id) ?? User.CreateUnknownUser(id);
-
-        public Channel GetChannel(string id) =>
-            Channels.FirstOrDefault(c => c.Id == id) ?? Channel.CreateDeletedChannel(id);
-
-        public Role GetRole(string id) =>
-            Roles.FirstOrDefault(r => r.Id == id) ?? Role.CreateDeletedRole(id);
-    }
-}

DiscordChatExporter.Core.Models/Message.cs

@@ -5,7 +5,7 @@ namespace DiscordChatExporter.Core.Models
 {
     // https://discordapp.com/developers/docs/resources/channel#message-object
 
-    public class Message
+    public class Message : IHasId
     {
         public string Id { get; }
 
@@ -19,7 +19,9 @@ namespace DiscordChatExporter.Core.Models
 
         public DateTimeOffset? EditedTimestamp { get; }
 
-        public string Content { get; }
+        public bool IsPinned { get; }
+
+        public string? Content { get; }
 
         public IReadOnlyList<Attachment> Attachments { get; }
 
@@ -29,12 +31,11 @@ namespace DiscordChatExporter.Core.Models
 
         public IReadOnlyList<User> MentionedUsers { get; }
 
-        public bool IsPinned { get; }
-
-        public Message(string id, string channelId, MessageType type, User author, DateTimeOffset timestamp,
-            DateTimeOffset? editedTimestamp, string content, IReadOnlyList<Attachment> attachments,
-            IReadOnlyList<Embed> embeds, IReadOnlyList<Reaction> reactions, IReadOnlyList<User> mentionedUsers,
-            bool isPinned)
+        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;
@@ -42,14 +43,14 @@ namespace DiscordChatExporter.Core.Models
             Author = author;
             Timestamp = timestamp;
             EditedTimestamp = editedTimestamp;
+            IsPinned = isPinned;
             Content = content;
             Attachments = attachments;
             Embeds = embeds;
             Reactions = reactions;
             MentionedUsers = mentionedUsers;
-            IsPinned = isPinned;
         }
 
-        public override string ToString() => Content;
+        public override string ToString() => Content ?? "<message without content>";
     }
 }

DiscordChatExporter.Core.Models/MessageGroup.cs

@@ -0,0 +1,23 @@
+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/Role.cs

@@ -1,17 +1,29 @@
-namespace DiscordChatExporter.Core.Models
+using System.Drawing;
+
+namespace DiscordChatExporter.Core.Models
 {
     // https://discordapp.com/developers/docs/topics/permissions#role-object
 
-    public partial class Role
+    public partial class Role : IHasId
     {
         public string Id { get; }
 
         public string Name { get; }
 
-        public Role(string id, string name)
+        public Color Color { get; }
+
+        public string ColorAsHex => $"#{Color.ToArgb() & 0xffffff:X6}";
+
+        public string ColorAsRgb => $"{Color.R}, {Color.G}, {Color.B}";
+
+        public int Position { get; }
+
+        public Role(string id, string name, Color color, int position)
         {
             Id = id;
             Name = name;
+            Color = color;
+            Position = position;
         }
 
         public override string ToString() => Name;
@@ -19,6 +31,6 @@
 
     public partial class Role
     {
-        public static Role CreateDeletedRole(string id) => new Role(id, "deleted-role");
+        public static Role CreateDeletedRole(string id) => new Role(id, "deleted-role", Color.Black, -1);
     }
 }

DiscordChatExporter.Core.Models/User.cs

@@ -1,11 +1,10 @@
 using System;
-using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Models
 {
     // https://discordapp.com/developers/docs/topics/permissions#role-object
 
-    public partial class User
+    public partial class User : IHasId
     {
         public string Id { get; }
 
@@ -15,13 +14,13 @@ namespace DiscordChatExporter.Core.Models
 
         public string FullName { get; }
 
-        public string AvatarHash { 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)
+        public User(string id, int discriminator, string name, string? avatarHash, bool isBot)
         {
             Id = id;
             Discriminator = discriminator;
@@ -40,10 +39,10 @@ namespace DiscordChatExporter.Core.Models
     {
         public static string GetFullName(string name, int discriminator) => $"{name}#{discriminator:0000}";
 
-        public static string GetAvatarUrl(string id, int discriminator, string avatarHash)
+        public static string GetAvatarUrl(string id, int discriminator, string? avatarHash)
         {
             // Custom avatar
-            if (!avatarHash.IsNullOrWhiteSpace())
+            if (!string.IsNullOrWhiteSpace(avatarHash))
             {
                 // Animated
                 if (avatarHash.StartsWith("a_", StringComparison.Ordinal))

DiscordChatExporter.Core.Rendering/CsvChatLogRenderer.cs

@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Markdown.Nodes;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public class CsvChatLogRenderer : IChatLogRenderer
-    {
-        private readonly ChatLog _chatLog;
-        private readonly string _dateFormat;
-
-        public CsvChatLogRenderer(ChatLog chatLog, string dateFormat)
-        {
-            _chatLog = chatLog;
-            _dateFormat = dateFormat;
-        }
-
-        private string FormatDate(DateTimeOffset date) =>
-            date.ToLocalTime().ToString(_dateFormat, CultureInfo.InvariantCulture);
-
-        private string FormatMarkdown(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 = _chatLog.Mentionables.GetUser(mentionNode.Id);
-                    return $"@{user.Name}";
-                }
-
-                // Channel mention node
-                if (mentionNode.Type == MentionType.Channel)
-                {
-                    var channel = _chatLog.Mentionables.GetChannel(mentionNode.Id);
-                    return $"#{channel.Name}";
-                }
-
-                // Role mention node
-                if (mentionNode.Type == MentionType.Role)
-                {
-                    var role = _chatLog.Mentionables.GetRole(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()}].");
-        }
-
-        private string FormatMarkdown(IEnumerable<Node> nodes) => nodes.Select(FormatMarkdown).JoinToString("");
-
-        private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.ParseMinimal(markdown));
-
-        private async Task RenderFieldAsync(TextWriter writer, string value)
-        {
-            var encodedValue = value.Replace("\"", "\"\"");
-            await writer.WriteAsync($"\"{encodedValue}\";");
-        }
-
-        private async Task RenderMessageAsync(TextWriter writer, Message message)
-        {
-            // Author ID
-            await RenderFieldAsync(writer, message.Author.Id);
-
-            // Author
-            await RenderFieldAsync(writer, message.Author.FullName);
-
-            // Timestamp
-            await RenderFieldAsync(writer, FormatDate(message.Timestamp));
-
-            // Content
-            await RenderFieldAsync(writer, FormatMarkdown(message.Content));
-
-            // Attachments
-            var formattedAttachments = message.Attachments.Select(a => a.Url).JoinToString(",");
-            await RenderFieldAsync(writer, formattedAttachments);
-
-            // Reactions
-            var formattedReactions = message.Reactions.Select(r => $"{r.Emoji.Name} ({r.Count})").JoinToString(",");
-            await RenderFieldAsync(writer, formattedReactions);
-
-            // Line break
-            await writer.WriteLineAsync();
-        }
-
-        public async Task RenderAsync(TextWriter writer)
-        {
-            // Headers
-            await writer.WriteLineAsync("AuthorID;Author;Date;Content;Attachments;Reactions;");
-
-            // Log
-            foreach (var message in _chatLog.Messages)
-                await RenderMessageAsync(writer, message);
-        }
-    }
-}

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

@@ -1,21 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
+  <Import Project="../DiscordChatExporter.props" />
 
   <ItemGroup>
+    <EmbeddedResource Include="Resources\HtmlCore.css" />
     <EmbeddedResource Include="Resources\HtmlDark.css" />
-    <EmbeddedResource Include="Resources\HtmlDark.html" />
     <EmbeddedResource Include="Resources\HtmlLight.css" />
-    <EmbeddedResource Include="Resources\HtmlLight.html" />
-    <EmbeddedResource Include="Resources\HtmlShared.css" />
-    <EmbeddedResource Include="Resources\HtmlShared.html" />
+    <EmbeddedResource Include="Resources\HtmlLayoutTemplate.html" />
+    <EmbeddedResource Include="Resources\HtmlMessageGroupTemplate.html" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Scriban" Version="2.1.0" />
+    <PackageReference Include="Scriban" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Core.Rendering/Formatters/CsvMessageWriter.cs

@@ -0,0 +1,34 @@
+using System.IO;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Logic;
+
+namespace DiscordChatExporter.Core.Rendering.Formatters
+{
+    public class CsvMessageWriter : MessageWriterBase
+    {
+        private readonly TextWriter _writer;
+
+        public CsvMessageWriter(Stream stream, RenderContext context)
+            : base(stream, context)
+        {
+            _writer = new StreamWriter(stream);
+        }
+
+        public override async Task WritePreambleAsync()
+        {
+            await _writer.WriteLineAsync(CsvRenderingLogic.FormatHeader(Context));
+        }
+
+        public override async Task WriteMessageAsync(Message message)
+        {
+            await _writer.WriteLineAsync(CsvRenderingLogic.FormatMessage(Context, message));
+        }
+
+        public override async ValueTask DisposeAsync()
+        {
+            await _writer.DisposeAsync();
+            await base.DisposeAsync();
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Formatters/HtmlMessageWriter.cs

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Logic;
+using Scriban;
+using Scriban.Runtime;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Rendering.Formatters
+{
+    public partial class HtmlMessageWriter : MessageWriterBase
+    {
+        private readonly TextWriter _writer;
+        private readonly string _themeName;
+        private readonly List<Message> _messageGroupBuffer = new List<Message>();
+
+        private readonly Template _preambleTemplate;
+        private readonly Template _messageGroupTemplate;
+        private readonly Template _postambleTemplate;
+
+        private long _messageCount;
+
+        public HtmlMessageWriter(Stream stream, RenderContext context, string themeName)
+            : base(stream, context)
+        {
+            _writer = new StreamWriter(stream);
+            _themeName = themeName;
+
+            _preambleTemplate = Template.Parse(GetPreambleTemplateCode());
+            _messageGroupTemplate = Template.Parse(GetMessageGroupTemplateCode());
+            _postambleTemplate = Template.Parse(GetPostambleTemplateCode());
+        }
+
+        private MessageGroup GetCurrentMessageGroup()
+        {
+            var firstMessage = _messageGroupBuffer.First();
+            return new MessageGroup(firstMessage.Author, firstMessage.Timestamp, _messageGroupBuffer);
+        }
+
+        private TemplateContext CreateTemplateContext(IReadOnlyDictionary<string, object>? constants = null)
+        {
+            // Template context
+            var templateContext = new TemplateContext
+            {
+                MemberRenamer = m => m.Name,
+                MemberFilter = m => true,
+                LoopLimit = int.MaxValue,
+                StrictVariables = true
+            };
+
+            // Model
+            var scriptObject = new ScriptObject();
+
+            // Constants
+            scriptObject.SetValue("Context", Context, true);
+            scriptObject.SetValue("CoreStyleSheet", GetCoreStyleSheetCode(), true);
+            scriptObject.SetValue("ThemeStyleSheet", GetThemeStyleSheetCode(_themeName), true);
+            scriptObject.SetValue("HighlightJsStyleName", $"solarized-{_themeName.ToLowerInvariant()}", true);
+
+            // Additional constants
+            if (constants != null)
+            {
+                foreach (var (member, value) in constants)
+                    scriptObject.SetValue(member, value, true);
+            }
+
+            // Functions
+            scriptObject.Import("FormatDate",
+                new Func<DateTimeOffset, string>(d => SharedRenderingLogic.FormatDate(d, Context.DateFormat)));
+
+            scriptObject.Import("FormatMarkdown",
+                new Func<string, string>(m => HtmlRenderingLogic.FormatMarkdown(Context, m)));
+
+            scriptObject.Import("GetUserColor", new Func<Guild, User, string>(Guild.GetUserColor));
+            
+            scriptObject.Import("GetUserNick", new Func<Guild, User, string>(Guild.GetUserNick));
+
+            // Push model
+            templateContext.PushGlobal(scriptObject);
+
+            // Push output
+            templateContext.PushOutput(new TextWriterOutput(_writer));
+
+            return templateContext;
+        }
+
+        private async Task RenderCurrentMessageGroupAsync()
+        {
+            var templateContext = CreateTemplateContext(new Dictionary<string, object>
+            {
+                ["MessageGroup"] = GetCurrentMessageGroup()
+            });
+
+            await templateContext.EvaluateAsync(_messageGroupTemplate.Page);
+        }
+
+        public override async Task WritePreambleAsync()
+        {
+            var templateContext = CreateTemplateContext();
+            await templateContext.EvaluateAsync(_preambleTemplate.Page);
+        }
+
+        public override async Task WriteMessageAsync(Message message)
+        {
+            // If message group is empty or the given message can be grouped, buffer the given message
+            if (!_messageGroupBuffer.Any() || HtmlRenderingLogic.CanBeGrouped(_messageGroupBuffer.Last(), message))
+            {
+                _messageGroupBuffer.Add(message);
+            }
+            // Otherwise, flush the group and render messages
+            else
+            {
+                await RenderCurrentMessageGroupAsync();
+
+                _messageGroupBuffer.Clear();
+                _messageGroupBuffer.Add(message);
+            }
+
+            // Increment message count
+            _messageCount++;
+        }
+
+        public override async Task WritePostambleAsync()
+        {
+            // Flush current message group
+            if (_messageGroupBuffer.Any())
+                await RenderCurrentMessageGroupAsync();
+
+            var templateContext = CreateTemplateContext(new Dictionary<string, object>
+            {
+                ["MessageCount"] = _messageCount
+            });
+
+            await templateContext.EvaluateAsync(_postambleTemplate.Page);
+        }
+
+        public override async ValueTask DisposeAsync()
+        {
+            await _writer.DisposeAsync();
+            await base.DisposeAsync();
+        }
+    }
+
+    public partial class HtmlMessageWriter
+    {
+        private static readonly Assembly ResourcesAssembly = typeof(HtmlRenderingLogic).Assembly;
+        private static readonly string ResourcesNamespace = $"{ResourcesAssembly.GetName().Name}.Resources";
+
+        private static string GetCoreStyleSheetCode() =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.HtmlCore.css");
+
+        private static string GetThemeStyleSheetCode(string themeName) =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.Html{themeName}.css");
+
+        private static string GetPreambleTemplateCode() =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.HtmlLayoutTemplate.html")
+                .SubstringUntil("{{~ %SPLIT% ~}}");
+
+        private static string GetMessageGroupTemplateCode() =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.HtmlMessageGroupTemplate.html");
+
+        private static string GetPostambleTemplateCode() =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.HtmlLayoutTemplate.html")
+                .SubstringAfter("{{~ %SPLIT% ~}}");
+    }
+}

DiscordChatExporter.Core.Rendering/Formatters/JsonMessageWriter.cs

@@ -0,0 +1,222 @@
+using System.IO;
+using System.Text.Json;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Internal;
+using DiscordChatExporter.Core.Rendering.Logic;
+
+namespace DiscordChatExporter.Core.Rendering.Formatters
+{
+    public class JsonMessageWriter : MessageWriterBase
+    {
+        private readonly Utf8JsonWriter _writer;
+
+        private long _messageCount;
+
+        public JsonMessageWriter(Stream stream, RenderContext context)
+            : base(stream, context)
+        {
+            _writer = new Utf8JsonWriter(stream, new JsonWriterOptions
+            {
+                Indented = true
+            });
+        }
+
+        public override async Task WritePreambleAsync()
+        {
+            // Root object (start)
+            _writer.WriteStartObject();
+
+            // Guild
+            _writer.WriteStartObject("guild");
+            _writer.WriteString("id", Context.Guild.Id);
+            _writer.WriteString("name", Context.Guild.Name);
+            _writer.WriteString("iconUrl", Context.Guild.IconUrl);
+            _writer.WriteEndObject();
+
+            // Channel
+            _writer.WriteStartObject("channel");
+            _writer.WriteString("id", Context.Channel.Id);
+            _writer.WriteString("type", Context.Channel.Type.ToString());
+            _writer.WriteString("name", Context.Channel.Name);
+            _writer.WriteString("topic", Context.Channel.Topic);
+            _writer.WriteEndObject();
+
+            // Date range
+            _writer.WriteStartObject("dateRange");
+            _writer.WriteString("after", Context.After);
+            _writer.WriteString("before", Context.Before);
+            _writer.WriteEndObject();
+
+            // Message array (start)
+            _writer.WriteStartArray("messages");
+
+            await _writer.FlushAsync();
+        }
+
+        public override async Task WriteMessageAsync(Message message)
+        {
+            _writer.WriteStartObject();
+
+            // Metadata
+            _writer.WriteString("id", message.Id);
+            _writer.WriteString("type", message.Type.ToString());
+            _writer.WriteString("timestamp", message.Timestamp);
+            _writer.WriteString("timestampEdited", message.EditedTimestamp);
+            _writer.WriteBoolean("isPinned", message.IsPinned);
+
+            // Content
+            var content = PlainTextRenderingLogic.FormatMessageContent(Context, message);
+            _writer.WriteString("content", content);
+
+            // Author
+            _writer.WriteStartObject("author");
+            _writer.WriteString("id", message.Author.Id);
+            _writer.WriteString("name", message.Author.Name);
+            _writer.WriteString("discriminator", $"{message.Author.Discriminator:0000}");
+            _writer.WriteBoolean("isBot", message.Author.IsBot);
+            _writer.WriteString("avatarUrl", message.Author.AvatarUrl);
+            _writer.WriteEndObject();
+
+            // Attachments
+            _writer.WriteStartArray("attachments");
+
+            foreach (var attachment in message.Attachments)
+            {
+                _writer.WriteStartObject();
+
+                _writer.WriteString("id", attachment.Id);
+                _writer.WriteString("url", attachment.Url);
+                _writer.WriteString("fileName", attachment.FileName);
+                _writer.WriteNumber("fileSizeBytes", (long) attachment.FileSize.Bytes);
+
+                _writer.WriteEndObject();
+            }
+
+            _writer.WriteEndArray();
+
+            // Embeds
+            _writer.WriteStartArray("embeds");
+
+            foreach (var embed in message.Embeds)
+            {
+                _writer.WriteStartObject();
+
+                _writer.WriteString("title", embed.Title);
+                _writer.WriteString("url", embed.Url);
+                _writer.WriteString("timestamp", embed.Timestamp);
+                _writer.WriteString("description", embed.Description);
+
+                // Author
+                if (embed.Author != null)
+                {
+                    _writer.WriteStartObject("author");
+                    _writer.WriteString("name", embed.Author.Name);
+                    _writer.WriteString("url", embed.Author.Url);
+                    _writer.WriteString("iconUrl", embed.Author.IconUrl);
+                    _writer.WriteEndObject();
+                }
+
+                // Thumbnail
+                if (embed.Thumbnail != null)
+                {
+                    _writer.WriteStartObject("thumbnail");
+                    _writer.WriteString("url", embed.Thumbnail.Url);
+                    _writer.WriteNumber("width", embed.Thumbnail.Width);
+                    _writer.WriteNumber("height", embed.Thumbnail.Height);
+                    _writer.WriteEndObject();
+                }
+
+                // Image
+                if (embed.Image != null)
+                {
+                    _writer.WriteStartObject("image");
+                    _writer.WriteString("url", embed.Image.Url);
+                    _writer.WriteNumber("width", embed.Image.Width);
+                    _writer.WriteNumber("height", embed.Image.Height);
+                    _writer.WriteEndObject();
+                }
+
+                // Footer
+                if (embed.Footer != null)
+                {
+                    _writer.WriteStartObject("footer");
+                    _writer.WriteString("text", embed.Footer.Text);
+                    _writer.WriteString("iconUrl", embed.Footer.IconUrl);
+                    _writer.WriteEndObject();
+                }
+
+                // Fields
+                _writer.WriteStartArray("fields");
+
+                foreach (var field in embed.Fields)
+                {
+                    _writer.WriteStartObject();
+
+                    _writer.WriteString("name", field.Name);
+                    _writer.WriteString("value", field.Value);
+                    _writer.WriteBoolean("isInline", field.IsInline);
+
+                    _writer.WriteEndObject();
+                }
+
+                _writer.WriteEndArray();
+
+                _writer.WriteEndObject();
+            }
+
+            _writer.WriteEndArray();
+
+            // Reactions
+            _writer.WriteStartArray("reactions");
+
+            foreach (var reaction in message.Reactions)
+            {
+                _writer.WriteStartObject();
+
+                // Emoji
+                _writer.WriteStartObject("emoji");
+                _writer.WriteString("id", reaction.Emoji.Id);
+                _writer.WriteString("name", reaction.Emoji.Name);
+                _writer.WriteBoolean("isAnimated", reaction.Emoji.IsAnimated);
+                _writer.WriteString("imageUrl", reaction.Emoji.ImageUrl);
+                _writer.WriteEndObject();
+
+                // Count
+                _writer.WriteNumber("count", reaction.Count);
+
+                _writer.WriteEndObject();
+            }
+
+            _writer.WriteEndArray();
+
+            _writer.WriteEndObject();
+
+            _messageCount++;
+
+            // Flush every 100 messages
+            if (_messageCount % 100 == 0)
+                await _writer.FlushAsync();
+        }
+
+        public override async Task WritePostambleAsync()
+        {
+            // Message array (end)
+            _writer.WriteEndArray();
+
+            // Message count
+            _writer.WriteNumber("messageCount", _messageCount);
+
+            // Root object (end)
+            _writer.WriteEndObject();
+
+            await _writer.FlushAsync();
+        }
+
+        public override async ValueTask DisposeAsync()
+        {
+            await _writer.DisposeAsync();
+            await base.DisposeAsync();
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Formatters/MessageWriterBase.cs

@@ -0,0 +1,28 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+
+namespace DiscordChatExporter.Core.Rendering.Formatters
+{
+    public abstract class MessageWriterBase : IAsyncDisposable
+    {
+        protected Stream Stream { get; }
+
+        protected RenderContext Context { get; }
+
+        protected MessageWriterBase(Stream stream, RenderContext context)
+        {
+            Stream = stream;
+            Context = context;
+        }
+
+        public virtual Task WritePreambleAsync() => Task.CompletedTask;
+
+        public abstract Task WriteMessageAsync(Message message);
+
+        public virtual Task WritePostambleAsync() => Task.CompletedTask;
+
+        public virtual async ValueTask DisposeAsync() => await Stream.DisposeAsync();
+    }
+}

DiscordChatExporter.Core.Rendering/Formatters/PlainTextMessageWriter.cs

@@ -0,0 +1,45 @@
+using System.IO;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Logic;
+
+namespace DiscordChatExporter.Core.Rendering.Formatters
+{
+    public class PlainTextMessageWriter : MessageWriterBase
+    {
+        private readonly TextWriter _writer;
+
+        private long _messageCount;
+
+        public PlainTextMessageWriter(Stream stream, RenderContext context)
+            : base(stream, context)
+        {
+            _writer = new StreamWriter(stream);
+        }
+
+        public override async Task WritePreambleAsync()
+        {
+            await _writer.WriteLineAsync(PlainTextRenderingLogic.FormatPreamble(Context));
+        }
+
+        public override async Task WriteMessageAsync(Message message)
+        {
+            await _writer.WriteLineAsync(PlainTextRenderingLogic.FormatMessage(Context, message));
+            await _writer.WriteLineAsync();
+
+            _messageCount++;
+        }
+
+        public override async Task WritePostambleAsync()
+        {
+            await _writer.WriteLineAsync();
+            await _writer.WriteLineAsync(PlainTextRenderingLogic.FormatPostamble(_messageCount));
+        }
+
+        public override async ValueTask DisposeAsync()
+        {
+            await _writer.DisposeAsync();
+            await base.DisposeAsync();
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.MessageGroup.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public partial class HtmlChatLogRenderer
-    {
-        private 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.Rendering/HtmlChatLogRenderer.TemplateLoader.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Threading.Tasks;
-using Scriban;
-using Scriban.Parsing;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public partial class HtmlChatLogRenderer
-    {
-        private class TemplateLoader : ITemplateLoader
-        {
-            private const string ResourceRootNamespace = "DiscordChatExporter.Core.Rendering.Resources";
-
-            public string Load(string templatePath) =>
-                Assembly.GetExecutingAssembly().GetManifestResourceString($"{ResourceRootNamespace}.{templatePath}");
-
-            public string GetPath(TemplateContext context, SourceSpan callerSpan, string templateName) => templateName;
-
-            public string Load(TemplateContext context, SourceSpan callerSpan, string templatePath) => Load(templatePath);
-
-            public ValueTask<string> LoadAsync(TemplateContext context, SourceSpan callerSpan, string templatePath) =>
-                new ValueTask<string>(Load(templatePath));
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/IChatLogRenderer.cs

@@ -1,10 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public interface IChatLogRenderer
-    {
-        Task RenderAsync(TextWriter writer);
-    }
-}

DiscordChatExporter.Core.Rendering/Internal/Extensions.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Text;
+using System.Text.Json;
+
+namespace DiscordChatExporter.Core.Rendering.Internal
+{
+    internal static class Extensions
+    {
+        public static StringBuilder AppendLineIfNotEmpty(this StringBuilder builder, string value) =>
+            !string.IsNullOrWhiteSpace(value) ? builder.AppendLine(value) : builder;
+
+        public static StringBuilder Trim(this StringBuilder builder)
+        {
+            while (builder.Length > 0 && char.IsWhiteSpace(builder[0]))
+                builder.Remove(0, 1);
+
+            while (builder.Length > 0 && char.IsWhiteSpace(builder[^1]))
+                builder.Remove(builder.Length - 1, 1);
+
+            return builder;
+        }
+
+        public static void WriteString(this Utf8JsonWriter writer, string propertyName, DateTimeOffset? value)
+        {
+            writer.WritePropertyName(propertyName);
+
+            if (value != null)
+                writer.WriteStringValue(value.Value);
+            else
+                writer.WriteNullValue();
+        }
+
+        public static void WriteNumber(this Utf8JsonWriter writer, string propertyName, int? value)
+        {
+            writer.WritePropertyName(propertyName);
+
+            if (value != null)
+                writer.WriteNumberValue(value.Value);
+            else
+                writer.WriteNullValue();
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Logic/CsvRenderingLogic.cs

@@ -0,0 +1,39 @@
+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,53 +1,32 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
+using System.Drawing;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Markdown.Nodes;
+using DiscordChatExporter.Core.Markdown.Ast;
 using DiscordChatExporter.Core.Models;
-using Scriban;
-using Scriban.Runtime;
 using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Core.Rendering
+namespace DiscordChatExporter.Core.Rendering.Logic
 {
-    public partial class HtmlChatLogRenderer : IChatLogRenderer
+    internal static class HtmlRenderingLogic
     {
-        private readonly ChatLog _chatLog;
-        private readonly string _themeName;
-        private readonly string _dateFormat;
-
-        public HtmlChatLogRenderer(ChatLog chatLog, string themeName, string dateFormat)
+        public static bool CanBeGrouped(Message message1, Message message2)
         {
-            _chatLog = chatLog;
-            _themeName = themeName;
-            _dateFormat = dateFormat;
+            if (message1.Author.Id != message2.Author.Id)
+                return false;
+
+            if ((message2.Timestamp - message1.Timestamp).Duration().TotalMinutes > 7)
+                return false;
+
+            return true;
         }
 
-        private string HtmlEncode(string s) => WebUtility.HtmlEncode(s);
+        private static string HtmlEncode(string s) => WebUtility.HtmlEncode(s);
 
-        private string FormatDate(DateTimeOffset date) =>
-            date.ToLocalTime().ToString(_dateFormat, CultureInfo.InvariantCulture);
-
-        private IEnumerable<MessageGroup> GroupMessages(IEnumerable<Message> messages) =>
-            messages.GroupContiguous((buffer, message) =>
-            {
-                // Break group if the author changed
-                if (buffer.Last().Author.Id != message.Author.Id)
-                    return false;
-
-                // Break group if last message was more than 7 minutes ago
-                if ((message.Timestamp - buffer.Last().Timestamp).TotalMinutes > 7)
-                    return false;
-
-                return true;
-            }).Select(g => new MessageGroup(g.First().Author, g.First().Timestamp, g));
-
-        private string FormatMarkdown(Node node, bool isJumbo)
+        private static string FormatMarkdownNode(RenderContext context, Node node, bool isJumbo)
         {
             // Text node
             if (node is TextNode textNode)
@@ -60,7 +39,7 @@ namespace DiscordChatExporter.Core.Rendering
             if (node is FormattedNode formattedNode)
             {
                 // Recursively get inner html
-                var innerHtml = FormatMarkdown(formattedNode.Children, false);
+                var innerHtml = FormatMarkdownNodes(context, formattedNode.Children, false);
 
                 // Bold
                 if (formattedNode.Formatting == TextFormatting.Bold)
@@ -97,7 +76,7 @@ namespace DiscordChatExporter.Core.Rendering
             if (node is MultiLineCodeBlockNode multilineCodeBlockNode)
             {
                 // Set CSS class for syntax highlighting
-                var highlightCssClass = !multilineCodeBlockNode.Language.IsNullOrWhiteSpace()
+                var highlightCssClass = !string.IsNullOrWhiteSpace(multilineCodeBlockNode.Language)
                     ? $"language-{multilineCodeBlockNode.Language}"
                     : "nohighlight";
 
@@ -116,22 +95,33 @@ namespace DiscordChatExporter.Core.Rendering
                 // User mention node
                 if (mentionNode.Type == MentionType.User)
                 {
-                    var user = _chatLog.Mentionables.GetUser(mentionNode.Id);
-                    return $"<span class=\"mention\" title=\"{HtmlEncode(user.FullName)}\">@{HtmlEncode(user.Name)}</span>";
+                    var user = context.MentionableUsers.FirstOrDefault(u => u.Id == mentionNode.Id) ??
+                               User.CreateUnknownUser(mentionNode.Id);
+
+                    var nick = Guild.GetUserNick(context.Guild, user);
+
+                    return $"<span class=\"mention\" title=\"{HtmlEncode(user.FullName)}\">@{HtmlEncode(nick)}</span>";
                 }
 
                 // Channel mention node
                 if (mentionNode.Type == MentionType.Channel)
                 {
-                    var channel = _chatLog.Mentionables.GetChannel(mentionNode.Id);
+                    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 = _chatLog.Mentionables.GetRole(mentionNode.Id);
-                    return $"<span class=\"mention\">@{HtmlEncode(role.Name)}</span>";
+                    var role = context.MentionableRoles.FirstOrDefault(r => r.Id == mentionNode.Id) ??
+                               Role.CreateDeletedRole(mentionNode.Id);
+                    string style = "";
+                    if (role.Color != Color.Black)
+                        style = $"style=\"color: {role.ColorAsHex}; background-color: rgba({role.ColorAsRgb}, 0.1); font-weight: 400;\"";
+
+                    return $"<span class=\"mention\" {style}>@{HtmlEncode(role.Name)}</span>";
                 }
             }
 
@@ -144,7 +134,8 @@ namespace DiscordChatExporter.Core.Rendering
                 // 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}\" />";
+                return
+                    $"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />";
             }
 
             // Link node
@@ -153,58 +144,24 @@ namespace DiscordChatExporter.Core.Rendering
                 // 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 linkedMessageId.IsNullOrWhiteSpace()
+                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()}].");
+            throw new InvalidOperationException($"Unexpected node [{node.GetType()}].");
         }
 
-        private string FormatMarkdown(IReadOnlyList<Node> nodes, bool isTopLevel)
+        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 && textNode.Text.IsNullOrWhiteSpace());
+            var isJumbo = isTopLevel && nodes.All(n => n is EmojiNode || n is TextNode textNode && string.IsNullOrWhiteSpace(textNode.Text));
 
-            return nodes.Select(n => FormatMarkdown(n, isJumbo)).JoinToString("");
+            return nodes.Select(n => FormatMarkdownNode(context, n, isJumbo)).JoinToString("");
         }
 
-        private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.Parse(markdown), true);
-
-        public async Task RenderAsync(TextWriter writer)
-        {
-            // Create template loader
-            var loader = new TemplateLoader();
-
-            // Get template
-            var templateCode = loader.Load($"Html{_themeName}.html");
-            var template = Template.Parse(templateCode);
-
-            // Create template context
-            var context = new TemplateContext
-            {
-                TemplateLoader = loader,
-                MemberRenamer = m => m.Name,
-                MemberFilter = m => true,
-                LoopLimit = int.MaxValue,
-                StrictVariables = true
-            };
-
-            // Create template model
-            var model = new ScriptObject();
-            model.SetValue("Model", _chatLog, true);
-            model.Import(nameof(GroupMessages), new Func<IEnumerable<Message>, IEnumerable<MessageGroup>>(GroupMessages));
-            model.Import(nameof(FormatDate), new Func<DateTimeOffset, string>(FormatDate));
-            model.Import(nameof(FormatMarkdown), new Func<string, string>(FormatMarkdown));
-            context.PushGlobal(model);
-
-            // Configure output
-            context.PushOutput(new TextWriterOutput(writer));
-
-            // HACK: Render output in a separate thread
-            // (even though Scriban has async API, it still makes a lot of blocking CPU-bound calls)
-            await Task.Run(async () => await context.EvaluateAsync(template.Page));
-        }
+        public static string FormatMarkdown(RenderContext context, string markdown) =>
+            FormatMarkdownNodes(context, MarkdownParser.Parse(markdown), true);
     }
 }

DiscordChatExporter.Core.Rendering/Logic/PlainTextRenderingLogic.cs

@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DiscordChatExporter.Core.Markdown;
+using DiscordChatExporter.Core.Markdown.Ast;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Internal;
+using Tyrrrz.Extensions;
+
+using static DiscordChatExporter.Core.Rendering.Logic.SharedRenderingLogic;
+
+namespace DiscordChatExporter.Core.Rendering.Logic
+{
+    public static class PlainTextRenderingLogic
+    {
+        public static string FormatPreamble(RenderContext context)
+        {
+            var buffer = new StringBuilder();
+
+            buffer.Append('=', 62).AppendLine();
+            buffer.AppendLine($"Guild: {context.Guild.Name}");
+            buffer.AppendLine($"Channel: {context.Channel.Name}");
+
+            if (!string.IsNullOrWhiteSpace(context.Channel.Topic))
+                buffer.AppendLine($"Topic: {context.Channel.Topic}");
+
+            if (context.After != null)
+                buffer.AppendLine($"After: {FormatDate(context.After.Value, context.DateFormat)}");
+
+            if (context.Before != null)
+                buffer.AppendLine($"Before: {FormatDate(context.Before.Value, context.DateFormat)}");
+
+            buffer.Append('=', 62).AppendLine();
+
+            return buffer.ToString();
+        }
+
+        public static string FormatPostamble(long messageCount)
+        {
+            var buffer = new StringBuilder();
+
+            buffer.Append('=', 62).AppendLine();
+            buffer.AppendLine($"Exported {messageCount:N0} message(s)");
+            buffer.Append('=', 62).AppendLine();
+
+            return buffer.ToString();
+        }
+
+        private static string FormatMarkdownNode(RenderContext context, Node node)
+        {
+            // Text node
+            if (node is TextNode textNode)
+            {
+                return textNode.Text;
+            }
+
+            // Mention node
+            if (node is MentionNode mentionNode)
+            {
+                // Meta mention node
+                if (mentionNode.Type == MentionType.Meta)
+                {
+                    return $"@{mentionNode.Id}";
+                }
+
+                // User mention node
+                if (mentionNode.Type == MentionType.User)
+                {
+                    var user = context.MentionableUsers.FirstOrDefault(u => u.Id == mentionNode.Id) ??
+                               User.CreateUnknownUser(mentionNode.Id);
+
+                    return $"@{user.Name}";
+                }
+
+                // Channel mention node
+                if (mentionNode.Type == MentionType.Channel)
+                {
+                    var channel = context.MentionableChannels.FirstOrDefault(c => c.Id == mentionNode.Id) ??
+                                  Channel.CreateDeletedChannel(mentionNode.Id);
+
+                    return $"#{channel.Name}";
+                }
+
+                // Role mention node
+                if (mentionNode.Type == MentionType.Role)
+                {
+                    var role = context.MentionableRoles.FirstOrDefault(r => r.Id == mentionNode.Id) ??
+                               Role.CreateDeletedRole(mentionNode.Id);
+
+                    return $"@{role.Name}";
+                }
+            }
+
+            // Emoji node
+            if (node is EmojiNode emojiNode)
+            {
+                return emojiNode.IsCustomEmoji ? $":{emojiNode.Name}:" : emojiNode.Name;
+            }
+
+            // Throw on unexpected nodes
+            throw new InvalidOperationException($"Unexpected node [{node.GetType()}].");
+        }
+
+        public static string FormatMarkdown(RenderContext context, string markdown) =>
+            MarkdownParser.ParseMinimal(markdown).Select(n => FormatMarkdownNode(context, n)).JoinToString("");
+
+        public static string FormatMessageHeader(RenderContext context, Message message)
+        {
+            var buffer = new StringBuilder();
+
+            // Timestamp & author
+            buffer
+                .Append($"[{FormatDate(message.Timestamp, context.DateFormat)}]")
+                .Append(' ')
+                .Append($"{message.Author.FullName}");
+
+            // Whether the message is pinned
+            if (message.IsPinned)
+            {
+                buffer.Append(' ').Append("(pinned)");
+            }
+
+            return buffer.ToString();
+        }
+
+        public static string FormatMessageContent(RenderContext context, Message message)
+        {
+            if (string.IsNullOrWhiteSpace(message.Content))
+                return "";
+
+            return FormatMarkdown(context, message.Content);
+        }
+
+        public static string FormatAttachments(IReadOnlyList<Attachment> attachments)
+        {
+            if (!attachments.Any())
+                return "";
+
+            var buffer = new StringBuilder();
+
+            buffer
+                .AppendLine("{Attachments}")
+                .AppendJoin(Environment.NewLine, attachments.Select(a => a.Url))
+                .AppendLine();
+
+            return buffer.ToString();
+        }
+
+        public static string FormatEmbeds(RenderContext context, IReadOnlyList<Embed> embeds)
+        {
+            if (!embeds.Any())
+                return "";
+
+            var buffer = new StringBuilder();
+
+            foreach (var embed in embeds)
+            {
+                buffer.AppendLine("{Embed}");
+
+                // Author name
+                if (!string.IsNullOrWhiteSpace(embed.Author?.Name))
+                    buffer.AppendLine(embed.Author.Name);
+
+                // URL
+                if (!string.IsNullOrWhiteSpace(embed.Url))
+                    buffer.AppendLine(embed.Url);
+
+                // Title
+                if (!string.IsNullOrWhiteSpace(embed.Title))
+                    buffer.AppendLine(FormatMarkdown(context, embed.Title));
+
+                // Description
+                if (!string.IsNullOrWhiteSpace(embed.Description))
+                    buffer.AppendLine(FormatMarkdown(context, embed.Description));
+
+                // Fields
+                foreach (var field in embed.Fields)
+                {
+                    // Name
+                    if (!string.IsNullOrWhiteSpace(field.Name))
+                        buffer.AppendLine(field.Name);
+
+                    // Value
+                    if (!string.IsNullOrWhiteSpace(field.Value))
+                        buffer.AppendLine(field.Value);
+                }
+
+                // Thumbnail URL
+                if (!string.IsNullOrWhiteSpace(embed.Thumbnail?.Url))
+                    buffer.AppendLine(embed.Thumbnail?.Url);
+
+                // Image URL
+                if (!string.IsNullOrWhiteSpace(embed.Image?.Url))
+                    buffer.AppendLine(embed.Image?.Url);
+
+                // Footer text
+                if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
+                    buffer.AppendLine(embed.Footer?.Text);
+
+                buffer.AppendLine();
+            }
+
+            return buffer.ToString();
+        }
+
+        public static string FormatReactions(IReadOnlyList<Reaction> reactions)
+        {
+            if (!reactions.Any())
+                return "";
+
+            var buffer = new StringBuilder();
+
+            buffer.AppendLine("{Reactions}");
+
+            foreach (var reaction in reactions)
+            {
+                buffer.Append(reaction.Emoji.Name);
+
+                if (reaction.Count > 1)
+                    buffer.Append($" ({reaction.Count})");
+
+                buffer.Append(" ");
+            }
+
+            buffer.AppendLine();
+
+            return buffer.ToString();
+        }
+
+        public static string FormatMessage(RenderContext context, Message message)
+        {
+            var buffer = new StringBuilder();
+
+            buffer
+                .AppendLine(FormatMessageHeader(context, message))
+                .AppendLineIfNotEmpty(FormatMessageContent(context, message))
+                .AppendLine()
+                .AppendLineIfNotEmpty(FormatAttachments(message.Attachments))
+                .AppendLineIfNotEmpty(FormatEmbeds(context, message.Embeds))
+                .AppendLineIfNotEmpty(FormatReactions(message.Reactions));
+
+            return buffer.Trim().ToString();
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Logic/SharedRenderingLogic.cs

@@ -0,0 +1,11 @@
+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/MessageRenderer.cs

@@ -0,0 +1,124 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Formatters;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public partial class MessageRenderer : IAsyncDisposable
+    {
+        private readonly RenderOptions _options;
+        private readonly RenderContext _context;
+
+        private long _renderedMessageCount;
+        private int _partitionIndex;
+        private MessageWriterBase? _writer;
+
+        public MessageRenderer(RenderOptions options, RenderContext context)
+        {
+            _options = options;
+            _context = context;
+        }
+
+        private async Task InitializeWriterAsync()
+        {
+            // Get partition file path
+            var filePath = GetPartitionFilePath(_options.BaseFilePath, _partitionIndex);
+
+            // Create output directory
+            var dirPath = Path.GetDirectoryName(_options.BaseFilePath);
+            if (!string.IsNullOrWhiteSpace(dirPath))
+                Directory.CreateDirectory(dirPath);
+
+            // Create writer
+            _writer = CreateMessageWriter(filePath, _options.Format, _context);
+
+            // Write preamble
+            await _writer.WritePreambleAsync();
+        }
+
+        private async Task ResetWriterAsync()
+        {
+            if (_writer != null)
+            {
+                // Write postamble
+                await _writer.WritePostambleAsync();
+
+                // Flush
+                await _writer.DisposeAsync();
+                _writer = null;
+            }
+        }
+
+        public async Task RenderMessageAsync(Message message)
+        {
+            // Ensure underlying writer is initialized
+            if (_writer == null)
+                await InitializeWriterAsync();
+
+            // Render the actual message
+            await _writer!.WriteMessageAsync(message);
+
+            // Increment count
+            _renderedMessageCount++;
+
+            // Shift partition if necessary
+            if (_options.PartitionLimit != null &&
+                _options.PartitionLimit != 0 &&
+                _renderedMessageCount % _options.PartitionLimit == 0)
+            {
+                await ResetWriterAsync();
+                _partitionIndex++;
+            }
+        }
+
+        public async ValueTask DisposeAsync() => await ResetWriterAsync();
+    }
+
+    public partial class MessageRenderer
+    {
+        private static string GetPartitionFilePath(string baseFilePath, int partitionIndex)
+        {
+            // First partition - no changes
+            if (partitionIndex <= 0)
+                return baseFilePath;
+
+            // Inject partition index into file name
+            var fileNameWithoutExt = Path.GetFileNameWithoutExtension(baseFilePath);
+            var fileExt = Path.GetExtension(baseFilePath);
+            var fileName = $"{fileNameWithoutExt} [part {partitionIndex + 1}]{fileExt}";
+
+            // Generate new path
+            var dirPath = Path.GetDirectoryName(baseFilePath);
+            if (!string.IsNullOrWhiteSpace(dirPath))
+                return Path.Combine(dirPath, fileName);
+
+            return fileName;
+        }
+
+        private static MessageWriterBase CreateMessageWriter(string filePath, ExportFormat format, RenderContext context)
+        {
+            // Create a stream (it will get disposed by the writer)
+            var stream = File.Create(filePath);
+
+            // Create formatter
+            if (format == ExportFormat.PlainText)
+                return new PlainTextMessageWriter(stream, context);
+
+            if (format == ExportFormat.Csv)
+                return new CsvMessageWriter(stream, context);
+
+            if (format == ExportFormat.HtmlDark)
+                return new HtmlMessageWriter(stream, context, "Dark");
+
+            if (format == ExportFormat.HtmlLight)
+                return new HtmlMessageWriter(stream, context, "Light");
+
+            if (format == ExportFormat.Json)
+                return new JsonMessageWriter(stream, context);
+
+            throw new InvalidOperationException($"Unknown export format [{format}].");
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/PlainTextChatLogRenderer.cs

@@ -1,236 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Markdown.Nodes;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public class PlainTextChatLogRenderer : IChatLogRenderer
-    {
-        private readonly ChatLog _chatLog;
-        private readonly string _dateFormat;
-
-        public PlainTextChatLogRenderer(ChatLog chatLog, string dateFormat)
-        {
-            _chatLog = chatLog;
-            _dateFormat = dateFormat;
-        }
-
-        private string FormatDate(DateTimeOffset date) =>
-            date.ToLocalTime().ToString(_dateFormat, CultureInfo.InvariantCulture);
-
-        private string FormatDateRange(DateTimeOffset? after, DateTimeOffset? before)
-        {
-            // Both 'after' and 'before'
-            if (after != null && before != null)
-                return $"{FormatDate(after.Value)} to {FormatDate(before.Value)}";
-
-            // Just 'after'
-            if (after != null)
-                return $"after {FormatDate(after.Value)}";
-
-            // Just 'before'
-            if (before != null)
-                return $"before {FormatDate(before.Value)}";
-
-            // Neither
-            return null;
-        }
-
-        private string FormatMarkdown(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 = _chatLog.Mentionables.GetUser(mentionNode.Id);
-                    return $"@{user.Name}";
-                }
-
-                // Channel mention node
-                if (mentionNode.Type == MentionType.Channel)
-                {
-                    var channel = _chatLog.Mentionables.GetChannel(mentionNode.Id);
-                    return $"#{channel.Name}";
-                }
-
-                // Role mention node
-                if (mentionNode.Type == MentionType.Role)
-                {
-                    var role = _chatLog.Mentionables.GetRole(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()}].");
-        }
-
-        private string FormatMarkdown(IEnumerable<Node> nodes) => nodes.Select(FormatMarkdown).JoinToString("");
-
-        private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.ParseMinimal(markdown));
-
-        private async Task RenderMessageHeaderAsync(TextWriter writer, Message message)
-        {
-            // Timestamp
-            await writer.WriteAsync($"[{FormatDate(message.Timestamp)}]");
-
-            // Author
-            await writer.WriteAsync($" {message.Author.FullName}");
-
-            // Whether the message is pinned
-            if (message.IsPinned)
-                await writer.WriteAsync(" (pinned)");
-
-            await writer.WriteLineAsync();
-        }
-
-        private async Task RenderAttachmentsAsync(TextWriter writer, IReadOnlyList<Attachment> attachments)
-        {
-            if (attachments.Any())
-            {
-                await writer.WriteLineAsync("{Attachments}");
-
-                foreach (var attachment in attachments)
-                    await writer.WriteLineAsync(attachment.Url);
-
-                await writer.WriteLineAsync();
-            }
-        }
-
-        private async Task RenderEmbedsAsync(TextWriter writer, IReadOnlyList<Embed> embeds)
-        {
-            foreach (var embed in embeds)
-            {
-                await writer.WriteLineAsync("{Embed}");
-
-                // Author name
-                if (!(embed.Author?.Name).IsNullOrWhiteSpace())
-                    await writer.WriteLineAsync(embed.Author?.Name);
-
-                // URL
-                if (!embed.Url.IsNullOrWhiteSpace())
-                    await writer.WriteLineAsync(embed.Url);
-
-                // Title
-                if (!embed.Title.IsNullOrWhiteSpace())
-                    await writer.WriteLineAsync(FormatMarkdown(embed.Title));
-
-                // Description
-                if (!embed.Description.IsNullOrWhiteSpace())
-                    await writer.WriteLineAsync(FormatMarkdown(embed.Description));
-
-                // Fields
-                foreach (var field in embed.Fields)
-                {
-                    // Name
-                    if (!field.Name.IsNullOrWhiteSpace())
-                        await writer.WriteLineAsync(field.Name);
-
-                    // Value
-                    if (!field.Value.IsNullOrWhiteSpace())
-                        await writer.WriteLineAsync(field.Value);
-                }
-
-                // Thumbnail URL
-                if (!(embed.Thumbnail?.Url).IsNullOrWhiteSpace())
-                    await writer.WriteLineAsync(embed.Thumbnail?.Url);
-
-                // Image URL
-                if (!(embed.Image?.Url).IsNullOrWhiteSpace())
-                    await writer.WriteLineAsync(embed.Image?.Url);
-
-                // Footer text
-                if (!(embed.Footer?.Text).IsNullOrWhiteSpace())
-                    await writer.WriteLineAsync(embed.Footer?.Text);
-
-                await writer.WriteLineAsync();
-            }
-        }
-
-        private async Task RenderReactionsAsync(TextWriter writer, IReadOnlyList<Reaction> reactions)
-        {
-            if (reactions.Any())
-            {
-                await writer.WriteLineAsync("{Reactions}");
-
-                foreach (var reaction in reactions)
-                {
-                    await writer.WriteAsync(reaction.Emoji.Name);
-
-                    if (reaction.Count > 1)
-                        await writer.WriteAsync($" ({reaction.Count})");
-
-                    await writer.WriteAsync(" ");
-                }
-
-                await writer.WriteLineAsync();
-                await writer.WriteLineAsync();
-            }
-        }
-
-        private async Task RenderMessageAsync(TextWriter writer, Message message)
-        {
-            // Header
-            await RenderMessageHeaderAsync(writer, message);
-
-            // Content
-            await writer.WriteLineAsync(FormatMarkdown(message.Content));
-
-            // Separator
-            await writer.WriteLineAsync();
-
-            // Attachments
-            await RenderAttachmentsAsync(writer, message.Attachments);
-
-            // Embeds
-            await RenderEmbedsAsync(writer, message.Embeds);
-
-            // Reactions
-            await RenderReactionsAsync(writer, message.Reactions);
-        }
-
-        public async Task RenderAsync(TextWriter writer)
-        {
-            // Metadata
-            await writer.WriteLineAsync('='.Repeat(62));
-            await writer.WriteLineAsync($"Guild: {_chatLog.Guild.Name}");
-            await writer.WriteLineAsync($"Channel: {_chatLog.Channel.Name}");
-            await writer.WriteLineAsync($"Topic: {_chatLog.Channel.Topic}");
-            await writer.WriteLineAsync($"Messages: {_chatLog.Messages.Count:N0}");
-            await writer.WriteLineAsync($"Range: {FormatDateRange(_chatLog.After, _chatLog.Before)}");
-            await writer.WriteLineAsync('='.Repeat(62));
-            await writer.WriteLineAsync();
-
-            // Log
-            foreach (var message in _chatLog.Messages)
-                await RenderMessageAsync(writer, message);
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/RenderContext.cs

@@ -0,0 +1,38 @@
+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/RenderOptions.cs

@@ -0,0 +1,20 @@
+using DiscordChatExporter.Core.Models;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public class RenderOptions
+    {
+        public string BaseFilePath { get; }
+
+        public ExportFormat Format { get; }
+
+        public int? PartitionLimit { get; }
+
+        public RenderOptions(string baseFilePath, ExportFormat format, int? partitionLimit)
+        {
+            BaseFilePath = baseFilePath;
+            Format = format;
+            PartitionLimit = partitionLimit;
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Resources/HtmlCore.css

@@ -1,4 +1,4 @@
-/* === GENERAL === */
+/* General */
 
 @font-face {
     font-family: Whitney;
@@ -58,10 +58,10 @@ img {
 }
 
 .quote {
+    margin: 0.5em 0;
+    padding-left: 0.6em;
     border-left: 4px solid;
     border-radius: 3px;
-    margin: 8px 0;
-    padding-left: 10px;
 }
 
 .pre {
@@ -69,8 +69,8 @@ img {
 }
 
 .pre--multiline {
-    margin-top: 4px;
-    padding: 8px;
+    margin-top: 0.25em;
+    padding: 0.5em;
     border: 2px solid;
     border-radius: 5px;
 }
@@ -78,88 +78,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 +164,53 @@ 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-thumbnail {
-    margin-top: 5px;
+    margin-top: 0.3em;
     max-width: 50%;
     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 +218,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 +235,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 +271,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 +282,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 +309,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 +321,8 @@ img {
 }
 
 .chatlog__embed-footer-text {
+    font-size: 0.75em;
     font-weight: 500;
-    font-size: .75em;
 }
 
 .chatlog__reactions {
@@ -342,26 +332,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;
-    background: #7289da;
-    color: #ffffff;
-    font-size: 0.625em;
-    padding: 1px 2px;
+    padding: 0.05em 0.3em;
     border-radius: 3px;
     vertical-align: middle;
     line-height: 1.3;
-    position: relative;
-    top: -.2em;
+    background: #7289da;
+    color: #ffffff;
+    font-size: 0.625em;
+    font-weight: 500;
+}
+
+/* Postamble */
+
+.postamble {
+    margin: 1.4em 0.3em 0.6em 0.3em;
+    padding: 1em;
+    border-top: 1px solid;
 }

DiscordChatExporter.Core.Rendering/Resources/HtmlDark.css

@@ -1,4 +1,4 @@
-/* === GENERAL === */
+/* General */
 
 body {
     background-color: #36393e;
@@ -23,28 +23,16 @@ a {
 
 .pre--multiline {
     border-color: #282b30 !important;
-    color: #839496 !important;
+    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);
@@ -70,6 +58,10 @@ a {
     color: rgba(255, 255, 255, 0.2);
 }
 
+.chatlog__embed-color-pill--default {
+    background-color: rgba(79, 84, 92, 1);
+}
+
 .chatlog__embed-content-container {
     background-color: rgba(46, 48, 54, 0.3);
     border-color: rgba(46, 48, 54, 0.6);
@@ -109,4 +101,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.Core.Rendering/Resources/HtmlDark.html

@@ -1,3 +0,0 @@
-{{~ ThemeStyleSheet = include "HtmlDark.css" ~}}
-{{~ HighlightJsStyleName = "solarized-dark" ~}}
-{{~ include "HtmlShared.html" ~}}

DiscordChatExporter.Core.Rendering/Resources/HtmlLayoutTemplate.html

@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    {{~ # Metadata ~}}
+    <title>{{ Context.Guild.Name | html.escape }} - {{ Context.Channel.Name | html.escape }}</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+
+    {{~ # Styles ~}}
+    <style>
+        {{ CoreStyleSheet }}
+    </style>
+    <style>
+        {{ ThemeStyleSheet }}
+    </style>
+
+    {{~ # Syntax highlighting ~}}
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/{{HighlightJsStyleName}}.min.css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
+    <script>
+        document.addEventListener('DOMContentLoaded', () => {
+            document.querySelectorAll('.pre--multiline').forEach(block => hljs.highlightBlock(block));
+        });
+    </script>
+
+    {{~ # Local scripts ~}}
+    <script>
+        function scrollToMessage(event, id) {
+            var element = document.getElementById('message-' + id);
+
+            if (element) {
+                event.preventDefault();
+
+                element.classList.add('chatlog__message--highlighted');
+
+                window.scrollTo({
+                    top: element.getBoundingClientRect().top - document.body.getBoundingClientRect().top - (window.innerHeight / 2),
+                    behavior: 'smooth'
+                });
+
+                window.setTimeout(function() {
+                    element.classList.remove('chatlog__message--highlighted');
+                }, 2000);
+            }
+        }
+    </script>
+</head>
+<body>
+
+{{~ # Preamble ~}}
+<div class="preamble">
+    <div class="preamble__guild-icon-container">
+        <img class="preamble__guild-icon" src="{{ Context.Guild.IconUrl }}" alt="Guild icon" />
+    </div>
+    <div class="preamble__entries-container">
+        <div class="preamble__entry">{{ Context.Guild.Name | html.escape }}</div>
+        <div class="preamble__entry">{{ Context.Channel.Name | html.escape }}</div>
+
+        {{~ if Context.Channel.Topic ~}}
+            <div class="preamble__entry preamble__entry--small">{{ Context.Channel.Topic | html.escape }}</div>
+        {{~ end ~}}
+
+        {{~ if Context.After || Context.Before ~}}
+            <div class="preamble__entry preamble__entry--small">
+                {{~ if Context.After && Context.Before ~}}
+                    Between {{ Context.After | FormatDate | html.escape }} and {{ Context.Before | FormatDate | html.escape }}
+                {{~ else if Context.After ~}}
+                    After {{ Context.After | FormatDate | html.escape }}
+                {{~ else if Context.Before ~}}
+                    Before {{ Context.Before | FormatDate | html.escape }}
+                {{~ end ~}}
+            </div>
+        {{~ end ~}}
+    </div>
+</div>
+
+{{~ # Log ~}}
+<div class="chatlog">
+    {{~ %SPLIT% ~}}
+</div>
+
+{{~ # Postamble ~}}
+<div class="postamble">
+    <div class="postamble__entry">Exported {{ MessageCount | object.format "N0" }} message(s)</div>
+</div>
+
+</body>
+</html>

DiscordChatExporter.Core.Rendering/Resources/HtmlLight.css

@@ -1,4 +1,4 @@
-/* === GENERAL === */
+/* General */
 
 body {
     background-color: #ffffff;
@@ -27,26 +27,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;
@@ -73,6 +60,10 @@ a {
     color: #747f8d;
 }
 
+.chatlog__embed-color-pill--default {
+    background-color: rgba(227, 229, 232, 1);
+}
+
 .chatlog__embed-content-container {
     background-color: rgba(249, 249, 249, 0.3);
     border-color: rgba(204, 204, 204, 0.3);
@@ -112,4 +103,14 @@ a {
 
 .chatlog__reaction-count {
     color: #747f8d;
+}
+
+/* Postamble */
+
+.postamble {
+    border-color: #eceeef;
+}
+
+.postamble__entry {
+    color: #2f3136;
 }

DiscordChatExporter.Core.Rendering/Resources/HtmlLight.html

@@ -1,3 +0,0 @@
-{{~ ThemeStyleSheet = include "HtmlLight.css" ~}}
-{{~ HighlightJsStyleName = "solarized-light" ~}}
-{{~ include "HtmlShared.html" ~}}

DiscordChatExporter.Core.Rendering/Resources/HtmlMessageGroupTemplate.html

@@ -0,0 +1,170 @@
+<div class="chatlog__message-group">
+    {{~ # Avatar ~}}
+    <div class="chatlog__author-avatar-container">
+        <img class="chatlog__author-avatar" src="{{ MessageGroup.Author.AvatarUrl }}" alt="Avatar" />
+    </div>
+    <div class="chatlog__messages">
+        {{~ # Author name and timestamp ~}}
+    <span class="chatlog__author-name" title="{{ MessageGroup.Author.FullName | html.escape }}" data-user-id="{{ MessageGroup.Author.Id | html.escape }}" style="color: {{ GetUserColor Context.Guild MessageGroup.Author }}">{{ GetUserNick Context.Guild MessageGroup.Author | html.escape }}</span>
+
+        {{~ # Bot tag ~}}
+        {{~ if MessageGroup.Author.IsBot ~}}
+            <span class="chatlog__bot-tag">BOT</span>
+        {{~ end ~}}
+
+        <span class="chatlog__timestamp">{{ MessageGroup.Timestamp | FormatDate | html.escape }}</span>
+
+        {{~ # Messages ~}}
+        {{~ for message in MessageGroup.Messages ~}}
+            <div class="chatlog__message {{if message.IsPinned }}chatlog__message--pinned{{ end }}" data-message-id="{{ message.Id }}" id="message-{{ message.Id }}">
+            {{~ # Content ~}}
+            {{~ if message.Content ~}}
+                <div class="chatlog__content">
+                    <span class="markdown">{{ message.Content | FormatMarkdown }}</span>
+
+                    {{~ # Edited timestamp ~}}
+                    {{~ if message.EditedTimestamp ~}}
+                        <span class="chatlog__edited-timestamp" title="{{ message.EditedTimestamp | FormatDate | html.escape }}">(edited)</span>
+                    {{~ end ~}}
+                </div>
+            {{~ end ~}}
+
+            {{~ # Attachments ~}}
+            {{~ for attachment in message.Attachments ~}}
+                <div class="chatlog__attachment">
+                    <a href="{{ attachment.Url }}">
+                        {{ # Image }}
+                        {{~ if attachment.IsImage ~}}
+                            <img class="chatlog__attachment-thumbnail" src="{{ attachment.Url }}" alt="Attachment" />
+                        {{~ # Non-image ~}}
+                        {{~ else ~}}
+                            Attachment: {{ attachment.FileName }} ({{ attachment.FileSize }})
+                        {{~ end ~}}
+                    </a>
+                </div>
+            {{~ end ~}}
+
+            {{~ # Embeds ~}}
+            {{~ for embed in message.Embeds ~}}
+            <div class="chatlog__embed">
+                {{~ if embed.Color ~}}
+                <div class="chatlog__embed-color-pill" style="background-color: rgba({{ embed.Color.R }},{{ embed.Color.G }},{{ embed.Color.B }},{{ embed.Color.A }})"></div>
+                {{~ else ~}}
+                <div class="chatlog__embed-color-pill chatlog__embed-color-pill--default"></div>
+                {{~ end ~}}
+                <div class="chatlog__embed-content-container">
+                    <div class="chatlog__embed-content">
+                        <div class="chatlog__embed-text">
+                            {{~ # Author ~}}
+                            {{~ if embed.Author ~}}
+                            <div class="chatlog__embed-author">
+                                {{~ if embed.Author.IconUrl ~}}
+                                <img class="chatlog__embed-author-icon" src="{{ embed.Author.IconUrl }}" alt="Author icon" />
+                                {{~ end ~}}
+
+                                {{~ if embed.Author.Name ~}}
+                                <span class="chatlog__embed-author-name">
+                                    {{~ if embed.Author.Url ~}}
+                                    <a class="chatlog__embed-author-name-link" href="{{ embed.Author.Url }}">{{ embed.Author.Name | html.escape }}</a>
+                                    {{~ else ~}}
+                                    {{ embed.Author.Name | html.escape }}
+                                    {{~ end ~}}
+                                </span>
+                                {{~ end ~}}
+                            </div>
+                            {{~ end ~}}
+
+                            {{~ # Title ~}}
+                            {{~ if embed.Title ~}}
+                            <div class="chatlog__embed-title">
+                                {{~ if embed.Url ~}}
+                                <a class="chatlog__embed-title-link" href="{{ embed.Url }}"><span class="markdown">{{ embed.Title | FormatMarkdown }}</span></a>
+                                {{~ else ~}}
+                                <span class="markdown">{{ embed.Title | FormatMarkdown }}</span>
+                                {{~ end ~}}
+                            </div>
+                            {{~ end ~}}
+
+                            {{~ # Description ~}}
+                            {{~ if embed.Description ~}}
+                            <div class="chatlog__embed-description"><span class="markdown">{{ embed.Description | FormatMarkdown }}</span></div>
+                            {{~ end ~}}
+
+                            {{~ # Fields ~}}
+                            {{~ if embed.Fields | array.size > 0 ~}}
+                            <div class="chatlog__embed-fields">
+                                {{~ for field in embed.Fields ~}}
+                                <div class="chatlog__embed-field {{ if field.IsInline }} chatlog__embed-field--inline {{ end }}">
+                                    {{~ if field.Name ~}}
+                                    <div class="chatlog__embed-field-name"><span class="markdown">{{ field.Name | FormatMarkdown }}</span></div>
+                                    {{~ end ~}}
+                                    {{~ if field.Value ~}}
+                                    <div class="chatlog__embed-field-value"><span class="markdown">{{ field.Value | FormatMarkdown }}</span></div>
+                                    {{~ end ~}}
+                                </div>
+                                {{~ end ~}}
+                            </div>
+                            {{~ end ~}}
+                        </div>
+
+                        {{~ # Thumbnail ~}}
+                        {{~ if embed.Thumbnail ~}}
+                        <div class="chatlog__embed-thumbnail-container">
+                            <a class="chatlog__embed-thumbnail-link" href="{{ embed.Thumbnail.Url }}">
+                                <img class="chatlog__embed-thumbnail" src="{{ embed.Thumbnail.Url }}" alt="Thumbnail" />
+                            </a>
+                        </div>
+                        {{~ end ~}}
+                    </div>
+
+                    {{~ # Image ~}}
+                    {{~ if embed.Image ~}}
+                    <div class="chatlog__embed-image-container">
+                        <a class="chatlog__embed-image-link" href="{{ embed.Image.Url }}">
+                            <img class="chatlog__embed-image" src="{{ embed.Image.Url }}" alt="Image" />
+                        </a>
+                    </div>
+                    {{~ end ~}}
+
+                    {{~ # Footer ~}}
+                    {{~ if embed.Footer || embed.Timestamp ~}}
+                    <div class="chatlog__embed-footer">
+                        {{~ if embed.Footer ~}}
+                        {{~ if embed.Footer.Text && embed.Footer.IconUrl ~}}
+                        <img class="chatlog__embed-footer-icon" src="{{ embed.Footer.IconUrl }}" alt="Footer icon" />
+                        {{~ end ~}}
+                        {{~ end ~}}
+
+                        <span class="chatlog__embed-footer-text">
+                            {{~ if embed.Footer ~}}
+                            {{~ if embed.Footer.Text ~}}
+                            {{ embed.Footer.Text | html.escape }}
+                            {{ if embed.Timestamp }} • {{ end }}
+                            {{~ end ~}}
+                            {{~ end ~}}
+
+                            {{~ if embed.Timestamp ~}}
+                            {{ embed.Timestamp | FormatDate | html.escape }}
+                            {{~ end ~}}
+                        </span>
+                    </div>
+                    {{~ end ~}}
+                </div>
+            </div>
+            {{~ end ~}}
+
+            {{~ # Reactions ~}}
+            {{~ if message.Reactions | array.size > 0 ~}}
+                <div class="chatlog__reactions">
+                    {{~ for reaction in message.Reactions ~}}
+                        <div class="chatlog__reaction">
+                            <img class="emoji emoji--small" alt="{{ reaction.Emoji.Name }}" title="{{ reaction.Emoji.Name }}" src="{{ reaction.Emoji.ImageUrl }}" />
+                            <span class="chatlog__reaction-count">{{ reaction.Count }}</span>
+                        </div>
+                    {{~ end ~}}
+                </div>
+            {{~ end ~}}
+            </div>
+        {{~ end ~}}
+    </div>
+</div>

DiscordChatExporter.Core.Rendering/Resources/HtmlShared.html

@@ -1,255 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    {{~ # Metadata ~}}
-    <title>{{ Model.Guild.Name | html.escape }} - {{ Model.Channel.Name | html.escape }}</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width" />
-
-    {{~ # Styles ~}}
-    <style>
-        {{ include "HtmlShared.css" }}
-    </style>
-    <style>
-        {{ ThemeStyleSheet }}
-    </style>
-
-    {{~ # Local scripts ~}}
-    <script>
-        function scrollToMessage(event, id) {
-            var element = document.getElementById('message-' + id);
-
-            if (element !== null && element !== undefined) {
-                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>
-
-    {{~ # 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>
-</head>
-<body>
-
-{{~ # Info ~}}
-<div class="info">
-    <div class="info__guild-icon-container">
-        <img class="info__guild-icon" src="{{ Model.Guild.IconUrl }}" />
-    </div>
-    <div class="info__metadata">
-        <div class="info__guild-name">{{ Model.Guild.Name | html.escape }}</div>
-        <div class="info__channel-name">{{ Model.Channel.Name | html.escape }}</div>
-
-        {{~ if Model.Channel.Topic ~}}
-            <div class="info__channel-topic">{{ Model.Channel.Topic | html.escape }}</div>
-        {{~ end ~}}
-
-        <div class="info__channel-message-count">{{ Model.Messages | array.size | object.format "N0" }} messages</div>
-
-        {{~ if Model.After || Model.Before ~}}
-            <div class="info__channel-date-range">
-                {{~ if Model.After && Model.Before ~}}
-                    Between {{ Model.After | FormatDate | html.escape }} and {{ Model.Before | FormatDate | html.escape }}
-                {{~ else if Model.After ~}}
-                    After {{ Model.After | FormatDate | html.escape }}
-                {{~ else if Model.Before ~}}
-                    Before {{ Model.Before | FormatDate | html.escape }}
-                {{~ end ~}}
-            </div>
-        {{~ end ~}}
-    </div>
-</div>
-
-{{~ # Log ~}}
-<div class="chatlog">
-    {{~ for group in Model.Messages | GroupMessages ~}}
-        <div class="chatlog__message-group">
-            {{~ # Avatar ~}}
-            <div class="chatlog__author-avatar-container">
-                <img class="chatlog__author-avatar" src="{{ group.Author.AvatarUrl }}" />
-            </div>
-            <div class="chatlog__messages">
-                {{~ # Author name and timestamp ~}}
-                <span class="chatlog__author-name" title="{{ group.Author.FullName | html.escape }}" data-user-id="{{ group.Author.Id | html.escape }}">{{ group.Author.Name | html.escape }}</span>
-
-                {{~ # Bot tag ~}}
-                {{~ if group.Author.IsBot ~}}
-                    <span class="chatlog__bot-tag">BOT</span>
-                {{~ end ~}}
-
-                <span class="chatlog__timestamp">{{ group.Timestamp | FormatDate | html.escape }}</span>
-
-                {{~ # Messages ~}}
-                {{~ for message in group.Messages ~}}
-                    <div class="chatlog__message {{if message.IsPinned }}chatlog__message--pinned{{ end }}" data-message-id="{{ message.Id }}" id="message-{{ message.Id }}">
-                    {{~ # Content ~}}
-                    {{~ if message.Content ~}}
-                        <div class="chatlog__content">
-                            <span class="markdown">{{ message.Content | FormatMarkdown }}</span>
-
-                            {{~ # Edited timestamp ~}}
-                            {{~ if message.EditedTimestamp ~}}
-                                <span class="chatlog__edited-timestamp" title="{{ message.EditedTimestamp | FormatDate | html.escape }}">(edited)</span>
-                            {{~ end ~}}
-                        </div>
-                    {{~ end ~}}
-
-                    {{~ # Attachments ~}}
-                    {{~ for attachment in message.Attachments ~}}
-                        <div class="chatlog__attachment">
-                            <a href="{{ attachment.Url }}">
-                                {{ # Image }}
-                                {{~ if attachment.IsImage ~}}
-                                    <img class="chatlog__attachment-thumbnail" src="{{ attachment.Url }}" />
-                                {{~ # Non-image ~}}
-                                {{~ else ~}}
-                                    Attachment: {{ attachment.FileName }} ({{ attachment.FileSize }})
-                                {{~ end ~}}
-                            </a>
-                        </div>
-                    {{~ end ~}}
-
-                    {{~ # Embeds ~}}
-                    {{~ for embed in message.Embeds ~}}
-                        <div class="chatlog__embed">
-                            <div class="chatlog__embed-color-pill" style="background-color: rgba({{ embed.Color.R }},{{ embed.Color.G }},{{ embed.Color.B }},{{ embed.Color.A }})"></div>
-                            <div class="chatlog__embed-content-container">
-                                <div class="chatlog__embed-content">
-                                    <div class="chatlog__embed-text">
-                                        {{~ # Author ~}}
-                                        {{~ if embed.Author ~}}
-                                            <div class="chatlog__embed-author">
-                                                {{~ if embed.Author.IconUrl ~}}
-                                                    <img class="chatlog__embed-author-icon" src="{{ embed.Author.IconUrl }}" />
-                                                {{~ end ~}}
-
-                                                {{~ if embed.Author.Name ~}}
-                                                    <span class="chatlog__embed-author-name">
-                                                        {{~ if embed.Author.Url ~}}
-                                                            <a class="chatlog__embed-author-name-link" href="{{ embed.Author.Url }}">{{ embed.Author.Name | html.escape }}</a>
-                                                        {{~ else ~}}
-                                                            {{ embed.Author.Name | html.escape }}
-                                                        {{~ end ~}}
-                                                    </span>
-                                                {{~ end ~}}
-                                            </div>
-                                        {{~ end ~}}
-
-                                        {{~ # Title ~}}
-                                        {{~ if embed.Title ~}}
-                                            <div class="chatlog__embed-title">
-                                                {{~ if embed.Url ~}}
-                                                    <a class="chatlog__embed-title-link" href="{{ embed.Url }}"><span class="markdown">{{ embed.Title | FormatMarkdown }}</span></a>
-                                                {{~ else ~}}
-                                                    <span class="markdown">{{ embed.Title | FormatMarkdown }}</span>
-                                                {{~ end ~}}
-                                            </div>
-                                        {{~ end ~}}
-
-                                        {{~ # Description ~}}
-                                        {{~ if embed.Description ~}}
-                                        <div class="chatlog__embed-description"><span class="markdown">{{ embed.Description | FormatMarkdown }}</span></div>
-                                        {{~ end ~}}
-
-                                        {{~ # Fields ~}}
-                                        {{~ if embed.Fields | array.size > 0 ~}}
-                                            <div class="chatlog__embed-fields">
-                                                {{~ for field in embed.Fields ~}}
-                                                    <div class="chatlog__embed-field {{ if field.IsInline }} chatlog__embed-field--inline {{ end }}">
-                                                        {{~ if field.Name ~}}
-                                                            <div class="chatlog__embed-field-name"><span class="markdown">{{ field.Name | FormatMarkdown }}</span></div>
-                                                        {{~ end ~}}
-                                                        {{~ if field.Value ~}}
-                                                            <div class="chatlog__embed-field-value"><span class="markdown">{{ field.Value | FormatMarkdown }}</span></div>
-                                                        {{~ end ~}}
-                                                    </div>
-                                                {{~ end ~}}
-                                            </div>
-                                        {{~ end ~}}
-                                    </div>
-
-                                    {{~ # Thumbnail ~}}
-                                    {{~ if embed.Thumbnail ~}}
-                                        <div class="chatlog__embed-thumbnail-container">
-                                            <a class="chatlog__embed-thumbnail-link" href="{{ embed.Thumbnail.Url }}">
-                                                <img class="chatlog__embed-thumbnail" src="{{ embed.Thumbnail.Url }}" />
-                                            </a>
-                                        </div>
-                                    {{~ end ~}}
-                                </div>
-
-                                {{~ # Image ~}}
-                                {{~ if embed.Image ~}}
-                                    <div class="chatlog__embed-image-container">
-                                        <a class="chatlog__embed-image-link" href="{{ embed.Image.Url }}">
-                                            <img class="chatlog__embed-image" src="{{ embed.Image.Url }}" />
-                                        </a>
-                                    </div>
-                                {{~ end ~}}
-
-                                {{~ # Footer ~}}
-                                {{~ if embed.Footer || embed.Timestamp ~}}
-                                    <div class="chatlog__embed-footer">
-                                        {{~ if embed.Footer ~}}
-                                            {{~ if embed.Footer.Text && embed.Footer.IconUrl ~}}
-                                                <img class="chatlog__embed-footer-icon" src="{{ embed.Footer.IconUrl }}" />
-                                            {{~ end ~}}
-                                        {{~ end ~}}
-
-                                        <span class="chatlog__embed-footer-text">
-                                            {{~ if embed.Footer ~}}
-                                                {{~ if embed.Footer.Text ~}}
-                                                    {{ embed.Footer.Text | html.escape }}
-                                                    {{ if embed.Timestamp }} • {{ end }}
-                                                {{~ end ~}}
-                                            {{~ end ~}}
-
-                                            {{~ if embed.Timestamp ~}}
-                                                {{ embed.Timestamp | FormatDate | html.escape }}
-                                            {{~ end ~}}
-                                        </span>
-                                    </div>
-                                {{~ end ~}}
-                            </div>
-                        </div>
-                    {{~ end ~}}
-
-                    {{~ # Reactions ~}}
-                    {{~ if message.Reactions | array.size > 0 ~}}
-                        <div class="chatlog__reactions">
-                            {{~ for reaction in message.Reactions ~}}
-                                <div class="chatlog__reaction">
-                                    <img class="emoji emoji--small" alt="{{ reaction.Emoji.Name }}" title="{{ reaction.Emoji.Name }}" src="{{ reaction.Emoji.ImageUrl }}" />
-                                    <span class="chatlog__reaction-count">{{ reaction.Count }}</span>
-                                </div>
-                            {{~ end ~}}
-                        </div>
-                    {{~ end ~}}
-                    </div>
-                {{~ end ~}}
-            </div>
-        </div>
-    {{~ end ~}}
-</div>
-
-</body>
-</html>

DiscordChatExporter.Core.Services/DataService.Parsers.cs

@@ -12,65 +12,82 @@ namespace DiscordChatExporter.Core.Services
     {
         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 id = json["id"]!.Value<string>();
+            var discriminator = json["discriminator"]!.Value<int>();
+            var name = json["username"]!.Value<string>();
+            var avatarHash = json["avatar"]!.Value<string>();
             var isBot = json["bot"]?.Value<bool>() ?? false;
 
             return new User(id, discriminator, name, avatarHash, isBot);
         }
 
+        private Member ParseMember(JToken json)
+        {
+            var userId = ParseUser(json["user"]!).Id;
+            var nick = json["nick"]?.Value<string>();
+            var roles = (json["roles"] ?? Enumerable.Empty<JToken>()).Select(j => j.Value<string>()).ToArray();
+
+            return new Member(userId, nick, roles);
+        }
+
         private Guild ParseGuild(JToken json)
         {
-            var id = json["id"].Value<string>();
-            var name = json["name"].Value<string>();
-            var iconHash = json["icon"].Value<string>();
+            var id = json["id"]!.Value<string>();
+            var name = json["name"]!.Value<string>();
+            var iconHash = json["icon"]!.Value<string>();
+            var roles = (json["roles"] ?? Enumerable.Empty<JToken>()).Select(ParseRole).ToArray();
 
-            return new Guild(id, name, iconHash);
+            return new Guild(id, name, roles, iconHash);
         }
 
         private Channel ParseChannel(JToken json)
         {
             // Get basic data
-            var id = json["id"].Value<string>();
+            var id = json["id"]!.Value<string>();
             var parentId = json["parent_id"]?.Value<string>();
-            var type = (ChannelType) json["type"].Value<int>();
+            var type = (ChannelType) json["type"]!.Value<int>();
             var topic = json["topic"]?.Value<string>();
 
             // Try to extract guild ID
             var guildId = json["guild_id"]?.Value<string>();
 
             // If the guild ID is blank, it's direct messages
-            if (guildId.IsNullOrWhiteSpace())
+            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 (name.IsNullOrWhiteSpace())
-                name = json["recipients"].Select(ParseUser).Select(u => u.Name).JoinToString(", ");
+            if (string.IsNullOrWhiteSpace(name))
+                name = json["recipients"]?.Select(ParseUser).Select(u => u.Name).JoinToString(", ");
+
+            // If the name is still blank for some reason, fallback to ID
+            // (blind fix to https://github.com/Tyrrrz/DiscordChatExporter/issues/227)
+            if (string.IsNullOrWhiteSpace(name))
+                name = id;
 
             return new Channel(id, parentId, guildId, name, topic, type);
         }
 
         private Role ParseRole(JToken json)
         {
-            var id = json["id"].Value<string>();
-            var name = json["name"].Value<string>();
+            var id = json["id"]!.Value<string>();
+            var name = json["name"]!.Value<string>();
+            var color = json["color"]!.Value<int>();
+            var position = json["position"]!.Value<int>();
 
-            return new Role(id, name);
+            return new Role(id, name, Color.FromArgb(color), position);
         }
 
         private Attachment ParseAttachment(JToken json)
         {
-            var id = json["id"].Value<string>();
-            var url = json["url"].Value<string>();
+            var 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 fileName = json["filename"]!.Value<string>();
+            var fileSizeBytes = json["size"]!.Value<long>();
 
             var fileSize = new FileSize(fileSizeBytes);
 
@@ -88,8 +105,8 @@ namespace DiscordChatExporter.Core.Services
 
         private EmbedField ParseEmbedField(JToken json)
         {
-            var name = json["name"].Value<string>();
-            var value = json["value"].Value<string>();
+            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);
@@ -106,7 +123,7 @@ namespace DiscordChatExporter.Core.Services
 
         private EmbedFooter ParseEmbedFooter(JToken json)
         {
-            var text = json["text"].Value<string>();
+            var text = json["text"]!.Value<string>();
             var iconUrl = json["icon_url"]?.Value<string>();
 
             return new EmbedFooter(text, iconUrl);
@@ -122,23 +139,23 @@ namespace DiscordChatExporter.Core.Services
 
             // Get color
             var color = json["color"] != null
-                ? Color.FromArgb(json["color"].Value<int>()).ResetAlpha()
-                : Color.FromArgb(79, 84, 92); // default color
+                ? Color.FromArgb(json["color"]!.Value<int>()).ResetAlpha()
+                : default(Color?);
 
             // Get author
-            var author = json["author"] != null ? ParseEmbedAuthor(json["author"]) : null;
+            var author = json["author"] != null ? ParseEmbedAuthor(json["author"]!) : null;
 
             // Get fields
-            var fields = json["fields"].EmptyIfNull().Select(ParseEmbedField).ToArray();
+            var fields = (json["fields"] ?? Enumerable.Empty<JToken>()).Select(ParseEmbedField).ToArray();
 
             // Get thumbnail
-            var thumbnail = json["thumbnail"] != null ? ParseEmbedImage(json["thumbnail"]) : null;
+            var thumbnail = json["thumbnail"] != null ? ParseEmbedImage(json["thumbnail"]!) : null;
 
             // Get image
-            var image = json["image"] != null ? ParseEmbedImage(json["image"]) : null;
+            var image = json["image"] != null ? ParseEmbedImage(json["image"]!) : null;
 
             // Get footer
-            var footer = json["footer"] != null ? ParseEmbedFooter(json["footer"]) : null;
+            var footer = json["footer"] != null ? ParseEmbedFooter(json["footer"]!) : null;
 
             return new Embed(title, url, timestamp, color, author, description, fields, thumbnail, image, footer);
         }
@@ -146,7 +163,7 @@ namespace DiscordChatExporter.Core.Services
         private Emoji ParseEmoji(JToken json)
         {
             var id = json["id"]?.Value<string>();
-            var name = json["name"]?.Value<string>();
+            var name = json["name"]!.Value<string>();
             var isAnimated = json["animated"]?.Value<bool>() ?? false;
 
             return new Emoji(id, name, isAnimated);
@@ -154,8 +171,8 @@ namespace DiscordChatExporter.Core.Services
 
         private Reaction ParseReaction(JToken json)
         {
-            var count = json["count"].Value<int>();
-            var emoji = ParseEmoji(json["emoji"]);
+            var count = json["count"]!.Value<int>();
+            var emoji = ParseEmoji(json["emoji"]!);
 
             return new Reaction(count, emoji);
         }
@@ -163,12 +180,12 @@ namespace DiscordChatExporter.Core.Services
         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 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>();
+            var content = json["content"]!.Value<string>();
+            var type = (MessageType) json["type"]!.Value<int>();
 
             // Workarounds for non-default types
             if (type == MessageType.RecipientAdd)
@@ -187,25 +204,25 @@ namespace DiscordChatExporter.Core.Services
                 content = "Joined the server.";
 
             // Get author
-            var author = ParseUser(json["author"]);
+            var author = ParseUser(json["author"]!);
 
             // Get attachments
-            var attachments = json["attachments"].EmptyIfNull().Select(ParseAttachment).ToArray();
+            var attachments = (json["attachments"] ?? Enumerable.Empty<JToken>()).Select(ParseAttachment).ToArray();
 
             // Get embeds
-            var embeds = json["embeds"].EmptyIfNull().Select(ParseEmbed).ToArray();
+            var embeds = (json["embeds"] ?? Enumerable.Empty<JToken>()).Select(ParseEmbed).ToArray();
 
             // Get reactions
-            var reactions = json["reactions"].EmptyIfNull().Select(ParseReaction).ToArray();
+            var reactions = (json["reactions"] ?? Enumerable.Empty<JToken>()).Select(ParseReaction).ToArray();
 
-            // Get mentioned users
-            var mentionedUsers = json["mentions"].EmptyIfNull().Select(ParseUser).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>();
+            var isPinned = json["pinned"]!.Value<bool>();
 
-            return new Message(id, channelId, type, author, timestamp, editedTimestamp, content, attachments, embeds,
-                reactions, mentionedUsers, isPinned);
+            return new Message(id, channelId, type, author, timestamp, editedTimestamp, isPinned, content, attachments, embeds,
+                reactions, mentionedUsers);
         }
     }
 }

DiscordChatExporter.Core.Services/DataService.cs

@@ -1,73 +1,73 @@
 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 Failsafe;
 using Newtonsoft.Json.Linq;
-using Tyrrrz.Extensions;
+using Polly;
 
 namespace DiscordChatExporter.Core.Services
 {
     public partial class DataService : IDisposable
     {
         private readonly HttpClient _httpClient = new HttpClient();
+        private readonly IAsyncPolicy<HttpResponseMessage> _httpPolicy;
 
-        private async Task<JToken> GetApiResponseAsync(AuthToken token, string resource, string endpoint,
-            params string[] parameters)
+        public DataService()
         {
-            // Create retry policy
-            var retry = Retry.Create()
-                .Catch<HttpErrorStatusCodeException>(false, e => (int) e.StatusCode >= 500)
-                .Catch<HttpErrorStatusCodeException>(false, e => (int) e.StatusCode == 429)
-                .WithMaxTryCount(10)
-                .WithDelay(TimeSpan.FromSeconds(0.4));
+            _httpClient.BaseAddress = new Uri("https://discordapp.com/api/v6");
 
-            // Send request
-            return await retry.ExecuteAsync(async () =>
+            // Discord seems to always respond 429 on our first request with unreasonable wait time (10+ minutes).
+            // For that reason the policy will start respecting their retry-after header only after Nth failed response.
+            _httpPolicy = Policy
+                .HandleResult<HttpResponseMessage>(m => m.StatusCode == HttpStatusCode.TooManyRequests)
+                .OrResult(m => m.StatusCode >= HttpStatusCode.InternalServerError)
+                .WaitAndRetryAsync(6,
+                    (i, result, ctx) =>
+                    {
+                        if (i <= 3)
+                            return TimeSpan.FromSeconds(2 * i);
+
+                        if (i <= 5)
+                            return TimeSpan.FromSeconds(5 * i);
+
+                        return result.Result.Headers.RetryAfter.Delta ?? TimeSpan.FromSeconds(10 * i);
+                    },
+                    (response, timespan, retryCount, context) => Task.CompletedTask);
+        }
+
+        private async Task<JToken> GetApiResponseAsync(AuthToken token, string route)
+        {
+            return (await GetApiResponseAsync(token, route, true))!;
+        }
+
+        private async Task<JToken?> GetApiResponseAsync(AuthToken token, string route, bool errorOnFail)
+        {
+            using var response = await _httpPolicy.ExecuteAsync(async () =>
             {
-                // Create request
-                const string apiRoot = "https://discordapp.com/api/v6";
-                using (var request = new HttpRequestMessage(HttpMethod.Get, $"{apiRoot}/{resource}/{endpoint}"))
-                {
-                    // Set authorization header
-                    request.Headers.Authorization = token.Type == AuthTokenType.Bot
-                        ? new AuthenticationHeaderValue("Bot", token.Value)
-                        : new AuthenticationHeaderValue(token.Value);
+                using var request = new HttpRequestMessage(HttpMethod.Get, route);
 
-                    // Add parameters
-                    foreach (var parameter in parameters)
-                    {
-                        var key = parameter.SubstringUntil("=");
-                        var value = parameter.SubstringAfter("=");
+                request.Headers.Authorization = token.Type == AuthTokenType.Bot
+                    ? new AuthenticationHeaderValue("Bot", token.Value)
+                    : new AuthenticationHeaderValue(token.Value);
 
-                        // Skip empty values
-                        if (value.IsNullOrWhiteSpace())
-                            continue;
-
-                        request.RequestUri = request.RequestUri.SetQueryParameter(key, value);
-                    }
-
-                    // Get response
-                    using (var response = await _httpClient.SendAsync(request))
-                    {
-                        // Check status code
-                        // We throw our own exception here because default one doesn't have status code
-                        if (!response.IsSuccessStatusCode)
-                            throw new HttpErrorStatusCodeException(response.StatusCode, response.ReasonPhrase);
-
-                        // Get content
-                        var raw = await response.Content.ReadAsStringAsync();
-
-                        // Parse
-                        return JToken.Parse(raw);
-                    }
-                }
+                return await _httpClient.SendAsync(request);
             });
+
+            // We throw our own exception here because default one doesn't have status code
+            if (!response.IsSuccessStatusCode)
+            {
+                if (errorOnFail) throw new HttpErrorStatusCodeException(response.StatusCode, response.ReasonPhrase);
+                else return null;
+            }
+
+            var jsonRaw = await response.Content.ReadAsStringAsync();
+            return JToken.Parse(jsonRaw);
         }
 
         public async Task<Guild> GetGuildAsync(AuthToken token, string guildId)
@@ -76,31 +76,56 @@ namespace DiscordChatExporter.Core.Services
             if (guildId == Guild.DirectMessages.Id)
                 return Guild.DirectMessages;
 
-            var response = await GetApiResponseAsync(token, "guilds", guildId);
+            var response = await GetApiResponseAsync(token, $"guilds/{guildId}");
             var guild = ParseGuild(response);
 
             return guild;
         }
 
+        public async Task<Member?> GetGuildMemberAsync(AuthToken token, string guildId, string userId)
+        {
+            var response = await GetApiResponseAsync(token, $"guilds/{guildId}/members/{userId}", false);
+            if (response == null) return null;
+            var member = ParseMember(response);
+
+            return member;
+        }
+
         public async Task<Channel> GetChannelAsync(AuthToken token, string channelId)
         {
-            var response = await GetApiResponseAsync(token, "channels", channelId);
+            var response = await GetApiResponseAsync(token, $"channels/{channelId}");
             var channel = ParseChannel(response);
 
             return channel;
         }
 
-        public async Task<IReadOnlyList<Guild>> GetUserGuildsAsync(AuthToken token)
+        public async IAsyncEnumerable<Guild> GetUserGuildsAsync(AuthToken token)
         {
-            var response = await GetApiResponseAsync(token, "users", "@me/guilds", "limit=100");
-            var guilds = response.Select(ParseGuild).ToArray();
+            var afterId = "";
 
-            return guilds;
+            while (true)
+            {
+                var route = "users/@me/guilds?limit=100";
+                if (!string.IsNullOrWhiteSpace(afterId))
+                    route += $"&after={afterId}";
+
+                var response = await GetApiResponseAsync(token, route);
+
+                if (!response.HasValues)
+                    yield break;
+
+                // Get full guild object
+                foreach (var guildId in response.Select(j => j["id"]!.Value<string>()))
+                {
+                    yield return await GetGuildAsync(token, guildId);
+                    afterId = guildId;
+                }
+            }
         }
 
         public async Task<IReadOnlyList<Channel>> GetDirectMessageChannelsAsync(AuthToken token)
         {
-            var response = await GetApiResponseAsync(token, "users", "@me/channels");
+            var response = await GetApiResponseAsync(token, "users/@me/channels");
             var channels = response.Select(ParseChannel).ToArray();
 
             return channels;
@@ -108,44 +133,48 @@ namespace DiscordChatExporter.Core.Services
 
         public async Task<IReadOnlyList<Channel>> GetGuildChannelsAsync(AuthToken token, string guildId)
         {
-            var response = await GetApiResponseAsync(token, "guilds", $"{guildId}/channels");
+            // 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)
+        private async Task<Message> GetLastMessageAsync(AuthToken token, string channelId, DateTimeOffset? before = null)
         {
-            var response = await GetApiResponseAsync(token, "guilds", $"{guildId}/roles");
-            var roles = response.Select(ParseRole).ToArray();
+            var route = $"channels/{channelId}/messages?limit=1";
+            if (before != null)
+                route += $"&before={before.Value.ToSnowflake()}";
 
-            return roles;
+            var response = await GetApiResponseAsync(token, route);
+
+            return response.Select(ParseMessage).FirstOrDefault();
         }
 
-        public async Task<IReadOnlyList<Message>> GetChannelMessagesAsync(AuthToken token, string channelId,
-            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double> progress = null)
+        public async IAsyncEnumerable<Message> GetMessagesAsync(AuthToken token, string channelId,
+            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double>? progress = null)
         {
-            var result = new List<Message>();
-
             // Get the last message
-            var response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
-                "limit=1", $"before={before?.ToSnowflake()}");
-            var lastMessage = response.Select(ParseMessage).FirstOrDefault();
+            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);
-                return result;
+                yield break;
             }
 
             // Get other messages
-            var offsetId = after?.ToSnowflake() ?? "0";
+            var firstMessage = default(Message);
+            var afterId = after?.ToSnowflake() ?? "0";
             while (true)
             {
                 // Get message batch
-                response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
-                    "limit=100", $"after={offsetId}");
+                var route = $"channels/{channelId}/messages?limit=100&after={afterId}";
+                var response = await GetApiResponseAsync(token, route);
 
                 // Parse
                 var messages = response
@@ -162,95 +191,30 @@ namespace DiscordChatExporter.Core.Services
                     .TakeWhile(m => m.Id != lastMessage.Id && m.Timestamp < lastMessage.Timestamp)
                     .ToArray();
 
-                // Add to result
-                result.AddRange(messagesInRange);
+                // 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;
-
-                // Report progress (based on the time range of parsed messages compared to total)
-                progress?.Report((result.Last().Timestamp - result.First().Timestamp).TotalSeconds /
-                                 (lastMessage.Timestamp - result.First().Timestamp).TotalSeconds);
-
-                // Move offset
-                offsetId = result.Last().Id;
             }
 
-            // Add last message
-            result.Add(lastMessage);
-
-            // Report progress
+            // Yield last message
+            yield return lastMessage;
             progress?.Report(1);
-
-            return result;
         }
 
-        public async Task<Mentionables> GetMentionablesAsync(AuthToken token, string guildId,
-            IEnumerable<Message> messages)
-        {
-            // Get channels and roles
-            var channels = guildId != Guild.DirectMessages.Id
-                ? await GetGuildChannelsAsync(token, guildId)
-                : Array.Empty<Channel>();
-            var roles = guildId != Guild.DirectMessages.Id
-                ? await GetGuildRolesAsync(token, guildId)
-                : Array.Empty<Role>();
-
-            // Get users
-            var userMap = new Dictionary<string, User>();
-            foreach (var message in messages)
-            {
-                // Author
-                userMap[message.Author.Id] = message.Author;
-
-                // Mentioned users
-                foreach (var mentionedUser in message.MentionedUsers)
-                    userMap[mentionedUser.Id] = mentionedUser;
-            }
-
-            var users = userMap.Values.ToArray();
-
-            return new Mentionables(users, channels, roles);
-        }
-
-        public async Task<ChatLog> GetChatLogAsync(AuthToken token, Guild guild, Channel channel,
-            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double> progress = null)
-        {
-            // Get messages
-            var messages = await GetChannelMessagesAsync(token, channel.Id, after, before, progress);
-
-            // Get mentionables
-            var mentionables = await GetMentionablesAsync(token, guild.Id, messages);
-
-            return new ChatLog(guild, channel, after, before, messages, mentionables);
-        }
-
-        public async Task<ChatLog> GetChatLogAsync(AuthToken token, Channel channel,
-            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double> progress = null)
-        {
-            // Get guild
-            var guild = channel.GuildId == Guild.DirectMessages.Id
-                ? Guild.DirectMessages
-                : await GetGuildAsync(token, channel.GuildId);
-
-            // Get the chat log
-            return await GetChatLogAsync(token, guild, channel, after, before, progress);
-        }
-
-        public async Task<ChatLog> GetChatLogAsync(AuthToken token, string channelId,
-            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double> progress = null)
-        {
-            // Get channel
-            var channel = await GetChannelAsync(token, channelId);
-
-            // Get the chat log
-            return await GetChatLogAsync(token, channel, after, before, progress);
-        }
-
-        public void Dispose()
-        {
-            _httpClient.Dispose();
-        }
+        public void Dispose() => _httpClient.Dispose();
     }
 }

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

@@ -1,15 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
+  <Import Project="../DiscordChatExporter.props" />
 
   <ItemGroup>
-    <PackageReference Include="Failsafe" Version="1.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="Onova" Version="2.4.5" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Onova" Version="2.5.2" />
+    <PackageReference Include="Polly" Version="7.2.0" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
     <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
   </ItemGroup>
 

DiscordChatExporter.Core.Services/ExportService.cs

@@ -1,89 +1,96 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Models.Exceptions;
 using DiscordChatExporter.Core.Rendering;
+using DiscordChatExporter.Core.Services.Logic;
 using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Services
 {
-    public class ExportService
+    public partial class ExportService
     {
         private readonly SettingsService _settingsService;
+        private readonly DataService _dataService;
 
-        public ExportService(SettingsService settingsService)
+        public ExportService(SettingsService settingsService, DataService dataService)
         {
             _settingsService = settingsService;
+            _dataService = dataService;
         }
 
-        private IChatLogRenderer CreateRenderer(ChatLog chatLog, ExportFormat 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)
         {
-            if (format == ExportFormat.PlainText)
-                return new PlainTextChatLogRenderer(chatLog, _settingsService.DateFormat);
+            // Get base file path from output path
+            var baseFilePath = GetFilePathFromOutputPath(outputPath, format, guild, channel, after, before);
 
-            if (format == ExportFormat.HtmlDark)
-                return new HtmlChatLogRenderer(chatLog, "Dark", _settingsService.DateFormat);
+            // Create options
+            var options = new RenderOptions(baseFilePath, format, partitionLimit);
 
-            if (format == ExportFormat.HtmlLight)
-                return new HtmlChatLogRenderer(chatLog, "Light", _settingsService.DateFormat);
+            // Create context
+            var mentionableUsers = new HashSet<User>(IdBasedEqualityComparer.Instance);
+            var mentionableChannels = await _dataService.GetGuildChannelsAsync(token, guild.Id);
+            var mentionableRoles = guild.Roles;
 
-            if (format == ExportFormat.Csv)
-                return new CsvChatLogRenderer(chatLog, _settingsService.DateFormat);
+            var context = new RenderContext
+            (
+                guild, channel, after, before, _settingsService.DateFormat,
+                mentionableUsers, mentionableChannels, mentionableRoles
+            );
 
-            throw new ArgumentOutOfRangeException(nameof(format), $"Unknown format [{format}].");
-        }
+            // Create renderer
+            await using var renderer = new MessageRenderer(options, context);
 
-        private async Task ExportChatLogAsync(ChatLog chatLog, string filePath, ExportFormat format)
-        {
-            // Create output directory
-            var dirPath = Path.GetDirectoryName(filePath);
-            if (!dirPath.IsNullOrWhiteSpace())
-                Directory.CreateDirectory(dirPath);
-
-            // Render chat log to output file
-            using (var writer = File.CreateText(filePath))
-                await CreateRenderer(chatLog, format).RenderAsync(writer);
-        }
-
-        public async Task ExportChatLogAsync(ChatLog chatLog, string filePath, ExportFormat format, int? partitionLimit)
-        {
-            // If partitioning is disabled or there are fewer messages in chat log than the limit - process it without partitioning
-            if (partitionLimit == null || partitionLimit <= 0 || chatLog.Messages.Count <= partitionLimit)
+            // Render messages
+            var renderedAnything = false;
+            await foreach (var message in _dataService.GetMessagesAsync(token, channel.Id, after, before, progress))
             {
-                await ExportChatLogAsync(chatLog, filePath, format);
-            }
-            // Otherwise split into partitions and export separately
-            else
-            {
-                // Create partitions by grouping up to X contiguous messages into separate chat logs
-                var partitions = chatLog.Messages.GroupContiguous(g => g.Count < partitionLimit.Value)
-                    .Select(g => new ChatLog(chatLog.Guild, chatLog.Channel, chatLog.After, chatLog.Before, g, chatLog.Mentionables))
-                    .ToArray();
+                // Add encountered users to the list of mentionable users
+                var encounteredUsers = new List<User>();
+                encounteredUsers.Add(message.Author);
+                encounteredUsers.AddRange(message.MentionedUsers);
 
-                // Split file path into components
-                var dirPath = Path.GetDirectoryName(filePath);
-                var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
-                var fileExt = Path.GetExtension(filePath);
+                mentionableUsers.AddRange(encounteredUsers);
 
-                // Export each partition separately
-                var partitionNumber = 1;
-                foreach (var partition in partitions)
+                foreach (User u in encounteredUsers)
                 {
-                    // Compose new file name
-                    var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Length}]{fileExt}";
-
-                    // Compose full file path
-                    if (!dirPath.IsNullOrWhiteSpace())
-                        partitionFilePath = Path.Combine(dirPath, partitionFilePath);
-
-                    // Export
-                    await ExportChatLogAsync(partition, partitionFilePath, format);
-
-                    // Increment partition number
-                    partitionNumber++;
+                    if(!guild.Members.ContainsKey(u.Id))
+                    {
+                        var member = await _dataService.GetGuildMemberAsync(token, guild.Id, u.Id);
+                        guild.Members[u.Id] = member;
+                    }
                 }
+
+
+                // Render message
+                await renderer.RenderMessageAsync(message);
+                renderedAnything = true;
             }
+
+            // Throw if no messages were rendered
+            if (!renderedAnything)
+                throw new DomainException($"Channel [{channel.Name}] contains no messages for specified period");
+        }
+    }
+
+    public partial class ExportService
+    {
+        private static string GetFilePathFromOutputPath(string outputPath, ExportFormat format, Guild guild, Channel channel,
+            DateTimeOffset? after, DateTimeOffset? before)
+        {
+            // Output is a directory
+            if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath)))
+            {
+                var fileName = ExportLogic.GetDefaultExportFileName(format, guild, channel, after, before);
+                return Path.Combine(outputPath, fileName);
+            }
+
+            // Output is a file
+            return outputPath;
         }
     }
 }

DiscordChatExporter.Core.Services/Extensions.cs

@@ -0,0 +1,22 @@
+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/Helpers/ExportHelper.cs

@@ -1,59 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services.Helpers
-{
-    public static class ExportHelper
-    {
-        public static bool IsDirectoryPath(string path) =>
-            path.Last() == Path.DirectorySeparatorChar ||
-            path.Last() == Path.AltDirectorySeparatorChar ||
-            (Path.GetExtension(path).IsNullOrWhiteSpace() && !File.Exists(path));
-
-        public static string GetDefaultExportFileName(ExportFormat format, Guild guild, Channel channel,
-            DateTimeOffset? after = null, DateTimeOffset? before = null)
-        {
-            var result = new StringBuilder();
-
-            // Append guild and channel names
-            result.Append($"{guild.Name} - {channel.Name} [{channel.Id}]");
-
-            // Append date range
-            if (after != null || before != null)
-            {
-                result.Append(" (");
-
-                // Both 'after' and 'before' are set
-                if (after != null && before != null)
-                {
-                    result.Append($"{after:yyyy-MM-dd} to {before:yyyy-MM-dd}");
-                }
-                // Only 'after' is set
-                else if (after != null)
-                {
-                    result.Append($"after {after:yyyy-MM-dd}");
-                }
-                // Only 'before' is set
-                else
-                {
-                    result.Append($"before {before:yyyy-MM-dd}");
-                }
-
-                result.Append(")");
-            }
-
-            // Append extension
-            result.Append($".{format.GetFileExtension()}");
-
-            // Replace invalid chars
-            foreach (var invalidChar in Path.GetInvalidFileNameChars())
-                result.Replace(invalidChar, '_');
-
-            return result.ToString();
-        }
-    }
-}

DiscordChatExporter.Core.Services/Logic/ExportLogic.cs

@@ -0,0 +1,53 @@
+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();
+        }
+    }
+}

DiscordChatExporter.Core.Services/SettingsService.cs

@@ -5,12 +5,18 @@ namespace DiscordChatExporter.Core.Services
 {
     public class SettingsService : SettingsManager
     {
-        public bool IsAutoUpdateEnabled { get; set; } = true;
-
         public string DateFormat { get; set; } = "dd-MMM-yy hh:mm tt";
 
-        public AuthToken LastToken { get; set; }
+        public bool IsAutoUpdateEnabled { get; set; } = true;
+
+        public bool IsTokenPersisted { get; set; } = true;
+
+        public int ParallelLimit { get; set; } = 1;
+
+        public AuthToken? LastToken { get; set; }
+
         public ExportFormat LastExportFormat { get; set; } = ExportFormat.HtmlDark;
+
         public int? LastPartitionLimit { get; set; }
 
         public SettingsService()
@@ -19,5 +25,7 @@ namespace DiscordChatExporter.Core.Services
             Configuration.SubDirectoryPath = "";
             Configuration.FileName = "Settings.dat";
         }
+
+        public bool ShouldSerializeLastToken() => IsTokenPersisted;
     }
 }

DiscordChatExporter.Gui/App.xaml

@@ -1,4 +1,4 @@
-<Application
+<Application
     x:Class="DiscordChatExporter.Gui.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

DiscordChatExporter.Gui/App.xaml.cs

@@ -1,6 +1,16 @@
-namespace DiscordChatExporter.Gui
+using System;
+using System.Reflection;
+
+namespace DiscordChatExporter.Gui
 {
     public partial class App
     {
+        private static readonly Assembly Assembly = typeof(App).Assembly;
+
+        public static string Name => Assembly.GetName().Name!;
+
+        public static Version Version => Assembly.GetName().Version!;
+
+        public static string VersionString => Version.ToString(3);
     }
 }

DiscordChatExporter.Gui/Behaviors/MultiSelectionListBoxBehavior.cs

@@ -3,7 +3,7 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace DiscordChatExporter.Gui.Behaviors
 {

DiscordChatExporter.Gui/Bootstrapper.cs

@@ -1,11 +1,14 @@
-using System.Windows;
-using System.Windows.Threading;
-using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Core.Services;
 using DiscordChatExporter.Gui.ViewModels;
 using DiscordChatExporter.Gui.ViewModels.Framework;
 using Stylet;
 using StyletIoC;
 
+#if !DEBUG
+using System.Windows;
+using System.Windows.Threading;
+#endif
+
 namespace DiscordChatExporter.Gui
 {
     public class Bootstrapper : Bootstrapper<RootViewModel>