Update version

Fixes #125
Closes #177

.github/FUNDING.yml

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

.github/workflows/CD.yml

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

.github/workflows/CI.yml

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

Changelog.md

@@ -1,3 +1,17 @@
+### v2.16 (08-Dec-2019)
+
+- Migrated from .NET Framework to .NET Core. To run this and future versions of DiscordChatExporter you will need [.NET Core runtime for desktop apps](https://dotnet.microsoft.com/download/dotnet-core/3.1/runtime) (for GUI/CLI version on Windows) or [.NET Core base runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1) (for CLI version on Windows, Linux or macOS).
+- Reworked the exporter engine to render output using streaming data source. This means that only a very small portion of messages are cached in memory when exporting. In other words, you are only limited by storage space and not how much RAM you have, so you can now export terrabytes of chat logs without hitting out of memory exceptions. I still recommend using partitions if you're exporting very large chat logs (250k+ messages) to HTML, unless you want your computer to catch fire when you try to open the export in browser.
+- Added a warning about automating user accounts to the usage guide in both GUI and CLI versions.
+- Added support for announcement (news) channels. You will now be able to see them in the list and export them.
+- Fixed various issues that resulted in exceptions during export process.
+- [HTML] Changed default color of the embed color pill to match the theme.
+- [HTML] Changed emoji parser to be less greedy. As a result it should match fewer character sequences that look like emojis but really aren't, but on the other hand it might miss some actual emojis. This means that some standard emojis (i.e. not custom server emojis) may not look like in Discord. This is a compromise I'm willing to take because detecting emojis in text is really hard to get right and not worth it at all.
+- [HTML] Some other minor styling adjustments.
+- [CSV] Replaced semicolons (;) with (,) as separators.
+
+Please note that CSV export is most likely not going to receive future updates and will remain only as an option for those who wish to use it for text analysis. In other words, it won't contain any of the rich media features like embeds. If you're currently using CSV as a structured output to feed into your program, JSON output will replace that in the future.
+
 ### v2.15 (15-Sep-2019)
 
 - Improved markdown parser and made it even faster for non-HTML formats.

Deploy/Prepare.ps1

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

DiscordChatExporter.Cli/Commands/ExportChannelCommand.cs

@@ -16,13 +16,6 @@ namespace DiscordChatExporter.Cli.Commands
         {
         }
 
-        public override async Task ExecuteAsync(IConsole console)
+        public override async Task ExecuteAsync(IConsole console) => await ExportAsync(console, ChannelId);
-        {
-            // Get channel
-            var channel = await DataService.GetChannelAsync(GetToken(), ChannelId);
-
-            // Export
-            await ExportChannelAsync(console, channel);
-        }
     }
 }

DiscordChatExporter.Cli/Commands/ExportCommandBase.cs

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

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -29,7 +29,7 @@ namespace DiscordChatExporter.Cli.Commands
             {
                 try
                 {
-                    await ExportChannelAsync(console, channel);
+                    await ExportAsync(console, channel);
                 }
                 catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
                 {

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -26,14 +26,14 @@ namespace DiscordChatExporter.Cli.Commands
             var channels = await DataService.GetGuildChannelsAsync(GetToken(), GuildId);
 
             // Filter and order channels
-            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
+            channels = channels.Where(c => c.Type.IsExportable()).OrderBy(c => c.Name).ToArray();
 
             // Loop through channels
             foreach (var channel in channels)
             {
                 try
                 {
-                    await ExportChannelAsync(console, channel);
+                    await ExportAsync(console, channel);
                 }
                 catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
                 {

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -24,7 +24,7 @@ namespace DiscordChatExporter.Cli.Commands
             var channels = await DataService.GetGuildChannelsAsync(GetToken(), GuildId);
 
             // Filter and order channels
-            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
+            channels = channels.Where(c => c.Type.IsExportable()).OrderBy(c => c.Name).ToArray();
 
             // Print result
             foreach (var channel in channels)

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -18,6 +18,7 @@ namespace DiscordChatExporter.Cli.Commands
             console.Output.WriteLine(" 4. Select \"Local Storage\" > \"https://discordapp.com\" on the left");
             console.Output.WriteLine(" 5. Press Ctrl+R to reload");
             console.Output.WriteLine(" 6. Find \"token\" at the bottom and copy the value");
+            console.Output.WriteLine(" *  Automating user accounts is technically against TOS, use at your own risk.");
             console.Output.WriteLine();
 
             console.WithForegroundColor(ConsoleColor.White, () => console.Output.WriteLine("To get bot token:"));

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

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

DiscordChatExporter.Cli/Internal/InlineProgress.cs

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

DiscordChatExporter.Cli/Program.cs

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

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

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

DiscordChatExporter.Core.Markdown/Internal/AggregateMatcher.cs

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

DiscordChatExporter.Core.Markdown/Internal/Extensions.cs

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

DiscordChatExporter.Core.Markdown/Internal/IMatcher.cs

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

DiscordChatExporter.Core.Markdown/Internal/RegexMatcher.cs

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

DiscordChatExporter.Core.Markdown/Internal/StringMatcher.cs

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

DiscordChatExporter.Core.Markdown/Internal/StringPart.cs

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

DiscordChatExporter.Core.Markdown/MarkdownParser.cs

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

DiscordChatExporter.Core.Markdown/Nodes/EmojiNode.cs

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

DiscordChatExporter.Core.Models/Attachment.cs

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

DiscordChatExporter.Core.Models/Channel.cs

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

DiscordChatExporter.Core.Models/ChannelType.cs

@@ -1,6 +1,7 @@
 namespace DiscordChatExporter.Core.Models
 {
     // https://discordapp.com/developers/docs/resources/channel#channel-object-channel-types
+    // Order of enum fields needs to match the order in the docs.
 
     public enum ChannelType
     {
@@ -8,6 +9,8 @@
         DirectTextChat,
         GuildVoiceChat,
         DirectGroupTextChat,
-        Category
+        GuildCategory,
+        GuildNews,
+        GuildStore
     }
 }

DiscordChatExporter.Core.Models/ChatLog.cs

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

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

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

DiscordChatExporter.Core.Models/Embed.cs

@@ -8,28 +8,28 @@ namespace DiscordChatExporter.Core.Models
 
     public class Embed
     {
-        public string Title { get; }
+        public string? Title { get; }
 
-        public string Url { get; }
+        public string? Url { get; }
 
         public DateTimeOffset? Timestamp { get; }
 
-        public Color Color { get; }
+        public Color? Color { get; }
 
-        public EmbedAuthor Author { get; }
+        public EmbedAuthor? Author { get; }
 
-        public string Description { get; }
+        public string? Description { get; }
 
         public IReadOnlyList<EmbedField> Fields { get; }
 
-        public EmbedImage Thumbnail { get; }
+        public EmbedImage? Thumbnail { get; }
 
-        public EmbedImage Image { get; }
+        public EmbedImage? Image { get; }
 
-        public EmbedFooter Footer { get; }
+        public EmbedFooter? Footer { get; }
 
-        public Embed(string title, string url, DateTimeOffset? timestamp, Color color, EmbedAuthor author, string description,
+        public Embed(string? title, string? url, DateTimeOffset? timestamp, Color? color, EmbedAuthor? author, string? description,
-            IReadOnlyList<EmbedField> fields, EmbedImage thumbnail, EmbedImage image, EmbedFooter footer)
+            IReadOnlyList<EmbedField> fields, EmbedImage? thumbnail, EmbedImage? image, EmbedFooter? footer)
         {
             Title = title;
             Url = url;
@@ -43,6 +43,6 @@ namespace DiscordChatExporter.Core.Models
             Footer = footer;
         }
 
-        public override string ToString() => Title;
+        public override string ToString() => Title ?? "<untitled embed>";
     }
 }

DiscordChatExporter.Core.Models/EmbedAuthor.cs

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

DiscordChatExporter.Core.Models/EmbedFooter.cs

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

DiscordChatExporter.Core.Models/EmbedImage.cs

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

DiscordChatExporter.Core.Models/Emoji.cs

@@ -8,7 +8,7 @@ namespace DiscordChatExporter.Core.Models
 
     public partial class Emoji
     {
-        public string Id { get; }
+        public string? Id { get; }
 
         public string Name { get; }
 
@@ -16,7 +16,7 @@ namespace DiscordChatExporter.Core.Models
 
         public string ImageUrl { get; }
 
-        public Emoji(string id, string name, bool isAnimated)
+        public Emoji(string? id, string name, bool isAnimated)
         {
             Id = id;
             Name = name;
@@ -37,10 +37,10 @@ namespace DiscordChatExporter.Core.Models
         private static string GetTwemojiName(string emoji) =>
             GetCodePoints(emoji).Select(i => i.ToString("x")).JoinToString("-");
 
-        public static string GetImageUrl(string id, string name, bool isAnimated)
+        public static string GetImageUrl(string? id, string name, bool isAnimated)
         {
             // Custom emoji
-            if (!id.IsNullOrWhiteSpace())
+            if (!string.IsNullOrWhiteSpace(id))
             {
                 // Animated
                 if (isAnimated)

DiscordChatExporter.Core.Models/Extensions.cs

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

DiscordChatExporter.Core.Models/FileSize.cs

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

DiscordChatExporter.Core.Models/Guild.cs

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

DiscordChatExporter.Core.Models/IHasId.cs

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

DiscordChatExporter.Core.Models/IdBasedEqualityComparer.cs

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

DiscordChatExporter.Core.Models/Mentionables.cs

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

DiscordChatExporter.Core.Models/Message.cs

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

DiscordChatExporter.Core.Models/MessageGroup.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace DiscordChatExporter.Core.Models
+{
+    // Used for grouping contiguous messages in HTML export
+
+    public class MessageGroup
+    {
+        public User Author { get; }
+
+        public DateTimeOffset Timestamp { get; }
+
+        public IReadOnlyList<Message> Messages { get; }
+
+        public MessageGroup(User author, DateTimeOffset timestamp, IReadOnlyList<Message> messages)
+        {
+            Author = author;
+            Timestamp = timestamp;
+            Messages = messages;
+        }
+    }
+}

DiscordChatExporter.Core.Models/Role.cs

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

DiscordChatExporter.Core.Models/User.cs

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

DiscordChatExporter.Core.Rendering/CsvChatLogRenderer.cs

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

DiscordChatExporter.Core.Rendering/CsvMessageRenderer.cs

@@ -0,0 +1,28 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Logic;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public class CsvMessageRenderer : MessageRendererBase
+    {
+        private bool _isHeaderRendered;
+
+        public CsvMessageRenderer(string filePath, RenderContext context)
+            : base(filePath, context)
+        {
+        }
+
+        public override async Task RenderMessageAsync(Message message)
+        {
+            // Render header if it's the first entry
+            if (!_isHeaderRendered)
+            {
+                await Writer.WriteLineAsync(CsvRenderingLogic.FormatHeader(Context));
+                _isHeaderRendered = true;
+            }
+
+            await Writer.WriteLineAsync(CsvRenderingLogic.FormatMessage(Context, message));
+        }
+    }
+}

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

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

DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.MessageGroup.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Rendering
-{
-    public partial class HtmlChatLogRenderer
-    {
-        private class MessageGroup
-        {
-            public User Author { get; }
-
-            public DateTimeOffset Timestamp { get; }
-
-            public IReadOnlyList<Message> Messages { get; }
-
-            public MessageGroup(User author, DateTimeOffset timestamp, IReadOnlyList<Message> messages)
-            {
-                Author = author;
-                Timestamp = timestamp;
-                Messages = messages;
-            }
-        }
-    }
-}

DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.TemplateLoader.cs

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

DiscordChatExporter.Core.Rendering/HtmlMessageRenderer.cs

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Logic;
+using Scriban;
+using Scriban.Runtime;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public partial class HtmlMessageRenderer : MessageRendererBase
+    {
+        private readonly string _themeName;
+        private readonly List<Message> _messageGroupBuffer = new List<Message>();
+
+        private readonly Template _leadingBlockTemplate;
+        private readonly Template _messageGroupTemplate;
+        private readonly Template _trailingBlockTemplate;
+
+        private bool _isLeadingBlockRendered;
+
+        public HtmlMessageRenderer(string filePath, RenderContext context, string themeName)
+            : base(filePath, context)
+        {
+            _themeName = themeName;
+
+            _leadingBlockTemplate = Template.Parse(GetLeadingBlockTemplateCode());
+            _messageGroupTemplate = Template.Parse(GetMessageGroupTemplateCode());
+            _trailingBlockTemplate = Template.Parse(GetTrailingBlockTemplateCode());
+        }
+
+        private MessageGroup GetCurrentMessageGroup()
+        {
+            var firstMessage = _messageGroupBuffer.First();
+            return new MessageGroup(firstMessage.Author, firstMessage.Timestamp, _messageGroupBuffer);
+        }
+
+        private TemplateContext CreateTemplateContext(IReadOnlyDictionary<string, object>? constants = null)
+        {
+            // Template context
+            var templateContext = new TemplateContext
+            {
+                MemberRenamer = m => m.Name,
+                MemberFilter = m => true,
+                LoopLimit = int.MaxValue,
+                StrictVariables = true
+            };
+
+            // Model
+            var scriptObject = new ScriptObject();
+
+            // Constants
+            scriptObject.SetValue("Context", Context, true);
+            scriptObject.SetValue("CoreStyleSheet", GetCoreStyleSheetCode(), true);
+            scriptObject.SetValue("ThemeStyleSheet", GetThemeStyleSheetCode(_themeName), true);
+            scriptObject.SetValue("HighlightJsStyleName", $"solarized-{_themeName.ToLowerInvariant()}", true);
+
+            // Additional constants
+            if (constants != null)
+            {
+                foreach (var (member, value) in constants)
+                    scriptObject.SetValue(member, value, true);
+            }
+
+            // Functions
+            scriptObject.Import("FormatDate",
+                new Func<DateTimeOffset, string>(d => SharedRenderingLogic.FormatDate(d, Context.DateFormat)));
+
+            scriptObject.Import("FormatMarkdown",
+                new Func<string, string>(m => HtmlRenderingLogic.FormatMarkdown(Context, m)));
+
+            // Push model
+            templateContext.PushGlobal(scriptObject);
+
+            // Push output
+            templateContext.PushOutput(new TextWriterOutput(Writer));
+
+            return templateContext;
+        }
+
+        private async Task RenderLeadingBlockAsync()
+        {
+            var templateContext = CreateTemplateContext();
+            await templateContext.EvaluateAsync(_leadingBlockTemplate.Page);
+        }
+
+        private async Task RenderCurrentMessageGroupAsync()
+        {
+            var templateContext = CreateTemplateContext(new Dictionary<string, object>
+            {
+                ["MessageGroup"] = GetCurrentMessageGroup()
+            });
+
+            await templateContext.EvaluateAsync(_messageGroupTemplate.Page);
+        }
+
+        private async Task RenderTrailingBlockAsync()
+        {
+            var templateContext = CreateTemplateContext();
+            await templateContext.EvaluateAsync(_trailingBlockTemplate.Page);
+        }
+
+        public override async Task RenderMessageAsync(Message message)
+        {
+            // Render leading block if it's the first entry
+            if (!_isLeadingBlockRendered)
+            {
+                await RenderLeadingBlockAsync();
+                _isLeadingBlockRendered = true;
+            }
+
+            // If message group is empty or the given message can be grouped, buffer the given message
+            if (!_messageGroupBuffer.Any() || HtmlRenderingLogic.CanBeGrouped(_messageGroupBuffer.Last(), message))
+            {
+                _messageGroupBuffer.Add(message);
+            }
+            // Otherwise, flush the group and render messages
+            else
+            {
+                await RenderCurrentMessageGroupAsync();
+
+                _messageGroupBuffer.Clear();
+                _messageGroupBuffer.Add(message);
+            }
+        }
+
+        public override async ValueTask DisposeAsync()
+        {
+            // Leading block (can happen if no message were rendered)
+            if (!_isLeadingBlockRendered)
+                await RenderLeadingBlockAsync();
+
+            // Flush current message group
+            if (_messageGroupBuffer.Any())
+                await RenderCurrentMessageGroupAsync();
+
+            // Trailing block
+            await RenderTrailingBlockAsync();
+
+            // Dispose stream
+            await base.DisposeAsync();
+        }
+    }
+
+    public partial class HtmlMessageRenderer
+    {
+        private static readonly Assembly ResourcesAssembly = typeof(HtmlRenderingLogic).Assembly;
+        private static readonly string ResourcesNamespace = $"{ResourcesAssembly.GetName().Name}.Resources";
+
+        private static string GetCoreStyleSheetCode() =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.HtmlCore.css");
+
+        private static string GetThemeStyleSheetCode(string themeName) =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.Html{themeName}.css");
+
+        private static string GetLeadingBlockTemplateCode() =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.HtmlLayoutTemplate.html")
+                .SubstringUntil("{{~ %SPLIT% ~}}");
+
+        private static string GetTrailingBlockTemplateCode() =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.HtmlLayoutTemplate.html")
+                .SubstringAfter("{{~ %SPLIT% ~}}");
+
+        private static string GetMessageGroupTemplateCode() =>
+            ResourcesAssembly
+                .GetManifestResourceString($"{ResourcesNamespace}.HtmlMessageGroupTemplate.html");
+    }
+}

DiscordChatExporter.Core.Rendering/IChatLogRenderer.cs

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

DiscordChatExporter.Core.Rendering/IMessageRenderer.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public interface IMessageRenderer : IAsyncDisposable
+    {
+        Task RenderMessageAsync(Message message);
+    }
+}

DiscordChatExporter.Core.Rendering/Internal/Extensions.cs

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

DiscordChatExporter.Core.Rendering/Logic/CsvRenderingLogic.cs

@@ -0,0 +1,39 @@
+using System.Linq;
+using System.Text;
+using DiscordChatExporter.Core.Models;
+using Tyrrrz.Extensions;
+
+using static DiscordChatExporter.Core.Rendering.Logic.SharedRenderingLogic;
+
+namespace DiscordChatExporter.Core.Rendering.Logic
+{
+    public static class CsvRenderingLogic
+    {
+        // Header is always the same
+        public static string FormatHeader(RenderContext context) => "AuthorID,Author,Date,Content,Attachments,Reactions";
+
+        private static string EncodeValue(string value)
+        {
+            value = value.Replace("\"", "\"\"");
+            return $"\"{value}\"";
+        }
+
+        public static string FormatMarkdown(RenderContext context, string markdown) =>
+            PlainTextRenderingLogic.FormatMarkdown(context, markdown);
+
+        public static string FormatMessage(RenderContext context, Message message)
+        {
+            var buffer = new StringBuilder();
+
+            buffer
+                .Append(EncodeValue(message.Author.Id)).Append(',')
+                .Append(EncodeValue(message.Author.FullName)).Append(',')
+                .Append(EncodeValue(FormatDate(message.Timestamp, context.DateFormat))).Append(',')
+                .Append(EncodeValue(FormatMarkdown(context, message.Content ?? ""))).Append(',')
+                .Append(EncodeValue(message.Attachments.Select(a => a.Url).JoinToString(","))).Append(',')
+                .Append(EncodeValue(message.Reactions.Select(r => $"{r.Emoji.Name} ({r.Count})").JoinToString(",")));
+
+            return buffer.ToString();
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Logic/HtmlRenderingLogic.cs

@@ -1,53 +1,31 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Nodes;
 using DiscordChatExporter.Core.Models;
-using Scriban;
-using Scriban.Runtime;
 using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Core.Rendering
+namespace DiscordChatExporter.Core.Rendering.Logic
 {
-    public partial class HtmlChatLogRenderer : IChatLogRenderer
+    internal static class HtmlRenderingLogic
     {
-        private readonly ChatLog _chatLog;
+        public static bool CanBeGrouped(Message message1, Message message2)
-        private readonly string _themeName;
-        private readonly string _dateFormat;
-
-        public HtmlChatLogRenderer(ChatLog chatLog, string themeName, string dateFormat)
         {
-            _chatLog = chatLog;
+            if (message1.Author.Id != message2.Author.Id)
-            _themeName = themeName;
-            _dateFormat = dateFormat;
-        }
-
-        private string HtmlEncode(string s) => WebUtility.HtmlEncode(s);
-
-        private string FormatDate(DateTimeOffset date) =>
-            date.ToLocalTime().ToString(_dateFormat, CultureInfo.InvariantCulture);
-
-        private IEnumerable<MessageGroup> GroupMessages(IEnumerable<Message> messages) =>
-            messages.GroupContiguous((buffer, message) =>
-            {
-                // Break group if the author changed
-                if (buffer.Last().Author.Id != message.Author.Id)
                 return false;
 
-                // Break group if last message was more than 7 minutes ago
+            if ((message2.Timestamp - message1.Timestamp).Duration().TotalMinutes > 7)
-                if ((message.Timestamp - buffer.Last().Timestamp).TotalMinutes > 7)
                 return false;
 
             return true;
-            }).Select(g => new MessageGroup(g.First().Author, g.First().Timestamp, g));
+        }
 
-        private string FormatMarkdown(Node node, bool isJumbo)
+        private static string HtmlEncode(string s) => WebUtility.HtmlEncode(s);
+
+        private static string FormatMarkdownNode(RenderContext context, Node node, bool isJumbo)
         {
             // Text node
             if (node is TextNode textNode)
@@ -60,7 +38,7 @@ namespace DiscordChatExporter.Core.Rendering
             if (node is FormattedNode formattedNode)
             {
                 // Recursively get inner html
-                var innerHtml = FormatMarkdown(formattedNode.Children, false);
+                var innerHtml = FormatMarkdownNodes(context, formattedNode.Children, false);
 
                 // Bold
                 if (formattedNode.Formatting == TextFormatting.Bold)
@@ -97,7 +75,7 @@ namespace DiscordChatExporter.Core.Rendering
             if (node is MultiLineCodeBlockNode multilineCodeBlockNode)
             {
                 // Set CSS class for syntax highlighting
-                var highlightCssClass = !multilineCodeBlockNode.Language.IsNullOrWhiteSpace()
+                var highlightCssClass = !string.IsNullOrWhiteSpace(multilineCodeBlockNode.Language)
                     ? $"language-{multilineCodeBlockNode.Language}"
                     : "nohighlight";
 
@@ -116,21 +94,27 @@ namespace DiscordChatExporter.Core.Rendering
                 // User mention node
                 if (mentionNode.Type == MentionType.User)
                 {
-                    var user = _chatLog.Mentionables.GetUser(mentionNode.Id);
+                    var user = context.MentionableUsers.FirstOrDefault(u => u.Id == mentionNode.Id) ??
+                               User.CreateUnknownUser(mentionNode.Id);
+
                     return $"<span class=\"mention\" title=\"{HtmlEncode(user.FullName)}\">@{HtmlEncode(user.Name)}</span>";
                 }
 
                 // Channel mention node
                 if (mentionNode.Type == MentionType.Channel)
                 {
-                    var channel = _chatLog.Mentionables.GetChannel(mentionNode.Id);
+                    var channel = context.MentionableChannels.FirstOrDefault(c => c.Id == mentionNode.Id) ??
+                                  Channel.CreateDeletedChannel(mentionNode.Id);
+
                     return $"<span class=\"mention\">#{HtmlEncode(channel.Name)}</span>";
                 }
 
                 // Role mention node
                 if (mentionNode.Type == MentionType.Role)
                 {
-                    var role = _chatLog.Mentionables.GetRole(mentionNode.Id);
+                    var role = context.MentionableRoles.FirstOrDefault(r => r.Id == mentionNode.Id) ??
+                               Role.CreateDeletedRole(mentionNode.Id);
+
                     return $"<span class=\"mention\">@{HtmlEncode(role.Name)}</span>";
                 }
             }
@@ -153,58 +137,24 @@ namespace DiscordChatExporter.Core.Rendering
                 // Extract message ID if the link points to a Discord message
                 var linkedMessageId = Regex.Match(linkNode.Url, "^https?://discordapp.com/channels/.*?/(\\d+)/?$").Groups[1].Value;
 
-                return linkedMessageId.IsNullOrWhiteSpace()
+                return string.IsNullOrWhiteSpace(linkedMessageId)
                     ? $"<a href=\"{Uri.EscapeUriString(linkNode.Url)}\">{HtmlEncode(linkNode.Title)}</a>"
                     : $"<a href=\"{Uri.EscapeUriString(linkNode.Url)}\" onclick=\"scrollToMessage(event, '{linkedMessageId}')\">{HtmlEncode(linkNode.Title)}</a>";
             }
 
             // Throw on unexpected nodes
-            throw new InvalidOperationException($"Unexpected node: [{node.GetType()}].");
+            throw new InvalidOperationException($"Unexpected node [{node.GetType()}].");
         }
 
-        private string FormatMarkdown(IReadOnlyList<Node> nodes, bool isTopLevel)
+        private static string FormatMarkdownNodes(RenderContext context, IReadOnlyList<Node> nodes, bool isTopLevel)
         {
             // Emojis are jumbo if all top-level nodes are emoji nodes or whitespace text nodes
-            var isJumbo = isTopLevel && nodes.All(n => n is EmojiNode || n is TextNode textNode && textNode.Text.IsNullOrWhiteSpace());
+            var isJumbo = isTopLevel && nodes.All(n => n is EmojiNode || n is TextNode textNode && string.IsNullOrWhiteSpace(textNode.Text));
 
-            return nodes.Select(n => FormatMarkdown(n, isJumbo)).JoinToString("");
+            return nodes.Select(n => FormatMarkdownNode(context, n, isJumbo)).JoinToString("");
         }
 
-        private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.Parse(markdown), true);
+        public static string FormatMarkdown(RenderContext context, string markdown) =>
-
+            FormatMarkdownNodes(context, MarkdownParser.Parse(markdown), true);
-        public async Task RenderAsync(TextWriter writer)
-        {
-            // Create template loader
-            var loader = new TemplateLoader();
-
-            // Get template
-            var templateCode = loader.Load($"Html{_themeName}.html");
-            var template = Template.Parse(templateCode);
-
-            // Create template context
-            var context = new TemplateContext
-            {
-                TemplateLoader = loader,
-                MemberRenamer = m => m.Name,
-                MemberFilter = m => true,
-                LoopLimit = int.MaxValue,
-                StrictVariables = true
-            };
-
-            // Create template model
-            var model = new ScriptObject();
-            model.SetValue("Model", _chatLog, true);
-            model.Import(nameof(GroupMessages), new Func<IEnumerable<Message>, IEnumerable<MessageGroup>>(GroupMessages));
-            model.Import(nameof(FormatDate), new Func<DateTimeOffset, string>(FormatDate));
-            model.Import(nameof(FormatMarkdown), new Func<string, string>(FormatMarkdown));
-            context.PushGlobal(model);
-
-            // Configure output
-            context.PushOutput(new TextWriterOutput(writer));
-
-            // HACK: Render output in a separate thread
-            // (even though Scriban has async API, it still makes a lot of blocking CPU-bound calls)
-            await Task.Run(async () => await context.EvaluateAsync(template.Page));
-        }
     }
 }

DiscordChatExporter.Core.Rendering/Logic/PlainTextRenderingLogic.cs

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

DiscordChatExporter.Core.Rendering/Logic/SharedRenderingLogic.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Globalization;
+
+namespace DiscordChatExporter.Core.Rendering.Logic
+{
+    public static class SharedRenderingLogic
+    {
+        public static string FormatDate(DateTimeOffset date, string dateFormat) =>
+            date.ToLocalTime().ToString(dateFormat, CultureInfo.InvariantCulture);
+    }
+}

DiscordChatExporter.Core.Rendering/MessageRendererBase.cs

@@ -0,0 +1,23 @@
+using System.IO;
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public abstract class MessageRendererBase : IMessageRenderer
+    {
+        protected TextWriter Writer { get; }
+
+        protected RenderContext Context { get; }
+
+        protected MessageRendererBase(string filePath, RenderContext context)
+        {
+            Writer = File.CreateText(filePath);
+            Context = context;
+        }
+
+        public abstract Task RenderMessageAsync(Message message);
+
+        public virtual ValueTask DisposeAsync() => Writer.DisposeAsync();
+    }
+}

DiscordChatExporter.Core.Rendering/PlainTextChatLogRenderer.cs

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

DiscordChatExporter.Core.Rendering/PlainTextMessageRenderer.cs

@@ -0,0 +1,29 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Rendering.Logic;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public class PlainTextMessageRenderer : MessageRendererBase
+    {
+        private bool _isPreambleRendered;
+
+        public PlainTextMessageRenderer(string filePath, RenderContext context)
+            : base(filePath, context)
+        {
+        }
+
+        public override async Task RenderMessageAsync(Message message)
+        {
+            // Render preamble if it's the first entry
+            if (!_isPreambleRendered)
+            {
+                await Writer.WriteLineAsync(PlainTextRenderingLogic.FormatPreamble(Context));
+                _isPreambleRendered = true;
+            }
+
+            await Writer.WriteLineAsync(PlainTextRenderingLogic.FormatMessage(Context, message));
+            await Writer.WriteLineAsync();
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/RenderContext.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using DiscordChatExporter.Core.Models;
+
+namespace DiscordChatExporter.Core.Rendering
+{
+    public class RenderContext
+    {
+        public Guild Guild { get; }
+
+        public Channel Channel { get; }
+
+        public DateTimeOffset? After { get; }
+
+        public DateTimeOffset? Before { get; }
+
+        public string DateFormat { get; }
+
+        public IReadOnlyCollection<User> MentionableUsers { get; }
+
+        public IReadOnlyCollection<Channel> MentionableChannels { get; }
+
+        public IReadOnlyCollection<Role> MentionableRoles { get; }
+
+        public RenderContext(Guild guild, Channel channel, DateTimeOffset? after, DateTimeOffset? before, string dateFormat,
+            IReadOnlyCollection<User> mentionableUsers, IReadOnlyCollection<Channel> mentionableChannels, IReadOnlyCollection<Role> mentionableRoles)
+        {
+            Guild = guild;
+            Channel = channel;
+            After = after;
+            Before = before;
+            DateFormat = dateFormat;
+            MentionableUsers = mentionableUsers;
+            MentionableChannels = mentionableChannels;
+            MentionableRoles = mentionableRoles;
+        }
+    }
+}

DiscordChatExporter.Core.Rendering/Resources/HtmlCore.css

@@ -358,6 +358,7 @@ img {
     background: #7289da;
     color: #ffffff;
     font-size: 0.625em;
+    font-weight: 500;
     padding: 1px 2px;
     border-radius: 3px;
     vertical-align: middle;

DiscordChatExporter.Core.Rendering/Resources/HtmlDark.css

@@ -23,7 +23,7 @@ a {
 
 .pre--multiline {
     border-color: #282b30 !important;
-    color: #839496 !important;
+    color: #b9bbbe !important;
 }
 
 .mention {
@@ -70,6 +70,10 @@ a {
     color: rgba(255, 255, 255, 0.2);
 }
 
+.chatlog__embed-color-pill--default {
+    background-color: rgba(79, 84, 92, 1);
+}
+
 .chatlog__embed-content-container {
     background-color: rgba(46, 48, 54, 0.3);
     border-color: rgba(46, 48, 54, 0.6);

DiscordChatExporter.Core.Rendering/Resources/HtmlDark.html

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

DiscordChatExporter.Core.Rendering/Resources/HtmlLayoutTemplate.html

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

DiscordChatExporter.Core.Rendering/Resources/HtmlLight.css

@@ -73,6 +73,10 @@ a {
     color: #747f8d;
 }
 
+.chatlog__embed-color-pill--default {
+    background-color: rgba(227, 229, 232, 1);
+}
+
 .chatlog__embed-content-container {
     background-color: rgba(249, 249, 249, 0.3);
     border-color: rgba(204, 204, 204, 0.3);

DiscordChatExporter.Core.Rendering/Resources/HtmlLight.html

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

DiscordChatExporter.Core.Rendering/Resources/HtmlMessageGroupTemplate.html

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

DiscordChatExporter.Core.Rendering/Resources/HtmlShared.html

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

DiscordChatExporter.Core.Services/DataService.Parsers.cs

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

DiscordChatExporter.Core.Services/DataService.cs

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

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

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

DiscordChatExporter.Core.Services/ExportService.cs

@@ -1,9 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Rendering;
+using DiscordChatExporter.Core.Services.Logic;
 using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Services
@@ -11,79 +12,99 @@ namespace DiscordChatExporter.Core.Services
     public class ExportService
     {
         private readonly SettingsService _settingsService;
+        private readonly DataService _dataService;
 
-        public ExportService(SettingsService settingsService)
+        public ExportService(SettingsService settingsService, DataService dataService)
         {
             _settingsService = settingsService;
+            _dataService = dataService;
         }
 
-        private IChatLogRenderer CreateRenderer(ChatLog chatLog, ExportFormat format)
+        private string GetFilePathFromOutputPath(string outputPath, ExportFormat format, RenderContext context)
         {
-            if (format == ExportFormat.PlainText)
+            // Output is a directory
-                return new PlainTextChatLogRenderer(chatLog, _settingsService.DateFormat);
+            if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath)))
-
+            {
-            if (format == ExportFormat.HtmlDark)
+                var fileName = ExportLogic.GetDefaultExportFileName(format, context.Guild, context.Channel, context.After, context.Before);
-                return new HtmlChatLogRenderer(chatLog, "Dark", _settingsService.DateFormat);
+                return Path.Combine(outputPath, fileName);
-
-            if (format == ExportFormat.HtmlLight)
-                return new HtmlChatLogRenderer(chatLog, "Light", _settingsService.DateFormat);
-
-            if (format == ExportFormat.Csv)
-                return new CsvChatLogRenderer(chatLog, _settingsService.DateFormat);
-
-            throw new ArgumentOutOfRangeException(nameof(format), $"Unknown format [{format}].");
             }
 
-        private async Task ExportChatLogAsync(ChatLog chatLog, string filePath, ExportFormat format)
+            // Output is a file
+            return outputPath;
+        }
+
+        private IMessageRenderer CreateRenderer(string outputPath, int partitionIndex, ExportFormat format, RenderContext context)
         {
+            var filePath = ExportLogic.GetExportPartitionFilePath(
+                GetFilePathFromOutputPath(outputPath, format, context),
+                partitionIndex);
+
             // Create output directory
             var dirPath = Path.GetDirectoryName(filePath);
-            if (!dirPath.IsNullOrWhiteSpace())
+            if (!string.IsNullOrWhiteSpace(dirPath))
                 Directory.CreateDirectory(dirPath);
 
-            // Render chat log to output file
+            // Create renderer
-            using (var writer = File.CreateText(filePath))
+
-                await CreateRenderer(chatLog, format).RenderAsync(writer);
+            if (format == ExportFormat.PlainText)
+                return new PlainTextMessageRenderer(filePath, context);
+
+            if (format == ExportFormat.Csv)
+                return new CsvMessageRenderer(filePath, context);
+
+            if (format == ExportFormat.HtmlDark)
+                return new HtmlMessageRenderer(filePath, context, "Dark");
+
+            if (format == ExportFormat.HtmlLight)
+                return new HtmlMessageRenderer(filePath, context, "Light");
+
+            throw new InvalidOperationException($"Unknown export format [{format}].");
         }
 
-        public async Task ExportChatLogAsync(ChatLog chatLog, string filePath, ExportFormat format, int? partitionLimit)
+        public async Task ExportChatLogAsync(AuthToken token, Guild guild, Channel channel,
+            string outputPath, ExportFormat format, int? partitionLimit,
+            DateTimeOffset? after = null, DateTimeOffset? before = null, IProgress<double>? progress = null)
         {
-            // If partitioning is disabled or there are fewer messages in chat log than the limit - process it without partitioning
+            // Create context
-            if (partitionLimit == null || partitionLimit <= 0 || chatLog.Messages.Count <= partitionLimit)
+            var mentionableUsers = new HashSet<User>(IdBasedEqualityComparer.Instance);
+            var mentionableChannels = await _dataService.GetGuildChannelsAsync(token, guild.Id);
+            var mentionableRoles = await _dataService.GetGuildRolesAsync(token, guild.Id);
+
+            var context = new RenderContext
+            (
+                guild, channel, after, before, _settingsService.DateFormat,
+                mentionableUsers, mentionableChannels, mentionableRoles
+            );
+
+            // Render messages
+            var partitionIndex = 0;
+            var partitionMessageCount = 0;
+            var renderer = CreateRenderer(outputPath, partitionIndex, format, context);
+
+            await foreach (var message in _dataService.GetMessagesAsync(token, channel.Id, after, before, progress))
             {
-                await ExportChatLogAsync(chatLog, filePath, format);
+                // Add encountered users to the list of mentionable users
-            }
+                mentionableUsers.Add(message.Author);
-            // Otherwise split into partitions and export separately
+                mentionableUsers.AddRange(message.MentionedUsers);
-            else
+
+                // If new partition is required, reset renderer
+                if (partitionLimit != null && partitionLimit > 0 && partitionMessageCount >= partitionLimit)
                 {
-                // Create partitions by grouping up to X contiguous messages into separate chat logs
+                    partitionIndex++;
-                var partitions = chatLog.Messages.GroupContiguous(g => g.Count < partitionLimit.Value)
+                    partitionMessageCount = 0;
-                    .Select(g => new ChatLog(chatLog.Guild, chatLog.Channel, chatLog.After, chatLog.Before, g, chatLog.Mentionables))
-                    .ToArray();
 
-                // Split file path into components
+                    // Flush old renderer and create a new one
-                var dirPath = Path.GetDirectoryName(filePath);
+                    await renderer.DisposeAsync();
-                var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
+                    renderer = CreateRenderer(outputPath, partitionIndex, format, context);
-                var fileExt = Path.GetExtension(filePath);
+                }
 
-                // Export each partition separately
+                // Render message
-                var partitionNumber = 1;
+                await renderer.RenderMessageAsync(message);
-                foreach (var partition in partitions)
+                partitionMessageCount++;
-                {
+            }
-                    // Compose new file name
-                    var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Length}]{fileExt}";
 
-                    // Compose full file path
+            // Flush last renderer
-                    if (!dirPath.IsNullOrWhiteSpace())
+            await renderer.DisposeAsync();
-                        partitionFilePath = Path.Combine(dirPath, partitionFilePath);
-
-                    // Export
-                    await ExportChatLogAsync(partition, partitionFilePath, format);
-
-                    // Increment partition number
-                    partitionNumber++;
-                }
-            }
         }
     }
 }

DiscordChatExporter.Core.Services/Extensions.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+
+namespace DiscordChatExporter.Core.Services
+{
+    public static class Extensions
+    {
+        private static async ValueTask<IReadOnlyList<T>> AggregateAsync<T>(this IAsyncEnumerable<T> asyncEnumerable)
+        {
+            var list = new List<T>();
+
+            await foreach (var i in asyncEnumerable)
+                list.Add(i);
+
+            return list;
+        }
+
+        public static ValueTaskAwaiter<IReadOnlyList<T>> GetAwaiter<T>(this IAsyncEnumerable<T> asyncEnumerable) =>
+            asyncEnumerable.AggregateAsync().GetAwaiter();
+    }
+}

DiscordChatExporter.Core.Services/Helpers/ExportHelper.cs

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

DiscordChatExporter.Core.Services/Logic/ExportLogic.cs

@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using System.Text;
+using DiscordChatExporter.Core.Models;
+
+namespace DiscordChatExporter.Core.Services.Logic
+{
+    public static class ExportLogic
+    {
+        public static string GetDefaultExportFileName(ExportFormat format,
+            Guild guild, Channel channel,
+            DateTimeOffset? after = null, DateTimeOffset? before = null)
+        {
+            var buffer = new StringBuilder();
+
+            // Append guild and channel names
+            buffer.Append($"{guild.Name} - {channel.Name} [{channel.Id}]");
+
+            // Append date range
+            if (after != null || before != null)
+            {
+                buffer.Append(" (");
+
+                // Both 'after' and 'before' are set
+                if (after != null && before != null)
+                {
+                    buffer.Append($"{after:yyyy-MM-dd} to {before:yyyy-MM-dd}");
+                }
+                // Only 'after' is set
+                else if (after != null)
+                {
+                    buffer.Append($"after {after:yyyy-MM-dd}");
+                }
+                // Only 'before' is set
+                else
+                {
+                    buffer.Append($"before {before:yyyy-MM-dd}");
+                }
+
+                buffer.Append(")");
+            }
+
+            // Append extension
+            buffer.Append($".{format.GetFileExtension()}");
+
+            // Replace invalid chars
+            foreach (var invalidChar in Path.GetInvalidFileNameChars())
+                buffer.Replace(invalidChar, '_');
+
+            return buffer.ToString();
+        }
+
+        public static string GetExportPartitionFilePath(string baseFilePath, int partitionIndex)
+        {
+            // First partition - no changes
+            if (partitionIndex <= 0)
+                return baseFilePath;
+
+            // Inject partition index into file name
+            var fileNameWithoutExt = Path.GetFileNameWithoutExtension(baseFilePath);
+            var fileExt = Path.GetExtension(baseFilePath);
+            var fileName = $"{fileNameWithoutExt} [part {partitionIndex + 1}]{fileExt}";
+
+            // Generate new path
+            var dirPath = Path.GetDirectoryName(baseFilePath);
+            if (!string.IsNullOrWhiteSpace(dirPath))
+                return Path.Combine(dirPath, fileName);
+
+            return fileName;
+        }
+    }
+}

DiscordChatExporter.Core.Services/SettingsService.cs

@@ -9,8 +9,10 @@ namespace DiscordChatExporter.Core.Services
 
         public string DateFormat { get; set; } = "dd-MMM-yy hh:mm tt";
 
-        public AuthToken LastToken { get; set; }
+        public AuthToken? LastToken { get; set; }
+
         public ExportFormat LastExportFormat { get; set; } = ExportFormat.HtmlDark;
+
         public int? LastPartitionLimit { get; set; }
 
         public SettingsService()

DiscordChatExporter.Gui/App.xaml.cs

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

DiscordChatExporter.Gui/Behaviors/MultiSelectionListBoxBehavior.cs

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

DiscordChatExporter.Gui/Bootstrapper.cs

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

DiscordChatExporter.Gui/Converters/DateTimeOffsetToDateTimeConverter.cs

@@ -4,25 +4,25 @@ using System.Windows.Data;
 
 namespace DiscordChatExporter.Gui.Converters
 {
-    [ValueConversion(typeof(DateTimeOffset), typeof(DateTime))]
+    [ValueConversion(typeof(DateTimeOffset?), typeof(DateTime?))]
     public class DateTimeOffsetToDateTimeConverter : IValueConverter
     {
         public static DateTimeOffsetToDateTimeConverter Instance { get; } = new DateTimeOffsetToDateTimeConverter();
 
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             if (value is DateTimeOffset dateTimeOffsetValue)
                 return dateTimeOffsetValue.DateTime;
 
-            return default;
+            return default(DateTime?);
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             if (value is DateTime dateTimeValue)
                 return new DateTimeOffset(dateTimeValue);
 
-            return default;
+            return default(DateTimeOffset?);
         }
     }
 }

DiscordChatExporter.Gui/Converters/ExportFormatToStringConverter.cs

@@ -10,12 +10,12 @@ namespace DiscordChatExporter.Gui.Converters
     {
         public static ExportFormatToStringConverter Instance { get; } = new ExportFormatToStringConverter();
 
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             if (value is ExportFormat exportFormatValue)
                 return exportFormatValue.GetDisplayName();
 
-            return default;
+            return default(string);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

DiscordChatExporter.Gui/Converters/InverseBoolConverter.cs

@@ -14,7 +14,7 @@ namespace DiscordChatExporter.Gui.Converters
             if (value is bool boolValue)
                 return !boolValue;
 
-            return default;
+            return default(bool);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -22,7 +22,7 @@ namespace DiscordChatExporter.Gui.Converters
             if (value is bool boolValue)
                 return !boolValue;
 
-            return default;
+            return default(bool);
         }
     }
 }

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -1,158 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="../DiscordChatExporter.props" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{732A67AF-93DE-49DF-B10F-FD74710B7863}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>DiscordChatExporter.Gui</RootNamespace>
     <AssemblyName>DiscordChatExporter</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <UseWPF>true</UseWPF>
-    <FileAlignment>512</FileAlignment>
+    <ApplicationIcon>../favicon.ico</ApplicationIcon>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <LangVersion>latest</LangVersion>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\favicon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
+    <Resource Include="../favicon.ico" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="App.xaml.cs">
+    <PackageReference Include="Gress" Version="1.1.1" />
-      <DependentUpon>App.xaml</DependentUpon>
+    <PackageReference Include="MaterialDesignColors" Version="1.2.0" />
-    </Compile>
+    <PackageReference Include="MaterialDesignThemes" Version="2.6.0" />
-    <Compile Include="Behaviors\ChannelViewModelMultiSelectionListBoxBehavior.cs" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3" />
-    <Compile Include="Behaviors\MultiSelectionListBoxBehavior.cs" />
+    <PackageReference Include="Ookii.Dialogs.Wpf" Version="1.1.0" />
-    <Compile Include="Bootstrapper.cs" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.1.3" />
-    <Compile Include="Converters\DateTimeOffsetToDateTimeConverter.cs" />
+    <PackageReference Include="Stylet" Version="1.3.0" />
-    <Compile Include="Converters\ExportFormatToStringConverter.cs" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
-    <Compile Include="Converters\InverseBoolConverter.cs" />
-    <Compile Include="Services\UpdateService.cs" />
-    <Compile Include="ViewModels\Components\ChannelViewModel.cs" />
-    <Compile Include="ViewModels\Components\GuildViewModel.cs" />
-    <Compile Include="ViewModels\Dialogs\ExportSetupViewModel.cs" />
-    <Compile Include="ViewModels\Framework\DialogManager.cs" />
-    <Compile Include="ViewModels\Framework\DialogScreen.cs" />
-    <Compile Include="ViewModels\Framework\Extensions.cs" />
-    <Compile Include="ViewModels\Framework\IViewModelFactory.cs" />
-    <Compile Include="ViewModels\Dialogs\SettingsViewModel.cs" />
-    <Compile Include="ViewModels\RootViewModel.cs" />
-    <Compile Include="Views\Dialogs\ExportSetupView.xaml.cs">
-      <DependentUpon>ExportSetupView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\RootView.xaml.cs">
-      <DependentUpon>RootView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialogs\SettingsView.xaml.cs">
-      <DependentUpon>SettingsView.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
+    <ProjectReference Include="..\DiscordChatExporter.Core.Markdown\DiscordChatExporter.Core.Markdown.csproj" />
-      <SubType>Code</SubType>
+    <ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj" />
-    </Compile>
+    <ProjectReference Include="..\DiscordChatExporter.Core.Rendering\DiscordChatExporter.Core.Rendering.csproj" />
-    <Compile Include="Properties\Resources.Designer.cs">
+    <ProjectReference Include="..\DiscordChatExporter.Core.Services\DiscordChatExporter.Core.Services.csproj" />
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
+
-    <Resource Include="..\favicon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Core.Models\DiscordChatExporter.Core.Models.csproj">
-      <Project>{67a9d184-4656-4ce1-9d75-bddcbcafb200}</Project>
-      <Name>DiscordChatExporter.Core.Models</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\DiscordChatExporter.Core.Services\DiscordChatExporter.Core.Services.csproj">
-      <Project>{707c0cd0-a7e0-4cab-8db9-07a45cb87377}</Project>
-      <Name>DiscordChatExporter.Core.Services</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="Views\Dialogs\ExportSetupView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\RootView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Dialogs\SettingsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Gress">
-      <Version>1.1.1</Version>
-    </PackageReference>
-    <PackageReference Include="MaterialDesignColors">
-      <Version>1.2.0</Version>
-    </PackageReference>
-    <PackageReference Include="MaterialDesignThemes">
-      <Version>2.6.0</Version>
-    </PackageReference>
-    <PackageReference Include="Ookii.Dialogs.Wpf">
-      <Version>1.1.0</Version>
-    </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody">
-      <Version>2.6.1</Version>
-    </PackageReference>
-    <PackageReference Include="Stylet">
-      <Version>1.2.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Windows.Interactivity.WPF">
-      <Version>2.0.20525</Version>
-    </PackageReference>
-    <PackageReference Include="Tyrrrz.Extensions">
-      <Version>1.6.2</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

DiscordChatExporter.Gui/Properties/AssemblyInfo.cs

@@ -1,7 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("DiscordChatExporter")]
-[assembly: AssemblyCompany("Tyrrrz")]
-[assembly: AssemblyCopyright("Copyright (c) Alexey Golub")]
-[assembly: AssemblyVersion("2.15")]
-[assembly: AssemblyFileVersion("2.15")]

DiscordChatExporter.Gui/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace DiscordChatExporter.Gui.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DiscordChatExporter.Gui.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

DiscordChatExporter.Gui/Properties/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

DiscordChatExporter.Gui/Services/UpdateService.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using DiscordChatExporter.Core.Services;
 using Onova;
 using Onova.Exceptions;
 using Onova.Services;
@@ -13,10 +12,10 @@ namespace DiscordChatExporter.Gui.Services
             new GithubPackageResolver("Tyrrrz", "DiscordChatExporter", "DiscordChatExporter.zip"),
             new ZipPackageExtractor());
 
-        private Version _updateVersion;
+        private Version? _updateVersion;
         private bool _updaterLaunched;
 
-        public async Task<Version> CheckForUpdatesAsync()
+        public async Task<Version?> CheckForUpdatesAsync()
         {
             var check = await _updateManager.CheckForUpdatesAsync();
             return check.CanUpdate ? check.LastVersion : null;

DiscordChatExporter.Gui/ViewModels/Components/ChannelViewModel.cs

@@ -7,7 +7,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Components
     {
         public Channel Model { get; set; }
 
-        public string Category { get; set; }
+        public string? Category { get; set; }
     }
 
     public partial class ChannelViewModel

DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs

@@ -3,10 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Core.Services.Helpers;
+using DiscordChatExporter.Core.Services.Logic;
 using DiscordChatExporter.Gui.ViewModels.Components;
 using DiscordChatExporter.Gui.ViewModels.Framework;
-using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Gui.ViewModels.Dialogs
 {
@@ -21,12 +20,12 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
 
         public bool IsSingleChannel => Channels.Count == 1;
 
-        public string OutputPath { get; set; }
+        public string? OutputPath { get; set; }
 
         public IReadOnlyList<ExportFormat> AvailableFormats =>
             Enum.GetValues(typeof(ExportFormat)).Cast<ExportFormat>().ToArray();
 
-        public ExportFormat SelectedFormat { get; set; } = ExportFormat.HtmlDark;
+        public ExportFormat SelectedFormat { get; set; }
 
         public DateTimeOffset? After { get; set; }
 
@@ -38,11 +37,6 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
         {
             _dialogManager = dialogManager;
             _settingsService = settingsService;
-        }
-
-        protected override void OnViewLoaded()
-        {
-            base.OnViewLoaded();
 
             // Persist preferences
             SelectedFormat = _settingsService.LastExportFormat;
@@ -68,7 +62,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
                 var channel = Channels.Single();
 
                 // Generate default file name
-                var defaultFileName = ExportHelper.GetDefaultExportFileName(SelectedFormat, Guild, channel, After, Before);
+                var defaultFileName = ExportLogic.GetDefaultExportFileName(SelectedFormat, Guild, channel, After, Before);
 
                 // Generate filter
                 var ext = SelectedFormat.GetFileExtension();
@@ -85,7 +79,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
             }
 
             // If canceled - return
-            if (OutputPath.IsNullOrWhiteSpace())
+            if (string.IsNullOrWhiteSpace(OutputPath))
                 return;
 
             // Close dialog

DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Threading.Tasks;
 using MaterialDesignThemes.Wpf;
 using Microsoft.Win32;
@@ -22,10 +23,10 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework
             var view = _viewManager.CreateAndBindViewForModelIfNecessary(dialogScreen);
 
             // Set up event routing that will close the view when called from viewmodel
-            void OnDialogOpened(object sender, DialogOpenedEventArgs openArgs)
+            void OnDialogOpened(object? sender, DialogOpenedEventArgs openArgs)
             {
                 // Delegate to close the dialog and unregister event handler
-                void OnScreenClosed(object o, CloseEventArgs closeArgs)
+                void OnScreenClosed(object? o, EventArgs closeArgs)
                 {
                     openArgs.Session.Close();
                     dialogScreen.Closed -= OnScreenClosed;
@@ -41,7 +42,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework
             return dialogScreen.DialogResult;
         }
 
-        public string PromptSaveFilePath(string filter = "All files|*.*", string defaultFilePath = "")
+        public string? PromptSaveFilePath(string filter = "All files|*.*", string defaultFilePath = "")
         {
             // Create dialog
             var dialog = new SaveFileDialog
@@ -56,7 +57,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework
             return dialog.ShowDialog() == true ? dialog.FileName : null;
         }
 
-        public string PromptDirectoryPath(string defaultDirPath = "")
+        public string? PromptDirectoryPath(string defaultDirPath = "")
         {
             // Create dialog
             var dialog = new VistaFolderBrowserDialog

DiscordChatExporter.Gui/ViewModels/Framework/DialogScreen.cs

@@ -1,22 +1,18 @@
-using Stylet;
+using System;
+using Stylet;
 
 namespace DiscordChatExporter.Gui.ViewModels.Framework
 {
-    public abstract class DialogScreen<T> : Screen
+    public abstract class DialogScreen<T> : PropertyChangedBase
     {
         public T DialogResult { get; private set; }
 
+        public event EventHandler? Closed;
+
         public void Close(T dialogResult = default)
         {
-            // Set the result
             DialogResult = dialogResult;
-
+            Closed?.Invoke(this, EventArgs.Empty);
-            // If there is a parent - ask them to close this dialog
-            if (Parent != null)
-                RequestClose(Equals(dialogResult, default(T)));
-            // Otherwise close ourselves
-            else
-                ((IScreenState) this).Close();
         }
     }
 

DiscordChatExporter.Gui/ViewModels/Framework/Extensions.cs

@@ -7,8 +7,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Framework
 {
     public static class Extensions
     {
-        public static ChannelViewModel CreateChannelViewModel(this IViewModelFactory factory, Channel model,
+        public static ChannelViewModel CreateChannelViewModel(this IViewModelFactory factory, Channel model, string? category = null)
-            string category = null)
         {
             var viewModel = factory.CreateChannelViewModel();
             viewModel.Model = model;

DiscordChatExporter.Gui/ViewModels/RootViewModel.cs

@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net;
-using System.Reflection;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Models;
 using DiscordChatExporter.Core.Services;
 using DiscordChatExporter.Core.Services.Exceptions;
-using DiscordChatExporter.Core.Services.Helpers;
 using DiscordChatExporter.Gui.Services;
 using DiscordChatExporter.Gui.ViewModels.Components;
 using DiscordChatExporter.Gui.ViewModels.Framework;
@@ -38,13 +35,13 @@ namespace DiscordChatExporter.Gui.ViewModels
 
         public bool IsBotToken { get; set; }
 
-        public string TokenValue { get; set; }
+        public string? TokenValue { get; set; }
 
-        public IReadOnlyList<GuildViewModel> AvailableGuilds { get; private set; }
+        public IReadOnlyList<GuildViewModel>? AvailableGuilds { get; private set; }
 
-        public GuildViewModel SelectedGuild { get; set; }
+        public GuildViewModel? SelectedGuild { get; set; }
 
-        public IReadOnlyList<ChannelViewModel> SelectedChannels { get; set; }
+        public IReadOnlyList<ChannelViewModel>? SelectedChannels { get; set; }
 
         public RootViewModel(IViewModelFactory viewModelFactory, DialogManager dialogManager,
             SettingsService settingsService, UpdateService updateService, DataService dataService,
@@ -58,8 +55,7 @@ namespace DiscordChatExporter.Gui.ViewModels
             _exportService = exportService;
 
             // Set title
-            var version = Assembly.GetExecutingAssembly().GetName().Version.ToString(3);
+            DisplayName = $"{App.Name} v{App.VersionString}";
-            DisplayName = $"DiscordChatExporter v{version}";
 
             // Update busy state when progress manager changes
             ProgressManager.Bind(o => o.IsActive, (sender, args) => IsBusy = ProgressManager.IsActive);
@@ -83,7 +79,7 @@ namespace DiscordChatExporter.Gui.ViewModels
                     return;
 
                 // Notify user of an update and prepare it
-                Notifications.Enqueue($"Downloading update to DiscordChatExporter v{updateVersion}...");
+                Notifications.Enqueue($"Downloading update to {App.Name} v{updateVersion}...");
                 await _updateService.PrepareUpdateAsync(updateVersion);
 
                 // Prompt user to install update (otherwise install it when application exits)
@@ -140,7 +136,7 @@ namespace DiscordChatExporter.Gui.ViewModels
             await _dialogManager.ShowDialogAsync(dialog);
         }
 
-        public bool CanPopulateGuildsAndChannels => !IsBusy && !TokenValue.IsNullOrWhiteSpace();
+        public bool CanPopulateGuildsAndChannels => !IsBusy && !string.IsNullOrWhiteSpace(TokenValue);
 
         public async void PopulateGuildsAndChannels()
         {
@@ -150,7 +146,7 @@ namespace DiscordChatExporter.Gui.ViewModels
             try
             {
                 // Sanitize token
-                TokenValue = TokenValue.Trim('"');
+                TokenValue = TokenValue!.Trim('"');
 
                 // Create token
                 var token = new AuthToken(
@@ -165,10 +161,7 @@ namespace DiscordChatExporter.Gui.ViewModels
 
                 // Get direct messages
                 {
-                    // Get fake guild
                     var guild = Guild.DirectMessages;
-
-                    // Get channels
                     var channels = await _dataService.GetDirectMessageChannelsAsync(token);
 
                     // Create channel view models
@@ -199,18 +192,13 @@ namespace DiscordChatExporter.Gui.ViewModels
                 var guilds = await _dataService.GetUserGuildsAsync(token);
                 foreach (var guild in guilds)
                 {
-                    // Get channels
                     var channels = await _dataService.GetGuildChannelsAsync(token, guild.Id);
-
+                    var categoryChannels = channels.Where(c => c.Type == ChannelType.GuildCategory).ToArray();
-                    // Get category channels
+                    var exportableChannels = channels.Where(c => c.Type.IsExportable()).ToArray();
-                    var categoryChannels = channels.Where(c => c.Type == ChannelType.Category).ToArray();
-
-                    // Get text channels
-                    var textChannels = channels.Where(c => c.Type == ChannelType.GuildTextChat).ToArray();
 
                     // Create channel view models
                     var channelViewModels = new List<ChannelViewModel>();
-                    foreach (var channel in textChannels)
+                    foreach (var channel in exportableChannels)
                     {
                         // Get category
                         var category = categoryChannels.FirstOrDefault(c => c.Id == channel.ParentId)?.Name;
@@ -248,20 +236,19 @@ namespace DiscordChatExporter.Gui.ViewModels
             }
             finally
             {
-                // Dispose progress operation
                 operation.Dispose();
             }
         }
 
-        public bool CanExportChannels => !IsBusy && !SelectedChannels.IsNullOrEmpty();
+        public bool CanExportChannels => !IsBusy && SelectedGuild != null && SelectedChannels != null && SelectedChannels.Any();
 
         public async void ExportChannels()
         {
             // Get last used token
-            var token = _settingsService.LastToken;
+            var token = _settingsService.LastToken!;
 
             // Create dialog
-            var dialog = _viewModelFactory.CreateExportSetupViewModel(SelectedGuild, SelectedChannels);
+            var dialog = _viewModelFactory.CreateExportSetupViewModel(SelectedGuild!, SelectedChannels!);
 
             // Show dialog, if canceled - return
             if (await _dialogManager.ShowDialogAsync(dialog) != true)
@@ -274,33 +261,15 @@ namespace DiscordChatExporter.Gui.ViewModels
             var successfulExportCount = 0;
             for (var i = 0; i < dialog.Channels.Count; i++)
             {
-                // Get operation and channel
                 var operation = operations[i];
                 var channel = dialog.Channels[i];
 
                 try
                 {
-                    // Generate file path if necessary
+                    await _exportService.ExportChatLogAsync(token, dialog.Guild, channel,
-                    var filePath = dialog.OutputPath;
+                        dialog.OutputPath!, dialog.SelectedFormat, dialog.PartitionLimit,
-                    if (ExportHelper.IsDirectoryPath(filePath))
-                    {
-                        // Generate default file name
-                        var fileName = ExportHelper.GetDefaultExportFileName(dialog.SelectedFormat, dialog.Guild,
-                            channel, dialog.After, dialog.Before);
-
-                        // Combine paths
-                        filePath = Path.Combine(filePath, fileName);
-                    }
-
-                    // Get chat log
-                    var chatLog = await _dataService.GetChatLogAsync(token, dialog.Guild, channel,
                         dialog.After, dialog.Before, operation);
 
-                    // Export
-                    await _exportService.ExportChatLogAsync(chatLog, filePath, dialog.SelectedFormat,
-                        dialog.PartitionLimit);
-
-                    // Report successful export
                     successfulExportCount++;
                 }
                 catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
@@ -313,7 +282,6 @@ namespace DiscordChatExporter.Gui.ViewModels
                 }
                 finally
                 {
-                    // Dispose progress operation
                     operation.Dispose();
                 }
             }

DiscordChatExporter.Gui/Views/RootView.xaml

@@ -5,7 +5,7 @@
     xmlns:behaviors="clr-namespace:DiscordChatExporter.Gui.Behaviors"
     xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
@@ -159,6 +159,8 @@
                             <Run Text="at the bottom and copy the value" />
                         </TextBlock>
                         <TextBlock Margin="0,24,0,0" FontSize="14">
+                            <Run Text="Automating user accounts is technically against TOS, use at your own risk." />
+                            <LineBreak />
                             <Run Text="To authorize using bot token instead, click" />
                             <InlineUIContainer>
                                 <materialDesign:PackIcon Margin="1,0,0,-3" Kind="Account" />

DiscordChatExporter.props

@@ -0,0 +1,12 @@
+<Project>
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Version>2.16</Version>
+    <Company>Tyrrrz</Company>
+    <Copyright>Copyright (c) Alexey Golub</Copyright>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

Dockerfile

@@ -1,8 +1,9 @@
 # Build
-FROM microsoft/dotnet:2.1-sdk AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
 WORKDIR /src
 
 COPY favicon.ico ./
+COPY DiscordChatExporter.props ./
 
 COPY DiscordChatExporter.Core.Markdown DiscordChatExporter.Core.Markdown
 COPY DiscordChatExporter.Core.Models DiscordChatExporter.Core.Models
@@ -10,13 +11,13 @@ COPY DiscordChatExporter.Core.Rendering DiscordChatExporter.Core.Rendering
 COPY DiscordChatExporter.Core.Services DiscordChatExporter.Core.Services
 COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
 
-RUN dotnet publish DiscordChatExporter.Cli -c Release -f netcoreapp2.1
+RUN dotnet publish DiscordChatExporter.Cli -o DiscordChatExporter.Cli/publish -c Release
 
 # Run
-FROM microsoft/dotnet:2.1-runtime AS run
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1 AS run
 WORKDIR /app
 
-COPY --from=build /src/DiscordChatExporter.Cli/bin/Release/netcoreapp2.1/publish ./
+COPY --from=build /src/DiscordChatExporter.Cli/publish ./
 
 WORKDIR /app/out
 ENTRYPOINT ["dotnet", "/app/DiscordChatExporter.Cli.dll"]

Readme.md

@@ -1,18 +1,19 @@
 # DiscordChatExporter
 
-[![Build](https://img.shields.io/appveyor/ci/Tyrrrz/DiscordChatExporter/master.svg)](https://ci.appveyor.com/project/Tyrrrz/DiscordChatExporter)
+[![Build](https://github.com/Tyrrrz/DiscordChatExporter/workflows/CI/badge.svg?branch=master)](https://github.com/Tyrrrz/DiscordChatExporter/actions)
 [![Release](https://img.shields.io/github/release/Tyrrrz/DiscordChatExporter.svg)](https://github.com/Tyrrrz/DiscordChatExporter/releases)
 [![Downloads](https://img.shields.io/github/downloads/Tyrrrz/DiscordChatExporter/total.svg)](https://github.com/Tyrrrz/DiscordChatExporter/releases)
-[![Donate](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://patreon.com/tyrrrz)
+[![Donate](https://img.shields.io/badge/donate-$$$-purple.svg)](https://tyrrrz.me/donate)
-[![Donate](https://img.shields.io/badge/buymeacoffee-donate-yellow.svg)](https://buymeacoffee.com/tyrrrz)
 
 DiscordChatExporter can be used to export message history from a [Discord](https://discordapp.com) channel to a file. It works for both direct message chats and guild chats, supports markdown, message grouping, embeds, attachments, mentions, reactions and other features. It works with both user and bot tokens, supports multiple output formats and allows you to trim messages by dates.
 
+_For guides and other info -- check out the [wiki](https://github.com/Tyrrrz/DiscordChatExporter/wiki)._
+
 ## Download
 
-- [Stable releases](https://github.com/Tyrrrz/DiscordChatExporter/releases)
+- **[Latest release](https://github.com/Tyrrrz/DiscordChatExporter/releases/latest)**
-- [Docker](https://hub.docker.com/r/tyrrrz/discordchatexporter): `docker pull tyrrrz/discordchatexporter`
+- [Docker image](https://hub.docker.com/r/tyrrrz/discordchatexporter): `docker pull tyrrrz/discordchatexporter`
-- [Continuous integration](https://ci.appveyor.com/project/Tyrrrz/DiscordChatExporter)
+- [CI build](https://github.com/Tyrrrz/DiscordChatExporter/actions)
 
 ## Features
 
@@ -26,22 +27,3 @@ DiscordChatExporter can be used to export message history from a [Discord](https
 
 ![channel list](.screenshots/list.png)
 ![rendered output](.screenshots/output.png)
-
-## Libraries used
-
-- [Stylet](https://github.com/canton7/Stylet)
-- [PropertyChanged.Fody](https://github.com/Fody/PropertyChanged)
-- [MaterialDesignInXamlToolkit](https://github.com/ButchersBoy/MaterialDesignInXamlToolkit)
-- [Newtonsoft.Json](http://www.newtonsoft.com/json)
-- [Scriban](https://github.com/lunet-io/scriban)
-- [Ookii.Dialogs](https://github.com/caioproiete/ookii-dialogs-wpf)
-- [CliFx](https://github.com/Tyrrrz/CliFx)
-- [Failsafe](https://github.com/Tyrrrz/Failsafe)
-- [Gress](https://github.com/Tyrrrz/Gress)
-- [Onova](https://github.com/Tyrrrz/Onova)
-- [Tyrrrz.Extensions](https://github.com/Tyrrrz/Extensions)
-- [Tyrrrz.Settings](https://github.com/Tyrrrz/Settings)
-
-## Donate
-
-If you really like my projects and want to support me, consider donating to me on [Patreon](https://patreon.com/tyrrrz) or [BuyMeACoffee](https://buymeacoffee.com/tyrrrz). All donations are optional and are greatly appreciated. 🙏

UpdateVersion.ps1

@@ -1,12 +0,0 @@
-param([string] $newVersion)
-
-function Replace-TextInFile {
-    param([string] $filePath, [string] $pattern, [string] $replacement)
-
-    $content = [IO.File]::ReadAllText($filePath)
-    $content = [Text.RegularExpressions.Regex]::Replace($content, $pattern, $replacement)
-    [IO.File]::WriteAllText($filePath, $content, [Text.Encoding]::UTF8)
-}
-
-Replace-TextInFile "$PSScriptRoot\DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj" '(?<=<Version>)(.*?)(?=</Version>)' $newVersion
-Replace-TextInFile "$PSScriptRoot\DiscordChatExporter.Gui\Properties\AssemblyInfo.cs" '(?<=Assembly.*?Version\(")(.*?)(?="\)\])' $newVersion

appveyor.yml

@@ -1,29 +0,0 @@
-version: '{build}'
-
-image: Visual Studio 2019 Preview
-configuration: Release
-
-before_build:
-- ps: nuget restore
-
-build:
-  verbosity: minimal
-
-after_build:
-- ps: Deploy\Prepare.ps1
-
-artifacts:
-- path: Deploy\Portable\bin\DiscordChatExporter.zip
-  name: DiscordChatExporter.zip
-- path: Deploy\Portable\bin\DiscordChatExporter.CLI.zip
-  name: DiscordChatExporter.CLI.zip
-
-deploy:
-- provider: GitHub
-  auth_token:
-    secure: sjQHWRw29AMiVMn3MtidtWnAzAf1mJ+mkJ/7h1B9TIAHhkFrqwMK7LtXV+uNJ9AO
-  artifact: DiscordChatExporter.zip,DiscordChatExporter.CLI.zip
-  description: '[Changelog](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Changelog.md)'
-  on:
-    branch: master
-    appveyor_repo_tag: true