Update version

Fixes a part of #146

Changelog.md

@@ -1,3 +1,47 @@
+### 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.
+
+### 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.
+- [HTML] Added small margin at the end of the chatlog so it doesn't look like it was truncated.
+- [CLI] Fixed an issue where the app would crash if stdout was redirected. Progress will not be reported in such cases.
+
+### v2.10.1 (06-Mar-2019)
+
+- [HTML] Fixed an issue where multiple emojis on a single line would get rendered as one emoji.
+- [HTML] Fixed an issue where an open square bracket character would incorrectly render as an emoji.
+- [HTML] Added alt text to emoji images so that they will be rendered using default font when Twemoji images are not available.
+
+### v2.10 (03-Mar-2019)
+
+- [HTML] Reworked the entire markdown parsing engine which fixes numerous rendering inconsistencies (over 15 issues fixed).
+- [HTML] Added support for animated emojis.
+- [HTML] Standard emojis are now rendered using Twemoji, the same image set that Discord uses.
+- [HTML] Fixed an issue where video attachments would render incorrectly.
+- [HTML] Minor fixes in styling.
+- [GUI] Aggregated export progress is now shown in the taskbar.
+- [GUI] Checkmarks are now displayed next to channels that are selected.
+- [CLI] Added progress reporting when exporting chat logs.
+
+### v2.9.1 (10-Feb-2019)
+
+- Fixed an issue where some of the last messages in a channel would sometimes not get exported.
+
 ### v2.9 (09-Feb-2019)
 
 - Added categories to channel list in GUI. Channels are now also grouped by category.

Deploy/Choco/discordchatexporter.nuspec

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
+  <metadata>
+    <id>discordchatexporter</id>
+    <title>DiscordChatExporter</title>
+    <version>2.12.1</version>
+    <owners>Tyrrrz</owners>
+    <authors>Tyrrrz</authors>
+    <copyright>Copyright (C) Alexey Golub</copyright>
+    <summary>Exports Discord chat logs to a file</summary>
+    <description>DiscordChatExporter can be used to export message history from a Discord channel to a file. It works for both direct message chats and guild chats, supports markdown, message grouping, and attachments. The tool also lets you select from/to dates to limit the exported messages. There are options to configure the output, such as date format, color theme, message grouping limit, etc.</description>
+    <tags>discordchatexporter discord export chat logs archive gui</tags>
+    <projectSourceUrl>https://github.com/Tyrrrz/DiscordChatExporter</projectSourceUrl>
+    <packageSourceUrl>https://github.com/Tyrrrz/DiscordChatExporter</packageSourceUrl>
+    <projectUrl>http://tyrrrz.me/Projects/DiscordChatExporter</projectUrl>
+    <releaseNotes>https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Changelog.md</releaseNotes>
+    <iconUrl>https://raw.githubusercontent.com/Tyrrrz/DiscordChatExporter/master/favicon.png</iconUrl>
+    <licenseUrl>https://raw.githubusercontent.com/Tyrrrz/DiscordChatExporter/master/License.txt</licenseUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <bugTrackerUrl>https://github.com/Tyrrrz/DiscordChatExporter/issues</bugTrackerUrl>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>

Deploy/Choco/tools/chocolateyinstall.ps1

@@ -0,0 +1,24 @@
+$ErrorActionPreference = 'Stop'
+$packageName = $env:ChocolateyPackageName
+$installDirPath = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+
+# Install package (GUI)
+
+$packageArgs = @{
+    packageName   = $packageName
+    unzipLocation = $installDirPath
+    url           = 'https://github.com/Tyrrrz/DiscordChatExporter/releases/download/2.12.1/DiscordChatExporter.zip'
+}
+Install-ChocolateyZipPackage @packageArgs
+
+# Mark the executable as GUI
+New-Item (Join-Path $installDirPath "DiscordChatExporter.exe.gui") -ItemType File -Force
+
+# Install package (CLI)
+
+$packageArgs = @{
+    packageName   = $packageName
+    unzipLocation = $installDirPath
+    url           = 'https://github.com/Tyrrrz/DiscordChatExporter/releases/download/2.12.1/DiscordChatExporter.CLI.zip'
+}
+Install-ChocolateyZipPackage @packageArgs

Deploy/Prepare.ps1

@@ -1,11 +1,27 @@
-New-Item "$PSScriptRoot\bin" -ItemType Directory -Force
+# --- PORTABLE / 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
+New-Item "$PSScriptRoot\Portable\GUI\bin" -ItemType Directory -Force
+$files | Compress-Archive -DestinationPath "$PSScriptRoot\Portable\GUI\bin\DiscordChatExporter.zip" -Force
+
+# --- PORTABLE / CLI ---
+
+# Get files
 $files = @()
-$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-Item -Path "$PSScriptRoot\..\License.txt"
+$files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Cli\bin\Release\net46\*" -Include "*.exe", "*.dll", "*.config"
+
+# Pack into archive
+New-Item "$PSScriptRoot\Portable\CLI\bin" -ItemType Directory -Force
+$files | Compress-Archive -DestinationPath "$PSScriptRoot\Portable\CLI\bin\DiscordChatExporter.CLI.zip" -Force
+
+# --- CHOCOLATEY ---
+
+# Create package
+New-Item "$PSScriptRoot\Choco\bin\" -ItemType Directory -Force
+choco pack $PSScriptRoot\Choco\discordchatexporter.nuspec --out $PSScriptRoot\Choco\bin\

DiscordChatExporter.Cli/Container.cs

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

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -1,22 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net461</TargetFramework>
-        <Version>2.9</Version>
-        <Company>Tyrrrz</Company>
-        <Copyright>Copyright (c) 2017-2018 Alexey Golub</Copyright>
-        <ApplicationIcon>..\favicon.ico</ApplicationIcon>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
+    <Version>2.12.1</Version>
+    <Company>Tyrrrz</Company>
+    <Copyright>Copyright (c) Alexey Golub</Copyright>
+    <ApplicationIcon>..\favicon.ico</ApplicationIcon>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </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>

DiscordChatExporter.Cli/Internal/InlineProgress.cs

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

DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs

@@ -1,9 +1,10 @@
 using System;
 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
@@ -23,32 +24,35 @@ namespace DiscordChatExporter.Cli.Verbs
             var exportService = Container.Instance.Get<ExportService>();
 
             // Configure settings
-            if (Options.DateFormat.IsNotBlank())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                 settingsService.DateFormat = Options.DateFormat;
-            if (Options.MessageGroupLimit > 0)
-                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
 
-            // Get chat log
-            var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), Options.ChannelId, 
-                Options.After, Options.Before);
-
-            // Generate file path if not set or is a directory
-            var filePath = Options.OutputPath;
-            if (filePath.IsBlank() || ExportHelper.IsDirectoryPath(filePath))
+            // Track progress
+            Console.Write($"Exporting channel [{Options.ChannelId}]... ");
+            using (var progress = new InlineProgress())
             {
-                // Generate default file name
-                var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                    chatLog.Channel, Options.After, Options.Before);
+                // Get chat log
+                var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), Options.ChannelId,
+                    Options.After, Options.Before, progress);
 
-                // Combine paths
-                filePath = Path.Combine(filePath ?? "", fileName);
+                // Generate file path if not set or is a directory
+                var filePath = Options.OutputPath;
+                if (filePath.IsNullOrWhiteSpace() || ExportHelper.IsDirectoryPath(filePath))
+                {
+                    // Generate default file name
+                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
+                        chatLog.Channel, Options.After, Options.Before);
+
+                    // Combine paths
+                    filePath = Path.Combine(filePath ?? "", fileName);
+                }
+
+                // Export
+                await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
+
+                // Report successful completion
+                progress.ReportCompletion();
             }
-
-            // Export
-            exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-
-            // Print result
-            Console.WriteLine($"Exported chat to [{filePath}]");
         }
     }
 }

DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs

@@ -3,10 +3,11 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Internal;
 using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.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
@@ -26,10 +27,8 @@ namespace DiscordChatExporter.Cli.Verbs
             var exportService = Container.Instance.Get<ExportService>();
 
             // Configure settings
-            if (Options.DateFormat.IsNotBlank())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                 settingsService.DateFormat = Options.DateFormat;
-            if (Options.MessageGroupLimit > 0)
-                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
 
             // Get channels
             var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
@@ -42,25 +41,28 @@ namespace DiscordChatExporter.Cli.Verbs
             {
                 try
                 {
-                    // Print current channel name
-                    Console.WriteLine($"Exporting chat from [{channel.Name}]...");
+                    // Track progress
+                    Console.Write($"Exporting channel [{channel.Name}]... ");
+                    using (var progress = new InlineProgress())
+                    {
+                        // Get chat log
+                        var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
+                            Options.After, Options.Before, progress);
 
-                    // Get chat log
-                    var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
-                        Options.After, Options.Before);
+                        // Generate default file name
+                        var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
+                            chatLog.Channel, Options.After, Options.Before);
 
-                    // Generate default file name
-                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                        chatLog.Channel, Options.After, Options.Before);
+                        // Generate file path
+                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
 
-                    // Generate file path
-                    var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
+                        // Export
+                        await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat,
+                            Options.PartitionLimit);
 
-                    // Export
-                    exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-
-                    // Print result
-                    Console.WriteLine($"Exported chat to [{filePath}]");
+                        // Report successful completion
+                        progress.ReportCompletion();
+                    }
                 }
                 catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
                 {

DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs

@@ -3,11 +3,12 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Internal;
 using DiscordChatExporter.Cli.Verbs.Options;
-using DiscordChatExporter.Core.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
@@ -27,10 +28,8 @@ namespace DiscordChatExporter.Cli.Verbs
             var exportService = Container.Instance.Get<ExportService>();
 
             // Configure settings
-            if (Options.DateFormat.IsNotBlank())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                 settingsService.DateFormat = Options.DateFormat;
-            if (Options.MessageGroupLimit > 0)
-                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
 
             // Get channels
             var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
@@ -43,25 +42,28 @@ namespace DiscordChatExporter.Cli.Verbs
             {
                 try
                 {
-                    // Print current channel name
-                    Console.WriteLine($"Exporting chat from [{channel.Name}]...");
+                    // Track progress
+                    Console.Write($"Exporting channel [{channel.Name}]... ");
+                    using (var progress = new InlineProgress())
+                    {
+                        // Get chat log
+                        var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
+                            Options.After, Options.Before, progress);
 
-                    // Get chat log
-                    var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
-                        Options.After, Options.Before);
+                        // Generate default file name
+                        var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
+                            chatLog.Channel, Options.After, Options.Before);
 
-                    // Generate default file name
-                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                        chatLog.Channel, Options.After, Options.Before);
+                        // Generate file path
+                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
 
-                    // Generate file path
-                    var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
+                        // Export
+                        await exportService.ExportChatLogAsync(chatLog, filePath, Options.ExportFormat,
+                            Options.PartitionLimit);
 
-                    // Export
-                    exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-
-                    // Print result
-                    Console.WriteLine($"Exported chat to [{filePath}]");
+                        // Report successful completion
+                        progress.ReportCompletion();
+                    }
                 }
                 catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
                 {

DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs

@@ -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; }
 
@@ -23,8 +25,5 @@ namespace DiscordChatExporter.Cli.Verbs.Options
 
         [Option("dateformat", Default = null, HelpText = "Date format used in output.")]
         public string DateFormat { get; set; }
-
-        [Option("grouplimit", Default = 0, HelpText = "Message group limit.")]
-        public int MessageGroupLimit { get; set; }
     }
 }

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

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
+  </ItemGroup>
+
+</Project>

DiscordChatExporter.Core.Markdown/Internal/AggregateMatcher.cs

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

DiscordChatExporter.Core.Markdown/Internal/Extensions.cs

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

DiscordChatExporter.Core.Markdown/Internal/IMatcher.cs

@@ -0,0 +1,7 @@
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    internal interface IMatcher<T>
+    {
+        ParsedMatch<T> Match(string input, int startIndex, int length);
+    }
+}

DiscordChatExporter.Core.Markdown/Internal/ParsedMatch.cs

@@ -0,0 +1,18 @@
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    internal partial 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;
+        }
+    }
+}

DiscordChatExporter.Core.Markdown/Internal/RegexMatcher.cs

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

DiscordChatExporter.Core.Markdown/Internal/StringMatcher.cs

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

DiscordChatExporter.Core.Markdown/MarkdownParser.cs

@@ -0,0 +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
+    {
+        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 preceeded 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 preceeded 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 preceeded 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);
+    }
+}

DiscordChatExporter.Core.Markdown/Nodes/EmojiNode.cs

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

DiscordChatExporter.Core.Markdown/Nodes/FormattedNode.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace DiscordChatExporter.Core.Markdown.Nodes
+{
+    public class FormattedNode : Node
+    {
+        public string Token { get; }
+
+        public TextFormatting Formatting { get; }
+
+        public IReadOnlyList<Node> Children { get; }
+
+        public FormattedNode(string source, string token, TextFormatting formatting, IReadOnlyList<Node> children)
+            : base(source)
+        {
+            Token = token;
+            Formatting = formatting;
+            Children = children;
+        }
+
+        public override string ToString() => $"<{Formatting}> ({Children.Count} direct children)";
+    }
+}

DiscordChatExporter.Core.Markdown/Nodes/InlineCodeBlockNode.cs

@@ -0,0 +1,15 @@
+namespace DiscordChatExporter.Core.Markdown.Nodes
+{
+    public class InlineCodeBlockNode : Node
+    {
+        public string Code { get; }
+
+        public InlineCodeBlockNode(string source, string code)
+            : base(source)
+        {
+            Code = code;
+        }
+
+        public override string ToString() => $"<Code> {Code}";
+    }
+}

DiscordChatExporter.Core.Markdown/Nodes/LinkNode.cs

@@ -0,0 +1,22 @@
+namespace DiscordChatExporter.Core.Markdown.Nodes
+{
+    public class LinkNode : Node
+    {
+        public string Url { get; }
+
+        public string Title { get; }
+
+        public LinkNode(string source, string url, string title)
+            : base(source)
+        {
+            Url = url;
+            Title = title;
+        }
+
+        public LinkNode(string source, string url) : this(source, url, url)
+        {
+        }
+
+        public override string ToString() => $"<Link> {Title}";
+    }
+}

DiscordChatExporter.Core.Markdown/Nodes/MentionNode.cs

@@ -0,0 +1,18 @@
+namespace DiscordChatExporter.Core.Markdown.Nodes
+{
+    public class MentionNode : Node
+    {
+        public string Id { get; }
+
+        public MentionType Type { get; }
+
+        public MentionNode(string source, string id, MentionType type)
+            : base(source)
+        {
+            Id = id;
+            Type = type;
+        }
+
+        public override string ToString() => $"<{Type} mention> {Id}";
+    }
+}

DiscordChatExporter.Core.Markdown/Nodes/MentionType.cs

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

DiscordChatExporter.Core.Markdown/Nodes/MultilineCodeBlockNode.cs

@@ -0,0 +1,18 @@
+namespace DiscordChatExporter.Core.Markdown.Nodes
+{
+    public class MultilineCodeBlockNode : Node
+    {
+        public string Language { get; }
+
+        public string Code { get; }
+
+        public MultilineCodeBlockNode(string source, string language, string code)
+            : base(source)
+        {
+            Language = language;
+            Code = code;
+        }
+
+        public override string ToString() => $"<Code [{Language}]> {Code}";
+    }
+}

DiscordChatExporter.Core.Markdown/Nodes/Node.cs

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

DiscordChatExporter.Core.Markdown/Nodes/TextFormatting.cs

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

DiscordChatExporter.Core.Markdown/Nodes/TextNode.cs

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

DiscordChatExporter.Core.Models/Attachment.cs

@@ -0,0 +1,50 @@
+using System;
+using System.IO;
+using System.Linq;
+
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/channel#attachment-object
+
+    public partial class Attachment
+    {
+        public string Id { get; }
+
+        public string Url { get; }
+
+        public int? Width { get; }
+
+        public int? Height { get; }
+
+        public string FileName { get; }
+
+        public bool IsImage { get; }
+
+        public FileSize FileSize { get; }
+
+        public Attachment(string id, int? width, int? height, string url, string fileName, FileSize fileSize)
+        {
+            Id = id;
+            Url = url;
+            Width = width;
+            Height = height;
+            FileName = fileName;
+            FileSize = fileSize;
+
+            IsImage = GetIsImage(fileName);
+        }
+
+        public override string ToString() => FileName;
+    }
+
+    public partial class Attachment
+    {
+        private static readonly string[] ImageFileExtensions = { ".jpg", ".jpeg", ".png", ".gif", ".bmp" };
+
+        public static bool GetIsImage(string fileName)
+        {
+            var fileExtension = Path.GetExtension(fileName);
+            return ImageFileExtensions.Contains(fileExtension, StringComparer.OrdinalIgnoreCase);
+        }
+    }
+}

DiscordChatExporter.Core.Models/ChatLog.cs

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

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

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
+  </ItemGroup>
+
+</Project>

DiscordChatExporter.Core.Models/Embed.cs

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

DiscordChatExporter.Core.Models/Emoji.cs

@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Linq;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/emoji#emoji-object
+
+    public partial class Emoji
+    {
+        public string Id { get; }
+
+        public string Name { get; }
+
+        public bool IsAnimated { get; }
+
+        public string ImageUrl { get; }
+
+        public Emoji(string id, string name, bool isAnimated)
+        {
+            Id = id;
+            Name = name;
+            IsAnimated = isAnimated;
+
+            ImageUrl = GetImageUrl(id, name, isAnimated);
+        }
+    }
+
+    public partial class Emoji
+    {
+        private static IEnumerable<int> GetCodePoints(string emoji)
+        {
+            for (var i = 0; i < emoji.Length; i += char.IsHighSurrogate(emoji[i]) ? 2 : 1)
+                yield return char.ConvertToUtf32(emoji, i);
+        }
+
+        private static string GetTwemojiName(string emoji) =>
+            GetCodePoints(emoji).Select(i => i.ToString("x")).JoinToString("-");
+
+        public static string GetImageUrl(string id, string name, bool isAnimated)
+        {
+            // Custom emoji
+            if (!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";
+        }
+    }
+}

DiscordChatExporter.Core.Models/FileSize.cs

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

DiscordChatExporter.Core.Models/Guild.cs

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

DiscordChatExporter.Core.Models/Message.cs

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

DiscordChatExporter.Core.Models/Reaction.cs

@@ -6,15 +6,12 @@
     {
         public int Count { get; }
 
-        public string EmojiId { get; }
+        public Emoji Emoji { get; }
 
-        public string EmojiName { get; }
-
-        public Reaction(int count, string emojiId, string emojiName) 
+        public Reaction(int count, Emoji emoji)
         {
             Count = count;
-            EmojiId = emojiId;
-            EmojiName = emojiName;
+            Emoji = emoji;
         }
     }
 }

DiscordChatExporter.Core.Models/Role.cs

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

DiscordChatExporter.Core.Models/User.cs

@@ -0,0 +1,59 @@
+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 User(string id, int discriminator, string name, string avatarHash)
+        {
+            Id = id;
+            Discriminator = discriminator;
+            Name = name;
+            AvatarHash = avatarHash;
+
+            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);
+    }
+}

DiscordChatExporter.Core.Rendering/CsvChatLogRenderer.cs

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

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

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+  </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>

DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.MessageGroup.cs

@@ -1,20 +1,20 @@
-using System;
+using DiscordChatExporter.Core.Models;
+using System;
 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;

DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.TemplateLoader.cs

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

DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.cs

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

DiscordChatExporter.Core.Rendering/IChatLogRenderer.cs

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

DiscordChatExporter.Core.Rendering/PlainTextChatLogRenderer.cs

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

DiscordChatExporter.Core.Rendering/Resources/HtmlDark.css

@@ -2,24 +2,27 @@
 
 body {
     background-color: #36393e;
-    color: #ffffffb3;
+    color: #dcddde;
 }
 
 a {
     color: #0096cf;
 }
 
+.spoiler {
+    background-color: rgba(255, 255, 255, 0.1);
+}
+
 .pre {
-    background-color: #2f3136;
+    background-color: #2f3136 !important;
 }
 
 .pre--multiline {
-    border-color: #282b30;
-    color: #839496;
+    border-color: #282b30 !important;
+    color: #839496 !important;
 }
 
 .mention {
-    background-color: #738bd71a;
     color: #7289da;
 }
 
@@ -40,7 +43,7 @@ a {
 /* === CHATLOG === */
 
 .chatlog__message-group {
-    border-color: #ffffff0a;
+    border-color: rgba(255, 255, 255, 0.1);
 }
 
 .chatlog__author-name {
@@ -48,16 +51,16 @@ a {
 }
 
 .chatlog__timestamp {
-    color: #ffffff33;
+    color: rgba(255, 255, 255, 0.2);
 }
 
 .chatlog__edited-timestamp {
-    color: #ffffff33;
+    color: rgba(255, 255, 255, 0.2);
 }
 
 .chatlog__embed-content-container {
-    background-color: #2e30364d;
-    border-color: #2e303699;
+    background-color: rgba(46, 48, 54, 0.3);
+    border-color: rgba(46, 48, 54, 0.6);
 }
 
 .chatlog__embed-author-name {
@@ -73,7 +76,7 @@ a {
 }
 
 .chatlog__embed-description {
-    color: #ffffff99;
+    color: rgba(255, 255, 255, 0.6);
 }
 
 .chatlog__embed-field-name {
@@ -81,17 +84,17 @@ a {
 }
 
 .chatlog__embed-field-value {
-    color: #ffffff99;
+    color: rgba(255, 255, 255, 0.6);
 }
 
 .chatlog__embed-footer {
-    color: #ffffff99;
+    color: rgba(255, 255, 255, 0.6);
 }
 
 .chatlog__reaction {
-    background-color: #ffffff0a;
+    background-color: rgba(255, 255, 255, 0.05);
 }
 
 .chatlog__reaction-count {
-    color: #ffffff4d;
+    color: rgba(255, 255, 255, 0.3);
 }

DiscordChatExporter.Core.Rendering/Resources/HtmlDark.html

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

DiscordChatExporter.Core.Rendering/Resources/HtmlLight.css

@@ -2,20 +2,24 @@
 
 body {
     background-color: #ffffff;
-    color: #737f8d;
+    color: #747f8d;
 }
 
 a {
     color: #00b0f4;
 }
 
+.spoiler {
+    background-color: rgba(0, 0, 0, 0.1);
+}
+
 .pre {
-    background-color: #f9f9f9;
+    background-color: #f9f9f9 !important;
 }
 
 .pre--multiline {
-    border-color: #f3f3f3;
-    color: #657b83;
+    border-color: #f3f3f3 !important;
+    color: #657b83 !important;
 }
 
 .mention {
@@ -56,8 +60,8 @@ a {
 }
 
 .chatlog__embed-content-container {
-    background-color: #f9f9f94d;
-    border-color: #cccccc4d;
+    background-color: rgba(249, 249, 249, 0.3);
+    border-color: rgba(204, 204, 204, 0.3);
 }
 
 .chatlog__embed-author-name {
@@ -85,11 +89,11 @@ a {
 }
 
 .chatlog__embed-footer {
-    color: #4f535b99;
+    color: rgba(79, 83, 91, 0.4);
 }
 
 .chatlog__reaction {
-    background-color: #4f545c0f;
+    background-color: rgba(79, 84, 92, 0.06);
 }
 
 .chatlog__reaction-count {

DiscordChatExporter.Core.Rendering/Resources/HtmlLight.html

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

DiscordChatExporter.Core.Rendering/Resources/HtmlShared.css

@@ -17,9 +17,18 @@ img {
     object-fit: contain;
 }
 
+.markdown {
+    white-space: pre-wrap;
+    line-height: 1.3;
+    overflow-wrap: break-word;
+}
+
+.spoiler {
+    border-radius: 3px;
+}
+
 .pre {
     font-family: "Consolas", "Courier New", Courier, Monospace;
-    white-space: pre-wrap;
 }
 
 .pre--multiline {
@@ -34,25 +43,25 @@ img {
     border-radius: 3px;
 }
 
+.mention {
+    font-weight: 500;
+}
+
 .emoji {
-    width: 24px;
-    height: 24px;
+    width: 1.45em;
+    height: 1.45em;
     margin: 0 1px;
-    vertical-align: middle;
+    vertical-align: -0.4em;
 }
 
 .emoji--small {
-    width: 16px;
-    height: 16px;
+    width: 1rem;
+    height: 1rem;
 }
 
 .emoji--large {
-    width: 32px;
-    height: 32px;
-}
-
-.mention {
-    font-weight: 600;
+    width: 2rem;
+    height: 2rem;
 }
 
 /* === INFO === */
@@ -101,6 +110,7 @@ img {
 
 .chatlog {
     max-width: 100%;
+    margin-bottom: 24px;
 }
 
 .chatlog__message-group {
@@ -130,6 +140,7 @@ img {
 
 .chatlog__author-name {
     font-size: 1em;
+    font-weight: 500;
 }
 
 .chatlog__timestamp {
@@ -144,7 +155,7 @@ img {
 }
 
 .chatlog__edited-timestamp {
-    margin-left: 5px;
+    margin-left: 3px;
     font-size: .8em;
 }
 
@@ -283,21 +294,19 @@ img {
 }
 
 .chatlog__reactions {
-    display: flex;    
+    display: flex;
 }
 
 .chatlog__reaction {
+    display: flex;
+    align-items: center;
     margin: 6px 2px 2px 2px;
-    padding: 2px 6px 2px 2px;
+    padding: 3px 6px;
     border-radius: 3px;
 }
 
-.chatlog__reaction-emoji {
-    margin-left: 3px;
-    vertical-align: middle;
-}
-
 .chatlog__reaction-count {
+    min-width: 9px;
+    margin-left: 6px;
     font-size: .875em;
-    vertical-align: middle;
 }

DiscordChatExporter.Core.Rendering/Resources/HtmlShared.html

@@ -2,12 +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>
-        {{ StyleSheet }}
+        {{ 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>
     
@@ -24,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 ~}}
@@ -58,7 +75,7 @@
                     {{~ # Content ~}}
                     {{~ if message.Content ~}}
                         <div class="chatlog__content">
-                            {{ message.Content | FormatContent }}
+                            <span class="markdown">{{ message.Content | FormatMarkdown }}</span>
 
                             {{~ # Edited timestamp ~}}
                             {{~ if message.EditedTimestamp ~}}
@@ -76,7 +93,7 @@
                                     <img class="chatlog__attachment-thumbnail" src="{{ attachment.Url }}" />
                                 {{~ # Non-image ~}}
                                 {{~ else ~}}
-                                    Attachment: {{ attachment.FileName }} ({{ attachment.FileSize | FormatFileSize }})
+                                    Attachment: {{ attachment.FileName }} ({{ attachment.FileSize }})
                                 {{~ end ~}}
                             </a>
                         </div>
@@ -85,7 +102,7 @@
                     {{~ # Embeds ~}}
                     {{~ for embed in message.Embeds ~}}
                         <div class="chatlog__embed">
-                            <div class="chatlog__embed-color-pill" style="background-color: rgba({{ embed.Color | FormatColor }})"></div>
+                            <div class="chatlog__embed-color-pill" style="background-color: rgba({{ embed.Color.R }},{{ embed.Color.G }},{{ embed.Color.B }},{{ embed.Color.A }})"></div>
                             <div class="chatlog__embed-content-container">
                                 <div class="chatlog__embed-content">
                                     <div class="chatlog__embed-text">
@@ -112,16 +129,16 @@
                                         {{~ if embed.Title ~}}
                                             <div class="chatlog__embed-title">
                                                 {{~ if embed.Url ~}}
-                                                    <a class="chatlog__embed-title-link" href="{{ embed.Url }}">{{ embed.Title | FormatContent }}</a>
+                                                    <a class="chatlog__embed-title-link" href="{{ embed.Url }}"><span class="markdown">{{ embed.Title | FormatMarkdown }}</span></a>
                                                 {{~ else ~}}
-                                                    {{ embed.Title | FormatContent }}
+                                                    <span class="markdown">{{ embed.Title | FormatMarkdown }}</span>
                                                 {{~ end ~}}
                                             </div>
                                         {{~ end ~}}
 
                                         {{~ # Description ~}}
                                         {{~ if embed.Description ~}}
-                                            <div class="chatlog__embed-description">{{ embed.Description | FormatContent true }}</div>
+                                        <div class="chatlog__embed-description"><span class="markdown">{{ embed.Description | FormatMarkdown }}</span></div>
                                         {{~ end ~}}
 
                                         {{~ # Fields ~}}
@@ -130,10 +147,10 @@
                                                 {{~ for field in embed.Fields ~}}
                                                     <div class="chatlog__embed-field {{ if field.IsInline }} chatlog__embed-field--inline {{ end }}">
                                                         {{~ if field.Name ~}}
-                                                            <div class="chatlog__embed-field-name">{{ field.Name | FormatContent }}</div>
+                                                            <div class="chatlog__embed-field-name"><span class="markdown">{{ field.Name | FormatMarkdown }}</span></div>
                                                         {{~ end ~}}
                                                         {{~ if field.Value ~}}
-                                                            <div class="chatlog__embed-field-value">{{ field.Value | FormatContent true }}</div>
+                                                            <div class="chatlog__embed-field-value"><span class="markdown">{{ field.Value | FormatMarkdown }}</span></div>
                                                         {{~ end ~}}
                                                     </div>
                                                 {{~ end ~}}
@@ -192,15 +209,7 @@
                         <div class="chatlog__reactions">
                             {{~ for reaction in message.Reactions ~}}
                                 <div class="chatlog__reaction">
-                                    <span class="chatlog__reaction-emoji">
-                                        {{~ # Custom emoji ~}}
-                                        {{~ if reaction.EmojiId ~}}
-                                            <img class="emoji emoji--small" title="{{ reaction.EmojiName }}" src="https://cdn.discordapp.com/emojis/{{ reaction.EmojiId }}.png" />
-                                        {{~ # Default emoji ~}}
-                                        {{~ else ~}}
-                                            {{ reaction.EmojiName }}
-                                        {{~ end ~}}
-                                    </span>
+                                    <img class="emoji emoji--small" alt="{{ reaction.Emoji.Name }}" title="{{ reaction.Emoji.Name }}" src="{{ reaction.Emoji.ImageUrl }}" />
                                     <span class="chatlog__reaction-count">{{ reaction.Count }}</span>
                                 </div>
                             {{~ end ~}}

DiscordChatExporter.Core.Services/DataService.Parsers.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using DiscordChatExporter.Core.Internal;
 using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Services.Internal;
 using Newtonsoft.Json.Linq;
 using Tyrrrz.Extensions;
 
@@ -41,14 +41,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);
@@ -69,7 +69,9 @@ namespace DiscordChatExporter.Core.Services
             var width = json["width"]?.Value<int>();
             var height = json["height"]?.Value<int>();
             var fileName = json["filename"].Value<string>();
-            var fileSize = json["size"].Value<long>();
+            var fileSizeBytes = json["size"].Value<long>();
+
+            var fileSize = new FileSize(fileSizeBytes);
 
             return new Attachment(id, width, height, url, fileName, fileSize);
         }
@@ -115,7 +117,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
@@ -140,13 +142,21 @@ namespace DiscordChatExporter.Core.Services
             return new Embed(title, url, timestamp, color, author, description, fields, thumbnail, image, footer);
         }
 
+        private Emoji ParseEmoji(JToken json)
+        {
+            var id = json["id"]?.Value<string>();
+            var name = json["name"]?.Value<string>();
+            var isAnimated = json["animated"]?.Value<bool>() ?? false;
+
+            return new Emoji(id, name, isAnimated);
+        }
+
         private Reaction ParseReaction(JToken json)
         {
             var count = json["count"].Value<int>();
-            var emojiId = json["emoji"]["id"]?.Value<string>();
-            var emojiName = json["emoji"]["name"].Value<string>();
+            var emoji = ParseEmoji(json["emoji"]);
 
-            return new Reaction(count, emojiId, emojiName);
+            return new Reaction(count, emoji);
         }
 
         private Message ParseMessage(JToken json)
@@ -154,8 +164,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>();
 

DiscordChatExporter.Core.Services/DataService.cs

@@ -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));
@@ -45,6 +46,11 @@ namespace DiscordChatExporter.Core.Services
                     {
                         var key = parameter.SubstringUntil("=");
                         var value = parameter.SubstringAfter("=");
+
+                        // Skip empty values
+                        if (value.IsNullOrWhiteSpace())
+                            continue;
+
                         request.RequestUri = request.RequestUri.SetQueryParameter(key, value);
                     }
 
@@ -60,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);
+                        }
                     }
                 }
             });
@@ -119,28 +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 snowflakes for the selected range
-            var firstId = from != null ? from.Value.ToSnowflake() : "0";
-            var lastId = to != null ? to.Value.ToSnowflake() : DateTime.MaxValue.ToSnowflake();
-
             // Get the last message
             var response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
-                "limit=1", $"before={lastId}");
+                "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 = firstId;
+            var offsetId = after?.ToSnowflake() ?? "0";
             while (true)
             {
                 // Get message batch
@@ -215,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
@@ -235,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()

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

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+  </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>

DiscordChatExporter.Core.Services/Exceptions/HttpErrorStatusCodeException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Net;
 
-namespace DiscordChatExporter.Core.Exceptions
+namespace DiscordChatExporter.Core.Services.Exceptions
 {
     public class HttpErrorStatusCodeException : Exception
     {

DiscordChatExporter.Core.Services/ExportService.cs

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

DiscordChatExporter.Core.Services/Helpers/ExportHelper.cs

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

DiscordChatExporter.Core.Services/Internal/Extensions.cs

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

DiscordChatExporter.Core.Services/SettingsService.cs

@@ -8,7 +8,6 @@ namespace DiscordChatExporter.Core.Services
         public bool IsAutoUpdateEnabled { get; set; } = true;
 
         public string DateFormat { get; set; } = "dd-MMM-yy hh:mm tt";
-        public int MessageGroupLimit { get; set; } = 20;
 
         public AuthToken LastToken { get; set; }
         public ExportFormat LastExportFormat { get; set; } = ExportFormat.HtmlDark;

DiscordChatExporter.Core.Services/UpdateService.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Threading.Tasks;
+using Onova;
+using Onova.Exceptions;
+using Onova.Services;
+
+namespace DiscordChatExporter.Core.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();
+    }
+}

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net461</TargetFramework>
-        <Version>2.9</Version>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\ExportTemplates\PlainText.txt" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Html\Core.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Html\Shared.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Html\DarkTheme.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Html\LightTheme.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Csv.csv" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Reference Include="mscorlib" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Failsafe" Version="1.0.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>
-
-</Project>

DiscordChatExporter.Core/Internal/Extensions.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Drawing;
-using Tyrrrz.Extensions;
-
-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 string Base64Encode(this string str) => str.GetBytes().ToBase64();
-
-        public static string Base64Decode(this string str) => str.FromBase64().GetString();
-
-        public static Color ResetAlpha(this Color color) => Color.FromArgb(1, color);
-    }
-}

DiscordChatExporter.Core/Models/Attachment.cs

@@ -1,33 +0,0 @@
-namespace DiscordChatExporter.Core.Models
-{
-    // https://discordapp.com/developers/docs/resources/channel#attachment-object
-
-    public class Attachment
-    {
-        public string Id { get; }
-
-        public string Url { get; }
-
-        public int? Width { get; }
-
-        public int? Height { get; }
-
-        public bool IsImage => Width != null;
-
-        public string FileName { get; }
-
-        public long FileSize { get; }
-
-        public Attachment(string id, int? width, int? height, string url, string fileName, long fileSize)
-        {
-            Id = id;
-            Url = url;
-            Width = width;
-            Height = height;
-            FileName = fileName;
-            FileSize = fileSize;
-        }
-
-        public override string ToString() => FileName;
-    }
-}

DiscordChatExporter.Core/Models/User.cs

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

DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv

@@ -1,10 +0,0 @@
-Author;Date;Content;Attachments;
-{{~ for message in Model.Messages -}}
-  {{- }}"{{ message.Author.FullName }}";
-
-  {{- }}"{{ message.Timestamp | FormatDate }}";
-
-  {{- }}"{{ message.Content | FormatContent }}";
-
-  {{- }}"{{ message.Attachments | array.map "Url" | array.join "," }}";
-{{~ end -}}

DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark.html

@@ -1,7 +0,0 @@
-{{
-    $SharedStyleSheet = include "Html.Shared.css"
-    $ThemeStyleSheet = include "Html.DarkTheme.css"
-    StyleSheet = $SharedStyleSheet + "\n" + $ThemeStyleSheet
-}}
-
-{{ include "Html.Core.html" }}

DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight.html

@@ -1,7 +0,0 @@
-{{ 
-    $SharedStyleSheet = include "Html.Shared.css"
-    $ThemeStyleSheet = include "Html.LightTheme.css"
-    StyleSheet = $SharedStyleSheet + "\n" + $ThemeStyleSheet
-}}
-
-{{ include "Html.Core.html" }}

DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt

@@ -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 | FormatContent }}
-  {{~ # Attachments ~}}
-  {{~ for attachment in message.Attachments ~}}
-    {{~ attachment.Url }}
-  {{~ end ~}}
-
-{{~ end ~}}

DiscordChatExporter.Core/Services/ExportService.TemplateLoader.cs

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

DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs

@@ -1,368 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-using System.Text.RegularExpressions;
-using DiscordChatExporter.Core.Internal;
-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;
-            private readonly int _messageGroupLimit;
-
-            public TemplateModel(ExportFormat format, ChatLog log, string dateFormat, int messageGroupLimit)
-            {
-                _format = format;
-                _log = log;
-                _dateFormat = dateFormat;
-                _messageGroupLimit = messageGroupLimit;
-            }
-
-            private IEnumerable<MessageGroup> GroupMessages(IEnumerable<Message> messages)
-            {
-                // Group adjacent messages by timestamp and author
-                var buffer = new List<Message>();
-                foreach (var message in messages)
-                {
-                    // Get first message of the group
-                    var groupFirstMessage = buffer.FirstOrDefault();
-
-                    // Group break condition
-                    var breakCondition =
-                        groupFirstMessage != null &&
-                        (
-                            message.Author.Id != groupFirstMessage.Author.Id || // when author changes
-                            (message.Timestamp - groupFirstMessage.Timestamp).TotalHours > 1 || // when difference in timestamps is an hour or more
-                            message.Timestamp.Hour != groupFirstMessage.Timestamp.Hour || // when the timestamp's hour changes
-                            buffer.Count >= _messageGroupLimit // when group is full
-                        );
-
-                    // If condition is true - flush buffer
-                    if (breakCondition)
-                    {
-                        var group = new MessageGroup(groupFirstMessage.Author, groupFirstMessage.Timestamp, buffer);
-
-                        // Reset the buffer instead of clearing to avoid mutations on existing references
-                        buffer = new List<Message>();
-
-                        yield return group;
-                    }
-
-                    // Add message to buffer
-                    buffer.Add(message);
-                }
-
-                // Add what's remaining in buffer
-                if (buffer.Any())
-                {
-                    var groupFirstMessage = buffer.First();
-                    var group = new MessageGroup(groupFirstMessage.Author, groupFirstMessage.Timestamp, buffer);
-
-                    yield return group;
-                }
-            }
-
-            private string HtmlEncode(string str) => WebUtility.HtmlEncode(str);
-
-            private string Format(IFormattable obj, string format) =>
-                obj.ToString(format, CultureInfo.InvariantCulture);
-
-            private string FormatDate(DateTime dateTime) => Format(dateTime, _dateFormat);
-
-            private string FormatFileSize(long fileSize)
-            {
-                string[] units = {"B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
-                double size = fileSize;
-                var unit = 0;
-
-                while (size >= 1024)
-                {
-                    size /= 1024;
-                    ++unit;
-                }
-
-                return $"{size:0.#} {units[unit]}";
-            }
-
-            private string FormatColor(Color color)
-            {
-                return $"{color.R},{color.G},{color.B},{color.A}";
-            }
-
-            private string FormatContentPlainText(string content)
-            {
-                // New lines
-                content = content.Replace("\n", Environment.NewLine);
-
-                // User mentions (<@id> and <@!id>)
-                var mentionedUserIds = Regex.Matches(content, "<@!?(\\d+)>")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedUserId in mentionedUserIds)
-                {
-                    var mentionedUser = _log.Mentionables.GetUser(mentionedUserId);
-                    content = Regex.Replace(content, $"<@!?{mentionedUserId}>", $"@{mentionedUser.FullName}");
-                }
-
-                // Channel mentions (<#id>)
-                var mentionedChannelIds = Regex.Matches(content, "<#(\\d+)>")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedChannelId in mentionedChannelIds)
-                {
-                    var mentionedChannel = _log.Mentionables.GetChannel(mentionedChannelId);
-                    content = content.Replace($"<#{mentionedChannelId}>", $"#{mentionedChannel.Name}");
-                }
-
-                // Role mentions (<@&id>)
-                var mentionedRoleIds = Regex.Matches(content, "<@&(\\d+)>")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedRoleId in mentionedRoleIds)
-                {
-                    var mentionedRole = _log.Mentionables.GetRole(mentionedRoleId);
-                    content = content.Replace($"<@&{mentionedRoleId}>", $"@{mentionedRole.Name}");
-                }
-
-                // Custom emojis (<:name:id>)
-                content = Regex.Replace(content, "<(:.*?:)\\d*>", "$1");
-
-                return content;
-            }
-
-            private string FormatContentHtml(string content, bool allowLinks = false)
-            {
-                // HTML-encode content
-                content = HtmlEncode(content);
-
-                // Encode multiline codeblocks (```text```)
-                content = Regex.Replace(content,
-                    @"```+(?:[^`]*?\n)?([^`]+)\n?```+",
-                    m => $"\x1AM{m.Groups[1].Value.Base64Encode()}\x1AM");
-
-                // Encode inline codeblocks (`text`)
-                content = Regex.Replace(content,
-                    @"`([^`]+)`",
-                    m => $"\x1AI{m.Groups[1].Value.Base64Encode()}\x1AI");
-
-                // Encode links
-                if (allowLinks)
-                {
-                    content = Regex.Replace(content, @"\[(.*?)\]\((.*?)\)",
-                        m => $"\x1AL{m.Groups[1].Value.Base64Encode()}|{m.Groups[2].Value.Base64Encode()}\x1AL");
-                }
-
-                // Encode URLs
-                content = Regex.Replace(content,
-                    @"(\b(?:(?:https?|ftp|file)://|www\.|ftp\.)(?:\([-a-zA-Z0-9+&@#/%?=~_|!:,\.\[\];]*\)|[-a-zA-Z0-9+&@#/%?=~_|!:,\.\[\];])*(?:\([-a-zA-Z0-9+&@#/%?=~_|!:,\.\[\];]*\)|[-a-zA-Z0-9+&@#/%=~_|$]))",
-                    m => $"\x1AU{m.Groups[1].Value.Base64Encode()}\x1AU");
-
-                // Process bold (**text**)
-                content = Regex.Replace(content, @"(\*\*)(?=\S)(.+?[*_]*)(?<=\S)\1", "<b>$2</b>");
-
-                // Process underline (__text__)
-                content = Regex.Replace(content, @"(__)(?=\S)(.+?)(?<=\S)\1", "<u>$2</u>");
-
-                // Process italic (*text* or _text_)
-                content = Regex.Replace(content, @"(\*|_)(?=\S)(.+?)(?<=\S)\1", "<i>$2</i>");
-
-                // Process strike through (~~text~~)
-                content = Regex.Replace(content, @"(~~)(?=\S)(.+?)(?<=\S)\1", "<s>$2</s>");
-
-                // Decode and process multiline codeblocks
-                content = Regex.Replace(content, "\x1AM(.*?)\x1AM",
-                    m => $"<div class=\"pre pre--multiline\">{m.Groups[1].Value.Base64Decode()}</div>");
-
-                // Decode and process inline codeblocks
-                content = Regex.Replace(content, "\x1AI(.*?)\x1AI",
-                    m => $"<span class=\"pre pre--inline\">{m.Groups[1].Value.Base64Decode()}</span>");
-
-                // Decode and process links
-                if (allowLinks)
-                {
-                    content = Regex.Replace(content, "\x1AL(.*?)\\|(.*?)\x1AL",
-                        m => $"<a href=\"{m.Groups[2].Value.Base64Decode()}\">{m.Groups[1].Value.Base64Decode()}</a>");
-                }
-
-                // Decode and process URLs
-                content = Regex.Replace(content, "\x1AU(.*?)\x1AU",
-                    m => $"<a href=\"{m.Groups[1].Value.Base64Decode()}\">{m.Groups[1].Value.Base64Decode()}</a>");
-
-                // Process new lines
-                content = content.Replace("\n", "<br />");
-
-                // Meta mentions (@everyone)
-                content = content.Replace("@everyone", "<span class=\"mention\">@everyone</span>");
-
-                // Meta mentions (@here)
-                content = content.Replace("@here", "<span class=\"mention\">@here</span>");
-
-                // User mentions (<@id> and <@!id>)
-                var mentionedUserIds = Regex.Matches(content, "&lt;@!?(\\d+)&gt;")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedUserId in mentionedUserIds)
-                {
-                    var mentionedUser = _log.Mentionables.GetUser(mentionedUserId);
-                    content = Regex.Replace(content, $"&lt;@!?{mentionedUserId}&gt;",
-                        $"<span class=\"mention\" title=\"{HtmlEncode(mentionedUser.FullName)}\">" +
-                        $"@{HtmlEncode(mentionedUser.Name)}" +
-                        "</span>");
-                }
-
-                // Channel mentions (<#id>)
-                var mentionedChannelIds = Regex.Matches(content, "&lt;#(\\d+)&gt;")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedChannelId in mentionedChannelIds)
-                {
-                    var mentionedChannel = _log.Mentionables.GetChannel(mentionedChannelId);
-                    content = content.Replace($"&lt;#{mentionedChannelId}&gt;",
-                        "<span class=\"mention\">" +
-                        $"#{HtmlEncode(mentionedChannel.Name)}" +
-                        "</span>");
-                }
-
-                // Role mentions (<@&id>)
-                var mentionedRoleIds = Regex.Matches(content, "&lt;@&amp;(\\d+)&gt;")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedRoleId in mentionedRoleIds)
-                {
-                    var mentionedRole = _log.Mentionables.GetRole(mentionedRoleId);
-                    content = content.Replace($"&lt;@&amp;{mentionedRoleId}&gt;",
-                        "<span class=\"mention\">" +
-                        $"@{HtmlEncode(mentionedRole.Name)}" +
-                        "</span>");
-                }
-
-                // Custom emojis (<:name:id>)
-                var isJumboable = Regex.Replace(content, "&lt;(:.*?:)(\\d*)&gt;", "").IsBlank();
-                var emojiClass = isJumboable ? "emoji emoji--large" : "emoji";
-                content = Regex.Replace(content, "&lt;(:.*?:)(\\d*)&gt;",
-                    $"<img class=\"{emojiClass}\" title=\"$1\" src=\"https://cdn.discordapp.com/emojis/$2.png\" />");
-
-                return content;
-            }
-
-            private string FormatContentCsv(string content)
-            {
-                // Escape quotes
-                content = content.Replace("\"", "\"\"");
-
-                // Escape commas and semicolons
-                if (content.Contains(",") || content.Contains(";"))
-                    content = $"\"{content}\"";
-
-                // User mentions (<@id> and <@!id>)
-                var mentionedUserIds = Regex.Matches(content, "<@!?(\\d+)>")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedUserId in mentionedUserIds)
-                {
-                    var mentionedUser = _log.Mentionables.GetUser(mentionedUserId);
-                    content = Regex.Replace(content, $"<@!?{mentionedUserId}>", $"@{mentionedUser.FullName}");
-                }
-
-                // Channel mentions (<#id>)
-                var mentionedChannelIds = Regex.Matches(content, "<#(\\d+)>")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedChannelId in mentionedChannelIds)
-                {
-                    var mentionedChannel = _log.Mentionables.GetChannel(mentionedChannelId);
-                    content = content.Replace($"<#{mentionedChannelId}>", $"#{mentionedChannel.Name}");
-                }
-
-                // Role mentions (<@&id>)
-                var mentionedRoleIds = Regex.Matches(content, "<@&(\\d+)>")
-                    .Cast<Match>()
-                    .Select(m => m.Groups[1].Value)
-                    .ExceptBlank()
-                    .ToArray();
-
-                foreach (var mentionedRoleId in mentionedRoleIds)
-                {
-                    var mentionedRole = _log.Mentionables.GetRole(mentionedRoleId);
-                    content = content.Replace($"<@&{mentionedRoleId}>", $"@{mentionedRole.Name}");
-                }
-
-                // Custom emojis (<:name:id>)
-                content = Regex.Replace(content, "<(:.*?:)\\d*>", "$1");
-
-                return content;
-            }
-
-            private string FormatContent(string content, bool allowLinks = false)
-            {
-                if (_format == ExportFormat.PlainText)
-                    return FormatContentPlainText(content);
-
-                if (_format == ExportFormat.HtmlDark)
-                    return FormatContentHtml(content, allowLinks);
-
-                if (_format == ExportFormat.HtmlLight)
-                    return FormatContentHtml(content, allowLinks);
-
-                if (_format == ExportFormat.Csv)
-                    return FormatContentCsv(content);
-
-                throw new ArgumentOutOfRangeException(nameof(_format));
-            }
-
-            public ScriptObject GetScriptObject()
-            {
-                // Create instance
-                var scriptObject = new ScriptObject();
-
-                // Import chat log
-                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(FormatFileSize), new Func<long, string>(FormatFileSize));
-                scriptObject.Import(nameof(FormatColor), new Func<Color, string>(FormatColor));
-                scriptObject.Import(nameof(FormatContent), new Func<string, bool, string>(FormatContent));
-
-                return scriptObject;
-            }
-        }
-    }
-}

DiscordChatExporter.Core/Services/ExportService.cs

@@ -1,130 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-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, _settingsService.MessageGroupLimit);
-
-            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++;
-            }
-        }
-
-        private IReadOnlyList<ChatLog> SplitIntoPartitions(ChatLog chatLog, int partitionLimit)
-        {
-            var result = new List<ChatLog>();
-
-            // Loop through all messages with an increment of partition limit
-            for (var i = 0; i < chatLog.Messages.Count; i += partitionLimit)
-            {
-                // Calculate how many messages left in total
-                var remainingMessageCount = chatLog.Messages.Count - i;
-
-                // Decide how many messages are going into this partition
-                // Each partition will have the same number of messages except the last one that might have fewer (all remaining messages)
-                var partitionMessageCount = partitionLimit.ClampMax(remainingMessageCount);
-
-                // Get messages that belong to this partition
-                var partitionMessages = new List<Message>();
-                for (var j = i; j < i + partitionMessageCount; j++)
-                    partitionMessages.Add(chatLog.Messages[j]);
-
-                // Create a partition and add to list
-                var partition = new ChatLog(chatLog.Guild, chatLog.Channel, chatLog.From, chatLog.To, partitionMessages,
-                    chatLog.Mentionables);
-                result.Add(partition);
-            }
-
-            return result;
-        }
-
-        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
-            {
-                var partitions = SplitIntoPartitions(chatLog, partitionLimit.Value);
-                ExportChatLogPartitioned(partitions, filePath, format);
-            }
-        }
-    }
-}

DiscordChatExporter.Core/Services/UpdateService.cs

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

DiscordChatExporter.Gui/Bootstrapper.cs

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

DiscordChatExporter.Gui/Converters/DateTimeOffsetToDateTimeConverter.cs

@@ -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 date)
+                return date.DateTime;
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is DateTime date)
+                return new DateTimeOffset(date);
+
+            return null;
+        }
+    }
+}

DiscordChatExporter.Gui/Converters/ExportFormatToStringConverter.cs

@@ -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 format)
+                return format.GetDisplayName();
+
+            return null;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -8,13 +8,14 @@
     <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>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,6 +59,7 @@
     <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="ViewModels\Components\ChannelViewModel.cs" />
     <Compile Include="ViewModels\Components\GuildViewModel.cs" />
@@ -96,9 +98,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>
@@ -142,9 +148,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>

DiscordChatExporter.Gui/Properties/AssemblyInfo.cs

@@ -2,6 +2,6 @@
 
 [assembly: AssemblyTitle("DiscordChatExporter")]
 [assembly: AssemblyCompany("Tyrrrz")]
-[assembly: AssemblyCopyright("Copyright (c) 2017-2018 Alexey Golub")]
-[assembly: AssemblyVersion("2.9")]
-[assembly: AssemblyFileVersion("2.9")]
+[assembly: AssemblyCopyright("Copyright (c) Alexey Golub")]
+[assembly: AssemblyVersion("2.12.1")]
+[assembly: AssemblyFileVersion("2.12.1")]

DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs

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

DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs

@@ -1,6 +1,5 @@
 using DiscordChatExporter.Core.Services;
 using DiscordChatExporter.Gui.ViewModels.Framework;
-using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Gui.ViewModels.Dialogs
 {
@@ -20,12 +19,6 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
             set => _settingsService.DateFormat = value;
         }
 
-        public int MessageGroupLimit
-        {
-            get => _settingsService.MessageGroupLimit;
-            set => _settingsService.MessageGroupLimit = value.ClampMin(0);
-        }
-
         public SettingsViewModel(SettingsService settingsService)
         {
             _settingsService = settingsService;

DiscordChatExporter.Gui/ViewModels/RootViewModel.cs

@@ -4,10 +4,10 @@ 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.ViewModels.Components;
 using DiscordChatExporter.Gui.ViewModels.Framework;
 using Gress;
@@ -62,9 +62,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 +122,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 +235,7 @@ namespace DiscordChatExporter.Gui.ViewModels
             }
         }
 
-        public bool CanExportChannels => !IsBusy && SelectedChannels.NotNullAndAny();
+        public bool CanExportChannels => !IsBusy && !SelectedChannels.IsNullOrEmpty();
 
         public async void ExportChannels()
         {
@@ -267,7 +267,7 @@ 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);
@@ -275,10 +275,10 @@ namespace DiscordChatExporter.Gui.ViewModels
 
                     // Get chat log
                     var chatLog = await _dataService.GetChatLogAsync(token, dialog.Guild, channel, 
-                        dialog.From, dialog.To, operation);
+                        dialog.After, dialog.Before, operation);
 
                     // Export
-                    _exportService.ExportChatLog(chatLog, filePath, dialog.SelectedFormat,
+                    await _exportService.ExportChatLogAsync(chatLog, filePath, dialog.SelectedFormat,
                         dialog.PartitionLimit);
 
                     // Notify completion

DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml

@@ -86,8 +86,8 @@
                 Margin="16,8"
                 materialDesign:HintAssist.Hint="From (optional)"
                 materialDesign:HintAssist.IsFloating="True"
-                DisplayDateEnd="{Binding To}"
-                SelectedDate="{Binding From}"
+                DisplayDateEnd="{Binding Before, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
+                SelectedDate="{Binding After, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
                 ToolTip="If this is set, only messages sent after this date will be exported" />
             <DatePicker
                 Grid.Row="0"
@@ -95,8 +95,8 @@
                 Margin="16,8"
                 materialDesign:HintAssist.Hint="To (optional)"
                 materialDesign:HintAssist.IsFloating="True"
-                DisplayDateStart="{Binding From}"
-                SelectedDate="{Binding To}"
+                DisplayDateStart="{Binding After, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
+                SelectedDate="{Binding Before, Converter={x:Static converters:DateTimeOffsetToDateTimeConverter.Instance}}"
                 ToolTip="If this is set, only messages sent before this date will be exported" />
         </Grid>
 

DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml

@@ -25,13 +25,6 @@
             materialDesign:HintAssist.IsFloating="True"
             Text="{Binding DateFormat}" />
 
-        <!--  Message group limit  -->
-        <TextBox
-            Margin="16,8"
-            materialDesign:HintAssist.Hint="Message group limit"
-            materialDesign:HintAssist.IsFloating="True"
-            Text="{Binding MessageGroupLimit}" />
-
         <!--  Auto-updates  -->
         <DockPanel LastChildFill="False">
             <TextBlock

DiscordChatExporter.Gui/Views/RootView.xaml

@@ -19,6 +19,9 @@
     Style="{DynamicResource MaterialDesignRoot}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
+    <Window.TaskbarItemInfo>
+        <TaskbarItemInfo ProgressState="Normal" ProgressValue="{Binding ProgressManager.Progress}" />
+    </Window.TaskbarItemInfo>
     <materialDesign:DialogHost SnackbarMessageQueue="{Binding Notifications}" Style="{DynamicResource MaterialDesignEmbeddedDialogHost}">
         <Grid>
             <Grid.RowDefinitions>
@@ -243,18 +246,26 @@
                             </i:Interaction.Behaviors>
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
-                                    <StackPanel
-                                        Margin="-8"
-                                        Background="Transparent"
-                                        Orientation="Horizontal">
-                                        <StackPanel.InputBindings>
+                                    <Grid Margin="-8" Background="Transparent">
+                                        <Grid.InputBindings>
                                             <MouseBinding Command="{s:Action ExportChannels}" MouseAction="LeftDoubleClick" />
-                                        </StackPanel.InputBindings>
+                                        </Grid.InputBindings>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <!--  Channel icon  -->
                                         <materialDesign:PackIcon
+                                            Grid.Column="0"
                                             Margin="16,7,0,6"
                                             VerticalAlignment="Center"
                                             Kind="Pound" />
+
+                                        <!--  Channel category / name  -->
                                         <TextBlock
+                                            Grid.Column="1"
                                             Margin="3,8,8,8"
                                             VerticalAlignment="Center"
                                             FontSize="14">
@@ -262,7 +273,17 @@
                                             <Run Text="/" />
                                             <Run Foreground="{DynamicResource PrimaryTextBrush}" Text="{Binding Model.Name, Mode=OneWay}" />
                                         </TextBlock>
-                                    </StackPanel>
+
+                                        <!--  Is selected checkmark  -->
+                                        <materialDesign:PackIcon
+                                            Grid.Column="2"
+                                            Width="24"
+                                            Height="24"
+                                            Margin="8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="Check"
+                                            Visibility="{Binding IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
+                                    </Grid>
                                 </DataTemplate>
                             </ListBox.ItemTemplate>
                         </ListBox>
@@ -276,7 +297,7 @@
                     VerticalAlignment="Bottom"
                     Command="{s:Action ExportChannels}"
                     Style="{StaticResource MaterialDesignFloatingActionAccentButton}"
-                    Visibility="{Binding IsEnabled, RelativeSource={RelativeSource Self}, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
+                    Visibility="{Binding CanExportChannels, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
                     <materialDesign:PackIcon
                         Width="32"
                         Height="32"

DiscordChatExporter.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA305DD5-1F98-415D-B6C4-65053A58F914}"
 	ProjectSection(SolutionItems) = preProject
@@ -10,9 +10,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Readme.md = Readme.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Gui", "DiscordChatExporter.Gui\DiscordChatExporter.Gui.csproj", "{732A67AF-93DE-49DF-B10F-FD74710B7863}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Core.Markdown", "DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj", "{14D02A08-E820-4012-B805-663B9A3D73E9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Core", "DiscordChatExporter.Core\DiscordChatExporter.Core.csproj", "{707C0CD0-A7E0-4CAB-8DB9-07A45CB87377}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Core.Models", "DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj", "{67A9D184-4656-4CE1-9D75-BDDCBCAFB200}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Core.Rendering", "DiscordChatExporter.Core.Rendering\DiscordChatExporter.Core.Rendering.csproj", "{D33F7443-4EEB-4E53-99BE-6045A62FC8C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Core.Services", "DiscordChatExporter.Core.Services\DiscordChatExporter.Core.Services.csproj", "{707C0CD0-A7E0-4CAB-8DB9-07A45CB87377}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Gui", "DiscordChatExporter.Gui\DiscordChatExporter.Gui.csproj", "{732A67AF-93DE-49DF-B10F-FD74710B7863}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Cli", "DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj", "{D08624B6-3081-4BCB-91F8-E9832FACC6CE}"
 EndProject
@@ -22,14 +28,26 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{732A67AF-93DE-49DF-B10F-FD74710B7863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{732A67AF-93DE-49DF-B10F-FD74710B7863}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{732A67AF-93DE-49DF-B10F-FD74710B7863}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{732A67AF-93DE-49DF-B10F-FD74710B7863}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14D02A08-E820-4012-B805-663B9A3D73E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14D02A08-E820-4012-B805-663B9A3D73E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14D02A08-E820-4012-B805-663B9A3D73E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14D02A08-E820-4012-B805-663B9A3D73E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67A9D184-4656-4CE1-9D75-BDDCBCAFB200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67A9D184-4656-4CE1-9D75-BDDCBCAFB200}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67A9D184-4656-4CE1-9D75-BDDCBCAFB200}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67A9D184-4656-4CE1-9D75-BDDCBCAFB200}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D33F7443-4EEB-4E53-99BE-6045A62FC8C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D33F7443-4EEB-4E53-99BE-6045A62FC8C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D33F7443-4EEB-4E53-99BE-6045A62FC8C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D33F7443-4EEB-4E53-99BE-6045A62FC8C8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{707C0CD0-A7E0-4CAB-8DB9-07A45CB87377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{707C0CD0-A7E0-4CAB-8DB9-07A45CB87377}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{707C0CD0-A7E0-4CAB-8DB9-07A45CB87377}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{707C0CD0-A7E0-4CAB-8DB9-07A45CB87377}.Release|Any CPU.Build.0 = Release|Any CPU
+		{732A67AF-93DE-49DF-B10F-FD74710B7863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{732A67AF-93DE-49DF-B10F-FD74710B7863}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{732A67AF-93DE-49DF-B10F-FD74710B7863}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{732A67AF-93DE-49DF-B10F-FD74710B7863}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D08624B6-3081-4BCB-91F8-E9832FACC6CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D08624B6-3081-4BCB-91F8-E9832FACC6CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D08624B6-3081-4BCB-91F8-E9832FACC6CE}.Release|Any CPU.ActiveCfg = Release|Any CPU

Dockerfile

@@ -1,12 +1,22 @@
-FROM mono:5
-WORKDIR /root/build
-COPY DiscordChatExporter.sln favicon.ico ./
-COPY DiscordChatExporter.Core DiscordChatExporter.Core
-COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
-RUN msbuild ./DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj /t:Restore
-RUN msbuild ./DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj /p:Configuration=Release
+# Build
+FROM microsoft/dotnet:2.1-sdk AS build
+WORKDIR /src
 
-FROM mono:5
-COPY --from=0 /root/build/DiscordChatExporter.Cli/bin/Release/net461 /root/bin
-WORKDIR /a
-ENTRYPOINT ["mono", "/root/bin/DiscordChatExporter.Cli.exe"]
+COPY favicon.ico ./
+
+COPY DiscordChatExporter.Core.Markdown DiscordChatExporter.Core.Markdown
+COPY DiscordChatExporter.Core.Models DiscordChatExporter.Core.Models
+COPY DiscordChatExporter.Core.Rendering DiscordChatExporter.Core.Rendering
+COPY DiscordChatExporter.Core.Services DiscordChatExporter.Core.Services
+COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
+
+RUN dotnet publish DiscordChatExporter.Cli -c Release -f netcoreapp2.1
+
+# Run
+FROM microsoft/dotnet:2.1-runtime AS run
+WORKDIR /app
+
+COPY --from=build /src/DiscordChatExporter.Cli/bin/Release/netcoreapp2.1/publish ./
+
+WORKDIR /app/out
+ENTRYPOINT ["dotnet", "/app/DiscordChatExporter.Cli.dll"]

License.txt

@@ -1,21 +1,692 @@
-MIT License
+ DiscordChatExporter
+ Copyright (C) 2017-2019 Alexey Golub
 
-Copyright (c) 2017-2018 Alexey Golub
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+ ======================================================================
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.