Update version

Improve usage instructions slightly
Add bot tags and some CSS fixes (#172 )
2026-07-07 14:44:39 +02:00 · 2019-05-15 01:04:21 +03:00 · 2019-05-15 00:56:50 +03:00 · 2019-05-09 13:52:46 +03:00 · 2019-04-25 22:14:17 +03:00 · 2019-04-18 22:21:20 +03:00
108 changed files with 1786 additions and 1077 deletions
@@ -1,3 +1,28 @@
+### v2.13 (15-May-2019)
+
+- Updated usage instructions.
+- [HTML] Added BOT tags to messages posted by bots.
+- [GUI] UI will now be disabled when exporting.
+- [GUI] Notification informing that the export has completed will now appear after all exports have completed, instead of each of them separately.
+
+### v2.12.1 (12-Apr-2019)
+
+- [GUI] Fixed an issue where the app crashed when trying to export multiple channels.
+- [HTML] Fixed an issue where some of the emojis were rendered via Twemoji while Discord renders them as plain text.
+- [HTML] Fixed an issue where emojis weren't jumbo if there were more than one of them.
+
+### v2.12 (11-Apr-2019)
+
+- Improved markdown parsing performance which speeds up the final stage of exporting by around 4.5 times.
+- Improved performance when exporting as PlainText or CSV.
+- [GUI] Fixed an issue where the app would freeze up and report as "not responding" during the final stage of exporting.
+- [CLI] Fixed an issue where it would say "Completed" after exporting a chat log, even if the process failed.
+
+### v2.11 (14-Mar-2019)
+
+- [HTML] Added syntax highlighting for multiline code blocks via Highlight.js.
+- Added retry policy for all 5xx status codes to prevent random crashes.
+
 ### v2.10.2 (10-Mar-2019)

 - [HTML] Updated message grouping algorithm to make it the same as in Discord. Removed "message group limit" setting and parameter.
@@ -1,13 +1,21 @@
-New-Item "$PSScriptRoot\bin" -ItemType Directory -Force
+New-Item "$PSScriptRoot\Portable\bin" -ItemType Directory -Force

-# GUI
+# --- GUI ---
+
+# Get files
 $files = @()
 $files += Get-Item -Path "$PSScriptRoot\..\License.txt"
 $files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Gui\bin\Release\*" -Include "*.exe", "*.dll", "*.config"
-$files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporter.zip" -Force

-# CLI
+# 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\net461\*" -Include "*.exe", "*.dll", "*.config"
-$files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporter.CLI.zip" -Force
+$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
@@ -11,7 +11,7 @@ namespace DiscordChatExporter.Cli
        {
            var builder = new StyletIoCBuilder();

-            // Autobind services in the .Core assembly
+            // Autobind the .Services assembly
            builder.Autobind(typeof(DataService).Assembly);

            // Bind settings as singleton
@@ -1,22 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net461</TargetFramework>
-        <Version>2.10.2</Version>
-        <Company>Tyrrrz</Company>
-        <Copyright>Copyright (c) Alexey Golub</Copyright>
-        <ApplicationIcon>..\favicon.ico</ApplicationIcon>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
+    <Version>2.13</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.1.22" />
-        <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.3.0" />
+    <PackageReference Include="Stylet" Version="1.1.22" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
+  </ItemGroup>

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

 </Project>
@@ -7,6 +7,8 @@ namespace DiscordChatExporter.Cli.Internal
        private readonly int _posX;
        private readonly int _posY;

+        private bool _isCompleted;
+
        public InlineProgress()
        {
            // If output is not redirected - save initial cursor position
@@ -27,6 +29,8 @@ namespace DiscordChatExporter.Cli.Internal
            }
        }

+        public void ReportCompletion() => _isCompleted = true;
+
        public void Dispose()
        {
            // If output is not redirected - reset cursor position
@@ -34,7 +38,10 @@ namespace DiscordChatExporter.Cli.Internal
                Console.SetCursorPosition(_posX, _posY);

            // Inform about completion
-            Console.WriteLine("Completed ✓");
+            if (_isCompleted)
+                Console.WriteLine("Completed ✓");
+            else
+                Console.WriteLine("Failed X");
        }
    }
 }
@@ -13,10 +13,10 @@ namespace DiscordChatExporter.Cli
            Console.WriteLine("# To get user token:");
            Console.WriteLine(" 1. Open Discord");
            Console.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
-            Console.WriteLine(" 3. Press Ctrl+R to reload");
-            Console.WriteLine(" 4. Navigate to the Application tab");
-            Console.WriteLine(" 5. Select \"Local Storage\" > \"https://discordapp.com\" on the left");
-            Console.WriteLine(" 6. Find \"token\" under key and copy the value");
+            Console.WriteLine(" 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");
@@ -24,12 +24,20 @@ namespace DiscordChatExporter.Cli
            Console.WriteLine(" 3. Navigate to the Bot section on the left");
            Console.WriteLine(" 4. Under Token click Copy");
            Console.WriteLine();
-            Console.WriteLine("# To get guild or channel ID:");
+            Console.WriteLine("# 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");
        }

        public static void Main(string[] args)
@@ -3,8 +3,8 @@ using System.IO;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Internal;
 using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Helpers;
 using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Core.Services.Helpers;
 using Tyrrrz.Extensions;

 namespace DiscordChatExporter.Cli.Verbs
@@ -24,7 +24,7 @@ namespace DiscordChatExporter.Cli.Verbs
            var exportService = Container.Instance.Get<ExportService>();

            // Configure settings
-            if (Options.DateFormat.IsNotBlank())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                settingsService.DateFormat = Options.DateFormat;

            // Track progress
@@ -37,7 +37,7 @@ namespace DiscordChatExporter.Cli.Verbs

                // Generate file path if not set or is a directory
                var filePath = Options.OutputPath;
-                if (filePath.IsBlank() || ExportHelper.IsDirectoryPath(filePath))
+                if (filePath.IsNullOrWhiteSpace() || ExportHelper.IsDirectoryPath(filePath))
                {
                    // Generate default file name
                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
@@ -48,7 +48,10 @@ namespace DiscordChatExporter.Cli.Verbs
                }

                // Export
-                exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
+                await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
+
+                // Report successful completion
+                progress.ReportCompletion();
            }
        }
    }
@@ -5,9 +5,9 @@ using System.Net;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Internal;
 using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Exceptions;
-using DiscordChatExporter.Core.Helpers;
 using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Core.Services.Exceptions;
+using DiscordChatExporter.Core.Services.Helpers;
 using Tyrrrz.Extensions;

 namespace DiscordChatExporter.Cli.Verbs
@@ -27,7 +27,7 @@ namespace DiscordChatExporter.Cli.Verbs
            var exportService = Container.Instance.Get<ExportService>();

            // Configure settings
-            if (Options.DateFormat.IsNotBlank())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                settingsService.DateFormat = Options.DateFormat;

            // Get channels
@@ -57,7 +57,11 @@ namespace DiscordChatExporter.Cli.Verbs
                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);

                        // Export
-                        exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
+                        await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat,
+                            Options.PartitionLimit);
+
+                        // Report successful completion
+                        progress.ReportCompletion();
                    }
                }
                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
@@ -5,10 +5,10 @@ using System.Net;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Internal;
 using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.Exceptions;
-using DiscordChatExporter.Core.Helpers;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Core.Services.Exceptions;
+using DiscordChatExporter.Core.Services.Helpers;
 using Tyrrrz.Extensions;

 namespace DiscordChatExporter.Cli.Verbs
@@ -28,7 +28,7 @@ namespace DiscordChatExporter.Cli.Verbs
            var exportService = Container.Instance.Get<ExportService>();

            // Configure settings
-            if (Options.DateFormat.IsNotBlank())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                settingsService.DateFormat = Options.DateFormat;

            // Get channels
@@ -58,7 +58,11 @@ namespace DiscordChatExporter.Cli.Verbs
                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);

                        // Export
-                        exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
+                        await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat,
+                            Options.PartitionLimit);
+
+                        // Report successful completion
+                        progress.ReportCompletion();
                    }
                }
                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
@@ -8,7 +8,7 @@ namespace DiscordChatExporter.Cli.Verbs
 {
    public class GetDirectMessageChannelsVerb : Verb<GetDirectMessageChannelsOptions>
    {
-        public GetDirectMessageChannelsVerb(GetDirectMessageChannelsOptions options) 
+        public GetDirectMessageChannelsVerb(GetDirectMessageChannelsOptions options)
            : base(options)
        {
        }
@@ -8,7 +8,7 @@ namespace DiscordChatExporter.Cli.Verbs
 {
    public class GetGuildsVerb : Verb<GetGuildsOptions>
    {
-        public GetGuildsVerb(GetGuildsOptions options) 
+        public GetGuildsVerb(GetGuildsOptions options)
            : base(options)
        {
        }
@@ -12,9 +12,11 @@ namespace DiscordChatExporter.Cli.Verbs.Options
        [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; }

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Sprache" Version="2.2.0" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
  </ItemGroup>

-</Project>
+</Project>
@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    internal class AggregateMatcher<T> : IMatcher<T>
+    {
+        private readonly IReadOnlyList<IMatcher<T>> _matchers;
+
+        public AggregateMatcher(IReadOnlyList<IMatcher<T>> matchers)
+        {
+            _matchers = matchers;
+        }
+
+        public AggregateMatcher(params IMatcher<T>[] matchers)
+            : this((IReadOnlyList<IMatcher<T>>)matchers)
+        {
+        }
+
+        public ParsedMatch<T> Match(string input, int startIndex, int length)
+        {
+            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);
+
+                // 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)
+                    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)
+                    break;
+            }
+
+            return earliestMatch;
+        }
+    }
+}
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+
+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)
+        {
+            // Get end index for simplicity
+            var endIndex = startIndex + length;
+
+            // Loop through segments divided by individual matches
+            var currentIndex = startIndex;
+            while (currentIndex < endIndex)
+            {
+                // Find a match within this segment
+                var match = matcher.Match(input, currentIndex, 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)
+                {
+                    var fallback = input.Substring(currentIndex, match.StartIndex - currentIndex);
+                    yield return new ParsedMatch<T>(currentIndex, fallback.Length, fallbackTransform(fallback));
+                }
+
+                // Yield match
+                yield return match;
+
+                // Shift current index to the end of the match
+                currentIndex = match.StartIndex + match.Length;
+            }
+
+            // If EOL wasn't reached - transform and yield remaining part as fallback
+            if (currentIndex < endIndex)
+            {
+                var fallback = input.Substring(currentIndex);
+                yield return new ParsedMatch<T>(currentIndex, fallback.Length, fallbackTransform(fallback));
+            }
+        }
+
+        public static IEnumerable<ParsedMatch<T>> MatchAll<T>(this IMatcher<T> matcher, string input,
+            Func<string, T> fallbackTransform) => matcher.MatchAll(input, 0, input.Length, fallbackTransform);
+    }
+}
@@ -1,178 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Sprache;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Markdown.Internal
-{
-    // The following parsing logic is meant to replicate Discord's markdown grammar as close as possible
-    internal static class Grammar
-    {
-        /* Formatting */
-
-        // Capture until the earliest double asterisk not followed by an asterisk
-        private static readonly Parser<Node> BoldFormattedNode =
-            Parse.RegexMatch(new Regex("\\*\\*(.+?)\\*\\*(?!\\*)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "**", TextFormatting.Bold, BuildTree(m.Groups[1].Value)));
-
-        // Capture until the earliest single asterisk not preceded or followed by an asterisk
-        // Can't have whitespace right after opening or right before closing asterisk
-        private static readonly Parser<Node> ItalicFormattedNode =
-            Parse.RegexMatch(new Regex("\\*(?!\\s)(.+?)(?<!\\s|\\*)\\*(?!\\*)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "*", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
-
-        // Can't have underscores inside
-        // Can't have word characters right after closing underscore
-        private static readonly Parser<Node> ItalicAltFormattedNode =
-            Parse.RegexMatch(new Regex("_([^_]+?)_(?!\\w)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "_", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
-
-        // Treated as a separate entity for simplicity
-        // Capture until the earliest triple asterisk not preceded or followed by an asterisk
-        private static readonly Parser<Node> ItalicBoldFormattedNode =
-            Parse.RegexMatch(new Regex("\\*(\\*\\*(?:.+?)\\*\\*)\\*(?!\\*)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "*", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
-
-        // Capture until the earliest double underscore not followed by an underscore
-        private static readonly Parser<Node> UnderlineFormattedNode =
-            Parse.RegexMatch(new Regex("__(.+?)__(?!_)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "__", TextFormatting.Underline, BuildTree(m.Groups[1].Value)));
-
-        // Treated as a separate entity for simplicity
-        // Capture until the earliest triple underscore not preceded or followed by an underscore
-        private static readonly Parser<Node> ItalicUnderlineFormattedNode =
-            Parse.RegexMatch(new Regex("_(__(?:.+?)__)_(?!_)", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "_", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
-
-        // Strikethrough is safe
-        private static readonly Parser<Node> StrikethroughFormattedNode =
-            Parse.RegexMatch(new Regex("~~(.+?)~~", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "~~", TextFormatting.Strikethrough, BuildTree(m.Groups[1].Value)));
-
-        // Spoiler is safe
-        private static readonly Parser<Node> SpoilerFormattedNode =
-            Parse.RegexMatch(new Regex("\\|\\|(.+?)\\|\\|", RegexOptions.Singleline))
-                .Select(m => new FormattedNode(m.Value, "||", TextFormatting.Spoiler, BuildTree(m.Groups[1].Value)));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyFormattedNode = 
-            ItalicBoldFormattedNode.Or(ItalicUnderlineFormattedNode)
-            .Or(BoldFormattedNode).Or(ItalicFormattedNode)
-            .Or(UnderlineFormattedNode).Or(ItalicAltFormattedNode)
-            .Or(StrikethroughFormattedNode).Or(SpoilerFormattedNode);
-
-        /* Code blocks */
-
-        // Can't have backticks inside and surrounding whitespace is trimmed
-        private static readonly Parser<Node> InlineCodeBlockNode =
-            Parse.RegexMatch(new Regex("`\\s*([^`]+?)\\s*`", RegexOptions.Singleline))
-                .Select(m => new InlineCodeBlockNode(m.Value, m.Groups[1].Value));
-
-        // The first word is a language identifier if it's the only word followed by a newline, the rest is code
-        private static readonly Parser<Node> MultilineCodeBlockNode =
-            Parse.RegexMatch(new Regex("```(?:(\\w*?)?(?:\\s*?\\n))?(.+?)```", RegexOptions.Singleline))
-                .Select(m => new MultilineCodeBlockNode(m.Value, m.Groups[1].Value, m.Groups[2].Value));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyCodeBlockNode = MultilineCodeBlockNode.Or(InlineCodeBlockNode);
-
-        /* Mentions */
-
-        // @everyone or @here
-        private static readonly Parser<Node> MetaMentionNode = Parse.RegexMatch("@(everyone|here)")
-            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Meta));
-
-        // <@123456> or <@!123456>
-        private static readonly Parser<Node> UserMentionNode = Parse.RegexMatch("<@!?(\\d+)>")
-            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.User));
-
-        // <#123456>
-        private static readonly Parser<Node> ChannelMentionNode = Parse.RegexMatch("<#(\\d+)>")
-            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Channel));
-
-        // <@&123456>
-        private static readonly Parser<Node> RoleMentionNode = Parse.RegexMatch("<@&(\\d+)>")
-            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Role));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyMentionNode =
-            MetaMentionNode.Or(UserMentionNode).Or(ChannelMentionNode).Or(RoleMentionNode);
-
-        /* Emojis */
-
-        // Matches all standard unicode emojis
-        private static readonly Parser<Node> StandardEmojiNode = Parse.RegexMatch(
-                "([\\u2700-\\u27bf]|" +
-                "(?:\\ud83c[\\udde6-\\uddff]){2}|" +
-                "[\\ud800-\\udbff][\\udc00-\\udfff]|" +
-                "[\\u0023-\\u0039]\\u20e3|" +
-                "\\u3299|\\u3297|\\u303d|\\u3030|\\u24c2|\\ud83c[\\udd70-\\udd71]|\\ud83c[\\udd7e-\\udd7f]|\\ud83c\\udd8e|\\ud83c[\\udd91-\\udd9a]|\\ud83c[\\udde6-\\uddff]|" +
-                "\\ud83c[\\ude01-\\ude02]|\\ud83c\\ude1a|\\ud83c\\ude2f|\\ud83c[\\ude32-\\ude3a]|\\ud83c[\\ude50-\\ude51]|\\u203c|\\u2049|[\\u25aa-\\u25ab]|" +
-                "\\u25b6|\\u25c0|[\\u25fb-\\u25fe]|\\u00a9|\\u00ae|\\u2122|\\u2139|\\ud83c\\udc04|[\\u2600-\\u26FF]|\\u2b05|\\u2b06|\\u2b07|\\u2b1b|\\u2b1c|\\u2b50|" +
-                "\\u2b55|\\u231a|\\u231b|\\u2328|\\u23cf|[\\u23e9-\\u23f3]|[\\u23f8-\\u23fa]|\\ud83c\\udccf|\\u2934|\\u2935|[\\u2190-\\u21ff])")
-            .Select(m => new EmojiNode(m.Value, m.Groups[1].Value));
-
-        // <:lul:123456> or <a:lul:123456>
-        private static readonly Parser<Node> CustomEmojiNode = Parse.RegexMatch("<(a)?:(.+?):(\\d+)>")
-            .Select(m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, m.Groups[1].Value.IsNotBlank()));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyEmojiNode = StandardEmojiNode.Or(CustomEmojiNode);
-
-        /* Links */
-
-        // [title](link)
-        private static readonly Parser<Node> TitledLinkNode = Parse.RegexMatch("\\[(.+?)\\]\\((.+?)\\)")
-            .Select(m => new LinkNode(m.Value, m.Groups[2].Value, m.Groups[1].Value));
-
-        // Starts with http:// or https://, stops at the last non-whitespace character followed by whitespace or punctuation character
-        private static readonly Parser<Node> AutoLinkNode = Parse.RegexMatch("(https?://\\S*[^\\.,:;\"\'\\s])")
-            .Select(m => new LinkNode(m.Value, m.Groups[1].Value));
-
-        // Autolink surrounded by angular brackets
-        private static readonly Parser<Node> HiddenLinkNode = Parse.RegexMatch("<(https?://\\S*[^\\.,:;\"\'\\s])>")
-            .Select(m => new LinkNode(m.Value, m.Groups[1].Value));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyLinkNode = TitledLinkNode.Or(HiddenLinkNode).Or(AutoLinkNode); 
-
-        /* Text */
-
-        // Shrug is an exception and needs to be exempt from formatting
-        private static readonly Parser<Node> ShrugTextNode =
-            Parse.String("¯\\_(ツ)_/¯").Text().Select(s => new TextNode(s));
-
-        // Backslash escapes any following unicode surrogate pair
-        private static readonly Parser<Node> EscapedSurrogateTextNode =
-            from slash in Parse.Char('\\')
-            from high in Parse.AnyChar.Where(char.IsHighSurrogate)
-            from low in Parse.AnyChar
-            let lexeme = $"{slash}{high}{low}"
-            let text = $"{high}{low}"
-            select new TextNode(lexeme, text);
-
-        // Backslash escapes any following non-whitespace character except for digits and latin letters
-        private static readonly Parser<Node> EscapedTextNode =
-            Parse.RegexMatch("\\\\([^a-zA-Z0-9\\s])").Select(m => new TextNode(m.Value, m.Groups[1].Value));
-
-        // Combinator, order matters
-        private static readonly Parser<Node> AnyTextNode = ShrugTextNode.Or(EscapedSurrogateTextNode).Or(EscapedTextNode);
-
-        /* Aggregator and fallback */
-
-        // Any node recognized by above patterns
-        private static readonly Parser<Node> AnyRecognizedNode = AnyFormattedNode.Or(AnyCodeBlockNode)
-            .Or(AnyMentionNode).Or(AnyEmojiNode).Or(AnyLinkNode).Or(AnyTextNode);
-
-        // Any node not recognized by above patterns (treated as plain text)
-        private static readonly Parser<Node> FallbackNode =
-            Parse.AnyChar.Except(AnyRecognizedNode).AtLeastOnce().Text().Select(s => new TextNode(s));
-
-        // Any node
-        private static readonly Parser<Node> AnyNode = AnyRecognizedNode.Or(FallbackNode);
-
-        // Entry point
-        public static IReadOnlyList<Node> BuildTree(string input) => AnyNode.Many().Parse(input).ToArray();
-    }
-}
@@ -0,0 +1,7 @@
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    internal interface IMatcher<T>
+    {
+        ParsedMatch<T> Match(string input, int startIndex, int length);
+    }
+}
@@ -0,0 +1,18 @@
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    internal class ParsedMatch<T>
+    {
+        public int StartIndex { get; }
+
+        public int Length { get; }
+
+        public T Value { get; }
+
+        public ParsedMatch(int startIndex, int length, T value)
+        {
+            StartIndex = startIndex;
+            Length = length;
+            Value = value;
+        }
+    }
+}
@@ -0,0 +1,23 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    internal class RegexMatcher<T> : IMatcher<T>
+    {
+        private readonly Regex _regex;
+        private readonly Func<Match, T> _transform;
+
+        public RegexMatcher(Regex regex, Func<Match, T> transform)
+        {
+            _regex = regex;
+            _transform = transform;
+        }
+
+        public ParsedMatch<T> Match(string input, int startIndex, int length)
+        {
+            var match = _regex.Match(input, startIndex, length);
+            return match.Success ? new ParsedMatch<T>(match.Index, match.Length, _transform(match)) : null;
+        }
+    }
+}
@@ -0,0 +1,29 @@
+using System;
+
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    internal class StringMatcher<T> : IMatcher<T>
+    {
+        private readonly string _needle;
+        private readonly StringComparison _comparison;
+        private readonly Func<string, T> _transform;
+
+        public StringMatcher(string needle, StringComparison comparison, Func<string, T> transform)
+        {
+            _needle = needle;
+            _comparison = comparison;
+            _transform = transform;
+        }
+
+        public StringMatcher(string needle, Func<string, T> transform)
+            : this(needle, StringComparison.Ordinal, transform)
+        {
+        }
+
+        public ParsedMatch<T> Match(string input, int startIndex, int length)
+        {
+            var index = input.IndexOf(_needle, startIndex, length, _comparison);
+            return index >= 0 ? new ParsedMatch<T>(index, _needle.Length, _transform(_needle)) : null;
+        }
+    }
+}
@@ -1,10 +1,205 @@
 using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
 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
    {
-        public static IReadOnlyList<Node> Parse(string input) => Grammar.BuildTree(input);
+        private const RegexOptions DefaultRegexOptions = RegexOptions.Compiled | RegexOptions.CultureInvariant;
+
+        /* 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)));
+
+        // 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)));
+
+        // 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)));
+
+        // 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)));
+
+        // 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)));
+
+        // 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)));
+
+        // 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)));
+
+        // 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)));
+
+        /* Code blocks */
+
+        // Capture any character except backtick until a backtick
+        // Whitespace surrounding content inside backticks is 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()));
+
+        // 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>(
+            new Regex("```(?:(\\w*)\\n)?(.+?)```", DefaultRegexOptions | RegexOptions.Singleline),
+            m => new MultilineCodeBlockNode(m.Value, m.Groups[1].Value, m.Groups[2].Value.Trim()));
+
+        /* Mentions */
+
+        // Capture @everyone
+        private static readonly IMatcher<Node> EveryoneMentionNodeMatcher = new StringMatcher<Node>(
+            "@everyone",
+            s => new MentionNode(s, "everyone", MentionType.Meta));
+
+        // Capture @here
+        private static readonly IMatcher<Node> HereMentionNodeMatcher = new StringMatcher<Node>(
+            "@here",
+            s => new MentionNode(s, "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));
+
+        // 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));
+
+        // 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));
+
+        /* Emojis */
+
+        // Capture any country flag emoji (two regional indicator surrogate pairs)
+        // ... or "symbol/other" 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));
+
+        // 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()));
+
+        /* 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));
+
+        // 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));
+
+        // 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));
+
+        /* Text */
+
+        // Capture the shrug emoticon
+        // This escapes it from matching for formatting
+        private static readonly IMatcher<Node> ShrugTextNodeMatcher = new StringMatcher<Node>(
+            @"¯\_(ツ)_/¯",
+            s => new TextNode(s));
+
+        // 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));
+
+        // 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));
+
+        // 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));
+
+        // Combine all matchers into one
+        // Matchers that have similar patterns are ordered from most specific to least specific
+        private static readonly IMatcher<Node> AggregateNodeMatcher = new AggregateMatcher<Node>(
+            // Escaped text
+            ShrugTextNodeMatcher,
+            IgnoredEmojiTextNodeMatcher,
+            EscapedSymbolTextNodeMatcher,
+            EscapedCharacterTextNodeMatcher,
+
+            // Formatting
+            ItalicBoldFormattedNodeMatcher,
+            ItalicUnderlineFormattedNodeMatcher,
+            BoldFormattedNodeMatcher,
+            ItalicFormattedNodeMatcher,
+            UnderlineFormattedNodeMatcher,
+            ItalicAltFormattedNodeMatcher,
+            StrikethroughFormattedNodeMatcher,
+            SpoilerFormattedNodeMatcher,
+
+            // Code blocks
+            MultilineCodeBlockNodeMatcher,
+            InlineCodeBlockNodeMatcher,
+
+            // Mentions
+            EveryoneMentionNodeMatcher,
+            HereMentionNodeMatcher,
+            UserMentionNodeMatcher,
+            ChannelMentionNodeMatcher,
+            RoleMentionNodeMatcher,
+
+            // Links
+            TitledLinkNodeMatcher,
+            AutoLinkNodeMatcher,
+            HiddenLinkNodeMatcher,
+
+            // Emoji
+            StandardEmojiNodeMatcher,
+            CustomEmojiNodeMatcher);
+
+        private static IReadOnlyList<Node> Parse(string input, IMatcher<Node> matcher) =>
+            matcher.MatchAll(input, s => new TextNode(s)).Select(r => r.Value).ToArray();
+
+        public static IReadOnlyList<Node> Parse(string input) => Parse(input, AggregateNodeMatcher);
    }
 }
@@ -1,12 +0,0 @@
-namespace DiscordChatExporter.Core.Markdown
-{
-    public abstract class Node
-    {
-        public string Lexeme { get; }
-
-        protected Node(string lexeme)
-        {
-            Lexeme = lexeme;
-        }
-    }
-}
@@ -1,6 +1,6 @@
 using Tyrrrz.Extensions;

-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown.Nodes
 {
    public class EmojiNode : Node
    {
@@ -10,18 +10,18 @@ namespace DiscordChatExporter.Core.Markdown

        public bool IsAnimated { get; }

-        public bool IsCustomEmoji => Id.IsNotBlank();
+        public bool IsCustomEmoji => !Id.IsNullOrWhiteSpace();

-        public EmojiNode(string lexeme, string id, string name, bool isAnimated)
-            : base(lexeme)
+        public EmojiNode(string source, string id, string name, bool isAnimated)
+            : base(source)
        {
            Id = id;
            Name = name;
            IsAnimated = isAnimated;
        }

-        public EmojiNode(string lexeme, string name)
-            : this(lexeme, null, name, false)
+        public EmojiNode(string source, string name)
+            : this(source, null, name, false)
        {
        }

@@ -1,6 +1,6 @@
 using System.Collections.Generic;

-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown.Nodes
 {
    public class FormattedNode : Node
    {
@@ -10,8 +10,8 @@ namespace DiscordChatExporter.Core.Markdown

        public IReadOnlyList<Node> Children { get; }

-        public FormattedNode(string lexeme, string token, TextFormatting formatting, IReadOnlyList<Node> children)
-            : base(lexeme)
+        public FormattedNode(string source, string token, TextFormatting formatting, IReadOnlyList<Node> children)
+            : base(source)
        {
            Token = token;
            Formatting = formatting;
@@ -1,11 +1,11 @@
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown.Nodes
 {
    public class InlineCodeBlockNode : Node
    {
        public string Code { get; }

-        public InlineCodeBlockNode(string lexeme, string code)
-            : base(lexeme)
+        public InlineCodeBlockNode(string source, string code)
+            : base(source)
        {
            Code = code;
        }
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown.Nodes
 {
    public class LinkNode : Node
    {
@@ -6,14 +6,14 @@

        public string Title { get; }

-        public LinkNode(string lexeme, string url, string title)
-            : base(lexeme)
+        public LinkNode(string source, string url, string title)
+            : base(source)
        {
            Url = url;
            Title = title;
        }

-        public LinkNode(string lexeme, string url) : this(lexeme, url, url)
+        public LinkNode(string source, string url) : this(source, url, url)
        {
        }

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

        public MentionType Type { get; }

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

        public string Code { get; }

-        public MultilineCodeBlockNode(string lexeme, string language, string code)
-            : base(lexeme)
+        public MultilineCodeBlockNode(string source, string language, string code)
+            : base(source)
        {
            Language = language;
            Code = code;
@@ -0,0 +1,12 @@
+namespace DiscordChatExporter.Core.Markdown.Nodes
+{
+    public abstract class Node
+    {
+        public string Source { get; }
+
+        protected Node(string source)
+        {
+            Source = source;
+        }
+    }
+}
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown.Nodes
 {
    public enum TextFormatting
    {
@@ -1,11 +1,11 @@
-namespace DiscordChatExporter.Core.Markdown
+namespace DiscordChatExporter.Core.Markdown.Nodes
 {
    public class TextNode : Node
    {
        public string Text { get; }

-        public TextNode(string lexeme, string text)
-            : base(lexeme)
+        public TextNode(string source, string text)
+            : base(source)
        {
            Text = text;
        }
@@ -1,11 +1,12 @@
 using System;
-using ByteSizeLib;
+using System.IO;
+using System.Linq;

 namespace DiscordChatExporter.Core.Models
 {
    // https://discordapp.com/developers/docs/resources/channel#attachment-object

-    public class Attachment
+    public partial class Attachment
    {
        public string Id { get; }

@@ -17,15 +18,11 @@ namespace DiscordChatExporter.Core.Models

        public string FileName { get; }

-        public bool IsImage => FileName.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase) ||
-                               FileName.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase) ||
-                               FileName.EndsWith(".png", StringComparison.OrdinalIgnoreCase) ||
-                               FileName.EndsWith(".gif", StringComparison.OrdinalIgnoreCase) ||
-                               FileName.EndsWith(".bmp", StringComparison.OrdinalIgnoreCase);
+        public bool IsImage { get; }

-        public ByteSize FileSize { get; }
+        public FileSize FileSize { get; }

-        public Attachment(string id, int? width, int? height, string url, string fileName, ByteSize fileSize)
+        public Attachment(string id, int? width, int? height, string url, string fileName, FileSize fileSize)
        {
            Id = id;
            Url = url;
@@ -33,8 +30,21 @@ namespace DiscordChatExporter.Core.Models
            Height = height;
            FileName = fileName;
            FileSize = fileSize;
+
+            IsImage = GetIsImage(fileName);
        }

        public override string ToString() => FileName;
    }
+
+    public partial class Attachment
+    {
+        private static readonly string[] ImageFileExtensions = { ".jpg", ".jpeg", ".png", ".gif", ".bmp" };
+
+        public static bool GetIsImage(string fileName)
+        {
+            var fileExtension = Path.GetExtension(fileName);
+            return ImageFileExtensions.Contains(fileExtension, StringComparer.OrdinalIgnoreCase);
+        }
+    }
 }
@@ -15,7 +15,7 @@
        public string Topic { get; }

        public ChannelType Type { get; }
-        
+
        public Channel(string id, string parentId, string guildId, string name, string topic, ChannelType type)
        {
            Id = id;
@@ -9,21 +9,21 @@ namespace DiscordChatExporter.Core.Models

        public Channel Channel { get; }

-        public DateTime? From { get; }
+        public DateTimeOffset? After { get; }

-        public DateTime? To { get; }
+        public DateTimeOffset? Before { get; }

        public IReadOnlyList<Message> Messages { get; }

        public Mentionables Mentionables { get; }

-        public ChatLog(Guild guild, Channel channel, DateTime? from, DateTime? to,
+        public ChatLog(Guild guild, Channel channel, DateTimeOffset? after, DateTimeOffset? before,
            IReadOnlyList<Message> messages, Mentionables mentionables)
        {
            Guild = guild;
            Channel = channel;
-            From = from;
-            To = to;
+            After = after;
+            Before = before;
            Messages = messages;
            Mentionables = mentionables;
        }
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
+  </ItemGroup>
+
+</Project>
@@ -12,7 +12,7 @@ namespace DiscordChatExporter.Core.Models

        public string Url { get; }

-        public DateTime? Timestamp { get; }
+        public DateTimeOffset? Timestamp { get; }

        public Color Color { get; }

@@ -28,7 +28,7 @@ namespace DiscordChatExporter.Core.Models

        public EmbedFooter Footer { get; }

-        public Embed(string title, string url, DateTime? timestamp, Color color, EmbedAuthor author, string description,
+        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;
@@ -14,31 +14,15 @@ namespace DiscordChatExporter.Core.Models

        public bool IsAnimated { get; }

-        public string ImageUrl
-        {
-            get
-            {
-                // Custom emoji
-                if (Id.IsNotBlank())
-                {
-                    // Animated
-                    if (IsAnimated)
-                        return $"https://cdn.discordapp.com/emojis/{Id}.gif";
-
-                    // Non-animated
-                    return $"https://cdn.discordapp.com/emojis/{Id}.png";
-                }
-
-                // Standard unicode emoji (via twemoji)
-                return $"https://twemoji.maxcdn.com/2/72x72/{GetTwemojiName(Name)}.png";
-            }
-        }
+        public string ImageUrl { get; }

        public Emoji(string id, string name, bool isAnimated)
        {
            Id = id;
            Name = name;
            IsAnimated = isAnimated;
+
+            ImageUrl = GetImageUrl(id, name, isAnimated);
        }
    }

@@ -50,7 +34,25 @@ namespace DiscordChatExporter.Core.Models
                yield return char.ConvertToUtf32(emoji, i);
        }

-        private static string GetTwemojiName(string emoji)
-            => GetCodePoints(emoji).Select(i => i.ToString("x")).JoinToString("-");
+        private static string GetTwemojiName(string emoji) =>
+            GetCodePoints(emoji).Select(i => i.ToString("x")).JoinToString("-");
+
+        public static string GetImageUrl(string id, string name, bool isAnimated)
+        {
+            // Custom emoji
+            if (!id.IsNullOrWhiteSpace())
+            {
+                // Animated
+                if (isAnimated)
+                    return $"https://cdn.discordapp.com/emojis/{id}.gif";
+
+                // Non-animated
+                return $"https://cdn.discordapp.com/emojis/{id}.png";
+            }
+
+            // Standard unicode emoji (via twemoji)
+            var twemojiName = GetTwemojiName(name);
+            return $"https://twemoji.maxcdn.com/2/72x72/{twemojiName}.png";
+        }
    }
 }
@@ -0,0 +1,84 @@
+using System;
+
+namespace DiscordChatExporter.Core.Models
+{
+    // Loosely based on https://github.com/omar/ByteSize (MIT license)
+
+    public struct FileSize
+    {
+        public const long BytesInKiloByte = 1024;
+        public const long BytesInMegaByte = 1024 * BytesInKiloByte;
+        public const long BytesInGigaByte = 1024 * BytesInMegaByte;
+        public const long BytesInTeraByte = 1024 * BytesInGigaByte;
+        public const long BytesInPetaByte = 1024 * BytesInTeraByte;
+
+        public const string ByteSymbol = "B";
+        public const string KiloByteSymbol = "KB";
+        public const string MegaByteSymbol = "MB";
+        public const string GigaByteSymbol = "GB";
+        public const string TeraByteSymbol = "TB";
+        public const string PetaByteSymbol = "PB";
+
+        public double Bytes { get; }
+        public double KiloBytes => Bytes / BytesInKiloByte;
+        public double MegaBytes => Bytes / BytesInMegaByte;
+        public double GigaBytes => Bytes / BytesInGigaByte;
+        public double TeraBytes => Bytes / BytesInTeraByte;
+        public double PetaBytes => Bytes / BytesInPetaByte;
+
+        public string LargestWholeNumberSymbol
+        {
+            get
+            {
+                // Absolute value is used to deal with negative values
+                if (Math.Abs(PetaBytes) >= 1)
+                    return PetaByteSymbol;
+
+                if (Math.Abs(TeraBytes) >= 1)
+                    return TeraByteSymbol;
+
+                if (Math.Abs(GigaBytes) >= 1)
+                    return GigaByteSymbol;
+
+                if (Math.Abs(MegaBytes) >= 1)
+                    return MegaByteSymbol;
+
+                if (Math.Abs(KiloBytes) >= 1)
+                    return KiloByteSymbol;
+
+                return ByteSymbol;
+            }
+        }
+
+        public double LargestWholeNumberValue
+        {
+            get
+            {
+                // Absolute value is used to deal with negative values
+                if (Math.Abs(PetaBytes) >= 1)
+                    return PetaBytes;
+
+                if (Math.Abs(TeraBytes) >= 1)
+                    return TeraBytes;
+
+                if (Math.Abs(GigaBytes) >= 1)
+                    return GigaBytes;
+
+                if (Math.Abs(MegaBytes) >= 1)
+                    return MegaBytes;
+
+                if (Math.Abs(KiloBytes) >= 1)
+                    return KiloBytes;
+
+                return Bytes;
+            }
+        }
+
+        public FileSize(double bytes)
+        {
+            Bytes = bytes;
+        }
+
+        public override string ToString() => $"{LargestWholeNumberValue:0.##} {LargestWholeNumberSymbol}";
+    }
+}
@@ -12,15 +12,15 @@ namespace DiscordChatExporter.Core.Models

        public string IconHash { get; }

-        public string IconUrl => IconHash.IsNotBlank()
-            ? $"https://cdn.discordapp.com/icons/{Id}/{IconHash}.png"
-            : "https://cdn.discordapp.com/embed/avatars/0.png";
+        public string IconUrl { get; }

        public Guild(string id, string name, string iconHash)
        {
            Id = id;
            Name = name;
            IconHash = iconHash;
+
+            IconUrl = GetIconUrl(id, iconHash);
        }

        public override string ToString() => Name;
@@ -28,6 +28,13 @@ namespace DiscordChatExporter.Core.Models

    public partial class Guild
    {
+        public static string GetIconUrl(string id, string iconHash)
+        {
+            return !iconHash.IsNullOrWhiteSpace()
+                ? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png"
+                : "https://cdn.discordapp.com/embed/avatars/0.png";
+        }
+
        public static Guild DirectMessages { get; } = new Guild("@me", "Direct Messages", null);
    }
 }
@@ -15,9 +15,9 @@ namespace DiscordChatExporter.Core.Models

        public User Author { get; }

-        public DateTime Timestamp { get; }
+        public DateTimeOffset Timestamp { get; }

-        public DateTime? EditedTimestamp { get; }
+        public DateTimeOffset? EditedTimestamp { get; }

        public string Content { get; }

@@ -29,8 +29,8 @@ namespace DiscordChatExporter.Core.Models

        public IReadOnlyList<User> MentionedUsers { get; }

-        public Message(string id, string channelId, MessageType type, User author, DateTime timestamp,
-            DateTime? editedTimestamp, string content, IReadOnlyList<Attachment> attachments,
+        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)
        {
            Id = id;
@@ -19,7 +19,6 @@

    public partial class Role
    {
-        public static Role CreateDeletedRole(string id) =>
-            new Role(id, "deleted-role");
+        public static Role CreateDeletedRole(string id) => new Role(id, "deleted-role");
    }
 }
@@ -0,0 +1,62 @@
+using System;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/topics/permissions#role-object
+
+    public partial class User
+    {
+        public string Id { get; }
+
+        public int Discriminator { get; }
+
+        public string Name { get; }
+
+        public string FullName { get; }
+
+        public string AvatarHash { get; }
+
+        public string AvatarUrl { get; }
+
+        public bool IsBot { get; }
+
+        public User(string id, int discriminator, string name, string avatarHash, bool isBot)
+        {
+            Id = id;
+            Discriminator = discriminator;
+            Name = name;
+            AvatarHash = avatarHash;
+            IsBot = isBot;
+
+            FullName = GetFullName(name, discriminator);
+            AvatarUrl = GetAvatarUrl(id, discriminator, avatarHash);
+        }
+
+        public override string ToString() => FullName;
+    }
+
+    public partial class User
+    {
+        public static string GetFullName(string name, int discriminator) => $"{name}#{discriminator:0000}";
+
+        public static string GetAvatarUrl(string id, int discriminator, string avatarHash)
+        {
+            // Custom avatar
+            if (!avatarHash.IsNullOrWhiteSpace())
+            {
+                // Animated
+                if (avatarHash.StartsWith("a_", StringComparison.Ordinal))
+                    return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.gif";
+
+                // Non-animated
+                return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.png";
+            }
+
+            // Default avatar
+            return $"https://cdn.discordapp.com/embed/avatars/{discriminator % 5}.png";
+        }
+
+        public static User CreateUnknownUser(string id) => new User(id, 0, "Unknown", null, false);
+    }
+}
@@ -0,0 +1,113 @@
+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);
+
+            // Line break
+            await writer.WriteLineAsync();
+        }
+
+        public async Task RenderAsync(TextWriter writer)
+        {
+            // Headers
+            await writer.WriteLineAsync("Author;Date;Content;Attachments;");
+
+            // Log
+            foreach (var message in _chatLog.Messages)
+                await RenderMessageAsync(writer, message);
+        }
+    }
+}
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <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" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Scriban" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj" />
+    <ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -2,19 +2,19 @@
 using System.Collections.Generic;
 using DiscordChatExporter.Core.Models;

-namespace DiscordChatExporter.Core.Services
+namespace DiscordChatExporter.Core.Rendering
 {
-    public partial class ExportService
+    public partial class HtmlChatLogRenderer
    {
        private class MessageGroup
        {
            public User Author { get; }

-            public DateTime Timestamp { get; }
+            public DateTimeOffset Timestamp { get; }

            public IReadOnlyList<Message> Messages { get; }

-            public MessageGroup(User author, DateTime timestamp, IReadOnlyList<Message> messages)
+            public MessageGroup(User author, DateTimeOffset timestamp, IReadOnlyList<Message> messages)
            {
                Author = author;
                Timestamp = timestamp;
@@ -0,0 +1,27 @@
+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));
+        }
+    }
+}
@@ -0,0 +1,200 @@
+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));
+        }
+    }
+}
@@ -0,0 +1,10 @@
+using System.IO;
+using System.Threading.Tasks;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public interface IChatLogRenderer
+    {
+        Task RenderAsync(TextWriter writer);
+    }
+}
@@ -0,0 +1,129 @@
+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 RenderMessageAsync(TextWriter writer, Message message)
+        {
+            // Timestamp and author
+            await writer.WriteLineAsync($"[{FormatDate(message.Timestamp)}] {message.Author.FullName}");
+
+            // Content
+            await writer.WriteLineAsync(FormatMarkdown(message.Content));
+
+            // Attachments
+            foreach (var attachment in message.Attachments)
+                await writer.WriteLineAsync(attachment.Url);
+        }
+
+        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);
+                await writer.WriteLineAsync();
+            }
+        }
+    }
+}
@@ -14,12 +14,12 @@ a {
 }

 .pre {
-    background-color: #2f3136;
+    background-color: #2f3136 !important;
 }

 .pre--multiline {
-    border-color: #282b30;
-    color: #839496;
+    border-color: #282b30 !important;
+    color: #839496 !important;
 }

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

 .pre {
-    background-color: #f9f9f9;
+    background-color: #f9f9f9 !important;
 }

 .pre--multiline {
-    border-color: #f3f3f3;
-    color: #657b83;
+    border-color: #f3f3f3 !important;
+    color: #657b83 !important;
 }

 .mention {
@@ -0,0 +1,3 @@
+{{~ ThemeStyleSheet = include "HtmlLight.css" ~}}
+{{~ HighlightJsStyleName = "solarized-light" ~}}
+{{~ include "HtmlShared.html" ~}}
@@ -1,5 +1,35 @@
 /* === GENERAL === */

+@font-face {
+    font-family: Whitney;
+    src: url(https://discordapp.com/assets/6c6374bad0b0b6d204d8d6dc4a18d820.woff);
+    font-weight: 300;
+}
+
+@font-face {
+    font-family: Whitney;
+    src: url(https://discordapp.com/assets/e8acd7d9bf6207f99350ca9f9e23b168.woff);
+    font-weight: 400;
+}
+
+@font-face {
+    font-family: Whitney;
+    src: url(https://discordapp.com/assets/3bdef1251a424500c1b3a78dea9b7e57.woff);
+    font-weight: 500;
+}
+
+@font-face {
+    font-family: Whitney;
+    src: url(https://discordapp.com/assets/be0060dafb7a0e31d2a1ca17c0708636.woff);
+    font-weight: 600;
+}
+
+@font-face {
+    font-family: Whitney;
+    src: url(https://discordapp.com/assets/8e12fb4f14d9c4592eb8ec9f22337b04.woff);
+    font-weight: 700;
+}
+
 body {
    font-family: "Whitney", "Helvetica Neue", Helvetica, Arial, sans-serif;
    font-size: 16px;
@@ -41,6 +71,7 @@ img {
 .pre--inline {
    padding: 2px;
    border-radius: 3px;
+    font-size: 85%;
 }

 .mention {
@@ -289,7 +320,7 @@ img {
 }

 .chatlog__embed-footer-text {
-    font-weight: 600;
+    font-weight: 500;
    font-size: .75em;
 }

@@ -309,4 +340,17 @@ img {
    min-width: 9px;
    margin-left: 6px;
    font-size: .875em;
+}
+
+.chatlog__bot-tag {
+    margin-left: 0.3em;
+    background: #7289da;
+    color: #ffffff;
+    font-size: 0.625em;
+    padding: 1px 2px;
+    border-radius: 3px;
+    vertical-align: middle;
+    line-height: 1.3;
+    position: relative;
+    top: -.2em;
 }
@@ -2,15 +2,29 @@
 <html lang="en">

 <head>
+    {{~ # Metadata ~}}
    <title>{{ Model.Guild.Name | html.escape }} - {{ Model.Channel.Name | html.escape }}</title>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width" />
+
+    {{~ # Styles ~}}
    <style>
-        {{ include "HtmlShared.Main.css" }}
+        {{ include "HtmlShared.css" }}
    </style>
    <style>
        {{ ThemeStyleSheet }}
    </style>
+
+    {{~ # Syntax highlighting ~}}
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/{{HighlightJsStyleName}}.min.css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
+    <script>
+        document.addEventListener('DOMContentLoaded', () => {
+            document.querySelectorAll('.pre--multiline').forEach((block) => {
+                hljs.highlightBlock(block);
+            });
+        });
+    </script>
 </head>
 <body>
    
@@ -27,16 +41,16 @@
            <div class="info__channel-topic">{{ Model.Channel.Topic | html.escape }}</div>
        {{~ end ~}}

-        <div class="info__channel-message-count">{{ Model.Messages | array.size | Format "N0" }} messages</div>
+        <div class="info__channel-message-count">{{ Model.Messages | array.size | object.format "N0" }} messages</div>
        
-        {{~ if Model.From || Model.To ~}}
+        {{~ if Model.After || Model.Before ~}}
            <div class="info__channel-date-range">
-                {{~ if Model.From && Model.To ~}}
-                    Between {{ Model.From | FormatDate | html.escape }} and {{ Model.To | FormatDate | html.escape }}
-                {{~ else if Model.From ~}}
-                    After {{ Model.From | FormatDate | html.escape }}
-                {{~ else if Model.To ~}}
-                    Before {{ Model.To | FormatDate | html.escape }}
+                {{~ if Model.After && Model.Before ~}}
+                    Between {{ Model.After | FormatDate | html.escape }} and {{ Model.Before | FormatDate | html.escape }}
+                {{~ else if Model.After ~}}
+                    After {{ Model.After | FormatDate | html.escape }}
+                {{~ else if Model.Before ~}}
+                    Before {{ Model.Before | FormatDate | html.escape }}
                {{~ end ~}}
            </div>
        {{~ end ~}}
@@ -54,6 +68,9 @@
            <div class="chatlog__messages">
                {{~ # Author name and timestamp ~}}
                <span class="chatlog__author-name" title="{{ group.Author.FullName | html.escape }}">{{ group.Author.Name | html.escape }}</span>
+                {{~ if group.Author.IsBot ~}}
+                    <span class="chatlog__bot-tag">BOT</span>
+                {{~ end ~}}
                <span class="chatlog__timestamp">{{ group.Timestamp | FormatDate | html.escape }}</span>

                {{~ # Messages ~}}
@@ -1,9 +1,8 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using ByteSizeLib;
-using DiscordChatExporter.Core.Internal;
 using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Services.Internal;
 using Newtonsoft.Json.Linq;
 using Tyrrrz.Extensions;

@@ -17,8 +16,9 @@ namespace DiscordChatExporter.Core.Services
            var discriminator = json["discriminator"].Value<int>();
            var name = json["username"].Value<string>();
            var avatarHash = json["avatar"].Value<string>();
+            var isBot = json["bot"]?.Value<bool>() ?? false;

-            return new User(id, discriminator, name, avatarHash);
+            return new User(id, discriminator, name, avatarHash, isBot);
        }

        private Guild ParseGuild(JToken json)
@@ -42,14 +42,14 @@ namespace DiscordChatExporter.Core.Services
            var guildId = json["guild_id"]?.Value<string>();

            // If the guild ID is blank, it's direct messages
-            if (guildId.IsBlank())
+            if (guildId.IsNullOrWhiteSpace())
                guildId = Guild.DirectMessages.Id;

            // Try to extract name
            var name = json["name"]?.Value<string>();

            // If the name is blank, it's direct messages
-            if (name.IsBlank())
+            if (name.IsNullOrWhiteSpace())
                name = json["recipients"].Select(ParseUser).Select(u => u.Name).JoinToString(", ");

            return new Channel(id, parentId, guildId, name, topic, type);
@@ -72,7 +72,7 @@ namespace DiscordChatExporter.Core.Services
            var fileName = json["filename"].Value<string>();
            var fileSizeBytes = json["size"].Value<long>();

-            var fileSize = ByteSize.FromBytes(fileSizeBytes);
+            var fileSize = new FileSize(fileSizeBytes);

            return new Attachment(id, width, height, url, fileName, fileSize);
        }
@@ -118,7 +118,7 @@ namespace DiscordChatExporter.Core.Services
            var title = json["title"]?.Value<string>();
            var description = json["description"]?.Value<string>();
            var url = json["url"]?.Value<string>();
-            var timestamp = json["timestamp"]?.Value<DateTime>();
+            var timestamp = json["timestamp"]?.Value<DateTimeOffset>();

            // Get color
            var color = json["color"] != null
@@ -165,8 +165,8 @@ namespace DiscordChatExporter.Core.Services
            // Get basic data
            var id = json["id"].Value<string>();
            var channelId = json["channel_id"].Value<string>();
-            var timestamp = json["timestamp"].Value<DateTime>();
-            var editedTimestamp = json["edited_timestamp"]?.Value<DateTime?>();
+            var timestamp = json["timestamp"].Value<DateTimeOffset>();
+            var editedTimestamp = json["edited_timestamp"]?.Value<DateTimeOffset?>();
            var content = json["content"].Value<string>();
            var type = (MessageType) json["type"].Value<int>();

@@ -1,15 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Models;
-using Newtonsoft.Json.Linq;
-using DiscordChatExporter.Core.Internal;
+using DiscordChatExporter.Core.Services.Exceptions;
+using DiscordChatExporter.Core.Services.Internal;
 using Failsafe;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Tyrrrz.Extensions;

 namespace DiscordChatExporter.Core.Services
@@ -23,7 +24,7 @@ namespace DiscordChatExporter.Core.Services
        {
            // Create retry policy
            var retry = Retry.Create()
-                .Catch<HttpErrorStatusCodeException>(false, e => e.StatusCode == HttpStatusCode.ServiceUnavailable)
+                .Catch<HttpErrorStatusCodeException>(false, e => (int) e.StatusCode >= 500)
                .Catch<HttpErrorStatusCodeException>(false, e => (int) e.StatusCode == 429)
                .WithMaxTryCount(10)
                .WithDelay(TimeSpan.FromSeconds(0.4));
@@ -41,13 +42,13 @@ namespace DiscordChatExporter.Core.Services
                        : new AuthenticationHeaderValue(token.Value);

                    // Add parameters
-                    foreach (var parameter in parameters.ExceptBlank())
+                    foreach (var parameter in parameters)
                    {
                        var key = parameter.SubstringUntil("=");
                        var value = parameter.SubstringAfter("=");

                        // Skip empty values
-                        if (value.IsBlank())
+                        if (value.IsNullOrWhiteSpace())
                            continue;

                        request.RequestUri = request.RequestUri.SetQueryParameter(key, value);
@@ -65,7 +66,12 @@ namespace DiscordChatExporter.Core.Services
                        var raw = await response.Content.ReadAsStringAsync();

                        // Parse
-                        return JToken.Parse(raw);
+                        using (var reader = new JsonTextReader(new StringReader(raw)))
+                        {
+                            reader.DateParseHandling = DateParseHandling.DateTimeOffset;
+
+                            return JToken.Load(reader);
+                        }
                    }
                }
            });
@@ -124,24 +130,24 @@ namespace DiscordChatExporter.Core.Services
        }

        public async Task<IReadOnlyList<Message>> GetChannelMessagesAsync(AuthToken token, string channelId,
-            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
+            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double> progress = null)
        {
            var result = new List<Message>();

            // Get the last message
            var response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
-                "limit=1", $"before={to?.ToSnowflake()}");
+                "limit=1", $"before={before?.ToSnowflake()}");
            var lastMessage = response.Select(ParseMessage).FirstOrDefault();

            // If the last message doesn't exist or it's outside of range - return
-            if (lastMessage == null || lastMessage.Timestamp < from)
+            if (lastMessage == null || lastMessage.Timestamp < after)
            {
                progress?.Report(1);
                return result;
            }

            // Get other messages
-            var offsetId = from?.ToSnowflake() ?? "0";
+            var offsetId = after?.ToSnowflake() ?? "0";
            while (true)
            {
                // Get message batch
@@ -216,19 +222,19 @@ namespace DiscordChatExporter.Core.Services
        }

        public async Task<ChatLog> GetChatLogAsync(AuthToken token, Guild guild, Channel channel,
-            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
+            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double> progress = null)
        {
            // Get messages
-            var messages = await GetChannelMessagesAsync(token, channel.Id, from, to, progress);
+            var messages = await GetChannelMessagesAsync(token, channel.Id, after, before, progress);

            // Get mentionables
            var mentionables = await GetMentionablesAsync(token, guild.Id, messages);

-            return new ChatLog(guild, channel, from, to, messages, mentionables);
+            return new ChatLog(guild, channel, after, before, messages, mentionables);
        }

        public async Task<ChatLog> GetChatLogAsync(AuthToken token, Channel channel,
-            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
+            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double> progress = null)
        {
            // Get guild
            var guild = channel.GuildId == Guild.DirectMessages.Id
@@ -236,17 +242,17 @@ namespace DiscordChatExporter.Core.Services
                : await GetGuildAsync(token, channel.GuildId);

            // Get the chat log
-            return await GetChatLogAsync(token, guild, channel, from, to, progress);
+            return await GetChatLogAsync(token, guild, channel, after, before, progress);
        }

        public async Task<ChatLog> GetChatLogAsync(AuthToken token, string channelId,
-            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
+            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double> progress = null)
        {
            // Get channel
            var channel = await GetChannelAsync(token, channelId);

            // Get the chat log
-            return await GetChatLogAsync(token, channel, from, to, progress);
+            return await GetChatLogAsync(token, channel, after, before, progress);
        }

        public void Dispose()
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Failsafe" Version="1.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Onova" Version="2.4.2" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
+    <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj" />
+    <ProjectReference Include="..\DiscordChatExporter.Core.Rendering\DiscordChatExporter.Core.Rendering.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -1,7 +1,7 @@
 using System;
 using System.Net;

-namespace DiscordChatExporter.Core.Exceptions
+namespace DiscordChatExporter.Core.Services.Exceptions
 {
    public class HttpErrorStatusCodeException : Exception
    {
@@ -0,0 +1,89 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Services
+{
+    public class ExportService
+    {
+        private readonly SettingsService _settingsService;
+
+        public ExportService(SettingsService settingsService)
+        {
+            _settingsService = settingsService;
+        }
+
+        private IChatLogRenderer CreateRenderer(ChatLog chatLog, ExportFormat format)
+        {
+            if (format == ExportFormat.PlainText)
+                return new PlainTextChatLogRenderer(chatLog, _settingsService.DateFormat);
+
+            if (format == ExportFormat.HtmlDark)
+                return new HtmlChatLogRenderer(chatLog, "Dark", _settingsService.DateFormat);
+
+            if (format == ExportFormat.HtmlLight)
+                return new HtmlChatLogRenderer(chatLog, "Light", _settingsService.DateFormat);
+
+            if (format == ExportFormat.Csv)
+                return new CsvChatLogRenderer(chatLog, _settingsService.DateFormat);
+
+            throw new ArgumentOutOfRangeException(nameof(format), $"Unknown format [{format}].");
+        }
+
+        private async Task ExportChatLogAsync(ChatLog chatLog, string filePath, ExportFormat format)
+        {
+            // Create output directory
+            var dirPath = Path.GetDirectoryName(filePath);
+            if (!dirPath.IsNullOrWhiteSpace())
+                Directory.CreateDirectory(dirPath);
+
+            // Render chat log to output file
+            using (var writer = File.CreateText(filePath))
+                await CreateRenderer(chatLog, format).RenderAsync(writer);
+        }
+
+        public async Task ExportChatLogAsync(ChatLog chatLog, string filePath, ExportFormat format, int? partitionLimit)
+        {
+            // If partitioning is disabled or there are fewer messages in chat log than the limit - process it without partitioning
+            if (partitionLimit == null || partitionLimit <= 0 || chatLog.Messages.Count <= partitionLimit)
+            {
+                await ExportChatLogAsync(chatLog, filePath, format);
+            }
+            // Otherwise split into partitions and export separately
+            else
+            {
+                // Create partitions by grouping up to X contiguous messages into separate chat logs
+                var partitions = chatLog.Messages.GroupContiguous(g => g.Count < partitionLimit.Value)
+                    .Select(g => new ChatLog(chatLog.Guild, chatLog.Channel, chatLog.After, chatLog.Before, g, chatLog.Mentionables))
+                    .ToArray();
+
+                // Split file path into components
+                var dirPath = Path.GetDirectoryName(filePath);
+                var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
+                var fileExt = Path.GetExtension(filePath);
+
+                // Export each partition separately
+                var partitionNumber = 1;
+                foreach (var partition in partitions)
+                {
+                    // Compose new file name
+                    var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Length}]{fileExt}";
+
+                    // Compose full file path
+                    if (!dirPath.IsNullOrWhiteSpace())
+                        partitionFilePath = Path.Combine(dirPath, partitionFilePath);
+
+                    // Export
+                    await ExportChatLogAsync(partition, partitionFilePath, format);
+
+                    // Increment partition number
+                    partitionNumber++;
+                }
+            }
+        }
+    }
+}
@@ -5,17 +5,17 @@ using System.Text;
 using DiscordChatExporter.Core.Models;
 using Tyrrrz.Extensions;

-namespace DiscordChatExporter.Core.Helpers
+namespace DiscordChatExporter.Core.Services.Helpers
 {
    public static class ExportHelper
    {
-        public static bool IsDirectoryPath(string path)
-            => path.Last() == Path.DirectorySeparatorChar ||
-               path.Last() == Path.AltDirectorySeparatorChar ||
-               Path.GetExtension(path).IsBlank();
+        public static bool IsDirectoryPath(string path) =>
+            path.Last() == Path.DirectorySeparatorChar ||
+            path.Last() == Path.AltDirectorySeparatorChar ||
+            (Path.GetExtension(path).IsNullOrWhiteSpace() && !File.Exists(path));

        public static string GetDefaultExportFileName(ExportFormat format, Guild guild, Channel channel,
-            DateTime? from = null, DateTime? to = null)
+            DateTimeOffset? after = null, DateTimeOffset? before = null)
        {
            var result = new StringBuilder();

@@ -23,24 +23,24 @@ namespace DiscordChatExporter.Core.Helpers
            result.Append($"{guild.Name} - {channel.Name} [{channel.Id}]");

            // Append date range
-            if (from != null || to != null)
+            if (after != null || before != null)
            {
                result.Append(" (");

-                // Both 'from' and 'to' are set
-                if (from != null && to != null)
+                // Both 'after' and 'before' are set
+                if (after != null && before != null)
                {
-                    result.Append($"{from:yyyy-MM-dd} to {to:yyyy-MM-dd}");
+                    result.Append($"{after:yyyy-MM-dd} to {before:yyyy-MM-dd}");
                }
-                // Only 'from' is set
-                else if (from != null)
+                // Only 'after' is set
+                else if (after != null)
                {
-                    result.Append($"after {from:yyyy-MM-dd}");
+                    result.Append($"after {after:yyyy-MM-dd}");
                }
-                // Only 'to' is set
+                // Only 'before' is set
                else
                {
-                    result.Append($"before {to:yyyy-MM-dd}");
+                    result.Append($"before {before:yyyy-MM-dd}");
                }

                result.Append(")");
@@ -0,0 +1,18 @@
+using System;
+using System.Drawing;
+
+namespace DiscordChatExporter.Core.Services.Internal
+{
+    internal static class Extensions
+    {
+        public static string ToSnowflake(this DateTimeOffset date)
+        {
+            const long epoch = 62135596800000;
+            var unixTime = date.ToUniversalTime().Ticks / TimeSpan.TicksPerMillisecond - epoch;
+            var value = ((ulong) unixTime - 1420070400000UL) << 22;
+            return value.ToString();
+        }
+
+        public static Color ResetAlpha(this Color color) => Color.FromArgb(1, color);
+    }
+}
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net461</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\ExportTemplates\PlainText\Template.txt" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark\Template.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight\Template.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlShared\Main.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlShared\Main.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark\Theme.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight\Theme.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Csv\Template.csv" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Reference Include="mscorlib" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="ByteSize" Version="1.3.0" />
-        <PackageReference Include="Failsafe" Version="1.1.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-        <PackageReference Include="Onova" Version="2.2.0" />
-        <PackageReference Include="Scriban" Version="1.2.9" />
-        <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
-        <PackageReference Include="Tyrrrz.Settings" Version="1.3.3" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj" />
-    </ItemGroup>
-
-</Project>
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Net;
-
-namespace DiscordChatExporter.Core.Internal
-{
-    internal static class Extensions
-    {
-        public static string ToSnowflake(this DateTime dateTime)
-        {
-            const long epoch = 62135596800000;
-            var unixTime = dateTime.ToUniversalTime().Ticks / TimeSpan.TicksPerMillisecond - epoch;
-            var value = ((ulong) unixTime - 1420070400000UL) << 22;
-            return value.ToString();
-        }
-
-        public static Color ResetAlpha(this Color color) => Color.FromArgb(1, color);
-
-        public static string HtmlEncode(this string value) => WebUtility.HtmlEncode(value);
-
-        public static IEnumerable<IReadOnlyList<T>> GroupAdjacentWhile<T>(this IEnumerable<T> source,
-            Func<IReadOnlyList<T>, T, bool> groupPredicate)
-        {
-            // Create buffer
-            var buffer = new List<T>();
-
-            // Enumerate source
-            foreach (var element in source)
-            {
-                // If buffer is not empty and group predicate failed - yield and flush buffer
-                if (buffer.Any() && !groupPredicate(buffer, element))
-                {
-                    yield return buffer;
-                    buffer = new List<T>(); // new instance to reset reference
-                }
-
-                // Add element to buffer
-                buffer.Add(element);
-            }
-
-            // If buffer still has something after the source has been enumerated - yield
-            if (buffer.Any())
-                yield return buffer;
-        }
-
-        public static IEnumerable<IReadOnlyList<T>> GroupAdjacentWhile<T>(this IEnumerable<T> source,
-            Func<IReadOnlyList<T>, bool> groupPredicate)
-            => source.GroupAdjacentWhile((buffer, _) => groupPredicate(buffer));
-    }
-}
@@ -1,61 +0,0 @@
-using System;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/topics/permissions#role-object
-
-    public partial class User
-    {
-        public string Id { get; }
-
-        public int Discriminator { get; }
-
-        public string Name { get; }
-
-        public string FullName => $"{Name}#{Discriminator:0000}";
-
-        public string DefaultAvatarHash => $"{Discriminator % 5}";
-
-        public string AvatarHash { get; }
-
-        public bool IsAvatarAnimated =>
-            AvatarHash.IsNotBlank() && AvatarHash.StartsWith("a_", StringComparison.Ordinal);
-
-        public string AvatarUrl
-        {
-            get
-            {
-                // Custom avatar
-                if (AvatarHash.IsNotBlank())
-                {
-                    // Animated
-                    if (IsAvatarAnimated)
-                        return $"https://cdn.discordapp.com/avatars/{Id}/{AvatarHash}.gif";
-
-                    // Non-animated
-                    return $"https://cdn.discordapp.com/avatars/{Id}/{AvatarHash}.png";
-                }
-
-                // Default avatar
-                return $"https://cdn.discordapp.com/embed/avatars/{DefaultAvatarHash}.png";
-            }
-        }
-
-        public User(string id, int discriminator, string name, string avatarHash)
-        {
-            Id = id;
-            Discriminator = discriminator;
-            Name = name;
-            AvatarHash = avatarHash;
-        }
-
-        public override string ToString() => FullName;
-    }
-
-    public partial class User
-    {
-        public static User CreateUnknownUser(string id) =>
-            new User(id, 0, "Unknown", null);
-    }
-}
@@ -1,10 +0,0 @@
-Author;Date;Content;Attachments;
-{{~ for message in Model.Messages -}}
-  {{- }}"{{ message.Author.FullName }}";
-
-  {{- }}"{{ message.Timestamp | FormatDate }}";
-
-  {{- }}"{{ message.Content | FormatMarkdown | string.replace "\"" "\"\"" }}";
-
-  {{- }}"{{ message.Attachments | array.map "Url" | array.join "," }}";
-{{~ end -}}
@@ -1,2 +0,0 @@
-{{~ ThemeStyleSheet = include "HtmlDark.Theme.css" ~}}
-{{~ include "HtmlShared.Main.html" ~}}
@@ -1,2 +0,0 @@
-{{~ ThemeStyleSheet = include "HtmlLight.Theme.css" ~}}
-{{~ include "HtmlShared.Main.html" ~}}
@@ -1,21 +0,0 @@
-{{~ # Info ~}}
-==============================================================
-Guild:    {{ Model.Guild.Name }}
-Channel:  {{ Model.Channel.Name }}
-Topic:    {{ Model.Channel.Topic }}
-Messages: {{ Model.Messages | array.size | Format "N0" }}
-Range:    {{ if Model.From }}{{ Model.From | FormatDate }} {{ end }}{{ if Model.From || Model.To }}->{{ end }}{{ if Model.To }} {{ Model.To | FormatDate }}{{ end }}
-==============================================================
-
-{{~ # Log ~}}
-{{~ for message in Model.Messages ~}}
-  {{~ # Author name and timestamp ~}}
-  {{~ }}[{{ message.Timestamp | FormatDate }}] {{ message.Author.FullName }}
-  {{~ # Content ~}}
-  {{~ message.Content | FormatMarkdown }}
-  {{~ # Attachments ~}}
-  {{~ for attachment in message.Attachments ~}}
-    {{~ attachment.Url }}
-  {{~ end ~}}
-
-{{~ end ~}}
@@ -1,37 +0,0 @@
-using System.Reflection;
-using DiscordChatExporter.Core.Models;
-using Scriban;
-using Scriban.Parsing;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private class TemplateLoader : ITemplateLoader
-        {
-            private const string ResourceRootNamespace = "DiscordChatExporter.Core.Resources.ExportTemplates";
-
-            public string GetPath(TemplateContext context, SourceSpan callerSpan, string templateName)
-            {
-                return $"{ResourceRootNamespace}.{templateName}";
-            }
-
-            public string GetPath(ExportFormat format)
-            {
-                return $"{ResourceRootNamespace}.{format}.Template.{format.GetFileExtension()}";
-            }
-
-            public string Load(TemplateContext context, SourceSpan callerSpan, string templatePath)
-            {
-                return Assembly.GetExecutingAssembly().GetManifestResourceString(templatePath);
-            }
-
-            public string Load(ExportFormat format)
-            {
-                return Assembly.GetExecutingAssembly().GetManifestResourceString(GetPath(format));
-            }
-        }
-    }
-}
@@ -1,222 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using DiscordChatExporter.Core.Internal;
-using DiscordChatExporter.Core.Markdown;
-using DiscordChatExporter.Core.Models;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private class TemplateModel
-        {
-            private readonly ExportFormat _format;
-            private readonly ChatLog _log;
-            private readonly string _dateFormat;
-
-            public TemplateModel(ExportFormat format, ChatLog log, string dateFormat)
-            {
-                _format = format;
-                _log = log;
-                _dateFormat = dateFormat;
-            }
-
-            private IEnumerable<MessageGroup> GroupMessages(IEnumerable<Message> messages)
-                => messages.GroupAdjacentWhile((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 Format(IFormattable obj, string format)
-                => obj.ToString(format, CultureInfo.InvariantCulture);
-
-            private string FormatDate(DateTime dateTime) => Format(dateTime, _dateFormat);
-
-            private string FormatMarkdownPlainText(IReadOnlyList<Node> nodes)
-            {
-                var buffer = new StringBuilder();
-
-                foreach (var node in nodes)
-                {
-                    if (node is FormattedNode formattedNode)
-                    {
-                        var innerText = FormatMarkdownPlainText(formattedNode.Children);
-                        buffer.Append($"{formattedNode.Token}{innerText}{formattedNode.Token}");
-                    }
-
-                    else if (node is MentionNode mentionNode && mentionNode.Type != MentionType.Meta)
-                    {
-                        if (mentionNode.Type == MentionType.User)
-                        {
-                            var user = _log.Mentionables.GetUser(mentionNode.Id);
-                            buffer.Append($"@{user.Name}");
-                        }
-
-                        else if (mentionNode.Type == MentionType.Channel)
-                        {
-                            var channel = _log.Mentionables.GetChannel(mentionNode.Id);
-                            buffer.Append($"#{channel.Name}");
-                        }
-
-                        else if (mentionNode.Type == MentionType.Role)
-                        {
-                            var role = _log.Mentionables.GetRole(mentionNode.Id);
-                            buffer.Append($"@{role.Name}");
-                        }
-                    }
-
-                    else if (node is EmojiNode emojiNode)
-                    {
-                        buffer.Append(emojiNode.IsCustomEmoji ? $":{emojiNode.Name}:" : node.Lexeme);
-                    }
-
-                    else
-                    {
-                        buffer.Append(node.Lexeme);
-                    }
-                }
-
-                return buffer.ToString();
-            }
-
-            private string FormatMarkdownPlainText(string input)
-                => FormatMarkdownPlainText(MarkdownParser.Parse(input));
-
-            private string FormatMarkdownHtml(IReadOnlyList<Node> nodes, int depth = 0)
-            {
-                var buffer = new StringBuilder();
-
-                foreach (var node in nodes)
-                {
-                    if (node is TextNode textNode)
-                    {
-                        buffer.Append(textNode.Text.HtmlEncode());
-                    }
-
-                    else if (node is FormattedNode formattedNode)
-                    {
-                        var innerHtml = FormatMarkdownHtml(formattedNode.Children, depth + 1);
-
-                        if (formattedNode.Formatting == TextFormatting.Bold)
-                            buffer.Append($"<strong>{innerHtml}</strong>");
-
-                        else if (formattedNode.Formatting == TextFormatting.Italic)
-                            buffer.Append($"<em>{innerHtml}</em>");
-
-                        else if (formattedNode.Formatting == TextFormatting.Underline)
-                            buffer.Append($"<u>{innerHtml}</u>");
-
-                        else if (formattedNode.Formatting == TextFormatting.Strikethrough)
-                            buffer.Append($"<s>{innerHtml}</s>");
-
-                        else if (formattedNode.Formatting == TextFormatting.Spoiler)
-                            buffer.Append($"<span class=\"spoiler\">{innerHtml}</span>");
-                    }
-
-                    else if (node is InlineCodeBlockNode inlineCodeBlockNode)
-                    {
-                        buffer.Append($"<span class=\"pre pre--inline\">{inlineCodeBlockNode.Code.HtmlEncode()}</span>");
-                    }
-
-                    else if (node is MultilineCodeBlockNode multilineCodeBlockNode)
-                    {
-                        // Set language class for syntax highlighting
-                        var languageCssClass = multilineCodeBlockNode.Language.IsNotBlank()
-                            ? "language-" + multilineCodeBlockNode.Language
-                            : null;
-
-                        buffer.Append(
-                            $"<div class=\"pre pre--multiline {languageCssClass}\">{multilineCodeBlockNode.Code.HtmlEncode()}</div>");
-                    }
-
-                    else if (node is MentionNode mentionNode)
-                    {
-                        if (mentionNode.Type == MentionType.Meta)
-                        {
-                            buffer.Append($"<span class=\"mention\">@{mentionNode.Id.HtmlEncode()}</span>");
-                        }
-
-                        else if (mentionNode.Type == MentionType.User)
-                        {
-                            var user = _log.Mentionables.GetUser(mentionNode.Id);
-                            buffer.Append($"<span class=\"mention\" title=\"{user.FullName}\">@{user.Name.HtmlEncode()}</span>");
-                        }
-
-                        else if (mentionNode.Type == MentionType.Channel)
-                        {
-                            var channel = _log.Mentionables.GetChannel(mentionNode.Id);
-                            buffer.Append($"<span class=\"mention\">#{channel.Name.HtmlEncode()}</span>");
-                        }
-
-                        else if (mentionNode.Type == MentionType.Role)
-                        {
-                            var role = _log.Mentionables.GetRole(mentionNode.Id);
-                            buffer.Append($"<span class=\"mention\">@{role.Name.HtmlEncode()}</span>");
-                        }
-                    }
-
-                    else if (node is EmojiNode emojiNode)
-                    {
-                        // Get emoji image URL
-                        var emojiImageUrl = new Emoji(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated).ImageUrl;
-
-                        // Emoji can be jumboable if it's the only top-level node
-                        var jumboableCssClass = depth == 0 && nodes.Count == 1
-                            ? "emoji--large"
-                            : null;
-
-                        buffer.Append($"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />");
-                    }
-
-                    else if (node is LinkNode linkNode)
-                    {
-                        var escapedUrl = Uri.EscapeUriString(linkNode.Url);
-                        buffer.Append($"<a href=\"{escapedUrl}\">{linkNode.Title.HtmlEncode()}</a>");
-                    }
-                }
-
-                return buffer.ToString();
-            }
-
-            private string FormatMarkdownHtml(string input) 
-                => FormatMarkdownHtml(MarkdownParser.Parse(input));
-
-            private string FormatMarkdown(string input)
-            {
-                return _format == ExportFormat.HtmlDark || _format == ExportFormat.HtmlLight
-                    ? FormatMarkdownHtml(input)
-                    : FormatMarkdownPlainText(input);
-            }
-
-            public ScriptObject GetScriptObject()
-            {
-                // Create instance
-                var scriptObject = new ScriptObject();
-
-                // Import model
-                scriptObject.SetValue("Model", _log, true);
-
-                // Import functions
-                scriptObject.Import(nameof(GroupMessages), new Func<IEnumerable<Message>, IEnumerable<MessageGroup>>(GroupMessages));
-                scriptObject.Import(nameof(Format), new Func<IFormattable, string, string>(Format));
-                scriptObject.Import(nameof(FormatDate), new Func<DateTime, string>(FormatDate));
-                scriptObject.Import(nameof(FormatMarkdown), new Func<string, string>(FormatMarkdown));
-
-                return scriptObject;
-            }
-        }
-    }
-}
@@ -1,107 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using DiscordChatExporter.Core.Internal;
-using DiscordChatExporter.Core.Models;
-using Scriban;
-using Scriban.Runtime;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private readonly SettingsService _settingsService;
-
-        public ExportService(SettingsService settingsService)
-        {
-            _settingsService = settingsService;
-        }
-
-        private void ExportChatLogSingle(ChatLog chatLog, string filePath, ExportFormat format)
-        {
-            // Create template loader
-            var loader = new TemplateLoader();
-
-            // Get template
-            var templateCode = loader.Load(format);
-            var template = Template.Parse(templateCode);
-
-            // Create template context
-            var context = new TemplateContext
-            {
-                TemplateLoader = loader,
-                MemberRenamer = m => m.Name,
-                MemberFilter = m => true,
-                LoopLimit = int.MaxValue,
-                StrictVariables = true
-            };
-
-            // Create template model
-            var templateModel = new TemplateModel(format, chatLog, _settingsService.DateFormat);
-
-            context.PushGlobal(templateModel.GetScriptObject());
-
-            // Create directory
-            var dirPath = Path.GetDirectoryName(filePath);
-            if (dirPath.IsNotBlank())
-                Directory.CreateDirectory(dirPath);
-
-            // Render output
-            using (var output = File.CreateText(filePath))
-            {
-                // Configure output
-                context.PushOutput(new TextWriterOutput(output));
-
-                // Render output
-                context.Evaluate(template.Page);
-            }
-        }
-
-        private void ExportChatLogPartitioned(IReadOnlyList<ChatLog> partitions, string filePath, ExportFormat format)
-        {
-            // Split file path into components
-            var dirPath = Path.GetDirectoryName(filePath);
-            var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
-            var fileExt = Path.GetExtension(filePath);
-
-            // Export each partition separately
-            var partitionNumber = 1;
-            foreach (var partition in partitions)
-            {
-                // Compose new file name
-                var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Count}]{fileExt}";
-
-                // Compose full file path
-                if (dirPath.IsNotBlank())
-                    partitionFilePath = Path.Combine(dirPath, partitionFilePath);
-
-                // Export
-                ExportChatLogSingle(partition, partitionFilePath, format);
-
-                // Increment partition number
-                partitionNumber++;
-            }
-        }
-
-        public void ExportChatLog(ChatLog chatLog, string filePath, ExportFormat format,
-            int? partitionLimit = null)
-        {
-            // If partitioning is disabled or there are fewer messages in chat log than the limit - process it without partitioning
-            if (partitionLimit == null || partitionLimit <= 0 || chatLog.Messages.Count <= partitionLimit)
-            {
-                ExportChatLogSingle(chatLog, filePath, format);
-            }
-            // Otherwise split into partitions and export separately
-            else
-            {
-                // Create partitions by grouping up to X adjacent messages into separate chat logs
-                var partitions = chatLog.Messages.GroupAdjacentWhile(g => g.Count < partitionLimit.Value)
-                    .Select(g => new ChatLog(chatLog.Guild, chatLog.Channel, chatLog.From, chatLog.To, g, chatLog.Mentionables))
-                    .ToArray();
-
-                ExportChatLogPartitioned(partitions, filePath, format);
-            }
-        }
-    }
-}
@@ -1,60 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Onova;
-using Onova.Services;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public class UpdateService
-    {
-        private readonly SettingsService _settingsService;
-
-        private readonly IUpdateManager _updateManager = new UpdateManager(
-            new GithubPackageResolver("Tyrrrz", "DiscordChatExporter", "DiscordChatExporter.zip"),
-            new ZipPackageExtractor());
-
-        private Version _updateVersion;
-        private bool _updaterLaunched;
-
-        public UpdateService(SettingsService settingsService)
-        {
-            _settingsService = settingsService;
-        }
-
-        public async Task<Version> CheckPrepareUpdateAsync()
-        {
-            // If auto-update is disabled - don't check for updates
-            if (!_settingsService.IsAutoUpdateEnabled)
-                return null;
-
-            // Cleanup leftover files
-            _updateManager.Cleanup();
-
-            // Check for updates
-            var check = await _updateManager.CheckForUpdatesAsync();
-            if (!check.CanUpdate)
-                return null;
-
-            // Prepare the update
-            if (!_updateManager.IsUpdatePrepared(check.LastVersion))
-                await _updateManager.PrepareUpdateAsync(check.LastVersion);
-
-            return _updateVersion = check.LastVersion;
-        }
-
-        public void FinalizeUpdate(bool needRestart)
-        {
-            // Check if an update is pending
-            if (_updateVersion == null)
-                return;
-
-            // Check if the updater has already been launched
-            if (_updaterLaunched)
-                return;
-
-            // Launch the updater
-            _updateManager.LaunchUpdater(_updateVersion, needRestart);
-            _updaterLaunched = true;
-        }
-    }
-}
@@ -1,6 +1,6 @@
 namespace DiscordChatExporter.Gui
 {
    public partial class App
-    {        
+    {
    }
 }
@@ -14,7 +14,7 @@ namespace DiscordChatExporter.Gui
        {
            base.ConfigureIoC(builder);

-            // Autobind services in the .Core assembly
+            // Autobind the .Services assembly
            builder.Autobind(typeof(DataService).Assembly);

            // Bind settings as singleton
@@ -0,0 +1,28 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace DiscordChatExporter.Gui.Converters
+{
+    [ValueConversion(typeof(DateTimeOffset), typeof(DateTime))]
+    public class DateTimeOffsetToDateTimeConverter : IValueConverter
+    {
+        public static DateTimeOffsetToDateTimeConverter Instance { get; } = new DateTimeOffsetToDateTimeConverter();
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is DateTimeOffset dateTimeOffsetValue)
+                return dateTimeOffsetValue.DateTime;
+
+            return default;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is DateTime dateTimeValue)
+                return new DateTimeOffset(dateTimeValue);
+
+            return default;
+        }
+    }
+}
@@ -12,8 +12,10 @@ namespace DiscordChatExporter.Gui.Converters

        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
        {
-            var format = value as ExportFormat?;
-            return format?.GetDisplayName();
+            if (value is ExportFormat exportFormatValue)
+                return exportFormatValue.GetDisplayName();
+
+            return default;
        }

        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -0,0 +1,28 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace DiscordChatExporter.Gui.Converters
+{
+    [ValueConversion(typeof(bool), typeof(bool))]
+    public class InverseBoolConverter : IValueConverter
+    {
+        public static InverseBoolConverter Instance { get; } = new InverseBoolConverter();
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is bool boolValue)
+                return !boolValue;
+
+            return default;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is bool boolValue)
+                return !boolValue;
+
+            return default;
+        }
+    }
+}
@@ -8,13 +8,15 @@
    <OutputType>WinExe</OutputType>
    <RootNamespace>DiscordChatExporter.Gui</RootNamespace>
    <AssemblyName>DiscordChatExporter</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <WarningLevel>4</WarningLevel>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <LangVersion>latest</LangVersion>
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,7 +60,10 @@
    <Compile Include="Behaviors\ChannelViewModelMultiSelectionListBoxBehavior.cs" />
    <Compile Include="Behaviors\MultiSelectionListBoxBehavior.cs" />
    <Compile Include="Bootstrapper.cs" />
+    <Compile Include="Converters\DateTimeOffsetToDateTimeConverter.cs" />
    <Compile Include="Converters\ExportFormatToStringConverter.cs" />
+    <Compile Include="Converters\InverseBoolConverter.cs" />
+    <Compile Include="Services\UpdateService.cs" />
    <Compile Include="ViewModels\Components\ChannelViewModel.cs" />
    <Compile Include="ViewModels\Components\GuildViewModel.cs" />
    <Compile Include="ViewModels\Dialogs\ExportSetupViewModel.cs" />
@@ -96,9 +101,13 @@
    <Resource Include="..\favicon.ico" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj">
+    <ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj">
+      <Project>{67a9d184-4656-4ce1-9d75-bddcbcafb200}</Project>
+      <Name>DiscordChatExporter.Core.Models</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscordChatExporter.Core.Services\DiscordChatExporter.Core.Services.csproj">
      <Project>{707c0cd0-a7e0-4cab-8db9-07a45cb87377}</Project>
-      <Name>DiscordChatExporter.Core</Name>
+      <Name>DiscordChatExporter.Core.Services</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
@@ -127,13 +136,13 @@
      <Version>1.1.3</Version>
    </PackageReference>
    <PackageReference Include="MaterialDesignThemes">
-      <Version>2.5.0.1205</Version>
+      <Version>2.5.1</Version>
    </PackageReference>
    <PackageReference Include="Ookii.Dialogs.Wpf">
      <Version>1.0.0</Version>
    </PackageReference>
    <PackageReference Include="PropertyChanged.Fody">
-      <Version>2.6.0</Version>
+      <Version>2.6.1</Version>
    </PackageReference>
    <PackageReference Include="Stylet">
      <Version>1.1.22</Version>
@@ -142,9 +151,8 @@
      <Version>2.0.20525</Version>
    </PackageReference>
    <PackageReference Include="Tyrrrz.Extensions">
-      <Version>1.5.1</Version>
+      <Version>1.6.1</Version>
    </PackageReference>
  </ItemGroup>
-  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
  <xs:element name="Weavers">
    <xs:complexType>
      <xs:all>
@@ -36,12 +36,17 @@
      </xs:all>
      <xs:attribute name="VerifyAssembly" type="xs:boolean">
        <xs:annotation>
-          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
        <xs:annotation>
-          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
        </xs:annotation>
      </xs:attribute>
    </xs:complexType>
@@ -3,5 +3,5 @@
 [assembly: AssemblyTitle("DiscordChatExporter")]
 [assembly: AssemblyCompany("Tyrrrz")]
 [assembly: AssemblyCopyright("Copyright (c) Alexey Golub")]
-[assembly: AssemblyVersion("2.10.2")]
-[assembly: AssemblyFileVersion("2.10.2")]
+[assembly: AssemblyVersion("2.13")]
+[assembly: AssemblyFileVersion("2.13")]
@@ -0,0 +1,80 @@
+using System;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Services;
+using Onova;
+using Onova.Exceptions;
+using Onova.Services;
+
+namespace DiscordChatExporter.Gui.Services
+{
+    public class UpdateService : IDisposable
+    {
+        private readonly SettingsService _settingsService;
+
+        private readonly IUpdateManager _updateManager = new UpdateManager(
+            new GithubPackageResolver("Tyrrrz", "DiscordChatExporter", "DiscordChatExporter.zip"),
+            new ZipPackageExtractor());
+
+        private Version _updateVersion;
+        private bool _updaterLaunched;
+
+        public UpdateService(SettingsService settingsService)
+        {
+            _settingsService = settingsService;
+        }
+
+        public async Task<Version> CheckPrepareUpdateAsync()
+        {
+            try
+            {
+                // If auto-update is disabled - don't check for updates
+                if (!_settingsService.IsAutoUpdateEnabled)
+                    return null;
+
+                // Check for updates
+                var check = await _updateManager.CheckForUpdatesAsync();
+                if (!check.CanUpdate)
+                    return null;
+
+                // Prepare the update
+                await _updateManager.PrepareUpdateAsync(check.LastVersion);
+
+                return _updateVersion = check.LastVersion;
+            }
+            catch (UpdaterAlreadyLaunchedException)
+            {
+                return null;
+            }
+            catch (LockFileNotAcquiredException)
+            {
+                return null;
+            }
+        }
+
+        public void FinalizeUpdate(bool needRestart)
+        {
+            try
+            {
+                // Check if an update is pending
+                if (_updateVersion == null)
+                    return;
+
+                // Check if the updater has already been launched
+                if (_updaterLaunched)
+                    return;
+
+                // Launch the updater
+                _updateManager.LaunchUpdater(_updateVersion, needRestart);
+                _updaterLaunched = true;
+            }
+            catch (UpdaterAlreadyLaunchedException)
+            {
+            }
+            catch (LockFileNotAcquiredException)
+            {
+            }
+        }
+
+        public void Dispose() => _updateManager.Dispose();
+    }
+}
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DiscordChatExporter.Core.Helpers;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Core.Services.Helpers;
 using DiscordChatExporter.Gui.ViewModels.Components;
 using DiscordChatExporter.Gui.ViewModels.Framework;
 using Tyrrrz.Extensions;
@@ -28,9 +28,9 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs

        public ExportFormat SelectedFormat { get; set; } = ExportFormat.HtmlDark;

-        public DateTime? From { get; set; }
+        public DateTimeOffset? After { get; set; }

-        public DateTime? To { get; set; }
+        public DateTimeOffset? Before { get; set; }

        public int? PartitionLimit { get; set; }

@@ -55,11 +55,11 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
            _settingsService.LastExportFormat = SelectedFormat;
            _settingsService.LastPartitionLimit = PartitionLimit;

-            // Clamp 'from' and 'to' values
-            if (From > To)
-                From = To;
-            if (To < From)
-                To = From;
+            // Clamp 'after' and 'before' values
+            if (After > Before)
+                After = Before;
+            if (Before < After)
+                Before = After;

            // If single channel - prompt file path
            if (IsSingleChannel)
@@ -68,7 +68,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
                var channel = Channels.Single();

                // Generate default file name
-                var defaultFileName = ExportHelper.GetDefaultExportFileName(SelectedFormat, Guild, channel, From, To);
+                var defaultFileName = ExportHelper.GetDefaultExportFileName(SelectedFormat, Guild, channel, After, Before);

                // Generate filter
                var ext = SelectedFormat.GetFileExtension();
@@ -85,7 +85,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
            }

            // If canceled - return
-            if (OutputPath.IsBlank())
+            if (OutputPath.IsNullOrWhiteSpace())
                return;

            // Close dialog
@@ -6,7 +6,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework
    {
        public T DialogResult { get; private set; }

-        public void Close(T dialogResult = default(T))
+        public void Close(T dialogResult = default)
        {
            // Set the result
            DialogResult = dialogResult;
@@ -21,6 +21,6 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework
    }

    public abstract class DialogScreen : DialogScreen<bool?>
-    {        
+    {
    }
 }
@@ -39,6 +39,6 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework

        public static ExportSetupViewModel CreateExportSetupViewModel(this IViewModelFactory factory,
            GuildViewModel guild, ChannelViewModel channel)
-            => factory.CreateExportSetupViewModel(guild, new[] {channel});
+            => factory.CreateExportSetupViewModel(guild, new[] { channel });
    }
 }
@@ -4,10 +4,11 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Reflection;
-using DiscordChatExporter.Core.Exceptions;
-using DiscordChatExporter.Core.Helpers;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Core.Services.Exceptions;
+using DiscordChatExporter.Core.Services.Helpers;
+using DiscordChatExporter.Gui.Services;
 using DiscordChatExporter.Gui.ViewModels.Components;
 using DiscordChatExporter.Gui.ViewModels.Framework;
 using Gress;
@@ -62,9 +63,9 @@ namespace DiscordChatExporter.Gui.ViewModels
            // Update busy state when progress manager changes
            ProgressManager.Bind(o => o.IsActive, (sender, args) => IsBusy = ProgressManager.IsActive);
            ProgressManager.Bind(o => o.IsActive,
-                (sender, args) => IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress <= 0);
+                (sender, args) => IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1));
            ProgressManager.Bind(o => o.Progress,
-                (sender, args) => IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress <= 0);
+                (sender, args) => IsProgressIndeterminate = ProgressManager.IsActive && ProgressManager.Progress.IsEither(0, 1));
        }

        protected override async void OnViewLoaded()
@@ -122,7 +123,7 @@ namespace DiscordChatExporter.Gui.ViewModels
            await _dialogManager.ShowDialogAsync(dialog);
        }

-        public bool CanPopulateGuildsAndChannels => !IsBusy && TokenValue.IsNotBlank();
+        public bool CanPopulateGuildsAndChannels => !IsBusy && !TokenValue.IsNullOrWhiteSpace();

        public async void PopulateGuildsAndChannels()
        {
@@ -235,7 +236,7 @@ namespace DiscordChatExporter.Gui.ViewModels
            }
        }

-        public bool CanExportChannels => !IsBusy && SelectedChannels.NotNullAndAny();
+        public bool CanExportChannels => !IsBusy && !SelectedChannels.IsNullOrEmpty();

        public async void ExportChannels()
        {
@@ -253,6 +254,7 @@ namespace DiscordChatExporter.Gui.ViewModels
            var operations = ProgressManager.CreateOperations(dialog.Channels.Count);

            // Export channels
+            var successfulExportCount = 0;
            for (var i = 0; i < dialog.Channels.Count; i++)
            {
                // Get operation and channel
@@ -267,22 +269,22 @@ namespace DiscordChatExporter.Gui.ViewModels
                    {
                        // Generate default file name
                        var fileName = ExportHelper.GetDefaultExportFileName(dialog.SelectedFormat, dialog.Guild,
-                            channel, dialog.From, dialog.To);
+                            channel, dialog.After, dialog.Before);

                        // Combine paths
                        filePath = Path.Combine(filePath, fileName);
                    }

                    // Get chat log
-                    var chatLog = await _dataService.GetChatLogAsync(token, dialog.Guild, channel, 
-                        dialog.From, dialog.To, operation);
+                    var chatLog = await _dataService.GetChatLogAsync(token, dialog.Guild, channel,
+                        dialog.After, dialog.Before, operation);

                    // Export
-                    _exportService.ExportChatLog(chatLog, filePath, dialog.SelectedFormat,
+                    await _exportService.ExportChatLogAsync(chatLog, filePath, dialog.SelectedFormat,
                        dialog.PartitionLimit);

-                    // Notify completion
-                    Notifications.Enqueue($"Channel [{channel.Model.Name}] successfully exported");
+                    // Report successful export
+                    successfulExportCount++;
                }
                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
                {
@@ -298,6 +300,9 @@ namespace DiscordChatExporter.Gui.ViewModels
                    operation.Dispose();
                }
            }
+
+            // Notify of overall completion
+            Notifications.Enqueue($"Successfully exported {successfulExportCount} channel(s)");
        }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexey Golub	0ced31ca4a	Update version	2019-05-15 01:04:21 +03:00
Alexey Golub	3bb5638b56	Improve usage instructions slightly	2019-05-15 00:56:50 +03:00
Malcolm Diller	3b5d752c95	Add bot tags and some CSS fixes (#172 )	2019-05-09 13:52:46 +03:00
Alexey Golub	2b1f599cbe	Add logo image	2019-04-25 22:14:17 +03:00
Alexey Golub	7cb1c21897	Refactor	2019-04-18 22:21:20 +03:00
Alexey Golub	37bcea86e3	[CLI] Update usage guide to explain steps needed to extract DM channel ID	2019-04-18 22:19:26 +03:00
Alexey Golub	559ef71d2f	Get rid of Chocolatey	2019-04-17 00:59:22 +03:00
Alexey Golub	ab0ce478db	Move UpdateService to GUI project	2019-04-16 23:08:38 +03:00
Alexey Golub	afb9f52221	Update FodyWeavers.xsd	2019-04-16 23:08:22 +03:00
Alexey Golub	d65ca409b1	Update nuget packages	2019-04-13 02:42:03 +03:00
Oleksii Holub	7784383ea7	Fix grammar mistakes in comments	2019-04-12 17:13:12 +03:00
Oleksii Holub	26322da800	[GUI] Notify when all exports are done instead of each of them separately	2019-04-12 16:24:17 +03:00
Oleksii Holub	1325edb135	Use latest C# version in all projects	2019-04-12 16:10:28 +03:00
Oleksii Holub	dec2c26d83	Update appveyor image to vs2019	2019-04-12 16:01:01 +03:00
Oleksii Holub	82b0b8cb0a	[GUI] Block UI when an export is underway	2019-04-12 15:23:07 +03:00
Oleksii Holub	a7da90943f	Remove trailing whitespace	2019-04-12 13:48:13 +03:00
Alexey Golub	1edeaf9d3a	Update changelog	2019-04-12 01:03:42 +03:00
Alexey Golub	9c043376f9	Update version	2019-04-12 00:14:54 +03:00
Alexey Golub	77366cc9b4	Escape specific emojis in markdown Fixes a part of #146	2019-04-12 00:11:01 +03:00
Alexey Golub	ffdca7b799	[HTML] Fix multiple emojis not getting jumbo	2019-04-11 23:31:29 +03:00
Alexey Golub	30cba7959f	Refactor string checks and fix exception when exporting multiple channels Fix #164	2019-04-11 22:56:29 +03:00
Alexey Golub	7951703cf2	Update version	2019-04-11 01:52:50 +03:00
Alexey Golub	795dfbb213	[CLI] Don't show 'completed' when export failed	2019-04-11 01:36:39 +03:00
Alexey Golub	6d9bc3625f	Switch from DateTime to DateTimeOffset	2019-04-11 01:20:52 +03:00
Alexey Golub	4bfb2ec7fd	Improve performance (#162 )	2019-04-10 23:45:21 +03:00
Oleksii Holub	359278afec	Optimize chocolatey package	2019-04-09 18:15:17 +03:00
Oleksii Holub	19f58f2c8c	Update readme	2019-04-09 16:32:24 +03:00
Alexey Golub	640b1f5866	Add deploy via chocolatey	2019-04-07 13:01:38 +03:00
Oleksii Holub	d13d04e75b	Add donation info	2019-04-03 18:33:34 +03:00
Oleksii Holub	6bf0ce3790	Fix dockerfile again	2019-03-25 15:22:51 +02:00
Oleksii Holub	aef8a1f6d2	Fix default output directory in dockerfile	2019-03-25 14:35:24 +02:00
Oleksii Holub	a63bf95212	Update dockerfile	2019-03-25 11:04:51 +02:00
Oleksii Holub	af9855fc15	[CLI] Copy nuget dependencies to output	2019-03-25 11:00:13 +02:00
Alexey Golub	4113101c0c	Get rid of ByteSize in favor of our own class	2019-03-24 12:36:25 +02:00
Oleksii Holub	cac48b3541	Optimize dockerfile	2019-03-22 15:09:07 +02:00
Alexey Golub	0a60dea5c1	Use net46, netstd2.0, and netcoreapp2.1 for target frameworks Closes #154	2019-03-22 00:07:13 +02:00
Alexey Golub	889446fff7	Update nuget packages	2019-03-21 22:54:12 +02:00
Alexey Golub	6d1cfef729	Update Onova	2019-03-21 00:55:24 +02:00
Oleksii Holub	77bf32aa5a	Update version	2019-03-14 16:36:55 +02:00
Oleksii Holub	ac2b450892	Retry on any 5xx HTTP response in DataService Closes #157	2019-03-14 16:30:27 +02:00
Oleksii Holub	4046fd0ad9	[HTML] Add syntax highlighting via Highlight.js Closes #138	2019-03-14 16:02:39 +02:00