Update version

Closes #249

.config/dotnet-tools.json

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

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: Tyrrrz
+patreon: 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@v1
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v1
+      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
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: ${{ github.ref }}
+        body: |
+          [Changelog](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Changelog.md)
+        draft: false
+        prerelease: false
+
+    - name: Upload release asset (CLI)
+      uses: actions/upload-release-asset@v1.0.1
+      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.1
+      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@v1
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v1
+      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@master
+      with:
+        name: DiscordChatExporter.CLI
+        path: DiscordChatExporter.Cli/bin/Publish/
+
+    - name: Upload build artifact (GUI)
+      uses: actions/upload-artifact@master
+      with:
+        name: DiscordChatExporter
+        path: DiscordChatExporter.Gui/bin/Publish/

Changelog.md

@@ -1,3 +1,39 @@
+### v2.17 (12-Jan-2020)
+
+- Fixed an issue where an empty file was produced when exporting a channel with no messages (for specified period). With the new behavior, no file will be created and instead a message will be shown to the user informing of the failure.
+- [HTML/TXT] Added message count to the bottom of the file. This number shows how many messages were exported as part of the current file. Prior to 2.16 this number was present along with the rest of the metadata at the top, then removed due to changes in the exporter, and now brought back at the end of the file instead.
+- [HTML] Fixed an issue where some emojis were not properly rendered.
+- [GUI] Added a setting that lets you configure whether to remember the last used token. Previously it was the default behavior, but now you can disable it if you don't want the token persisted on your system.
+
+### v2.16 (08-Dec-2019)
+
+- Migrated from .NET Framework to .NET Core. To run this and future versions of DiscordChatExporter you will need [.NET Core runtime for desktop apps](https://dotnet.microsoft.com/download/dotnet-core/3.1/runtime) (for GUI/CLI version on Windows) or [.NET Core base runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1) (for CLI version on Windows, Linux or macOS).
+- Reworked the exporter engine to render output using streaming data source. This means that only a very small portion of messages are cached in memory when exporting. In other words, you are only limited by storage space and not how much RAM you have, so you can now export terabytes of chat logs without hitting out of memory exceptions. I still recommend using partitions if you're exporting very large chat logs (250k+ messages) to HTML, unless you want your computer to catch fire when you try to open the export in browser.
+- Changed how partitioned files are named, due to the fact that total number of partitions is no longer known ahead of time.
+- Added a warning about automating user accounts to the usage guide in both GUI and CLI versions.
+- Added support for announcement (news) channels. You will now be able to see them in the list and export them.
+- Fixed various issues that resulted in exceptions during export process.
+- [HTML/TXT] Removed message count from the metadata. Due to the fact that the messages are exported as they are streamed, total number of messages is not known ahead of time.
+- [HTML] Changed default color of the embed color pill to match the theme.
+- [HTML] Changed emoji parser to be less greedy. As a result it should match fewer character sequences that look like emojis but really aren't, but on the other hand it might miss some actual emojis. This means that some standard emojis (i.e. not custom server emojis) may not look like in Discord. This is a compromise I'm willing to take because detecting emojis in text is really hard to get right and not worth it at all.
+- [HTML] Some other minor styling adjustments.
+- [CSV] Replaced semicolons (;) with (,) as separators.
+
+Please note that CSV export is most likely not going to receive future updates and will remain only as an option for those who wish to use it for text analysis. In other words, it won't contain any of the rich media features like embeds. If you're currently using CSV as a structured output to feed into your program, JSON output will replace that in the future.
+
+### v2.15 (15-Sep-2019)
+
+- Improved markdown parser and made it even faster for non-HTML formats.
+- [HTML] Added support for block quotes.
+- [HTML] Links pointing to a Discord message will now navigate to the linked message inside exported chat log if it's there.
+- [HTML] Updated light theme to match how it looks in Discord after recent changes.
+- [HTML] Added indication for when a message is pinned. Pinned messages now have a tinted background.
+- [HTML] Fixed an issue where multiline code blocks sometimes had incorrect formatting applied to them.
+- [TXT] Added indication for when a message is pinned. Pinned messages now have `(pinned)` next to timestamp and author.
+- [CSV] Added message author's user ID to output.
+- [GUI] Streamlined auto-update process a bit.
+- [GUI] Added some tooltips.
+
 ### v2.14 (15-Jun-2019)
 
 - [TXT] Added support for embeds.

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

@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Services;
+using DiscordChatExporter.Core.Services;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("export", Description = "Export a channel.")]
+    public class ExportChannelCommand : ExportCommandBase
+    {
+        [CommandOption("channel", 'c', IsRequired = true, Description= "Channel ID.")]
+        public string ChannelId { get; set; }
+
+        public ExportChannelCommand(SettingsService settingsService, DataService dataService, ExportService exportService)
+            : base(settingsService, dataService, exportService)
+        {
+        }
+
+        public override async Task ExecuteAsync(IConsole console) => await ExportAsync(console, ChannelId);
+    }
+}

DiscordChatExporter.Cli/Commands/ExportCommandBase.cs

@@ -0,0 +1,71 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Services;
+using CliFx.Utilities;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Services;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    public abstract class ExportCommandBase : TokenCommandBase
+    {
+        protected SettingsService SettingsService { get; }
+
+        protected ExportService ExportService { get; }
+
+        [CommandOption("format", 'f', Description = "Output file format.")]
+        public ExportFormat ExportFormat { get; set; } = ExportFormat.HtmlDark;
+
+        [CommandOption("output", 'o', Description = "Output file or directory path.")]
+        public string? OutputPath { get; set; }
+
+        [CommandOption("after", Description = "Limit to messages sent after this date.")]
+        public DateTimeOffset? After { get; set; }
+
+        [CommandOption("before", Description = "Limit to messages sent before this date.")]
+        public DateTimeOffset? Before { get; set; }
+
+        [CommandOption("partition", 'p', Description = "Split output into partitions limited to this number of messages.")]
+        public int? PartitionLimit { get; set; }
+
+        [CommandOption("dateformat", Description = "Date format used in output.")]
+        public string? DateFormat { get; set; }
+
+        protected ExportCommandBase(SettingsService settingsService, DataService dataService, ExportService exportService)
+            : base(dataService)
+        {
+            SettingsService = settingsService;
+            ExportService = exportService;
+        }
+
+        protected async Task ExportAsync(IConsole console, Guild guild, Channel channel)
+        {
+            if (!string.IsNullOrWhiteSpace(DateFormat))
+                SettingsService.DateFormat = DateFormat;
+
+            console.Output.Write($"Exporting channel [{channel.Name}]... ");
+            var progress = console.CreateProgressTicker();
+
+            var outputPath = OutputPath ?? Directory.GetCurrentDirectory();
+            await ExportService.ExportChatLogAsync(GetToken(), guild, channel,
+                outputPath, ExportFormat, PartitionLimit,
+                After, Before, progress);
+
+            console.Output.WriteLine();
+        }
+
+        protected async Task ExportAsync(IConsole console, Channel channel)
+        {
+            var guild = await DataService.GetGuildAsync(GetToken(), channel.GuildId);
+            await ExportAsync(console, guild, channel);
+        }
+
+        protected async Task ExportAsync(IConsole console, string channelId)
+        {
+            var channel = await DataService.GetChannelAsync(GetToken(), channelId);
+            await ExportAsync(console, channel);
+        }
+    }
+}

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -0,0 +1,50 @@
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Services;
+using DiscordChatExporter.Core.Models.Exceptions;
+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 ExportDirectMessagesCommand(SettingsService settingsService, DataService dataService, ExportService exportService)
+            : base(settingsService, dataService, exportService)
+        {
+        }
+
+        public override async Task ExecuteAsync(IConsole console)
+        {
+            // Get channels
+            var channels = await DataService.GetDirectMessageChannelsAsync(GetToken());
+
+            // Order channels
+            channels = channels.OrderBy(c => c.Name).ToArray();
+
+            // Loop through channels
+            foreach (var channel in channels)
+            {
+                try
+                {
+                    await ExportAsync(console, channel);
+                }
+                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
+                {
+                    console.Error.WriteLine("You don't have access to this channel.");
+                }
+                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
+                {
+                    console.Error.WriteLine("This channel doesn't exist.");
+                }
+                catch (DomainException ex)
+                {
+                    console.Error.WriteLine(ex.Message);
+                }
+            }
+        }
+    }
+}

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -0,0 +1,54 @@
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Services;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Models.Exceptions;
+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
+    {
+        [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
+        public string GuildId { get; set; }
+
+        public ExportGuildCommand(SettingsService settingsService, DataService dataService, ExportService exportService)
+            : base(settingsService, dataService, exportService)
+        {
+        }
+
+        public override async Task ExecuteAsync(IConsole console)
+        {
+            // Get channels
+            var channels = await DataService.GetGuildChannelsAsync(GetToken(), GuildId);
+
+            // Filter and order channels
+            channels = channels.Where(c => c.Type.IsExportable()).OrderBy(c => c.Name).ToArray();
+
+            // Loop through channels
+            foreach (var channel in channels)
+            {
+                try
+                {
+                    await ExportAsync(console, channel);
+                }
+                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
+                {
+                    console.Error.WriteLine("You don't have access to this channel.");
+                }
+                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
+                {
+                    console.Error.WriteLine("This channel doesn't exist.");
+                }
+                catch (DomainException ex)
+                {
+                    console.Error.WriteLine(ex.Message);
+                }
+            }
+        }
+    }
+}

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

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

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -0,0 +1,30 @@
+using System.Linq;
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Services;
+using DiscordChatExporter.Core.Services;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("dm", Description = "Get the list of direct message channels.")]
+    public class GetDirectMessageChannelsCommand : TokenCommandBase
+    {
+        public GetDirectMessageChannelsCommand(DataService dataService)
+            : base(dataService)
+        {
+        }
+
+        public override async Task ExecuteAsync(IConsole console)
+        {
+            // Get channels
+            var channels = await DataService.GetDirectMessageChannelsAsync(GetToken());
+
+            // Order channels
+            channels = channels.OrderBy(c => c.Name).ToArray();
+
+            // Print result
+            foreach (var channel in channels)
+                console.Output.WriteLine($"{channel.Id} | {channel.Name}");
+        }
+    }
+}

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

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

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -0,0 +1,54 @@
+using System;
+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)
+        {
+            console.WithForegroundColor(ConsoleColor.White, () => console.Output.WriteLine("To get user token:"));
+            console.Output.WriteLine(" 1. Open Discord");
+            console.Output.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
+            console.Output.WriteLine(" 3. Navigate to the Application tab");
+            console.Output.WriteLine(" 4. Select \"Local Storage\" > \"https://discordapp.com\" on the left");
+            console.Output.WriteLine(" 5. Press Ctrl+R to reload");
+            console.Output.WriteLine(" 6. Find \"token\" at the bottom and copy the value");
+            console.Output.WriteLine(" *  Automating user accounts is technically against TOS, use at your own risk.");
+            console.Output.WriteLine();
+
+            console.WithForegroundColor(ConsoleColor.White, () => console.Output.WriteLine("To get bot token:"));
+            console.Output.WriteLine(" 1. Go to Discord developer portal");
+            console.Output.WriteLine(" 2. Open your application's settings");
+            console.Output.WriteLine(" 3. Navigate to the Bot section on the left");
+            console.Output.WriteLine(" 4. Under Token click Copy");
+            console.Output.WriteLine();
+
+            console.WithForegroundColor(ConsoleColor.White, () => console.Output.WriteLine("To get guild ID or guild channel ID:"));
+            console.Output.WriteLine(" 1. Open Discord");
+            console.Output.WriteLine(" 2. Open Settings");
+            console.Output.WriteLine(" 3. Go to Appearance section");
+            console.Output.WriteLine(" 4. Enable Developer Mode");
+            console.Output.WriteLine(" 5. Right click on the desired guild or channel and click Copy ID");
+            console.Output.WriteLine();
+
+            console.WithForegroundColor(ConsoleColor.White, () => console.Output.WriteLine("To get direct message channel ID:"));
+            console.Output.WriteLine(" 1. Open Discord");
+            console.Output.WriteLine(" 2. Open the desired direct message channel");
+            console.Output.WriteLine(" 3. Press Ctrl+Shift+I to show developer tools");
+            console.Output.WriteLine(" 4. Navigate to the Console tab");
+            console.Output.WriteLine(" 5. Type \"window.location.href\" and press Enter");
+            console.Output.WriteLine(" 6. Copy the first long sequence of numbers inside the URL");
+            console.Output.WriteLine();
+
+            console.Output.WriteLine("If you still have unanswered questions, check out the wiki:");
+            console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");
+
+            return Task.CompletedTask;
+        }
+    }
+}

DiscordChatExporter.Cli/Commands/TokenCommandBase.cs

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

DiscordChatExporter.Cli/Container.cs

@@ -1,24 +0,0 @@
-using DiscordChatExporter.Core.Services;
-using StyletIoC;
-
-namespace DiscordChatExporter.Cli
-{
-    public static class Container
-    {
-        public static IContainer Instance { get; }
-
-        static Container()
-        {
-            var builder = new StyletIoCBuilder();
-
-            // Autobind the .Services assembly
-            builder.Autobind(typeof(DataService).Assembly);
-
-            // Bind settings as singleton
-            builder.Bind<SettingsService>().ToSelf().InSingletonScope();
-
-            // Set instance
-            Instance = builder.BuildContainer();
-        }
-    }
-}

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

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

DiscordChatExporter.Cli/Internal/InlineProgress.cs

@@ -1,47 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Cli.Internal
-{
-    internal class InlineProgress : IProgress<double>, IDisposable
-    {
-        private readonly int _posX;
-        private readonly int _posY;
-
-        private bool _isCompleted;
-
-        public InlineProgress()
-        {
-            // If output is not redirected - save initial cursor position
-            if (!Console.IsOutputRedirected)
-            {
-                _posX = Console.CursorLeft;
-                _posY = Console.CursorTop;
-            }
-        }
-
-        public void Report(double progress)
-        {
-            // If output is not redirected - reset cursor position and write progress
-            if (!Console.IsOutputRedirected)
-            {
-                Console.SetCursorPosition(_posX, _posY);
-                Console.WriteLine($"{progress:P1}");
-            }
-        }
-
-        public void ReportCompletion() => _isCompleted = true;
-
-        public void Dispose()
-        {
-            // If output is not redirected - reset cursor position
-            if (!Console.IsOutputRedirected)
-                Console.SetCursorPosition(_posX, _posY);
-
-            // Inform about completion
-            if (_isCompleted)
-                Console.WriteLine("Completed ✓");
-            else
-                Console.WriteLine("Failed X");
-        }
-    }
-}

DiscordChatExporter.Cli/Program.cs

@@ -1,80 +1,44 @@
 using System;
-using System.Linq;
-using CommandLine;
-using DiscordChatExporter.Cli.Verbs;
-using DiscordChatExporter.Cli.Verbs.Options;
+using System.Threading.Tasks;
+using CliFx;
+using DiscordChatExporter.Cli.Commands;
+using DiscordChatExporter.Core.Services;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DiscordChatExporter.Cli
 {
     public static class Program
     {
-        private static void PrintTokenHelp()
+        private static IServiceProvider ConfigureServices()
         {
-            Console.WriteLine("# To get user token:");
-            Console.WriteLine(" 1. Open Discord");
-            Console.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
-            Console.WriteLine(" 3. Navigate to the Application tab");
-            Console.WriteLine(" 4. Select \"Local Storage\" > \"https://discordapp.com\" on the left");
-            Console.WriteLine(" 5. Press Ctrl+R to reload");
-            Console.WriteLine(" 6. Find \"token\" at the bottom and copy the value");
-            Console.WriteLine();
-            Console.WriteLine("# To get bot token:");
-            Console.WriteLine(" 1. Go to Discord developer portal");
-            Console.WriteLine(" 2. Open your application's settings");
-            Console.WriteLine(" 3. Navigate to the Bot section on the left");
-            Console.WriteLine(" 4. Under Token click Copy");
-            Console.WriteLine();
-            Console.WriteLine("# To get guild ID or guild channel ID:");
-            Console.WriteLine(" 1. Open Discord");
-            Console.WriteLine(" 2. Open Settings");
-            Console.WriteLine(" 3. Go to Appearance section");
-            Console.WriteLine(" 4. Enable Developer Mode");
-            Console.WriteLine(" 5. Right click on the desired guild or channel and click Copy ID");
-            Console.WriteLine();
-            Console.WriteLine("# To get direct message channel ID:");
-            Console.WriteLine(" 1. Open Discord");
-            Console.WriteLine(" 2. Open the desired direct message channel");
-            Console.WriteLine(" 3. Press Ctrl+Shift+I to show developer tools");
-            Console.WriteLine(" 4. Navigate to the Console tab");
-            Console.WriteLine(" 5. Type \"window.location.href\" and press Enter");
-            Console.WriteLine(" 6. Copy the first long sequence of numbers inside the URL");
+            var services = new ServiceCollection();
+
+            // Register services
+            services.AddSingleton<DataService>();
+            services.AddSingleton<ExportService>();
+            services.AddSingleton<SettingsService>();
+
+            // Register commands
+            services.AddTransient<ExportChannelCommand>();
+            services.AddTransient<ExportDirectMessagesCommand>();
+            services.AddTransient<ExportGuildCommand>();
+            services.AddTransient<GetChannelsCommand>();
+            services.AddTransient<GetDirectMessageChannelsCommand>();
+            services.AddTransient<GetGuildsCommand>();
+            services.AddTransient<GuideCommand>();
+
+            return services.BuildServiceProvider();
         }
 
-        public static void Main(string[] args)
+        public static Task<int> Main(string[] args)
         {
-            // Get all verb types
-            var verbTypes = new[]
-            {
-                typeof(ExportChannelOptions),
-                typeof(ExportDirectMessagesOptions),
-                typeof(ExportGuildOptions),
-                typeof(GetChannelsOptions),
-                typeof(GetDirectMessageChannelsOptions),
-                typeof(GetGuildsOptions)
-            };
+            var serviceProvider = ConfigureServices();
 
-            // Parse command line arguments
-            var parsedArgs = Parser.Default.ParseArguments(args, verbTypes);
-
-            // Execute commands
-            parsedArgs.WithParsed<ExportChannelOptions>(o => new ExportChannelVerb(o).Execute());
-            parsedArgs.WithParsed<ExportDirectMessagesOptions>(o => new ExportDirectMessagesVerb(o).Execute());
-            parsedArgs.WithParsed<ExportGuildOptions>(o => new ExportGuildVerb(o).Execute());
-            parsedArgs.WithParsed<GetChannelsOptions>(o => new GetChannelsVerb(o).Execute());
-            parsedArgs.WithParsed<GetDirectMessageChannelsOptions>(o => new GetDirectMessageChannelsVerb(o).Execute());
-            parsedArgs.WithParsed<GetGuildsOptions>(o => new GetGuildsVerb(o).Execute());
-
-            // Show token help if help requested or no verb specified
-            parsedArgs.WithNotParsed(errs =>
-            {
-                var err = errs.First();
-
-                if (err.Tag == ErrorType.NoVerbSelectedError)
-                    PrintTokenHelp();
-
-                if (err.Tag == ErrorType.HelpVerbRequestedError && args.Length == 1)
-                    PrintTokenHelp();
-            });
+            return new CliApplicationBuilder()
+                .AddCommandsFromThisAssembly()
+                .UseCommandFactory(schema => (ICommand) serviceProvider.GetService(schema.Type))
+                .Build()
+                .RunAsync(args);
         }
     }
 }

DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs

@@ -1,58 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Internal;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Helpers;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class ExportChannelVerb : Verb<ExportChannelOptions>
-    {
-        public ExportChannelVerb(ExportChannelOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get services
-            var settingsService = Container.Instance.Get<SettingsService>();
-            var dataService = Container.Instance.Get<DataService>();
-            var exportService = Container.Instance.Get<ExportService>();
-
-            // Configure settings
-            if (!Options.DateFormat.IsNullOrWhiteSpace())
-                settingsService.DateFormat = Options.DateFormat;
-
-            // Track progress
-            Console.Write($"Exporting channel [{Options.ChannelId}]... ");
-            using (var progress = new InlineProgress())
-            {
-                // Get chat log
-                var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), Options.ChannelId,
-                    Options.After, Options.Before, progress);
-
-                // Generate file path if not set or is a directory
-                var filePath = Options.OutputPath;
-                if (filePath.IsNullOrWhiteSpace() || ExportHelper.IsDirectoryPath(filePath))
-                {
-                    // Generate default file name
-                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                        chatLog.Channel, Options.After, Options.Before);
-
-                    // Combine paths
-                    filePath = Path.Combine(filePath ?? "", fileName);
-                }
-
-                // Export
-                await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-
-                // Report successful completion
-                progress.ReportCompletion();
-            }
-        }
-    }
-}

DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs

@@ -1,78 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Internal;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Exceptions;
-using DiscordChatExporter.Core.Services.Helpers;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class ExportDirectMessagesVerb : Verb<ExportDirectMessagesOptions>
-    {
-        public ExportDirectMessagesVerb(ExportDirectMessagesOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get services
-            var settingsService = Container.Instance.Get<SettingsService>();
-            var dataService = Container.Instance.Get<DataService>();
-            var exportService = Container.Instance.Get<ExportService>();
-
-            // Configure settings
-            if (!Options.DateFormat.IsNullOrWhiteSpace())
-                settingsService.DateFormat = Options.DateFormat;
-
-            // Get channels
-            var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
-
-            // Order channels
-            channels = channels.OrderBy(c => c.Name).ToArray();
-
-            // Loop through channels
-            foreach (var channel in channels)
-            {
-                try
-                {
-                    // Track progress
-                    Console.Write($"Exporting channel [{channel.Name}]... ");
-                    using (var progress = new InlineProgress())
-                    {
-                        // Get chat log
-                        var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
-                            Options.After, Options.Before, progress);
-
-                        // Generate default file name
-                        var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                            chatLog.Channel, Options.After, Options.Before);
-
-                        // Generate file path
-                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
-
-                        // Export
-                        await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat,
-                            Options.PartitionLimit);
-
-                        // Report successful completion
-                        progress.ReportCompletion();
-                    }
-                }
-                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");
-                }
-            }
-        }
-    }
-}

DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs

@@ -1,79 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Internal;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Exceptions;
-using DiscordChatExporter.Core.Services.Helpers;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class ExportGuildVerb : Verb<ExportGuildOptions>
-    {
-        public ExportGuildVerb(ExportGuildOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get services
-            var settingsService = Container.Instance.Get<SettingsService>();
-            var dataService = Container.Instance.Get<DataService>();
-            var exportService = Container.Instance.Get<ExportService>();
-
-            // Configure settings
-            if (!Options.DateFormat.IsNullOrWhiteSpace())
-                settingsService.DateFormat = Options.DateFormat;
-
-            // Get channels
-            var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
-
-            // Filter and order channels
-            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
-
-            // Loop through channels
-            foreach (var channel in channels)
-            {
-                try
-                {
-                    // Track progress
-                    Console.Write($"Exporting channel [{channel.Name}]... ");
-                    using (var progress = new InlineProgress())
-                    {
-                        // Get chat log
-                        var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
-                            Options.After, Options.Before, progress);
-
-                        // Generate default file name
-                        var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                            chatLog.Channel, Options.After, Options.Before);
-
-                        // Generate file path
-                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
-
-                        // Export
-                        await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat,
-                            Options.PartitionLimit);
-
-                        // Report successful completion
-                        progress.ReportCompletion();
-                    }
-                }
-                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");
-                }
-            }
-        }
-    }
-}

DiscordChatExporter.Cli/Verbs/GetChannelsVerb.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class GetChannelsVerb : Verb<GetChannelsOptions>
-    {
-        public GetChannelsVerb(GetChannelsOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get data service
-            var dataService = Container.Instance.Get<DataService>();
-
-            // Get channels
-            var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
-
-            // Filter and order channels
-            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
-
-            // Print result
-            foreach (var channel in channels)
-                Console.WriteLine($"{channel.Id} | {channel.Name}");
-        }
-    }
-}

DiscordChatExporter.Cli/Verbs/GetDirectMessageChannelsVerb.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class GetDirectMessageChannelsVerb : Verb<GetDirectMessageChannelsOptions>
-    {
-        public GetDirectMessageChannelsVerb(GetDirectMessageChannelsOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get data service
-            var dataService = Container.Instance.Get<DataService>();
-
-            // Get channels
-            var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
-
-            // Order channels
-            channels = channels.OrderBy(c => c.Name).ToArray();
-
-            // Print result
-            foreach (var channel in channels)
-                Console.WriteLine($"{channel.Id} | {channel.Name}");
-        }
-    }
-}

DiscordChatExporter.Cli/Verbs/GetGuildsVerb.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Services;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public class GetGuildsVerb : Verb<GetGuildsOptions>
-    {
-        public GetGuildsVerb(GetGuildsOptions options)
-            : base(options)
-        {
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            // Get data service
-            var dataService = Container.Instance.Get<DataService>();
-
-            // Get guilds
-            var guilds = await dataService.GetUserGuildsAsync(Options.GetToken());
-
-            // Order guilds
-            guilds = guilds.OrderBy(g => g.Name).ToArray();
-
-            // Print result
-            foreach (var guild in guilds)
-                Console.WriteLine($"{guild.Id} | {guild.Name}");
-        }
-    }
-}

DiscordChatExporter.Cli/Verbs/Options/ExportChannelOptions.cs

@@ -1,11 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("export", HelpText = "Export channel.")]
-    public class ExportChannelOptions : ExportOptions
-    {
-        [Option('c', "channel", Required = true, HelpText = "Channel ID.")]
-        public string ChannelId { get; set; }
-    }
-}

DiscordChatExporter.Cli/Verbs/Options/ExportDirectMessagesOptions.cs

@@ -1,9 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("exportdm", HelpText = "Export all direct message channels.")]
-    public class ExportDirectMessagesOptions : ExportOptions
-    {
-    }
-}

DiscordChatExporter.Cli/Verbs/Options/ExportGuildOptions.cs

@@ -1,11 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("exportguild", HelpText = "Export all channels within a given guild.")]
-    public class ExportGuildOptions : ExportOptions
-    {
-        [Option('g', "guild", Required = true, HelpText = "Guild ID.")]
-        public string GuildId { get; set; }
-    }
-}

DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs

@@ -1,29 +0,0 @@
-using System;
-using CommandLine;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    public abstract class ExportOptions : TokenOptions
-    {
-        [Option('f', "format", Default = ExportFormat.HtmlDark, HelpText = "Output file format.")]
-        public ExportFormat ExportFormat { get; set; }
-
-        [Option('o', "output", Default = null, HelpText = "Output file or directory path.")]
-        public string OutputPath { get; set; }
-
-        // HACK: CommandLineParser doesn't support DateTimeOffset
-        [Option("after", Default = null, HelpText = "Limit to messages sent after this date.")]
-        public DateTime? After { get; set; }
-
-        // HACK: CommandLineParser doesn't support DateTimeOffset
-        [Option("before", Default = null, HelpText = "Limit to messages sent before this date.")]
-        public DateTime? Before { get; set; }
-
-        [Option('p', "partition", Default = null, HelpText = "Split output into partitions limited to this number of messages.")]
-        public int? PartitionLimit { get; set; }
-
-        [Option("dateformat", Default = null, HelpText = "Date format used in output.")]
-        public string DateFormat { get; set; }
-    }
-}

DiscordChatExporter.Cli/Verbs/Options/GetChannelsOptions.cs

@@ -1,11 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("channels", HelpText = "Get the list of channels in the given guild.")]
-    public class GetChannelsOptions : TokenOptions
-    {
-        [Option('g', "guild", Required = true, HelpText = "Guild ID.")]
-        public string GuildId { get; set; }
-    }
-}

DiscordChatExporter.Cli/Verbs/Options/GetDirectMessageChannelsOptions.cs

@@ -1,9 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("dm", HelpText = "Get the list of direct message channels.")]
-    public class GetDirectMessageChannelsOptions : TokenOptions
-    {
-    }
-}

DiscordChatExporter.Cli/Verbs/Options/GetGuildsOptions.cs

@@ -1,9 +0,0 @@
-using CommandLine;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    [Verb("guilds", HelpText = "Get the list of accessible guilds.")]
-    public class GetGuildsOptions : TokenOptions
-    {
-    }
-}

DiscordChatExporter.Cli/Verbs/Options/TokenOptions.cs

@@ -1,16 +0,0 @@
-using CommandLine;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Cli.Verbs.Options
-{
-    public abstract class TokenOptions
-    {
-        [Option('t', "token", Required = true, HelpText = "Authorization token.")]
-        public string TokenValue { get; set; }
-
-        [Option('b', "bot", Default = false, HelpText = "Whether this authorization token belongs to a bot.")]
-        public bool IsBotToken { get; set; }
-
-        public AuthToken GetToken() => new AuthToken(IsBotToken ? AuthTokenType.Bot : AuthTokenType.User, TokenValue);
-    }
-}

DiscordChatExporter.Cli/Verbs/Verb.cs

@@ -1,18 +0,0 @@
-using System.Threading.Tasks;
-
-namespace DiscordChatExporter.Cli.Verbs
-{
-    public abstract class Verb<TOptions>
-    {
-        protected TOptions Options { get; }
-
-        protected Verb(TOptions options)
-        {
-            Options = options;
-        }
-
-        public abstract Task ExecuteAsync();
-
-        public virtual void Execute() => ExecuteAsync().GetAwaiter().GetResult();
-    }
-}

DiscordChatExporter.Core.Markdown/Ast/EmojiNode.cs

@@ -0,0 +1,27 @@
+namespace DiscordChatExporter.Core.Markdown.Ast
+{
+    public class EmojiNode : Node
+    {
+        public string? Id { get; }
+
+        public string Name { get; }
+
+        public bool IsAnimated { get; }
+
+        public bool IsCustomEmoji => !string.IsNullOrWhiteSpace(Id);
+
+        public EmojiNode(string? id, string name, bool isAnimated)
+        {
+            Id = id;
+            Name = name;
+            IsAnimated = isAnimated;
+        }
+
+        public EmojiNode(string name)
+            : this(null, name, false)
+        {
+        }
+
+        public override string ToString() => $"<Emoji> {Name}";
+    }
+}

DiscordChatExporter.Core.Markdown/Ast/FormattedNode.cs

@@ -1,19 +1,15 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class FormattedNode : Node
     {
-        public string Token { get; }
-
         public TextFormatting Formatting { get; }
 
         public IReadOnlyList<Node> Children { get; }
 
-        public FormattedNode(string source, string token, TextFormatting formatting, IReadOnlyList<Node> children)
-            : base(source)
+        public FormattedNode(TextFormatting formatting, IReadOnlyList<Node> children)
         {
-            Token = token;
             Formatting = formatting;
             Children = children;
         }

DiscordChatExporter.Core.Markdown/Ast/InlineCodeBlockNode.cs

@@ -1,11 +1,10 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class InlineCodeBlockNode : Node
     {
         public string Code { get; }
 
-        public InlineCodeBlockNode(string source, string code)
-            : base(source)
+        public InlineCodeBlockNode(string code)
         {
             Code = code;
         }

DiscordChatExporter.Core.Markdown/Ast/LinkNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class LinkNode : Node
     {
@@ -6,14 +6,14 @@
 
         public string Title { get; }
 
-        public LinkNode(string source, string url, string title)
-            : base(source)
+        public LinkNode(string url, string title)
         {
             Url = url;
             Title = title;
         }
 
-        public LinkNode(string source, string url) : this(source, url, url)
+        public LinkNode(string url)
+            : this(url, url)
         {
         }
 

DiscordChatExporter.Core.Markdown/Ast/MentionNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     public class MentionNode : Node
     {
@@ -6,8 +6,7 @@
 
         public MentionType Type { get; }
 
-        public MentionNode(string source, string id, MentionType type)
-            : base(source)
+        public MentionNode(string id, MentionType type)
         {
             Id = id;
             Type = type;

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,13 +1,12 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
-    public class MultilineCodeBlockNode : Node
+    public class MultiLineCodeBlockNode : Node
     {
         public string Language { get; }
 
         public string Code { get; }
 
-        public MultilineCodeBlockNode(string source, string language, string code)
-            : base(source)
+        public MultiLineCodeBlockNode(string language, string code)
         {
             Language = language;
             Code = code;

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
     {
@@ -6,6 +6,7 @@
         Italic,
         Underline,
         Strikethrough,
-        Spoiler
+        Spoiler,
+        Quote
     }
 }

DiscordChatExporter.Core.Markdown/Ast/TextNode.cs

@@ -0,0 +1,14 @@
+namespace DiscordChatExporter.Core.Markdown.Ast
+{
+    public class TextNode : Node
+    {
+        public string Text { get; }
+
+        public TextNode(string text)
+        {
+            Text = text;
+        }
+
+        public override string ToString() => Text;
+    }
+}

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,27 +16,27 @@ namespace DiscordChatExporter.Core.Markdown.Internal
         {
         }
 
-        public ParsedMatch<T> Match(string input, int startIndex, int length)
+        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)
             {
                 // Try to match
-                var match = matcher.Match(input, startIndex, length);
+                var match = matcher.Match(stringPart);
 
                 // If there's no match - continue
                 if (match == null)
                     continue;
 
                 // If this match is earlier than previous earliest - replace
-                if (earliestMatch == null || match.StartIndex < earliestMatch.StartIndex)
+                if (earliestMatch == null || match.StringPart.StartIndex < earliestMatch.StringPart.StartIndex)
                     earliestMatch = match;
 
                 // If the earliest match starts at the very beginning - break,
                 // because it's impossible to find a match earlier than that
-                if (earliestMatch.StartIndex == startIndex)
+                if (earliestMatch.StringPart.StartIndex == stringPart.StartIndex)
                     break;
             }
 

DiscordChatExporter.Core.Markdown/Internal/Extensions.cs

@@ -5,46 +5,40 @@ namespace DiscordChatExporter.Core.Markdown.Internal
 {
     internal static class Extensions
     {
-        public static IEnumerable<ParsedMatch<T>> MatchAll<T>(this IMatcher<T> matcher, string input,
-            int startIndex, int length, Func<string, T> fallbackTransform)
+        public static IEnumerable<ParsedMatch<T>> MatchAll<T>(this IMatcher<T> matcher, StringPart stringPart,
+            Func<StringPart, T> fallbackTransform)
         {
-            // Get end index for simplicity
-            var endIndex = startIndex + length;
-
             // Loop through segments divided by individual matches
-            var currentIndex = startIndex;
-            while (currentIndex < endIndex)
+            var currentIndex = stringPart.StartIndex;
+            while (currentIndex < stringPart.EndIndex)
             {
                 // Find a match within this segment
-                var match = matcher.Match(input, currentIndex, endIndex - currentIndex);
+                var match = matcher.Match(stringPart.Slice(currentIndex, stringPart.EndIndex - currentIndex));
 
                 // If there's no match - break
                 if (match == null)
                     break;
 
                 // If this match doesn't start immediately at current index - transform and yield fallback first
-                if (match.StartIndex > currentIndex)
+                if (match.StringPart.StartIndex > currentIndex)
                 {
-                    var fallback = input.Substring(currentIndex, match.StartIndex - currentIndex);
-                    yield return new ParsedMatch<T>(currentIndex, fallback.Length, fallbackTransform(fallback));
+                    var fallbackPart = stringPart.Slice(currentIndex, match.StringPart.StartIndex - currentIndex);
+                    yield return new ParsedMatch<T>(fallbackPart, fallbackTransform(fallbackPart));
                 }
 
                 // Yield match
                 yield return match;
 
                 // Shift current index to the end of the match
-                currentIndex = match.StartIndex + match.Length;
+                currentIndex = match.StringPart.StartIndex + match.StringPart.Length;
             }
 
             // If EOL wasn't reached - transform and yield remaining part as fallback
-            if (currentIndex < endIndex)
+            if (currentIndex < stringPart.EndIndex)
             {
-                var fallback = input.Substring(currentIndex);
-                yield return new ParsedMatch<T>(currentIndex, fallback.Length, fallbackTransform(fallback));
+                var fallbackPart = stringPart.Slice(currentIndex);
+                yield return new ParsedMatch<T>(fallbackPart, fallbackTransform(fallbackPart));
             }
         }
-
-        public static IEnumerable<ParsedMatch<T>> MatchAll<T>(this IMatcher<T> matcher, string input,
-            Func<string, T> fallbackTransform) => matcher.MatchAll(input, 0, input.Length, fallbackTransform);
     }
 }

DiscordChatExporter.Core.Markdown/Internal/IMatcher.cs

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

DiscordChatExporter.Core.Markdown/Internal/ParsedMatch.cs

@@ -2,16 +2,13 @@
 {
     internal class ParsedMatch<T>
     {
-        public int StartIndex { get; }
-
-        public int Length { get; }
+        public StringPart StringPart { get; }
 
         public T Value { get; }
 
-        public ParsedMatch(int startIndex, int length, T value)
+        public ParsedMatch(StringPart stringPart, T value)
         {
-            StartIndex = startIndex;
-            Length = length;
+            StringPart = stringPart;
             Value = value;
         }
     }

DiscordChatExporter.Core.Markdown/Internal/RegexMatcher.cs

@@ -6,18 +6,35 @@ namespace DiscordChatExporter.Core.Markdown.Internal
     internal class RegexMatcher<T> : IMatcher<T>
     {
         private readonly Regex _regex;
-        private readonly Func<Match, T> _transform;
+        private readonly Func<StringPart, Match, T> _transform;
 
-        public RegexMatcher(Regex regex, Func<Match, T> transform)
+        public RegexMatcher(Regex regex, Func<StringPart, Match, T> transform)
         {
             _regex = regex;
             _transform = transform;
         }
 
-        public ParsedMatch<T> Match(string input, int startIndex, int length)
+        public RegexMatcher(Regex regex, Func<Match, T> transform)
+            : this(regex, (p, m) => transform(m))
         {
-            var match = _regex.Match(input, startIndex, length);
-            return match.Success ? new ParsedMatch<T>(match.Index, match.Length, _transform(match)) : null;
+        }
+
+        public ParsedMatch<T>? Match(StringPart stringPart)
+        {
+            var match = _regex.Match(stringPart.Target, stringPart.StartIndex, stringPart.Length);
+            if (!match.Success)
+                return null;
+
+            // Overload regex.Match(string, int, int) doesn't take the whole string into account,
+            // it effectively functions as a match check on a substring.
+            // Which is super weird because regex.Match(string, int) takes the whole input in context.
+            // So in order to properly account for ^/$ regex tokens, we need to make sure that
+            // the expression also matches on the bigger part of the input.
+            if (!_regex.IsMatch(stringPart.Target.Substring(0, stringPart.EndIndex), stringPart.StartIndex))
+                return null;
+
+            var stringPartMatch = stringPart.Slice(match.Index, match.Length);
+            return new ParsedMatch<T>(stringPartMatch, _transform(stringPartMatch, match));
         }
     }
 }

DiscordChatExporter.Core.Markdown/Internal/StringMatcher.cs

@@ -6,24 +6,31 @@ namespace DiscordChatExporter.Core.Markdown.Internal
     {
         private readonly string _needle;
         private readonly StringComparison _comparison;
-        private readonly Func<string, T> _transform;
+        private readonly Func<StringPart, T> _transform;
 
-        public StringMatcher(string needle, StringComparison comparison, Func<string, T> transform)
+        public StringMatcher(string needle, StringComparison comparison, Func<StringPart, T> transform)
         {
             _needle = needle;
             _comparison = comparison;
             _transform = transform;
         }
 
-        public StringMatcher(string needle, Func<string, T> transform)
+        public StringMatcher(string needle, Func<StringPart, T> transform)
             : this(needle, StringComparison.Ordinal, transform)
         {
         }
 
-        public ParsedMatch<T> Match(string input, int startIndex, int length)
+        public ParsedMatch<T>? Match(StringPart stringPart)
         {
-            var index = input.IndexOf(_needle, startIndex, length, _comparison);
-            return index >= 0 ? new ParsedMatch<T>(index, _needle.Length, _transform(_needle)) : null;
+            var index = stringPart.Target.IndexOf(_needle, stringPart.StartIndex, stringPart.Length, _comparison);
+
+            if (index >= 0)
+            {
+                var stringPartMatch = stringPart.Slice(index, _needle.Length);
+                return new ParsedMatch<T>(stringPartMatch, _transform(stringPartMatch));
+            }
+
+            return null;
         }
     }
 }

DiscordChatExporter.Core.Markdown/Internal/StringPart.cs

@@ -0,0 +1,36 @@
+using System.Text.RegularExpressions;
+
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    internal readonly struct StringPart
+    {
+        public string Target { get; }
+
+        public int StartIndex { get; }
+
+        public int Length { get; }
+
+        public int EndIndex { get; }
+
+        public StringPart(string target, int startIndex, int length)
+        {
+            Target = target;
+            StartIndex = startIndex;
+            Length = length;
+            EndIndex = startIndex + length;
+        }
+
+        public StringPart(string target)
+            : this(target, 0, target.Length)
+        {
+        }
+
+        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,136 +1,147 @@
 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
 {
     // The following parsing logic is meant to replicate Discord's markdown grammar as close as possible
     public static class MarkdownParser
     {
-        private const RegexOptions DefaultRegexOptions = RegexOptions.Compiled | RegexOptions.CultureInvariant;
+        private const RegexOptions DefaultRegexOptions = RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.Multiline;
 
         /* Formatting */
 
         // 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),
-            m => new FormattedNode(m.Value, "**", TextFormatting.Bold, Parse(m.Groups[1].Value)));
+            (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),
-            m => new FormattedNode(m.Value, "*", TextFormatting.Italic, Parse(m.Groups[1].Value)));
+            (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),
-            m => new FormattedNode(m.Value, "*", TextFormatting.Italic, Parse(m.Groups[1].Value, 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),
-            m => new FormattedNode(m.Value, "_", TextFormatting.Italic, Parse(m.Groups[1].Value)));
+            (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),
-            m => new FormattedNode(m.Value, "__", TextFormatting.Underline, Parse(m.Groups[1].Value)));
+            (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),
-            m => new FormattedNode(m.Value, "_", TextFormatting.Italic, Parse(m.Groups[1].Value, 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),
-            m => new FormattedNode(m.Value, "~~", TextFormatting.Strikethrough, Parse(m.Groups[1].Value)));
+            (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),
-            m => new FormattedNode(m.Value, "||", TextFormatting.Spoiler, Parse(m.Groups[1].Value)));
+            (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.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.Slice(m.Groups[1]))));
 
         /* Code blocks */
 
         // Capture any character except backtick until a backtick
-        // Whitespace surrounding content inside backticks is trimmed
+        // Blank lines at the beginning and end of content are trimmed
         private static readonly IMatcher<Node> InlineCodeBlockNodeMatcher = new RegexMatcher<Node>(
             new Regex("`([^`]+)`", DefaultRegexOptions | RegexOptions.Singleline),
-            m => new InlineCodeBlockNode(m.Value, m.Groups[1].Value.Trim()));
+            m => new InlineCodeBlockNode(m.Groups[1].Value.Trim('\r', '\n')));
 
         // Capture language identifier and then any character until the earliest triple backtick
-        // Languge identifier is one word immediately after opening backticks, followed immediately by newline
-        // Whitespace surrounding content inside backticks is trimmed
-        private static readonly IMatcher<Node> MultilineCodeBlockNodeMatcher = new RegexMatcher<Node>(
+        // Language identifier is one word immediately after opening backticks, followed immediately by newline
+        // Blank lines at the beginning and end of content are trimmed
+        private static readonly IMatcher<Node> MultiLineCodeBlockNodeMatcher = new RegexMatcher<Node>(
             new Regex("```(?:(\\w*)\\n)?(.+?)```", DefaultRegexOptions | RegexOptions.Singleline),
-            m => new MultilineCodeBlockNode(m.Value, m.Groups[1].Value, m.Groups[2].Value.Trim()));
+            m => new MultiLineCodeBlockNode(m.Groups[1].Value, m.Groups[2].Value.Trim('\r', '\n')));
 
         /* Mentions */
 
         // Capture @everyone
         private static readonly IMatcher<Node> EveryoneMentionNodeMatcher = new StringMatcher<Node>(
             "@everyone",
-            s => new MentionNode(s, "everyone", MentionType.Meta));
+            p => new MentionNode("everyone", MentionType.Meta));
 
         // Capture @here
         private static readonly IMatcher<Node> HereMentionNodeMatcher = new StringMatcher<Node>(
             "@here",
-            s => new MentionNode(s, "here", MentionType.Meta));
+            p => new MentionNode("here", MentionType.Meta));
 
         // Capture <@123456> or <@!123456>
         private static readonly IMatcher<Node> UserMentionNodeMatcher = new RegexMatcher<Node>(
             new Regex("<@!?(\\d+)>", DefaultRegexOptions),
-            m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.User));
+            m => new MentionNode(m.Groups[1].Value, MentionType.User));
 
         // Capture <#123456>
         private static readonly IMatcher<Node> ChannelMentionNodeMatcher = new RegexMatcher<Node>(
             new Regex("<#(\\d+)>", DefaultRegexOptions),
-            m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Channel));
+            m => new MentionNode(m.Groups[1].Value, MentionType.Channel));
 
         // Capture <@&123456>
         private static readonly IMatcher<Node> RoleMentionNodeMatcher = new RegexMatcher<Node>(
             new Regex("<@&(\\d+)>", DefaultRegexOptions),
-            m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Role));
+            m => new MentionNode(m.Groups[1].Value, MentionType.Role));
 
         /* 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),
-            m => new EmojiNode(m.Value, m.Groups[1].Value));
+            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.Value, 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 */
 
         // Capture [title](link)
         private static readonly IMatcher<Node> TitledLinkNodeMatcher = new RegexMatcher<Node>(
             new Regex("\\[(.+?)\\]\\((.+?)\\)", DefaultRegexOptions),
-            m => new LinkNode(m.Value, m.Groups[2].Value, m.Groups[1].Value));
+            m => new LinkNode(m.Groups[2].Value, m.Groups[1].Value));
 
         // Capture any non-whitespace character after http:// or https:// until the last punctuation character or whitespace
         private static readonly IMatcher<Node> AutoLinkNodeMatcher = new RegexMatcher<Node>(
             new Regex("(https?://\\S*[^\\.,:;\"\'\\s])", DefaultRegexOptions),
-            m => new LinkNode(m.Value, m.Groups[1].Value));
+            m => new LinkNode(m.Groups[1].Value));
 
         // Same as auto link but also surrounded by angular brackets
         private static readonly IMatcher<Node> HiddenLinkNodeMatcher = new RegexMatcher<Node>(
             new Regex("<(https?://\\S*[^\\.,:;\"\'\\s])>", DefaultRegexOptions),
-            m => new LinkNode(m.Value, m.Groups[1].Value));
+            m => new LinkNode(m.Groups[1].Value));
 
         /* Text */
 
@@ -138,25 +149,25 @@ namespace DiscordChatExporter.Core.Markdown
         // This escapes it from matching for formatting
         private static readonly IMatcher<Node> ShrugTextNodeMatcher = new StringMatcher<Node>(
             @"¯\_(ツ)_/¯",
-            s => new TextNode(s));
+            p => new TextNode(p.ToString()));
 
         // Capture some specific emojis that don't get rendered
         // This escapes it from matching for emoji
         private static readonly IMatcher<Node> IgnoredEmojiTextNodeMatcher = new RegexMatcher<Node>(
             new Regex("(\\u26A7|\\u2640|\\u2642|\\u2695|\\u267E|\\u00A9|\\u00AE|\\u2122)", DefaultRegexOptions),
-            m => new TextNode(m.Value, m.Groups[1].Value));
+            m => new TextNode(m.Groups[1].Value));
 
         // Capture any "symbol/other" character or surrogate pair preceded by a backslash
         // This escapes it from matching for emoji
         private static readonly IMatcher<Node> EscapedSymbolTextNodeMatcher = new RegexMatcher<Node>(
             new Regex("\\\\(\\p{So}|\\p{Cs}{2})", DefaultRegexOptions),
-            m => new TextNode(m.Value, m.Groups[1].Value));
+            m => new TextNode(m.Groups[1].Value));
 
         // Capture any non-whitespace, non latin alphanumeric character preceded by a backslash
         // This escapes it from matching for formatting or other tokens
         private static readonly IMatcher<Node> EscapedCharacterTextNodeMatcher = new RegexMatcher<Node>(
             new Regex("\\\\([^a-zA-Z0-9\\s])", DefaultRegexOptions),
-            m => new TextNode(m.Value, m.Groups[1].Value));
+            m => new TextNode(m.Groups[1].Value));
 
         // Combine all matchers into one
         // Matchers that have similar patterns are ordered from most specific to least specific
@@ -176,9 +187,11 @@ namespace DiscordChatExporter.Core.Markdown
             ItalicAltFormattedNodeMatcher,
             StrikethroughFormattedNodeMatcher,
             SpoilerFormattedNodeMatcher,
+            MultiLineQuoteNodeMatcher,
+            SingleLineQuoteNodeMatcher,
 
             // Code blocks
-            MultilineCodeBlockNodeMatcher,
+            MultiLineCodeBlockNodeMatcher,
             InlineCodeBlockNodeMatcher,
 
             // Mentions
@@ -197,9 +210,27 @@ namespace DiscordChatExporter.Core.Markdown
             StandardEmojiNodeMatcher,
             CustomEmojiNodeMatcher);
 
-        private static IReadOnlyList<Node> Parse(string input, IMatcher<Node> matcher) =>
-            matcher.MatchAll(input, s => new TextNode(s)).Select(r => r.Value).ToArray();
+        // Minimal set of matchers for non-multimedia formats (e.g. plain text)
+        private static readonly IMatcher<Node> MinimalAggregateNodeMatcher = new AggregateMatcher<Node>(
+            // Mentions
+            EveryoneMentionNodeMatcher,
+            HereMentionNodeMatcher,
+            UserMentionNodeMatcher,
+            ChannelMentionNodeMatcher,
+            RoleMentionNodeMatcher,
 
-        public static IReadOnlyList<Node> Parse(string input) => Parse(input, AggregateNodeMatcher);
+            // Emoji
+            CustomEmojiNodeMatcher);
+
+        private static IReadOnlyList<Node> Parse(StringPart stringPart, IMatcher<Node> matcher) =>
+            matcher.MatchAll(stringPart, p => new TextNode(p.ToString())).Select(r => r.Value).ToArray();
+
+        private static IReadOnlyList<Node> Parse(StringPart stringPart) => Parse(stringPart, AggregateNodeMatcher);
+
+        private static IReadOnlyList<Node> ParseMinimal(StringPart stringPart) => Parse(stringPart, MinimalAggregateNodeMatcher);
+
+        public static IReadOnlyList<Node> Parse(string input) => Parse(new StringPart(input));
+
+        public static IReadOnlyList<Node> ParseMinimal(string input) => ParseMinimal(new StringPart(input));
     }
 }

DiscordChatExporter.Core.Markdown/Nodes/EmojiNode.cs

@@ -1,30 +0,0 @@
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Markdown.Nodes
-{
-    public class EmojiNode : Node
-    {
-        public string Id { get; }
-
-        public string Name { get; }
-
-        public bool IsAnimated { get; }
-
-        public bool IsCustomEmoji => !Id.IsNullOrWhiteSpace();
-
-        public EmojiNode(string source, string id, string name, bool isAnimated)
-            : base(source)
-        {
-            Id = id;
-            Name = name;
-            IsAnimated = isAnimated;
-        }
-
-        public EmojiNode(string source, string name)
-            : this(source, null, name, false)
-        {
-        }
-
-        public override string ToString() => $"<Emoji> {Name}";
-    }
-}

DiscordChatExporter.Core.Markdown/Nodes/Node.cs

@@ -1,12 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
-{
-    public abstract class Node
-    {
-        public string Source { get; }
-
-        protected Node(string source)
-        {
-            Source = source;
-        }
-    }
-}

DiscordChatExporter.Core.Markdown/Nodes/TextNode.cs

@@ -1,19 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
-{
-    public class TextNode : Node
-    {
-        public string Text { get; }
-
-        public TextNode(string source, string text)
-            : base(source)
-        {
-            Text = text;
-        }
-
-        public TextNode(string text) : this(text, text)
-        {
-        }
-
-        public override string ToString() => Text;
-    }
-}

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

@@ -4,32 +4,31 @@ 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",
+                _ => 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 => "Plain Text",
+                ExportFormat.HtmlDark => "HTML (Dark)",
+                ExportFormat.HtmlLight => "HTML (Light)",
+                ExportFormat.Csv => "Comma Separated Values (CSV)",
+                _ => throw new ArgumentOutOfRangeException(nameof(format))
+            };
     }
 }

DiscordChatExporter.Core.Models/FileSize.cs

@@ -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,20 +1,18 @@
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Models
+namespace DiscordChatExporter.Core.Models
 {
-    // https://discordapp.com/developers/docs/resources/guild#guild-object
+    // https://discordapp.string.IsNullOrWhiteSpace(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 string IconUrl { get; }
 
-        public Guild(string id, string name, string iconHash)
+        public Guild(string id, string name, string? iconHash)
         {
             Id = id;
             Name = name;
@@ -28,9 +26,9 @@ namespace DiscordChatExporter.Core.Models
 
     public partial class Guild
     {
-        public static string GetIconUrl(string id, string iconHash)
+        public static string GetIconUrl(string id, string? iconHash)
         {
-            return !iconHash.IsNullOrWhiteSpace()
+            return !string.IsNullOrWhiteSpace(iconHash)
                 ? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png"
                 : "https://cdn.discordapp.com/embed/avatars/0.png";
         }

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/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,9 +31,11 @@ namespace DiscordChatExporter.Core.Models
 
         public IReadOnlyList<User> MentionedUsers { 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)
+        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;
@@ -39,6 +43,7 @@ namespace DiscordChatExporter.Core.Models
             Author = author;
             Timestamp = timestamp;
             EditedTimestamp = editedTimestamp;
+            IsPinned = isPinned;
             Content = content;
             Attachments = attachments;
             Embeds = embeds;
@@ -46,6 +51,6 @@ namespace DiscordChatExporter.Core.Models
             MentionedUsers = mentionedUsers;
         }
 
-        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

@@ -2,7 +2,7 @@
 {
     // https://discordapp.com/developers/docs/topics/permissions#role-object
 
-    public partial class Role
+    public partial class Role : IHasId
     {
         public string Id { get; }
 

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,117 +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)
-        {
-            // Formatted node
-            if (node is FormattedNode formattedNode)
-            {
-                // Recursively get inner text
-                var innerText = FormatMarkdown(formattedNode.Children);
-
-                return $"{formattedNode.Token}{innerText}{formattedNode.Token}";
-            }
-
-            // Non-meta mention node
-            if (node is MentionNode mentionNode && mentionNode.Type != MentionType.Meta)
-            {
-                // 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}";
-                }
-            }
-
-            // Custom emoji node
-            if (node is EmojiNode emojiNode && emojiNode.IsCustomEmoji)
-            {
-                return $":{emojiNode.Name}:";
-            }
-
-            // All other nodes - simply return source
-            return node.Source;
-        }
-
-        private string FormatMarkdown(IEnumerable<Node> nodes) => nodes.Select(FormatMarkdown).JoinToString("");
-
-        private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.Parse(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
-            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("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.0.1" />
+    <PackageReference Include="Scriban" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Core.Rendering/Formatters/CsvMessageWriter.cs

@@ -0,0 +1,25 @@
+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
+    {
+        public CsvMessageWriter(TextWriter writer, RenderContext context)
+            : base(writer, context)
+        {
+        }
+
+        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));
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Formatters/HtmlMessageWriter.cs

@@ -0,0 +1,163 @@
+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 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(TextWriter writer, RenderContext context, string themeName)
+            : base(writer, context)
+        {
+            _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)));
+
+            // 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 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/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 TextWriter Writer { get; }
+
+        protected RenderContext Context { get; }
+
+        protected MessageWriterBase(TextWriter writer, RenderContext context)
+        {
+            Writer = writer;
+            Context = context;
+        }
+
+        public virtual Task WritePreambleAsync() => Task.CompletedTask;
+
+        public abstract Task WriteMessageAsync(Message message);
+
+        public virtual Task WritePostambleAsync() => Task.CompletedTask;
+
+        public async ValueTask DisposeAsync() => await Writer.DisposeAsync();
+    }
+}

DiscordChatExporter.Core.Rendering/Formatters/PlainTextMessageWriter.cs

@@ -0,0 +1,36 @@
+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 long _messageCount;
+
+        public PlainTextMessageWriter(TextWriter writer, RenderContext context)
+            : base(writer, context)
+        {
+        }
+
+        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));
+        }
+    }
+}

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

@@ -1,200 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Markdown.Nodes;
-using DiscordChatExporter.Core.Models;
-using Scriban;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public partial class HtmlChatLogRenderer : IChatLogRenderer
-    {
-        private readonly ChatLog _chatLog;
-        private readonly string _themeName;
-        private readonly string _dateFormat;
-
-        public HtmlChatLogRenderer(ChatLog chatLog, string themeName, string dateFormat)
-        {
-            _chatLog = chatLog;
-            _themeName = themeName;
-            _dateFormat = dateFormat;
-        }
-
-        private 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)
-        {
-            // Text node
-            if (node is TextNode textNode)
-            {
-                // Return HTML-encoded text
-                return HtmlEncode(textNode.Text);
-            }
-
-            // Formatted node
-            if (node is FormattedNode formattedNode)
-            {
-                // Recursively get inner html
-                var innerHtml = FormatMarkdown(formattedNode.Children, false);
-
-                // Bold
-                if (formattedNode.Formatting == TextFormatting.Bold)
-                    return $"<strong>{innerHtml}</strong>";
-
-                // Italic
-                if (formattedNode.Formatting == TextFormatting.Italic)
-                    return $"<em>{innerHtml}</em>";
-
-                // Underline
-                if (formattedNode.Formatting == TextFormatting.Underline)
-                    return $"<u>{innerHtml}</u>";
-
-                // Strikethrough
-                if (formattedNode.Formatting == TextFormatting.Strikethrough)
-                    return $"<s>{innerHtml}</s>";
-
-                // Spoiler
-                if (formattedNode.Formatting == TextFormatting.Spoiler)
-                    return $"<span class=\"spoiler\">{innerHtml}</span>";
-            }
-
-            // Inline code block node
-            if (node is InlineCodeBlockNode inlineCodeBlockNode)
-            {
-                return $"<span class=\"pre pre--inline\">{HtmlEncode(inlineCodeBlockNode.Code)}</span>";
-            }
-
-            // Multi-line code block node
-            if (node is MultilineCodeBlockNode multilineCodeBlockNode)
-            {
-                // Set language class for syntax highlighting
-                var languageCssClass = !multilineCodeBlockNode.Language.IsNullOrWhiteSpace()
-                    ? "language-" + multilineCodeBlockNode.Language
-                    : null;
-
-                return $"<div class=\"pre pre--multiline {languageCssClass}\">{HtmlEncode(multilineCodeBlockNode.Code)}</div>";
-            }
-
-            // Mention node
-            if (node is MentionNode mentionNode)
-            {
-                // Meta mention node
-                if (mentionNode.Type == MentionType.Meta)
-                {
-                    return $"<span class=\"mention\">@{HtmlEncode(mentionNode.Id)}</span>";
-                }
-
-                // User mention node
-                if (mentionNode.Type == MentionType.User)
-                {
-                    var user = _chatLog.Mentionables.GetUser(mentionNode.Id);
-                    return $"<span class=\"mention\" title=\"{HtmlEncode(user.FullName)}\">@{HtmlEncode(user.Name)}</span>";
-                }
-
-                // Channel mention node
-                if (mentionNode.Type == MentionType.Channel)
-                {
-                    var channel = _chatLog.Mentionables.GetChannel(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>";
-                }
-            }
-
-            // Emoji node
-            if (node is EmojiNode emojiNode)
-            {
-                // Get emoji image URL
-                var emojiImageUrl = Emoji.GetImageUrl(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated);
-
-                // Make emoji large if it's jumbo
-                var jumboableCssClass = isJumbo ? "emoji--large" : null;
-
-                return $"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />";
-            }
-
-            // Link node
-            if (node is LinkNode linkNode)
-            {
-                return $"<a href=\"{Uri.EscapeUriString(linkNode.Url)}\">{HtmlEncode(linkNode.Title)}</a>";
-            }
-
-            // All other nodes - simply return source
-            return node.Source;
-        }
-
-        private string FormatMarkdown(IReadOnlyList<Node> nodes, bool isTopLevel)
-        {
-            // Emojis are jumbo if all top-level nodes are emoji nodes, disregarding whitespace
-            var isJumbo = isTopLevel && nodes.Where(n => !n.Source.IsNullOrWhiteSpace()).All(n => n is EmojiNode);
-
-            return nodes.Select(n => FormatMarkdown(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));
-        }
-    }
-}

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,21 @@
+using System.Text;
+
+namespace DiscordChatExporter.Core.Rendering.Internal
+{
+    internal static class Extensions
+    {
+        public static StringBuilder AppendLineIfNotEmpty(this StringBuilder builder, string value) =>
+            !string.IsNullOrWhiteSpace(value) ? builder.AppendLine(value) : builder;
+
+        public static StringBuilder Trim(this StringBuilder builder)
+        {
+            while (builder.Length > 0 && char.IsWhiteSpace(builder[0]))
+                builder.Remove(0, 1);
+
+            while (builder.Length > 0 && char.IsWhiteSpace(builder[^1]))
+                builder.Remove(builder.Length - 1, 1);
+
+            return builder;
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Logic/CsvRenderingLogic.cs

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

@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text.RegularExpressions;
+using DiscordChatExporter.Core.Markdown;
+using DiscordChatExporter.Core.Markdown.Ast;
+using DiscordChatExporter.Core.Models;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Rendering.Logic
+{
+    internal static class HtmlRenderingLogic
+    {
+        public static bool CanBeGrouped(Message message1, Message message2)
+        {
+            if (message1.Author.Id != message2.Author.Id)
+                return false;
+
+            if ((message2.Timestamp - message1.Timestamp).Duration().TotalMinutes > 7)
+                return false;
+
+            return true;
+        }
+
+        private static string HtmlEncode(string s) => WebUtility.HtmlEncode(s);
+
+        private static string FormatMarkdownNode(RenderContext context, Node node, bool isJumbo)
+        {
+            // Text node
+            if (node is TextNode textNode)
+            {
+                // Return HTML-encoded text
+                return HtmlEncode(textNode.Text);
+            }
+
+            // Formatted node
+            if (node is FormattedNode formattedNode)
+            {
+                // Recursively get inner html
+                var innerHtml = FormatMarkdownNodes(context, formattedNode.Children, false);
+
+                // Bold
+                if (formattedNode.Formatting == TextFormatting.Bold)
+                    return $"<strong>{innerHtml}</strong>";
+
+                // Italic
+                if (formattedNode.Formatting == TextFormatting.Italic)
+                    return $"<em>{innerHtml}</em>";
+
+                // Underline
+                if (formattedNode.Formatting == TextFormatting.Underline)
+                    return $"<u>{innerHtml}</u>";
+
+                // Strikethrough
+                if (formattedNode.Formatting == TextFormatting.Strikethrough)
+                    return $"<s>{innerHtml}</s>";
+
+                // Spoiler
+                if (formattedNode.Formatting == TextFormatting.Spoiler)
+                    return $"<span class=\"spoiler\">{innerHtml}</span>";
+
+                // Quote
+                if (formattedNode.Formatting == TextFormatting.Quote)
+                    return $"<div class=\"quote\">{innerHtml}</div>";
+            }
+
+            // Inline code block node
+            if (node is InlineCodeBlockNode inlineCodeBlockNode)
+            {
+                return $"<span class=\"pre pre--inline\">{HtmlEncode(inlineCodeBlockNode.Code)}</span>";
+            }
+
+            // Multi-line code block node
+            if (node is MultiLineCodeBlockNode multilineCodeBlockNode)
+            {
+                // Set CSS class for syntax highlighting
+                var highlightCssClass = !string.IsNullOrWhiteSpace(multilineCodeBlockNode.Language)
+                    ? $"language-{multilineCodeBlockNode.Language}"
+                    : "nohighlight";
+
+                return $"<div class=\"pre pre--multiline {highlightCssClass}\">{HtmlEncode(multilineCodeBlockNode.Code)}</div>";
+            }
+
+            // Mention node
+            if (node is MentionNode mentionNode)
+            {
+                // Meta mention node
+                if (mentionNode.Type == MentionType.Meta)
+                {
+                    return $"<span class=\"mention\">@{HtmlEncode(mentionNode.Id)}</span>";
+                }
+
+                // User mention node
+                if (mentionNode.Type == MentionType.User)
+                {
+                    var user = context.MentionableUsers.FirstOrDefault(u => u.Id == mentionNode.Id) ??
+                               User.CreateUnknownUser(mentionNode.Id);
+
+                    return $"<span class=\"mention\" title=\"{HtmlEncode(user.FullName)}\">@{HtmlEncode(user.Name)}</span>";
+                }
+
+                // Channel mention node
+                if (mentionNode.Type == MentionType.Channel)
+                {
+                    var channel = context.MentionableChannels.FirstOrDefault(c => c.Id == mentionNode.Id) ??
+                                  Channel.CreateDeletedChannel(mentionNode.Id);
+
+                    return $"<span class=\"mention\">#{HtmlEncode(channel.Name)}</span>";
+                }
+
+                // Role mention node
+                if (mentionNode.Type == MentionType.Role)
+                {
+                    var role = context.MentionableRoles.FirstOrDefault(r => r.Id == mentionNode.Id) ??
+                               Role.CreateDeletedRole(mentionNode.Id);
+
+                    return $"<span class=\"mention\">@{HtmlEncode(role.Name)}</span>";
+                }
+            }
+
+            // Emoji node
+            if (node is EmojiNode emojiNode)
+            {
+                // Get emoji image URL
+                var emojiImageUrl = Emoji.GetImageUrl(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated);
+
+                // Make emoji large if it's jumbo
+                var jumboableCssClass = isJumbo ? "emoji--large" : null;
+
+                return $"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />";
+            }
+
+            // Link node
+            if (node is LinkNode linkNode)
+            {
+                // Extract message ID if the link points to a Discord message
+                var linkedMessageId = Regex.Match(linkNode.Url, "^https?://discordapp.com/channels/.*?/(\\d+)/?$").Groups[1].Value;
+
+                return string.IsNullOrWhiteSpace(linkedMessageId)
+                    ? $"<a href=\"{Uri.EscapeUriString(linkNode.Url)}\">{HtmlEncode(linkNode.Title)}</a>"
+                    : $"<a href=\"{Uri.EscapeUriString(linkNode.Url)}\" onclick=\"scrollToMessage(event, '{linkedMessageId}')\">{HtmlEncode(linkNode.Title)}</a>";
+            }
+
+            // Throw on unexpected nodes
+            throw new InvalidOperationException($"Unexpected node [{node.GetType()}].");
+        }
+
+        private static string FormatMarkdownNodes(RenderContext context, IReadOnlyList<Node> nodes, bool isTopLevel)
+        {
+            // Emojis are jumbo if all top-level nodes are emoji nodes or whitespace text nodes
+            var isJumbo = isTopLevel && nodes.All(n => n is EmojiNode || n is TextNode textNode && string.IsNullOrWhiteSpace(textNode.Text));
+
+            return nodes.Select(n => FormatMarkdownNode(context, n, isJumbo)).JoinToString("");
+        }
+
+        public static string FormatMarkdown(RenderContext context, string markdown) =>
+            FormatMarkdownNodes(context, MarkdownParser.Parse(markdown), true);
+    }
+}

DiscordChatExporter.Core.Rendering/Logic/PlainTextRenderingLogic.cs

@@ -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,121 @@
+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 inner writer (it will get disposed by the wrapper)
+            var writer = File.CreateText(filePath);
+
+            // Create formatter
+            if (format == ExportFormat.PlainText)
+                return new PlainTextMessageWriter(writer, context);
+
+            if (format == ExportFormat.Csv)
+                return new CsvMessageWriter(writer, context);
+
+            if (format == ExportFormat.HtmlDark)
+                return new HtmlMessageWriter(writer, context, "Dark");
+
+            if (format == ExportFormat.HtmlLight)
+                return new HtmlMessageWriter(writer, context, "Light");
+
+            throw new InvalidOperationException($"Unknown export format [{format}].");
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/PlainTextChatLogRenderer.cs

@@ -1,218 +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)
-        {
-            // Formatted node
-            if (node is FormattedNode formattedNode)
-            {
-                // Recursively get inner text
-                var innerText = FormatMarkdown(formattedNode.Children);
-
-                return $"{formattedNode.Token}{innerText}{formattedNode.Token}";
-            }
-
-            // Non-meta mention node
-            if (node is MentionNode mentionNode && mentionNode.Type != MentionType.Meta)
-            {
-                // 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}";
-                }
-            }
-
-            // Custom emoji node
-            if (node is EmojiNode emojiNode && emojiNode.IsCustomEmoji)
-            {
-                return $":{emojiNode.Name}:";
-            }
-
-            // All other nodes - simply return source
-            return node.Source;
-        }
-
-        private string FormatMarkdown(IEnumerable<Node> nodes) => nodes.Select(FormatMarkdown).JoinToString("");
-
-        private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.Parse(markdown));
-
-        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)
-        {
-            // Timestamp and author
-            await writer.WriteLineAsync($"[{FormatDate(message.Timestamp)}] {message.Author.FullName}");
-
-            // 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;
@@ -32,7 +32,7 @@
 
 body {
     font-family: "Whitney", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: 16px;
+    font-size: 17px;
 }
 
 a {
@@ -57,21 +57,28 @@ img {
     border-radius: 3px;
 }
 
+.quote {
+    margin: 0.5em 0;
+    padding-left: 0.6em;
+    border-left: 4px solid;
+    border-radius: 3px;
+}
+
 .pre {
-    font-family: "Consolas", "Courier New", Courier, Monospace;
+    font-family: "Consolas", "Courier New", Courier, monospace;
 }
 
 .pre--multiline {
-    margin-top: 4px;
-    padding: 8px;
+    margin-top: 0.25em;
+    padding: 0.5em;
     border: 2px solid;
-    border-radius: 5px;    
+    border-radius: 5px;
 }
 
 .pre--inline {
     padding: 2px;
     border-radius: 3px;
-    font-size: 85%;
+    font-size: 0.85em;
 }
 
 .mention {
@@ -79,80 +86,69 @@ img {
 }
 
 .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;
 }
@@ -164,37 +160,39 @@ 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: 0.1em 0.3em;
+    margin: 0 -0.3em;
+    background-color: transparent;
+    transition: background-color 1s ease;
 }
 
 .chatlog__content {
-    padding-top: 5px;
-    font-size: .9375em;
+    font-size: 0.95em;
     word-wrap: break-word;
 }
 
 .chatlog__edited-timestamp {
-    margin-left: 3px;
-    font-size: .8em;
-}
-
-.chatlog__attachment {
-    margin: 5px 0;
+    margin-left: 0.15em;
+    font-size: 0.8em;
 }
 
 .chatlog__attachment-thumbnail {
+    margin-top: 0.3em;
     max-width: 50%;
     max-height: 500px;
     border-radius: 3px;
@@ -202,13 +200,13 @@ img {
 
 .chatlog__embed {
     display: flex;
+    margin-top: 0.3em;
     max-width: 520px;
-    margin-top: 5px;
 }
 
 .chatlog__embed-color-pill {
     flex-shrink: 0;
-    width: 4px;
+    width: 0.25em;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
 }
@@ -216,15 +214,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 {
@@ -233,31 +231,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 {
@@ -269,7 +267,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 {
@@ -279,40 +278,38 @@ 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 {    
+.chatlog__embed-image {
     max-width: 500px;
     max-height: 400px;
     border-radius: 3px;
 }
 
 .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%;
@@ -320,8 +317,8 @@ img {
 }
 
 .chatlog__embed-footer-text {
+    font-size: 0.75em;
     font-weight: 500;
-    font-size: .75em;
 }
 
 .chatlog__reactions {
@@ -331,26 +328,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;
@@ -13,34 +13,30 @@ a {
     background-color: rgba(255, 255, 255, 0.1);
 }
 
+.quote {
+    border-color: #4f545c;
+}
+
 .pre {
     background-color: #2f3136 !important;
 }
 
 .pre--multiline {
     border-color: #282b30 !important;
-    color: #839496 !important;
+    color: #b9bbbe !important;
 }
 
 .mention {
     color: #7289da;
 }
 
-/* === INFO === */
+/* === Preamble === */
 
-.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);
@@ -54,10 +50,22 @@ a {
     color: rgba(255, 255, 255, 0.2);
 }
 
+.chatlog__message--highlighted {
+    background-color: rgba(114, 137, 218, 0.2) !important;
+}
+
+.chatlog__message--pinned {
+    background-color: rgba(249, 168, 37, 0.05);
+}
+
 .chatlog__edited-timestamp {
     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);
@@ -97,4 +105,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;
 }