Update version

Closes #157

Changelog.md

@@ -1,3 +1,35 @@
+### 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/Prepare.ps1

@@ -2,10 +2,12 @@ New-Item "$PSScriptRoot\bin" -ItemType Directory -Force
 
 # GUI
 $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
 $files = @()
+$files += Get-Item -Path "$PSScriptRoot\..\License.txt"
 $files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Cli\bin\Release\net461\*" -Include "*.exe", "*.dll", "*.config"
 $files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporter.CLI.zip" -Force

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -3,9 +3,9 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net461</TargetFramework>
-        <Version>2.9</Version>
+        <Version>2.11</Version>
         <Company>Tyrrrz</Company>
-        <Copyright>Copyright (c) 2017-2018 Alexey Golub</Copyright>
+        <Copyright>Copyright (c) Alexey Golub</Copyright>
         <ApplicationIcon>..\favicon.ico</ApplicationIcon>
     </PropertyGroup>
 

DiscordChatExporter.Cli/Internal/InlineProgress.cs

@@ -0,0 +1,40 @@
+using System;
+
+namespace DiscordChatExporter.Cli.Internal
+{
+    internal class InlineProgress : IProgress<double>, IDisposable
+    {
+        private readonly int _posX;
+        private readonly int _posY;
+
+        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 Dispose()
+        {
+            // If output is not redirected - reset cursor position
+            if (!Console.IsOutputRedirected)
+                Console.SetCursorPosition(_posX, _posY);
+
+            // Inform about completion
+            Console.WriteLine("Completed ✓");
+        }
+    }
+}

DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs

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

DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs

@@ -3,6 +3,7 @@ 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;
@@ -28,8 +29,6 @@ namespace DiscordChatExporter.Cli.Verbs
             // Configure settings
             if (Options.DateFormat.IsNotBlank())
                 settingsService.DateFormat = Options.DateFormat;
-            if (Options.MessageGroupLimit > 0)
-                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
 
             // Get channels
             var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
@@ -42,25 +41,24 @@ namespace DiscordChatExporter.Cli.Verbs
             {
                 try
                 {
-                    // Print current channel name
+                    // Track progress
-                    Console.WriteLine($"Exporting chat from [{channel.Name}]...");
+                    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
+                        // Generate default file name
-                    var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
+                        var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                        Options.After, Options.Before);
+                            chatLog.Channel, Options.After, Options.Before);
 
-                    // Generate default file name
+                        // Generate file path
-                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
+                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
-                        chatLog.Channel, Options.After, Options.Before);
 
-                    // Generate file path
+                        // Export
-                    var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
+                        exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-
+                    }
-                    // Export
-                    exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-
-                    // Print result
-                    Console.WriteLine($"Exported chat to [{filePath}]");
                 }
                 catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
                 {

DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs

@@ -3,6 +3,7 @@ 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;
@@ -29,8 +30,6 @@ namespace DiscordChatExporter.Cli.Verbs
             // Configure settings
             if (Options.DateFormat.IsNotBlank())
                 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,24 @@ namespace DiscordChatExporter.Cli.Verbs
             {
                 try
                 {
-                    // Print current channel name
+                    // Track progress
-                    Console.WriteLine($"Exporting chat from [{channel.Name}]...");
+                    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
+                        // Generate default file name
-                    var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
+                        var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
-                        Options.After, Options.Before);
+                            chatLog.Channel, Options.After, Options.Before);
 
-                    // Generate default file name
+                        // Generate file path
-                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
+                        var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
-                        chatLog.Channel, Options.After, Options.Before);
 
-                    // Generate file path
+                        // Export
-                    var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
+                        exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-
+                    }
-                    // Export
-                    exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
-
-                    // Print result
-                    Console.WriteLine($"Exported chat to [{filePath}]");
                 }
                 catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
                 {

DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs

@@ -23,8 +23,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,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Sprache" Version="2.2.0" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
+  </ItemGroup>
+
+</Project>

DiscordChatExporter.Core.Markdown/EmojiNode.cs

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

DiscordChatExporter.Core.Markdown/FormattedNode.cs

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

DiscordChatExporter.Core.Markdown/InlineCodeBlockNode.cs

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

DiscordChatExporter.Core.Markdown/Internal/Grammar.cs

@@ -0,0 +1,178 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Sprache;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Markdown.Internal
+{
+    // The following parsing logic is meant to replicate Discord's markdown grammar as close as possible
+    internal static class Grammar
+    {
+        /* Formatting */
+
+        // Capture until the earliest double asterisk not followed by an asterisk
+        private static readonly Parser<Node> BoldFormattedNode =
+            Parse.RegexMatch(new Regex("\\*\\*(.+?)\\*\\*(?!\\*)", RegexOptions.Singleline))
+                .Select(m => new FormattedNode(m.Value, "**", TextFormatting.Bold, BuildTree(m.Groups[1].Value)));
+
+        // Capture until the earliest single asterisk not preceded or followed by an asterisk
+        // Can't have whitespace right after opening or right before closing asterisk
+        private static readonly Parser<Node> ItalicFormattedNode =
+            Parse.RegexMatch(new Regex("\\*(?!\\s)(.+?)(?<!\\s|\\*)\\*(?!\\*)", RegexOptions.Singleline))
+                .Select(m => new FormattedNode(m.Value, "*", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
+
+        // Can't have underscores inside
+        // Can't have word characters right after closing underscore
+        private static readonly Parser<Node> ItalicAltFormattedNode =
+            Parse.RegexMatch(new Regex("_([^_]+?)_(?!\\w)", RegexOptions.Singleline))
+                .Select(m => new FormattedNode(m.Value, "_", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
+
+        // Treated as a separate entity for simplicity
+        // Capture until the earliest triple asterisk not preceded or followed by an asterisk
+        private static readonly Parser<Node> ItalicBoldFormattedNode =
+            Parse.RegexMatch(new Regex("\\*(\\*\\*(?:.+?)\\*\\*)\\*(?!\\*)", RegexOptions.Singleline))
+                .Select(m => new FormattedNode(m.Value, "*", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
+
+        // Capture until the earliest double underscore not followed by an underscore
+        private static readonly Parser<Node> UnderlineFormattedNode =
+            Parse.RegexMatch(new Regex("__(.+?)__(?!_)", RegexOptions.Singleline))
+                .Select(m => new FormattedNode(m.Value, "__", TextFormatting.Underline, BuildTree(m.Groups[1].Value)));
+
+        // Treated as a separate entity for simplicity
+        // Capture until the earliest triple underscore not preceded or followed by an underscore
+        private static readonly Parser<Node> ItalicUnderlineFormattedNode =
+            Parse.RegexMatch(new Regex("_(__(?:.+?)__)_(?!_)", RegexOptions.Singleline))
+                .Select(m => new FormattedNode(m.Value, "_", TextFormatting.Italic, BuildTree(m.Groups[1].Value)));
+
+        // Strikethrough is safe
+        private static readonly Parser<Node> StrikethroughFormattedNode =
+            Parse.RegexMatch(new Regex("~~(.+?)~~", RegexOptions.Singleline))
+                .Select(m => new FormattedNode(m.Value, "~~", TextFormatting.Strikethrough, BuildTree(m.Groups[1].Value)));
+
+        // Spoiler is safe
+        private static readonly Parser<Node> SpoilerFormattedNode =
+            Parse.RegexMatch(new Regex("\\|\\|(.+?)\\|\\|", RegexOptions.Singleline))
+                .Select(m => new FormattedNode(m.Value, "||", TextFormatting.Spoiler, BuildTree(m.Groups[1].Value)));
+
+        // Combinator, order matters
+        private static readonly Parser<Node> AnyFormattedNode = 
+            ItalicBoldFormattedNode.Or(ItalicUnderlineFormattedNode)
+            .Or(BoldFormattedNode).Or(ItalicFormattedNode)
+            .Or(UnderlineFormattedNode).Or(ItalicAltFormattedNode)
+            .Or(StrikethroughFormattedNode).Or(SpoilerFormattedNode);
+
+        /* Code blocks */
+
+        // Can't have backticks inside and surrounding whitespace is trimmed
+        private static readonly Parser<Node> InlineCodeBlockNode =
+            Parse.RegexMatch(new Regex("`\\s*([^`]+?)\\s*`", RegexOptions.Singleline))
+                .Select(m => new InlineCodeBlockNode(m.Value, m.Groups[1].Value));
+
+        // The first word is a language identifier if it's the only word followed by a newline, the rest is code
+        private static readonly Parser<Node> MultilineCodeBlockNode =
+            Parse.RegexMatch(new Regex("```(?:(\\w*?)?(?:\\s*?\\n))?(.+?)```", RegexOptions.Singleline))
+                .Select(m => new MultilineCodeBlockNode(m.Value, m.Groups[1].Value, m.Groups[2].Value));
+
+        // Combinator, order matters
+        private static readonly Parser<Node> AnyCodeBlockNode = MultilineCodeBlockNode.Or(InlineCodeBlockNode);
+
+        /* Mentions */
+
+        // @everyone or @here
+        private static readonly Parser<Node> MetaMentionNode = Parse.RegexMatch("@(everyone|here)")
+            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Meta));
+
+        // <@123456> or <@!123456>
+        private static readonly Parser<Node> UserMentionNode = Parse.RegexMatch("<@!?(\\d+)>")
+            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.User));
+
+        // <#123456>
+        private static readonly Parser<Node> ChannelMentionNode = Parse.RegexMatch("<#(\\d+)>")
+            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Channel));
+
+        // <@&123456>
+        private static readonly Parser<Node> RoleMentionNode = Parse.RegexMatch("<@&(\\d+)>")
+            .Select(m => new MentionNode(m.Value, m.Groups[1].Value, MentionType.Role));
+
+        // Combinator, order matters
+        private static readonly Parser<Node> AnyMentionNode =
+            MetaMentionNode.Or(UserMentionNode).Or(ChannelMentionNode).Or(RoleMentionNode);
+
+        /* Emojis */
+
+        // Matches all standard unicode emojis
+        private static readonly Parser<Node> StandardEmojiNode = Parse.RegexMatch(
+                "([\\u2700-\\u27bf]|" +
+                "(?:\\ud83c[\\udde6-\\uddff]){2}|" +
+                "[\\ud800-\\udbff][\\udc00-\\udfff]|" +
+                "[\\u0023-\\u0039]\\u20e3|" +
+                "\\u3299|\\u3297|\\u303d|\\u3030|\\u24c2|\\ud83c[\\udd70-\\udd71]|\\ud83c[\\udd7e-\\udd7f]|\\ud83c\\udd8e|\\ud83c[\\udd91-\\udd9a]|\\ud83c[\\udde6-\\uddff]|" +
+                "\\ud83c[\\ude01-\\ude02]|\\ud83c\\ude1a|\\ud83c\\ude2f|\\ud83c[\\ude32-\\ude3a]|\\ud83c[\\ude50-\\ude51]|\\u203c|\\u2049|[\\u25aa-\\u25ab]|" +
+                "\\u25b6|\\u25c0|[\\u25fb-\\u25fe]|\\u00a9|\\u00ae|\\u2122|\\u2139|\\ud83c\\udc04|[\\u2600-\\u26FF]|\\u2b05|\\u2b06|\\u2b07|\\u2b1b|\\u2b1c|\\u2b50|" +
+                "\\u2b55|\\u231a|\\u231b|\\u2328|\\u23cf|[\\u23e9-\\u23f3]|[\\u23f8-\\u23fa]|\\ud83c\\udccf|\\u2934|\\u2935|[\\u2190-\\u21ff])")
+            .Select(m => new EmojiNode(m.Value, m.Groups[1].Value));
+
+        // <:lul:123456> or <a:lul:123456>
+        private static readonly Parser<Node> CustomEmojiNode = Parse.RegexMatch("<(a)?:(.+?):(\\d+)>")
+            .Select(m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, m.Groups[1].Value.IsNotBlank()));
+
+        // Combinator, order matters
+        private static readonly Parser<Node> AnyEmojiNode = StandardEmojiNode.Or(CustomEmojiNode);
+
+        /* Links */
+
+        // [title](link)
+        private static readonly Parser<Node> TitledLinkNode = Parse.RegexMatch("\\[(.+?)\\]\\((.+?)\\)")
+            .Select(m => new LinkNode(m.Value, m.Groups[2].Value, m.Groups[1].Value));
+
+        // Starts with http:// or https://, stops at the last non-whitespace character followed by whitespace or punctuation character
+        private static readonly Parser<Node> AutoLinkNode = Parse.RegexMatch("(https?://\\S*[^\\.,:;\"\'\\s])")
+            .Select(m => new LinkNode(m.Value, m.Groups[1].Value));
+
+        // Autolink surrounded by angular brackets
+        private static readonly Parser<Node> HiddenLinkNode = Parse.RegexMatch("<(https?://\\S*[^\\.,:;\"\'\\s])>")
+            .Select(m => new LinkNode(m.Value, m.Groups[1].Value));
+
+        // Combinator, order matters
+        private static readonly Parser<Node> AnyLinkNode = TitledLinkNode.Or(HiddenLinkNode).Or(AutoLinkNode); 
+
+        /* Text */
+
+        // Shrug is an exception and needs to be exempt from formatting
+        private static readonly Parser<Node> ShrugTextNode =
+            Parse.String("¯\\_(ツ)_/¯").Text().Select(s => new TextNode(s));
+
+        // Backslash escapes any following unicode surrogate pair
+        private static readonly Parser<Node> EscapedSurrogateTextNode =
+            from slash in Parse.Char('\\')
+            from high in Parse.AnyChar.Where(char.IsHighSurrogate)
+            from low in Parse.AnyChar
+            let lexeme = $"{slash}{high}{low}"
+            let text = $"{high}{low}"
+            select new TextNode(lexeme, text);
+
+        // Backslash escapes any following non-whitespace character except for digits and latin letters
+        private static readonly Parser<Node> EscapedTextNode =
+            Parse.RegexMatch("\\\\([^a-zA-Z0-9\\s])").Select(m => new TextNode(m.Value, m.Groups[1].Value));
+
+        // Combinator, order matters
+        private static readonly Parser<Node> AnyTextNode = ShrugTextNode.Or(EscapedSurrogateTextNode).Or(EscapedTextNode);
+
+        /* Aggregator and fallback */
+
+        // Any node recognized by above patterns
+        private static readonly Parser<Node> AnyRecognizedNode = AnyFormattedNode.Or(AnyCodeBlockNode)
+            .Or(AnyMentionNode).Or(AnyEmojiNode).Or(AnyLinkNode).Or(AnyTextNode);
+
+        // Any node not recognized by above patterns (treated as plain text)
+        private static readonly Parser<Node> FallbackNode =
+            Parse.AnyChar.Except(AnyRecognizedNode).AtLeastOnce().Text().Select(s => new TextNode(s));
+
+        // Any node
+        private static readonly Parser<Node> AnyNode = AnyRecognizedNode.Or(FallbackNode);
+
+        // Entry point
+        public static IReadOnlyList<Node> BuildTree(string input) => AnyNode.Many().Parse(input).ToArray();
+    }
+}

DiscordChatExporter.Core.Markdown/LinkNode.cs

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

DiscordChatExporter.Core.Markdown/MarkdownParser.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using DiscordChatExporter.Core.Markdown.Internal;
+
+namespace DiscordChatExporter.Core.Markdown
+{
+    public static class MarkdownParser
+    {
+        public static IReadOnlyList<Node> Parse(string input) => Grammar.BuildTree(input);
+    }
+}

DiscordChatExporter.Core.Markdown/MentionNode.cs

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

DiscordChatExporter.Core.Markdown/MentionType.cs

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

DiscordChatExporter.Core.Markdown/MultilineCodeBlockNode.cs

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

DiscordChatExporter.Core.Markdown/Node.cs

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

DiscordChatExporter.Core.Markdown/TextFormatting.cs

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

DiscordChatExporter.Core.Markdown/TextNode.cs

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

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -2,18 +2,17 @@
 
     <PropertyGroup>
         <TargetFramework>net461</TargetFramework>
-        <Version>2.9</Version>
     </PropertyGroup>
 
     <ItemGroup>
-        <EmbeddedResource Include="Resources\ExportTemplates\PlainText.txt" />
+        <EmbeddedResource Include="Resources\ExportTemplates\PlainText\Template.txt" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark.html" />
+        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark\Template.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight.html" />
+        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight\Template.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Html\Core.html" />
+        <EmbeddedResource Include="Resources\ExportTemplates\HtmlShared\Main.html" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Html\Shared.css" />
+        <EmbeddedResource Include="Resources\ExportTemplates\HtmlShared\Main.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Html\DarkTheme.css" />
+        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark\Theme.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Html\LightTheme.css" />
+        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight\Theme.css" />
-        <EmbeddedResource Include="Resources\ExportTemplates\Csv.csv" />
+        <EmbeddedResource Include="Resources\ExportTemplates\Csv\Template.csv" />
     </ItemGroup>
 
     <ItemGroup>
@@ -21,7 +20,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Failsafe" Version="1.0.0" />
+        <PackageReference Include="ByteSize" Version="1.3.0" />
+        <PackageReference Include="Failsafe" Version="1.1.0" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
         <PackageReference Include="Onova" Version="2.2.0" />
         <PackageReference Include="Scriban" Version="1.2.9" />
@@ -29,4 +29,8 @@
         <PackageReference Include="Tyrrrz.Settings" Version="1.3.3" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj" />
+    </ItemGroup>
+
 </Project>

DiscordChatExporter.Core/Internal/Extensions.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Drawing;
-using Tyrrrz.Extensions;
+using System.Linq;
+using System.Net;
 
 namespace DiscordChatExporter.Core.Internal
 {
@@ -14,10 +16,37 @@ namespace DiscordChatExporter.Core.Internal
             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);
+
+        public static string HtmlEncode(this string value) => WebUtility.HtmlEncode(value);
+
+        public static IEnumerable<IReadOnlyList<T>> GroupAdjacentWhile<T>(this IEnumerable<T> source,
+            Func<IReadOnlyList<T>, T, bool> groupPredicate)
+        {
+            // Create buffer
+            var buffer = new List<T>();
+
+            // Enumerate source
+            foreach (var element in source)
+            {
+                // If buffer is not empty and group predicate failed - yield and flush buffer
+                if (buffer.Any() && !groupPredicate(buffer, element))
+                {
+                    yield return buffer;
+                    buffer = new List<T>(); // new instance to reset reference
+                }
+
+                // Add element to buffer
+                buffer.Add(element);
+            }
+
+            // If buffer still has something after the source has been enumerated - yield
+            if (buffer.Any())
+                yield return buffer;
+        }
+
+        public static IEnumerable<IReadOnlyList<T>> GroupAdjacentWhile<T>(this IEnumerable<T> source,
+            Func<IReadOnlyList<T>, bool> groupPredicate)
+            => source.GroupAdjacentWhile((buffer, _) => groupPredicate(buffer));
     }
 }

DiscordChatExporter.Core/Models/Attachment.cs

@@ -1,4 +1,7 @@
-namespace DiscordChatExporter.Core.Models
+using System;
+using ByteSizeLib;
+
+namespace DiscordChatExporter.Core.Models
 {
     // https://discordapp.com/developers/docs/resources/channel#attachment-object
 
@@ -12,13 +15,17 @@
 
         public int? Height { get; }
 
-        public bool IsImage => Width != null;
-
         public string FileName { get; }
 
-        public long FileSize { get; }
+        public bool IsImage => FileName.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase) ||
+                               FileName.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase) ||
+                               FileName.EndsWith(".png", StringComparison.OrdinalIgnoreCase) ||
+                               FileName.EndsWith(".gif", StringComparison.OrdinalIgnoreCase) ||
+                               FileName.EndsWith(".bmp", StringComparison.OrdinalIgnoreCase);
 
-        public Attachment(string id, int? width, int? height, string url, string fileName, long fileSize)
+        public ByteSize FileSize { get; }
+
+        public Attachment(string id, int? width, int? height, string url, string fileName, ByteSize fileSize)
         {
             Id = id;
             Url = url;

DiscordChatExporter.Core/Models/Emoji.cs

@@ -0,0 +1,56 @@
+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
+            {
+                // Custom emoji
+                if (Id.IsNotBlank())
+                {
+                    // Animated
+                    if (IsAnimated)
+                        return $"https://cdn.discordapp.com/emojis/{Id}.gif";
+
+                    // Non-animated
+                    return $"https://cdn.discordapp.com/emojis/{Id}.png";
+                }
+
+                // Standard unicode emoji (via twemoji)
+                return $"https://twemoji.maxcdn.com/2/72x72/{GetTwemojiName(Name)}.png";
+            }
+        }
+
+        public Emoji(string id, string name, bool isAnimated)
+        {
+            Id = id;
+            Name = name;
+            IsAnimated = 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("-");
+    }
+}

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, Emoji emoji)
-
-        public Reaction(int count, string emojiId, string emojiName) 
         {
             Count = count;
-            EmojiId = emojiId;
+            Emoji = emoji;
-            EmojiName = emojiName;
         }
     }
 }

DiscordChatExporter.Core/Resources/ExportTemplates/Csv/Template.csv

@@ -4,7 +4,7 @@
 
   {{- }}"{{ message.Timestamp | FormatDate }}";
 
-  {{- }}"{{ message.Content | FormatContent }}";
+  {{- }}"{{ message.Content | FormatMarkdown | string.replace "\"" "\"\"" }}";
 
   {{- }}"{{ 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/HtmlDark/Template.html

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

DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark/Theme.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;
+    border-color: #282b30 !important;
-    color: #839496;
+    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;
+    background-color: rgba(46, 48, 54, 0.3);
-    border-color: #2e303699;
+    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/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/HtmlLight/Template.html

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

DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight/Theme.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;
+    border-color: #f3f3f3 !important;
-    color: #657b83;
+    color: #657b83 !important;
 }
 
 .mention {
@@ -56,8 +60,8 @@ a {
 }
 
 .chatlog__embed-content-container {
-    background-color: #f9f9f94d;
+    background-color: rgba(249, 249, 249, 0.3);
-    border-color: #cccccc4d;
+    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/Resources/ExportTemplates/HtmlShared/Main.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;
+    width: 1.45em;
-    height: 24px;
+    height: 1.45em;
     margin: 0 1px;
-    vertical-align: middle;
+    vertical-align: -0.4em;
 }
 
 .emoji--small {
-    width: 16px;
+    width: 1rem;
-    height: 16px;
+    height: 1rem;
 }
 
 .emoji--large {
-    width: 32px;
+    width: 2rem;
-    height: 32px;
+    height: 2rem;
-}
-
-.mention {
-    font-weight: 600;
 }
 
 /* === 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/Resources/ExportTemplates/HtmlShared/Main.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.Main.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>
     
@@ -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">
+                                    <img class="emoji emoji--small" alt="{{ reaction.Emoji.Name }}" title="{{ reaction.Emoji.Name }}" src="{{ reaction.Emoji.ImageUrl }}" />
-                                        {{~ # 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>
                                     <span class="chatlog__reaction-count">{{ reaction.Count }}</span>
                                 </div>
                             {{~ end ~}}

DiscordChatExporter.Core/Resources/ExportTemplates/PlainText/Template.txt

@@ -12,7 +12,7 @@ Range:    {{ if Model.From }}{{ Model.From | FormatDate }} {{ end }}{{ if Model.
   {{~ # Author name and timestamp ~}}
   {{~ }}[{{ message.Timestamp | FormatDate }}] {{ message.Author.FullName }}
   {{~ # Content ~}}
-  {{~ message.Content | FormatContent }}
+  {{~ message.Content | FormatMarkdown }}
   {{~ # Attachments ~}}
   {{~ for attachment in message.Attachments ~}}
     {{~ attachment.Url }}

DiscordChatExporter.Core/Services/DataService.Parsers.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
+using ByteSizeLib;
 using DiscordChatExporter.Core.Internal;
 using DiscordChatExporter.Core.Models;
 using Newtonsoft.Json.Linq;
@@ -69,7 +70,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 = ByteSize.FromBytes(fileSizeBytes);
 
             return new Attachment(id, width, height, url, fileName, fileSize);
         }
@@ -140,13 +143,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 emoji = ParseEmoji(json["emoji"]);
-            var emojiName = json["emoji"]["name"].Value<string>();
 
-            return new Reaction(count, emojiId, emojiName);
+            return new Reaction(count, emoji);
         }
 
         private Message ParseMessage(JToken json)

DiscordChatExporter.Core/Services/DataService.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
@@ -23,7 +22,7 @@ namespace DiscordChatExporter.Core.Services
         {
             // Create retry policy
             var retry = Retry.Create()
-                .Catch<HttpErrorStatusCodeException>(false, e => e.StatusCode == HttpStatusCode.ServiceUnavailable)
+                .Catch<HttpErrorStatusCodeException>(false, e => (int) e.StatusCode >= 500)
                 .Catch<HttpErrorStatusCodeException>(false, e => (int) e.StatusCode == 429)
                 .WithMaxTryCount(10)
                 .WithDelay(TimeSpan.FromSeconds(0.4));
@@ -41,10 +40,15 @@ namespace DiscordChatExporter.Core.Services
                         : new AuthenticationHeaderValue(token.Value);
 
                     // Add parameters
-                    foreach (var parameter in parameters)
+                    foreach (var parameter in parameters.ExceptBlank())
                     {
                         var key = parameter.SubstringUntil("=");
                         var value = parameter.SubstringAfter("=");
+
+                        // Skip empty values
+                        if (value.IsBlank())
+                            continue;
+
                         request.RequestUri = request.RequestUri.SetQueryParameter(key, value);
                     }
 
@@ -123,13 +127,9 @@ namespace DiscordChatExporter.Core.Services
         {
             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={to?.ToSnowflake()}");
             var lastMessage = response.Select(ParseMessage).FirstOrDefault();
 
             // If the last message doesn't exist or it's outside of range - return
@@ -140,7 +140,7 @@ namespace DiscordChatExporter.Core.Services
             }
 
             // Get other messages
-            var offsetId = firstId;
+            var offsetId = from?.ToSnowflake() ?? "0";
             while (true)
             {
                 // Get message batch

DiscordChatExporter.Core/Services/ExportService.TemplateLoader.cs

@@ -20,7 +20,7 @@ namespace DiscordChatExporter.Core.Services
 
             public string GetPath(ExportFormat format)
             {
-                return $"{ResourceRootNamespace}.{format}.{format.GetFileExtension()}";
+                return $"{ResourceRootNamespace}.{format}.Template.{format.GetFileExtension()}";
             }
 
             public string Load(TemplateContext context, SourceSpan callerSpan, string templatePath)

DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Globalization;
 using System.Linq;
-using System.Net;
+using System.Text;
-using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Internal;
+using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Models;
 using Scriban.Runtime;
 using Tyrrrz.Extensions;
@@ -19,330 +18,187 @@ namespace DiscordChatExporter.Core.Services
             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)
+            public TemplateModel(ExportFormat format, ChatLog log, string dateFormat)
             {
                 _format = format;
                 _log = log;
                 _dateFormat = dateFormat;
-                _messageGroupLimit = messageGroupLimit;
             }
 
             private IEnumerable<MessageGroup> GroupMessages(IEnumerable<Message> messages)
-            {
+                => messages.GroupAdjacentWhile((buffer, message) =>
-                // Group adjacent messages by timestamp and author
-                var buffer = new List<Message>();
-                foreach (var message in messages)
                 {
-                    // Get first message of the group
+                    // Break group if the author changed
-                    var groupFirstMessage = buffer.FirstOrDefault();
+                    if (buffer.Last().Author.Id != message.Author.Id)
+                        return false;
 
-                    // Group break condition
+                    // Break group if last message was more than 7 minutes ago
-                    var breakCondition =
+                    if ((message.Timestamp - buffer.Last().Timestamp).TotalMinutes > 7)
-                        groupFirstMessage != null &&
+                        return false;
-                        (
-                            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
+                    return true;
-                    if (breakCondition)
+                }).Select(g => new MessageGroup(g.First().Author, g.First().Timestamp, g));
-                    {
-                        var group = new MessageGroup(groupFirstMessage.Author, groupFirstMessage.Timestamp, buffer);
 
-                        // Reset the buffer instead of clearing to avoid mutations on existing references
+            private string Format(IFormattable obj, string format)
-                        buffer = new List<Message>();
+                => obj.ToString(format, CultureInfo.InvariantCulture);
-
-                        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)
+            private string FormatMarkdownPlainText(IReadOnlyList<Node> nodes)
             {
-                string[] units = {"B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
+                var buffer = new StringBuilder();
-                double size = fileSize;
-                var unit = 0;
 
-                while (size >= 1024)
+                foreach (var node in nodes)
                 {
-                    size /= 1024;
+                    if (node is FormattedNode formattedNode)
-                    ++unit;
+                    {
+                        var innerText = FormatMarkdownPlainText(formattedNode.Children);
+                        buffer.Append($"{formattedNode.Token}{innerText}{formattedNode.Token}");
+                    }
+
+                    else if (node is MentionNode mentionNode && mentionNode.Type != MentionType.Meta)
+                    {
+                        if (mentionNode.Type == MentionType.User)
+                        {
+                            var user = _log.Mentionables.GetUser(mentionNode.Id);
+                            buffer.Append($"@{user.Name}");
+                        }
+
+                        else if (mentionNode.Type == MentionType.Channel)
+                        {
+                            var channel = _log.Mentionables.GetChannel(mentionNode.Id);
+                            buffer.Append($"#{channel.Name}");
+                        }
+
+                        else if (mentionNode.Type == MentionType.Role)
+                        {
+                            var role = _log.Mentionables.GetRole(mentionNode.Id);
+                            buffer.Append($"@{role.Name}");
+                        }
+                    }
+
+                    else if (node is EmojiNode emojiNode)
+                    {
+                        buffer.Append(emojiNode.IsCustomEmoji ? $":{emojiNode.Name}:" : node.Lexeme);
+                    }
+
+                    else
+                    {
+                        buffer.Append(node.Lexeme);
+                    }
                 }
 
-                return $"{size:0.#} {units[unit]}";
+                return buffer.ToString();
             }
 
-            private string FormatColor(Color color)
+            private string FormatMarkdownPlainText(string input)
+                => FormatMarkdownPlainText(MarkdownParser.Parse(input));
+
+            private string FormatMarkdownHtml(IReadOnlyList<Node> nodes, int depth = 0)
             {
-                return $"{color.R},{color.G},{color.B},{color.A}";
+                var buffer = new StringBuilder();
+
+                foreach (var node in nodes)
+                {
+                    if (node is TextNode textNode)
+                    {
+                        buffer.Append(textNode.Text.HtmlEncode());
+                    }
+
+                    else if (node is FormattedNode formattedNode)
+                    {
+                        var innerHtml = FormatMarkdownHtml(formattedNode.Children, depth + 1);
+
+                        if (formattedNode.Formatting == TextFormatting.Bold)
+                            buffer.Append($"<strong>{innerHtml}</strong>");
+
+                        else if (formattedNode.Formatting == TextFormatting.Italic)
+                            buffer.Append($"<em>{innerHtml}</em>");
+
+                        else if (formattedNode.Formatting == TextFormatting.Underline)
+                            buffer.Append($"<u>{innerHtml}</u>");
+
+                        else if (formattedNode.Formatting == TextFormatting.Strikethrough)
+                            buffer.Append($"<s>{innerHtml}</s>");
+
+                        else if (formattedNode.Formatting == TextFormatting.Spoiler)
+                            buffer.Append($"<span class=\"spoiler\">{innerHtml}</span>");
+                    }
+
+                    else if (node is InlineCodeBlockNode inlineCodeBlockNode)
+                    {
+                        buffer.Append($"<span class=\"pre pre--inline\">{inlineCodeBlockNode.Code.HtmlEncode()}</span>");
+                    }
+
+                    else if (node is MultilineCodeBlockNode multilineCodeBlockNode)
+                    {
+                        // Set language class for syntax highlighting
+                        var languageCssClass = multilineCodeBlockNode.Language.IsNotBlank()
+                            ? "language-" + multilineCodeBlockNode.Language
+                            : null;
+
+                        buffer.Append(
+                            $"<div class=\"pre pre--multiline {languageCssClass}\">{multilineCodeBlockNode.Code.HtmlEncode()}</div>");
+                    }
+
+                    else if (node is MentionNode mentionNode)
+                    {
+                        if (mentionNode.Type == MentionType.Meta)
+                        {
+                            buffer.Append($"<span class=\"mention\">@{mentionNode.Id.HtmlEncode()}</span>");
+                        }
+
+                        else if (mentionNode.Type == MentionType.User)
+                        {
+                            var user = _log.Mentionables.GetUser(mentionNode.Id);
+                            buffer.Append($"<span class=\"mention\" title=\"{user.FullName}\">@{user.Name.HtmlEncode()}</span>");
+                        }
+
+                        else if (mentionNode.Type == MentionType.Channel)
+                        {
+                            var channel = _log.Mentionables.GetChannel(mentionNode.Id);
+                            buffer.Append($"<span class=\"mention\">#{channel.Name.HtmlEncode()}</span>");
+                        }
+
+                        else if (mentionNode.Type == MentionType.Role)
+                        {
+                            var role = _log.Mentionables.GetRole(mentionNode.Id);
+                            buffer.Append($"<span class=\"mention\">@{role.Name.HtmlEncode()}</span>");
+                        }
+                    }
+
+                    else if (node is EmojiNode emojiNode)
+                    {
+                        // Get emoji image URL
+                        var emojiImageUrl = new Emoji(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated).ImageUrl;
+
+                        // Emoji can be jumboable if it's the only top-level node
+                        var jumboableCssClass = depth == 0 && nodes.Count == 1
+                            ? "emoji--large"
+                            : null;
+
+                        buffer.Append($"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />");
+                    }
+
+                    else if (node is LinkNode linkNode)
+                    {
+                        var escapedUrl = Uri.EscapeUriString(linkNode.Url);
+                        buffer.Append($"<a href=\"{escapedUrl}\">{linkNode.Title.HtmlEncode()}</a>");
+                    }
+                }
+
+                return buffer.ToString();
             }
 
-            private string FormatContentPlainText(string content)
+            private string FormatMarkdownHtml(string input) 
+                => FormatMarkdownHtml(MarkdownParser.Parse(input));
+
+            private string FormatMarkdown(string input)
             {
-                // New lines
+                return _format == ExportFormat.HtmlDark || _format == ExportFormat.HtmlLight
-                content = content.Replace("\n", Environment.NewLine);
+                    ? FormatMarkdownHtml(input)
-
+                    : FormatMarkdownPlainText(input);
-                // 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()
@@ -350,16 +206,14 @@ namespace DiscordChatExporter.Core.Services
                 // Create instance
                 var scriptObject = new ScriptObject();
 
-                // Import chat log
+                // Import model
                 scriptObject.SetValue("Model", _log, true);
 
                 // Import functions
                 scriptObject.Import(nameof(GroupMessages), new Func<IEnumerable<Message>, IEnumerable<MessageGroup>>(GroupMessages));
                 scriptObject.Import(nameof(Format), new Func<IFormattable, string, string>(Format));
                 scriptObject.Import(nameof(FormatDate), new Func<DateTime, string>(FormatDate));
-                scriptObject.Import(nameof(FormatFileSize), new Func<long, string>(FormatFileSize));
+                scriptObject.Import(nameof(FormatMarkdown), new Func<string, string>(FormatMarkdown));
-                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,5 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using DiscordChatExporter.Core.Internal;
 using DiscordChatExporter.Core.Models;
 using Scriban;
 using Scriban.Runtime;
@@ -36,8 +38,7 @@ namespace DiscordChatExporter.Core.Services
             };
 
             // Create template model
-            var templateModel = new TemplateModel(format, chatLog,
+            var templateModel = new TemplateModel(format, chatLog, _settingsService.DateFormat);
-                _settingsService.DateFormat, _settingsService.MessageGroupLimit);
 
             context.PushGlobal(templateModel.GetScriptObject());
 
@@ -83,34 +84,6 @@ namespace DiscordChatExporter.Core.Services
             }
         }
 
-        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)
         {
@@ -122,7 +95,11 @@ namespace DiscordChatExporter.Core.Services
             // Otherwise split into partitions and export separately
             else
             {
-                var partitions = SplitIntoPartitions(chatLog, partitionLimit.Value);
+                // Create partitions by grouping up to X adjacent messages into separate chat logs
+                var partitions = chatLog.Messages.GroupAdjacentWhile(g => g.Count < partitionLimit.Value)
+                    .Select(g => new ChatLog(chatLog.Guild, chatLog.Channel, chatLog.From, chatLog.To, g, chatLog.Mentionables))
+                    .ToArray();
+
                 ExportChatLogPartitioned(partitions, filePath, format);
             }
         }

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.Gui/Properties/AssemblyInfo.cs

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

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/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
+                                    <Grid Margin="-8" Background="Transparent">
-                                        Margin="-8"
+                                        <Grid.InputBindings>
-                                        Background="Transparent"
-                                        Orientation="Horizontal">
-                                        <StackPanel.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

@@ -16,6 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Core",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Cli", "DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj", "{D08624B6-3081-4BCB-91F8-E9832FACC6CE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Core.Markdown", "DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj", "{14D02A08-E820-4012-B805-663B9A3D73E9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,6 +36,10 @@ Global
 		{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
 		{D08624B6-3081-4BCB-91F8-E9832FACC6CE}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Dockerfile

@@ -2,6 +2,7 @@ FROM mono:5
 WORKDIR /root/build
 COPY DiscordChatExporter.sln favicon.ico ./
 COPY DiscordChatExporter.Core DiscordChatExporter.Core
+COPY DiscordChatExporter.Core.Markdown DiscordChatExporter.Core.Markdown
 COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
 RUN msbuild ./DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj /t:Restore
 RUN msbuild ./DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj /p:Configuration=Release

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
+ This program is distributed in the hope that it will be useful,
-of this software and associated documentation files (the "Software"), to deal
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-in the Software without restriction, including without limitation the rights
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ GNU General Public License for more details.
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+ You should have received a copy of the GNU General Public License
-copies or substantial portions of the Software.
+ 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
+                    GNU GENERAL PUBLIC LICENSE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+                       Version 3, 29 June 2007
-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
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-SOFTWARE.
+ 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>.

Readme.md

@@ -34,6 +34,7 @@ DiscordChatExporter can be used to export message history from a [Discord](https
 - [Scriban](https://github.com/lunet-io/scriban)
 - [CommandLineParser](https://github.com/commandlineparser/commandline)
 - [Ookii.Dialogs](https://github.com/caioproiete/ookii-dialogs-wpf)
+- [ByteSize](https://github.com/omar/ByteSize)
 - [Failsafe](https://github.com/Tyrrrz/Failsafe)
 - [Gress](https://github.com/Tyrrrz/Gress)
 - [Onova](https://github.com/Tyrrrz/Onova)

UpdateVersion.ps1

@@ -8,6 +8,5 @@ function Replace-TextInFile {
     [IO.File]::WriteAllText($filePath, $content, [Text.Encoding]::UTF8)
 }
 
-Replace-TextInFile "$PSScriptRoot\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" '(?<=<Version>)(.*?)(?=</Version>)' $newVersion
 Replace-TextInFile "$PSScriptRoot\DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj" '(?<=<Version>)(.*?)(?=</Version>)' $newVersion
 Replace-TextInFile "$PSScriptRoot\DiscordChatExporter.Gui\Properties\AssemblyInfo.cs" '(?<=Assembly.*?Version\(")(.*?)(?="\)\])' $newVersion