Update version

Fixes #137

Changelog.md

@@ -1,3 +1,61 @@
+### v2.9.1 (10-Feb-2019)
+
+- Fixed an issue where some of the last messages in a channel would sometimes not get exported.
+
+### v2.9 (09-Feb-2019)
+
+- Added categories to channel list in GUI. Channels are now also grouped by category.
+- Added ability to export multiple channels at once in GUI by selecting them with shift or ctrl keys.
+- Added CLI command to export all available channels in a guild (`exportguild`).
+- Added CLI command to export all direct message channels (`exportdm`).
+- Added retry policy for 503 status code errors to prevent random crashes.
+- Changed how channels are exported in GUI. Now you need to select them first and then click a button to export. You can also double click a single channel to export it as before.
+- Improved default file name generation by adding date ranges and channel ID to the file name.
+- Improved naming of files exported with partitioning.
+- Improved usage instructions.
+- Improved GUI layout and styling.
+- Fixed an issue where dialogs would sometimes appear over other windows.
+- Fixed an issue where launching DiscordChatExporter from Windows Start Menu would make it crash.
+
+### v2.8 (03-Nov-2018)
+
+- Added support for partitioning which lets you split the output into multiple files by setting the partition message limit (`-p` parameter for CLI).
+- Exported file will no longer open automatically on completion.
+- Reduced amount of memory used during exporting.
+- Disabled message grouping in PlainText export.
+- Improved encoding of newlines in CSV export.
+- Improved error messages in the GUI app during crashes.
+
+### v2.7 (14-Sep-2018)
+
+- Updated instructions on how to obtain the user token.
+- Expanded CLI with new commands: `channels` (get a list of channels in a guild), `dm` (get a list of DM channels), `guilds` (get a list of guilds), on top of `export` (export chatlog).
+- Improved help text and error messages in CLI.
+- In CLI, the file name will be automatically generated if the provided output file path is a directory.
+
+### v2.6 (25-Jul-2018)
+
+- Added support for bot tokens as an alternative to user tokens. For GUI, use the button in the top-left to switch between user and bot token. For CLI, pass the `--bot` switch to indicate that the given token is a bot token.
+- Added support for animated avatars.
+
+### v2.5.1 (01-Jul-2018)
+
+- Fixed a bug that would prevent timestamps from rendering properly in CSV and PlainText exports.
+- Fixed incorrect layout in CSV export.
+- Improved readability of PlainText export.
+
+### v2.5 (28-Jun-2018)
+
+- Added support for embeds and webhooks (HTML only).
+- Implemented progress reporting when downloading messages.
+- Added support for reactions (HTML only).
+- Selected date range is now shown in the export (HTML and PlainText).
+- Added placeholders for guild icons to display while the icons are loading.
+- Added support for jumbo emojis (custom emojis only).
+- Added basic retry policy for 429 error responses.
+- Added validation for from/to dates in the UI which prevents choosing invalid date ranges.
+- Added an error message when trying to export a deleted channel.
+
 ### v2.4.1 (15-Apr-2018)
 
 - Added CSV export format.

Deploy/Prepare.ps1

@@ -8,4 +8,4 @@ $files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporte
 # CLI
 $files = @()
 $files += Get-ChildItem -Path "$PSScriptRoot\..\DiscordChatExporter.Cli\bin\Release\net461\*" -Include "*.exe", "*.dll", "*.config"
-$files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporter.Cli.zip" -Force
+$files | Compress-Archive -DestinationPath "$PSScriptRoot\bin\DiscordChatExporter.CLI.zip" -Force

DiscordChatExporter.Cli/CliOptions.cs

@@ -1,24 +0,0 @@
-using System;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Cli
-{
-    public class CliOptions
-    {
-        public string Token { get; set; }
-
-        public string ChannelId { get; set; }
-
-        public ExportFormat ExportFormat { get; set; }
-
-        public string FilePath { get; set; }
-
-        public DateTime? From { get; set; }
-
-        public DateTime? To { get; set; }
-
-        public string DateFormat { get; set; }
-
-        public int MessageGroupLimit { get; set; }
-    }
-}

DiscordChatExporter.Cli/Container.cs

@@ -1,37 +1,24 @@
-using CommonServiceLocator;
-using DiscordChatExporter.Cli.ViewModels;
-using DiscordChatExporter.Core.Services;
-using GalaSoft.MvvmLight.Ioc;
+using DiscordChatExporter.Core.Services;
+using StyletIoC;
 
 namespace DiscordChatExporter.Cli
 {
-    public class Container
+    public static class Container
     {
-        public IMainViewModel MainViewModel => Resolve<IMainViewModel>();
-        public ISettingsService SettingsService => Resolve<ISettingsService>();
+        public static IContainer Instance { get; }
 
-        private T Resolve<T>(string key = null)
+        static Container()
         {
-            return ServiceLocator.Current.GetInstance<T>(key);
-        }
+            var builder = new StyletIoCBuilder();
 
-        public void Init()
-        {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-            SimpleIoc.Default.Reset();
+            // Autobind services in the .Core assembly
+            builder.Autobind(typeof(DataService).Assembly);
 
-            // Services
-            SimpleIoc.Default.Register<IDataService, DataService>();
-            SimpleIoc.Default.Register<IExportService, ExportService>();
-            SimpleIoc.Default.Register<IMessageGroupService, MessageGroupService>();
-            SimpleIoc.Default.Register<ISettingsService, SettingsService>();
+            // Bind settings as singleton
+            builder.Bind<SettingsService>().ToSelf().InSingletonScope();
 
-            // View models
-            SimpleIoc.Default.Register<IMainViewModel, MainViewModel>(true);
-        }
-
-        public void Cleanup()
-        {
+            // Set instance
+            Instance = builder.BuildContainer();
         }
     }
 }

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -3,17 +3,16 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net461</TargetFramework>
-        <Version>2.4.1</Version>
+        <Version>2.9.1</Version>
         <Company>Tyrrrz</Company>
         <Copyright>Copyright (c) 2017-2018 Alexey Golub</Copyright>
         <ApplicationIcon>..\favicon.ico</ApplicationIcon>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CommonServiceLocator" Version="2.0.3" />
-        <PackageReference Include="FluentCommandLineParser" Version="1.4.3" />
-        <PackageReference Include="MvvmLightLibs" Version="5.4.1" />
-        <PackageReference Include="Tyrrrz.Extensions" Version="1.5.0" />
+        <PackageReference Include="CommandLineParser" Version="2.3.0" />
+        <PackageReference Include="Stylet" Version="1.1.22" />
+        <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
     </ItemGroup>
 
     <ItemGroup>

DiscordChatExporter.Cli/Program.cs

@@ -1,111 +1,72 @@
 using System;
-using System.Reflection;
-using DiscordChatExporter.Core.Models;
-using Fclp;
-using Tyrrrz.Extensions;
+using System.Linq;
+using CommandLine;
+using DiscordChatExporter.Cli.Verbs;
+using DiscordChatExporter.Cli.Verbs.Options;
 
 namespace DiscordChatExporter.Cli
 {
     public static class Program
     {
-        private static readonly Container Container = new Container();
-
-        private static void ShowHelp()
+        private static void PrintTokenHelp()
         {
-            var version = Assembly.GetExecutingAssembly().GetName().Version;
-            var availableFormats = Enum.GetNames(typeof(ExportFormat));
-
-            Console.WriteLine($"=== Discord Chat Exporter (Command Line Interface) v{version} ===");
+            Console.WriteLine("# To get user token:");
+            Console.WriteLine(" 1. Open Discord");
+            Console.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
+            Console.WriteLine(" 3. Press Ctrl+R to reload");
+            Console.WriteLine(" 4. Navigate to the Application tab");
+            Console.WriteLine(" 5. Select \"Local Storage\" > \"https://discordapp.com\" on the left");
+            Console.WriteLine(" 6. Find \"token\" under key and copy the value");
             Console.WriteLine();
-            Console.WriteLine("[-t] [--token]       Discord authorization token.");
-            Console.WriteLine("[-c] [--channel]     Discord channel ID.");
-            Console.WriteLine("[-f] [--format]      Export format. Optional.");
-            Console.WriteLine("[-o] [--output]      Output file path. Optional.");
-            Console.WriteLine("     [--datefrom]    Limit to messages after this date. Optional.");
-            Console.WriteLine("     [--dateto]      Limit to messages before this date. Optional.");
-            Console.WriteLine("     [--dateformat]  Date format. Optional.");
-            Console.WriteLine("     [--grouplimit]  Message group limit. Optional.");
+            Console.WriteLine("# To get bot token:");
+            Console.WriteLine(" 1. Go to Discord developer portal");
+            Console.WriteLine(" 2. Open your application's settings");
+            Console.WriteLine(" 3. Navigate to the Bot section on the left");
+            Console.WriteLine(" 4. Under Token click Copy");
             Console.WriteLine();
-            Console.WriteLine($"Available export formats: {availableFormats.JoinToString(", ")}");
-            Console.WriteLine();
-            Console.WriteLine("# To get authorization token:");
-            Console.WriteLine(" - Open Discord app");
-            Console.WriteLine(" - Log in if you haven't");
-            Console.WriteLine(" - Press Ctrl+Shift+I");
-            Console.WriteLine(" - Navigate to Application tab");
-            Console.WriteLine(" - Expand Storage > Local Storage > https://discordapp.com");
-            Console.WriteLine(" - Find \"token\" under key and copy the value");
-            Console.WriteLine();
-            Console.WriteLine("# To get channel ID:");
-            Console.WriteLine(" - Open Discord app");
-            Console.WriteLine(" - Log in if you haven't");
-            Console.WriteLine(" - Go to any channel you want to export");
-            Console.WriteLine(" - Press Ctrl+Shift+I");
-            Console.WriteLine(" - Navigate to Console tab");
-            Console.WriteLine(" - Type \"document.URL\" and press Enter");
-            Console.WriteLine(" - Copy the long sequence of numbers after last slash");
-        }
-
-        private static CliOptions ParseOptions(string[] args)
-        {
-            var argsParser = new FluentCommandLineParser<CliOptions>();
-
-            var settings = Container.SettingsService;
-
-            argsParser.Setup(o => o.Token).As('t', "token").Required();
-            argsParser.Setup(o => o.ChannelId).As('c', "channel").Required();
-            argsParser.Setup(o => o.ExportFormat).As('f', "format").SetDefault(ExportFormat.HtmlDark);
-            argsParser.Setup(o => o.FilePath).As('o', "output").SetDefault(null);
-            argsParser.Setup(o => o.From).As("datefrom").SetDefault(null);
-            argsParser.Setup(o => o.To).As("dateto").SetDefault(null);
-            argsParser.Setup(o => o.DateFormat).As("dateformat").SetDefault(settings.DateFormat);
-            argsParser.Setup(o => o.MessageGroupLimit).As("grouplimit").SetDefault(settings.MessageGroupLimit);
-
-            var parsed = argsParser.Parse(args);
-
-            // Show help if no arguments
-            if (parsed.EmptyArgs)
-            {
-                ShowHelp();
-                Environment.Exit(0);
-            }
-            // Show error if there are any
-            else if (parsed.HasErrors)
-            {
-                Console.Error.Write(parsed.ErrorText);
-                Environment.Exit(-1);
-            }
-
-            return argsParser.Object;
+            Console.WriteLine("# To get guild or channel ID:");
+            Console.WriteLine(" 1. Open Discord");
+            Console.WriteLine(" 2. Open Settings");
+            Console.WriteLine(" 3. Go to Appearance section");
+            Console.WriteLine(" 4. Enable Developer Mode");
+            Console.WriteLine(" 5. Right click on the desired guild or channel and click Copy ID");
         }
 
         public static void Main(string[] args)
         {
-            // Init container
-            Container.Init();
+            // Get all verb types
+            var verbTypes = new[]
+            {
+                typeof(ExportChannelOptions),
+                typeof(ExportDirectMessagesOptions),
+                typeof(ExportGuildOptions),
+                typeof(GetChannelsOptions),
+                typeof(GetDirectMessageChannelsOptions),
+                typeof(GetGuildsOptions)
+            };
 
-            // Parse options
-            var options = ParseOptions(args);
+            // Parse command line arguments
+            var parsedArgs = Parser.Default.ParseArguments(args, verbTypes);
 
-            // Inject some settings
-            var settings = Container.SettingsService;
-            settings.DateFormat = options.DateFormat;
-            settings.MessageGroupLimit = options.MessageGroupLimit;
+            // Execute commands
+            parsedArgs.WithParsed<ExportChannelOptions>(o => new ExportChannelVerb(o).Execute());
+            parsedArgs.WithParsed<ExportDirectMessagesOptions>(o => new ExportDirectMessagesVerb(o).Execute());
+            parsedArgs.WithParsed<ExportGuildOptions>(o => new ExportGuildVerb(o).Execute());
+            parsedArgs.WithParsed<GetChannelsOptions>(o => new GetChannelsVerb(o).Execute());
+            parsedArgs.WithParsed<GetDirectMessageChannelsOptions>(o => new GetDirectMessageChannelsVerb(o).Execute());
+            parsedArgs.WithParsed<GetGuildsOptions>(o => new GetGuildsVerb(o).Execute());
 
-            // Export
-            var vm = Container.MainViewModel;
-            vm.ExportAsync(
-                options.Token,
-                options.ChannelId,
-                options.FilePath,
-                options.ExportFormat,
-                options.From,
-                options.To).GetAwaiter().GetResult();
+            // Show token help if help requested or no verb specified
+            parsedArgs.WithNotParsed(errs =>
+            {
+                var err = errs.First();
 
-            // Cleanup container
-            Container.Cleanup();
+                if (err.Tag == ErrorType.NoVerbSelectedError)
+                    PrintTokenHelp();
 
-            Console.WriteLine("Export complete.");
+                if (err.Tag == ErrorType.HelpVerbRequestedError && args.Length == 1)
+                    PrintTokenHelp();
+            });
         }
     }
 }

DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs

@@ -0,0 +1,54 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Verbs.Options;
+using DiscordChatExporter.Core.Helpers;
+using DiscordChatExporter.Core.Services;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Cli.Verbs
+{
+    public class ExportChannelVerb : Verb<ExportChannelOptions>
+    {
+        public ExportChannelVerb(ExportChannelOptions options)
+            : base(options)
+        {
+        }
+
+        public override async Task ExecuteAsync()
+        {
+            // Get services
+            var settingsService = Container.Instance.Get<SettingsService>();
+            var dataService = Container.Instance.Get<DataService>();
+            var exportService = Container.Instance.Get<ExportService>();
+
+            // Configure settings
+            if (Options.DateFormat.IsNotBlank())
+                settingsService.DateFormat = Options.DateFormat;
+            if (Options.MessageGroupLimit > 0)
+                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
+
+            // Get chat log
+            var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), Options.ChannelId, 
+                Options.After, Options.Before);
+
+            // Generate file path if not set or is a directory
+            var filePath = Options.OutputPath;
+            if (filePath.IsBlank() || ExportHelper.IsDirectoryPath(filePath))
+            {
+                // Generate default file name
+                var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
+                    chatLog.Channel, Options.After, Options.Before);
+
+                // Combine paths
+                filePath = Path.Combine(filePath ?? "", fileName);
+            }
+
+            // Export
+            exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
+
+            // Print result
+            Console.WriteLine($"Exported chat to [{filePath}]");
+        }
+    }
+}

DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs

@@ -0,0 +1,76 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Verbs.Options;
+using DiscordChatExporter.Core.Exceptions;
+using DiscordChatExporter.Core.Helpers;
+using DiscordChatExporter.Core.Services;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Cli.Verbs
+{
+    public class ExportDirectMessagesVerb : Verb<ExportDirectMessagesOptions>
+    {
+        public ExportDirectMessagesVerb(ExportDirectMessagesOptions options)
+            : base(options)
+        {
+        }
+
+        public override async Task ExecuteAsync()
+        {
+            // Get services
+            var settingsService = Container.Instance.Get<SettingsService>();
+            var dataService = Container.Instance.Get<DataService>();
+            var exportService = Container.Instance.Get<ExportService>();
+
+            // Configure settings
+            if (Options.DateFormat.IsNotBlank())
+                settingsService.DateFormat = Options.DateFormat;
+            if (Options.MessageGroupLimit > 0)
+                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
+
+            // Get channels
+            var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken());
+
+            // Order channels
+            channels = channels.OrderBy(c => c.Name).ToArray();
+
+            // Loop through channels
+            foreach (var channel in channels)
+            {
+                try
+                {
+                    // Print current channel name
+                    Console.WriteLine($"Exporting chat from [{channel.Name}]...");
+
+                    // Get chat log
+                    var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
+                        Options.After, Options.Before);
+
+                    // Generate default file name
+                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
+                        chatLog.Channel, Options.After, Options.Before);
+
+                    // Generate file path
+                    var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
+
+                    // Export
+                    exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
+
+                    // Print result
+                    Console.WriteLine($"Exported chat to [{filePath}]");
+                }
+                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
+                {
+                    Console.Error.WriteLine("You don't have access to this channel");
+                }
+                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
+                {
+                    Console.Error.WriteLine("This channel doesn't exist");
+                }
+            }
+        }
+    }
+}

DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs

@@ -0,0 +1,77 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Verbs.Options;
+using DiscordChatExporter.Core.Exceptions;
+using DiscordChatExporter.Core.Helpers;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Services;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Cli.Verbs
+{
+    public class ExportGuildVerb : Verb<ExportGuildOptions>
+    {
+        public ExportGuildVerb(ExportGuildOptions options)
+            : base(options)
+        {
+        }
+
+        public override async Task ExecuteAsync()
+        {
+            // Get services
+            var settingsService = Container.Instance.Get<SettingsService>();
+            var dataService = Container.Instance.Get<DataService>();
+            var exportService = Container.Instance.Get<ExportService>();
+
+            // Configure settings
+            if (Options.DateFormat.IsNotBlank())
+                settingsService.DateFormat = Options.DateFormat;
+            if (Options.MessageGroupLimit > 0)
+                settingsService.MessageGroupLimit = Options.MessageGroupLimit;
+
+            // Get channels
+            var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId);
+
+            // Filter and order channels
+            channels = channels.Where(c => c.Type == ChannelType.GuildTextChat).OrderBy(c => c.Name).ToArray();
+
+            // Loop through channels
+            foreach (var channel in channels)
+            {
+                try
+                {
+                    // Print current channel name
+                    Console.WriteLine($"Exporting chat from [{channel.Name}]...");
+
+                    // Get chat log
+                    var chatLog = await dataService.GetChatLogAsync(Options.GetToken(), channel,
+                        Options.After, Options.Before);
+
+                    // Generate default file name
+                    var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,
+                        chatLog.Channel, Options.After, Options.Before);
+
+                    // Generate file path
+                    var filePath = Path.Combine(Options.OutputPath ?? "", fileName);
+
+                    // Export
+                    exportService.ExportChatLog(chatLog, filePath, Options.ExportFormat, Options.PartitionLimit);
+
+                    // Print result
+                    Console.WriteLine($"Exported chat to [{filePath}]");
+                }
+                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.Forbidden)
+                {
+                    Console.Error.WriteLine("You don't have access to this channel");
+                }
+                catch (HttpErrorStatusCodeException ex) when (ex.StatusCode == HttpStatusCode.NotFound)
+                {
+                    Console.Error.WriteLine("This channel doesn't exist");
+                }
+            }
+        }
+    }
+}

DiscordChatExporter.Cli/Verbs/GetChannelsVerb.cs

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

DiscordChatExporter.Cli/Verbs/GetDirectMessageChannelsVerb.cs

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

DiscordChatExporter.Cli/Verbs/GetGuildsVerb.cs

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

DiscordChatExporter.Cli/Verbs/Options/ExportChannelOptions.cs

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

DiscordChatExporter.Cli/Verbs/Options/ExportDirectMessagesOptions.cs

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

DiscordChatExporter.Cli/Verbs/Options/ExportGuildOptions.cs

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

DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs

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

DiscordChatExporter.Cli/Verbs/Options/GetChannelsOptions.cs

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

DiscordChatExporter.Cli/Verbs/Options/GetDirectMessageChannelsOptions.cs

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

DiscordChatExporter.Cli/Verbs/Options/GetGuildsOptions.cs

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

DiscordChatExporter.Cli/Verbs/Options/TokenOptions.cs

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

DiscordChatExporter.Cli/Verbs/Verb.cs

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

DiscordChatExporter.Cli/ViewModels/IMainViewModel.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Cli.ViewModels
-{
-    public interface IMainViewModel
-    {
-        Task ExportAsync(string token, string channelId, string filePath, ExportFormat format, DateTime? from,
-            DateTime? to);
-    }
-}

DiscordChatExporter.Cli/ViewModels/MainViewModel.cs

@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.ViewModels
-{
-    public class MainViewModel : IMainViewModel
-    {
-        private readonly IDataService _dataService;
-        private readonly IMessageGroupService _messageGroupService;
-        private readonly IExportService _exportService;
-
-        public MainViewModel(IDataService dataService, IMessageGroupService messageGroupService,
-            IExportService exportService)
-        {
-            _dataService = dataService;
-            _messageGroupService = messageGroupService;
-            _exportService = exportService;
-        }
-
-        public async Task ExportAsync(string token, string channelId, string filePath, ExportFormat format, DateTime? from,
-            DateTime? to)
-        {
-            // Get channel and guild
-            var channel = await _dataService.GetChannelAsync(token, channelId);
-            var guild = channel.GuildId == Guild.DirectMessages.Id
-                ? Guild.DirectMessages
-                : await _dataService.GetGuildAsync(token, channel.GuildId);
-
-            // Generate file path if not set
-            if (filePath.IsBlank())
-            {
-                filePath = $"{guild.Name} - {channel.Name}.{format.GetFileExtension()}"
-                    .Replace(Path.GetInvalidFileNameChars(), '_');
-            }
-
-            // Get messages
-            var messages = await _dataService.GetChannelMessagesAsync(token, channelId, from, to);
-
-            // Group them
-            var messageGroups = _messageGroupService.GroupMessages(messages);
-
-            // Create log
-            var log = new ChannelChatLog(guild, channel, messageGroups, messages.Count);
-
-            // Export
-            await _exportService.ExportAsync(format, filePath, log);
-        }
-    }
-}

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -2,24 +2,31 @@
 
     <PropertyGroup>
         <TargetFramework>net461</TargetFramework>
-        <Version>2.4.1</Version>
+        <Version>2.9.1</Version>
     </PropertyGroup>
 
     <ItemGroup>
-        <EmbeddedResource Include="Resources\ExportService\DarkTheme.css" />
-        <EmbeddedResource Include="Resources\ExportService\LightTheme.css" />
+        <EmbeddedResource Include="Resources\ExportTemplates\PlainText.txt" />
+        <EmbeddedResource Include="Resources\ExportTemplates\HtmlDark.html" />
+        <EmbeddedResource Include="Resources\ExportTemplates\HtmlLight.html" />
+        <EmbeddedResource Include="Resources\ExportTemplates\Html\Core.html" />
+        <EmbeddedResource Include="Resources\ExportTemplates\Html\Shared.css" />
+        <EmbeddedResource Include="Resources\ExportTemplates\Html\DarkTheme.css" />
+        <EmbeddedResource Include="Resources\ExportTemplates\Html\LightTheme.css" />
+        <EmbeddedResource Include="Resources\ExportTemplates\Csv.csv" />
     </ItemGroup>
 
     <ItemGroup>
-        <Reference Include="System.Net.Http" />
+        <Reference Include="mscorlib" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="CsvHelper" Version="7.1.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-        <PackageReference Include="Onova" Version="2.1.0" />
-        <PackageReference Include="Tyrrrz.Extensions" Version="1.5.0" />
-        <PackageReference Include="Tyrrrz.Settings" Version="1.3.2" />
+        <PackageReference Include="Failsafe" Version="1.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+        <PackageReference Include="Onova" Version="2.2.0" />
+        <PackageReference Include="Scriban" Version="1.2.9" />
+        <PackageReference Include="Tyrrrz.Extensions" Version="1.5.1" />
+        <PackageReference Include="Tyrrrz.Settings" Version="1.3.3" />
     </ItemGroup>
 
 </Project>

DiscordChatExporter.Core/Exceptions/HttpErrorStatusCodeException.cs

@@ -7,9 +7,13 @@ namespace DiscordChatExporter.Core.Exceptions
     {
         public HttpStatusCode StatusCode { get; }
 
-        public HttpErrorStatusCodeException(HttpStatusCode statusCode)
+        public string ReasonPhrase { get; }
+
+        public HttpErrorStatusCodeException(HttpStatusCode statusCode, string reasonPhrase)
+            : base($"Error HTTP status code: {statusCode} - {reasonPhrase}")
         {
             StatusCode = statusCode;
+            ReasonPhrase = reasonPhrase;
         }
     }
 }

DiscordChatExporter.Core/Helpers/ExportHelper.cs

@@ -0,0 +1,59 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using DiscordChatExporter.Core.Models;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Helpers
+{
+    public static class ExportHelper
+    {
+        public static bool IsDirectoryPath(string path)
+            => path.Last() == Path.DirectorySeparatorChar ||
+               path.Last() == Path.AltDirectorySeparatorChar ||
+               Path.GetExtension(path).IsBlank();
+
+        public static string GetDefaultExportFileName(ExportFormat format, Guild guild, Channel channel,
+            DateTime? from = null, DateTime? to = null)
+        {
+            var result = new StringBuilder();
+
+            // Append guild and channel names
+            result.Append($"{guild.Name} - {channel.Name} [{channel.Id}]");
+
+            // Append date range
+            if (from != null || to != null)
+            {
+                result.Append(" (");
+
+                // Both 'from' and 'to' are set
+                if (from != null && to != null)
+                {
+                    result.Append($"{from:yyyy-MM-dd} to {to:yyyy-MM-dd}");
+                }
+                // Only 'from' is set
+                else if (from != null)
+                {
+                    result.Append($"after {from:yyyy-MM-dd}");
+                }
+                // Only 'to' is set
+                else
+                {
+                    result.Append($"before {to: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/Internal/Extensions.cs

@@ -1,22 +1,23 @@
-using System.IO;
-using System.Reflection;
-using System.Resources;
+using System;
+using System.Drawing;
+using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Internal
 {
     internal static class Extensions
     {
-        public static string GetManifestResourceString(this Assembly assembly, string resourceName)
+        public static string ToSnowflake(this DateTime dateTime)
         {
-            var stream = assembly.GetManifestResourceStream(resourceName);
-            if (stream == null)
-                throw new MissingManifestResourceException($"Could not find resource [{resourceName}].");
-
-            using (stream)
-            using (var reader = new StreamReader(stream))
-            {
-                return reader.ReadToEnd();
-            }
+            const long epoch = 62135596800000;
+            var unixTime = dateTime.ToUniversalTime().Ticks / TimeSpan.TicksPerMillisecond - epoch;
+            var value = ((ulong) unixTime - 1420070400000UL) << 22;
+            return value.ToString();
         }
+
+        public static string Base64Encode(this string str) => str.GetBytes().ToBase64();
+
+        public static string Base64Decode(this string str) => str.FromBase64().GetString();
+
+        public static Color ResetAlpha(this Color color) => Color.FromArgb(1, color);
     }
 }

DiscordChatExporter.Core/Models/Attachment.cs

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

DiscordChatExporter.Core/Models/AuthToken.cs

@@ -0,0 +1,15 @@
+namespace DiscordChatExporter.Core.Models
+{
+    public class AuthToken
+    {
+        public AuthTokenType Type { get; }
+
+        public string Value { get; }
+
+        public AuthToken(AuthTokenType type, string value)
+        {
+            Type = type;
+            Value = value;
+        }
+    }
+}

DiscordChatExporter.Core/Models/AuthTokenType.cs

@@ -1,8 +1,8 @@
 namespace DiscordChatExporter.Core.Models
 {
-    public enum AttachmentType
+    public enum AuthTokenType
     {
-        Other,
-        Image
+        User,
+        Bot
     }
 }

DiscordChatExporter.Core/Models/Channel.cs

@@ -1,9 +1,13 @@
 namespace DiscordChatExporter.Core.Models
 {
+    // https://discordapp.com/developers/docs/resources/channel#channel-object
+
     public partial class Channel
     {
         public string Id { get; }
 
+        public string ParentId { get; }
+
         public string GuildId { get; }
 
         public string Name { get; }
@@ -11,27 +15,23 @@
         public string Topic { get; }
 
         public ChannelType Type { get; }
-
-        public Channel(string id, 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;
             GuildId = guildId;
             Name = name;
             Topic = topic;
             Type = type;
         }
 
-        public override string ToString()
-        {
-            return Name;
-        }
+        public override string ToString() => Name;
     }
 
     public partial class Channel
     {
-        public static Channel CreateDeletedChannel(string id)
-        {
-            return new Channel(id, null, "deleted-channel", null, ChannelType.GuildTextChat);
-        }
+        public static Channel CreateDeletedChannel(string id) =>
+            new Channel(id, null, null, "deleted-channel", null, ChannelType.GuildTextChat);
     }
 }

DiscordChatExporter.Core/Models/ChannelChatLog.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public class ChannelChatLog
-    {
-        public Guild Guild { get; }
-
-        public Channel Channel { get; }
-
-        public IReadOnlyList<MessageGroup> MessageGroups { get; }
-
-        public int TotalMessageCount { get; }
-
-        public ChannelChatLog(Guild guild, Channel channel, IReadOnlyList<MessageGroup> messageGroups,
-            int totalMessageCount)
-        {
-            Guild = guild;
-            Channel = channel;
-            MessageGroups = messageGroups;
-            TotalMessageCount = totalMessageCount;
-        }
-    }
-}

DiscordChatExporter.Core/Models/ChannelType.cs

@@ -1,5 +1,7 @@
 namespace DiscordChatExporter.Core.Models
 {
+    // https://discordapp.com/developers/docs/resources/channel#channel-object-channel-types
+
     public enum ChannelType
     {
         GuildTextChat,

DiscordChatExporter.Core/Models/ChatLog.cs

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

DiscordChatExporter.Core/Models/Embed.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/channel#embed-object
+
+    public class Embed
+    {
+        public string Title { get; }
+
+        public string Url { get; }
+
+        public DateTime? Timestamp { get; }
+
+        public Color Color { get; }
+
+        public EmbedAuthor Author { get; }
+
+        public string Description { get; }
+
+        public IReadOnlyList<EmbedField> Fields { get; }
+
+        public EmbedImage Thumbnail { get; }
+
+        public EmbedImage Image { get; }
+
+        public EmbedFooter Footer { get; }
+
+        public Embed(string title, string url, DateTime? timestamp, Color color, EmbedAuthor author, string description,
+            IReadOnlyList<EmbedField> fields, EmbedImage thumbnail, EmbedImage image, EmbedFooter footer)
+        {
+            Title = title;
+            Url = url;
+            Timestamp = timestamp;
+            Color = color;
+            Author = author;
+            Description = description;
+            Fields = fields;
+            Thumbnail = thumbnail;
+            Image = image;
+            Footer = footer;
+        }
+
+        public override string ToString() => Title;
+    }
+}

DiscordChatExporter.Core/Models/EmbedAuthor.cs

@@ -0,0 +1,22 @@
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-author-structure
+
+    public class EmbedAuthor
+    {
+        public string Name { get; }
+
+        public string Url { get; }
+
+        public string IconUrl { get; }
+
+        public EmbedAuthor(string name, string url, string iconUrl)
+        {
+            Name = name;
+            Url = url;
+            IconUrl = iconUrl;
+        }
+
+        public override string ToString() => Name;
+    }
+}

DiscordChatExporter.Core/Models/EmbedField.cs

@@ -0,0 +1,22 @@
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-field-structure
+
+    public class EmbedField
+    {
+        public string Name { get; }
+
+        public string Value { get; }
+
+        public bool IsInline { get; }
+
+        public EmbedField(string name, string value, bool isInline)
+        {
+            Name = name;
+            Value = value;
+            IsInline = isInline;
+        }
+
+        public override string ToString() => $"{Name} | {Value}";
+    }
+}

DiscordChatExporter.Core/Models/EmbedFooter.cs

@@ -0,0 +1,19 @@
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-footer-structure
+
+    public class EmbedFooter
+    {
+        public string Text { get; }
+
+        public string IconUrl { get; }
+
+        public EmbedFooter(string text, string iconUrl)
+        {
+            Text = text;
+            IconUrl = iconUrl;
+        }
+
+        public override string ToString() => Text;
+    }
+}

DiscordChatExporter.Core/Models/EmbedImage.cs

@@ -0,0 +1,20 @@
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-image-structure
+
+    public class EmbedImage
+    {
+        public string Url { get; }
+
+        public int? Width { get; }
+
+        public int? Height { get; }
+
+        public EmbedImage(string url, int? width, int? height)
+        {
+            Url = url;
+            Height = height;
+            Width = width;
+        }
+    }
+}

DiscordChatExporter.Core/Models/Guild.cs

@@ -1,8 +1,9 @@
-using System.Collections.Generic;
-using Tyrrrz.Extensions;
+using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Models
 {
+    // https://discordapp.com/developers/docs/resources/guild#guild-object
+
     public partial class Guild
     {
         public string Id { get; }
@@ -15,24 +16,18 @@ namespace DiscordChatExporter.Core.Models
             ? $"https://cdn.discordapp.com/icons/{Id}/{IconHash}.png"
             : "https://cdn.discordapp.com/embed/avatars/0.png";
 
-        public IReadOnlyList<Role> Roles { get; }
-
-        public Guild(string id, string name, string iconHash, IReadOnlyList<Role> roles)
+        public Guild(string id, string name, string iconHash)
         {
             Id = id;
             Name = name;
             IconHash = iconHash;
-            Roles = roles;
         }
 
-        public override string ToString()
-        {
-            return Name;
-        }
+        public override string ToString() => Name;
     }
 
     public partial class Guild
     {
-        public static Guild DirectMessages { get; } = new Guild("@me", "Direct Messages", null, new Role[0]);
+        public static Guild DirectMessages { get; } = new Guild("@me", "Direct Messages", null);
     }
 }

DiscordChatExporter.Core/Models/Mentionables.cs

@@ -0,0 +1,30 @@
+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

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 
 namespace DiscordChatExporter.Core.Models
 {
+    // https://discordapp.com/developers/docs/resources/channel#message-object
+
     public class Message
     {
         public string Id { get; }
@@ -13,42 +15,37 @@ namespace DiscordChatExporter.Core.Models
 
         public User Author { get; }
 
-        public DateTime TimeStamp { get; }
+        public DateTime Timestamp { get; }
 
-        public DateTime? EditedTimeStamp { get; }
+        public DateTime? EditedTimestamp { get; }
 
         public string Content { get; }
 
         public IReadOnlyList<Attachment> Attachments { get; }
 
+        public IReadOnlyList<Embed> Embeds { get; }
+
+        public IReadOnlyList<Reaction> Reactions { get; }
+
         public IReadOnlyList<User> MentionedUsers { get; }
 
-        public IReadOnlyList<Role> MentionedRoles { get; }
-
-        public IReadOnlyList<Channel> MentionedChannels { get; }
-
-        public Message(string id, string channelId, MessageType type,
-            User author, DateTime timeStamp,
-            DateTime? editedTimeStamp, string content,
-            IReadOnlyList<Attachment> attachments, IReadOnlyList<User> mentionedUsers,
-            IReadOnlyList<Role> mentionedRoles, IReadOnlyList<Channel> mentionedChannels)
+        public Message(string id, string channelId, MessageType type, User author, DateTime timestamp,
+            DateTime? editedTimestamp, string content, IReadOnlyList<Attachment> attachments,
+            IReadOnlyList<Embed> embeds, IReadOnlyList<Reaction> reactions, IReadOnlyList<User> mentionedUsers)
         {
             Id = id;
             ChannelId = channelId;
             Type = type;
             Author = author;
-            TimeStamp = timeStamp;
-            EditedTimeStamp = editedTimeStamp;
+            Timestamp = timestamp;
+            EditedTimestamp = editedTimestamp;
             Content = content;
             Attachments = attachments;
+            Embeds = embeds;
+            Reactions = reactions;
             MentionedUsers = mentionedUsers;
-            MentionedRoles = mentionedRoles;
-            MentionedChannels = mentionedChannels;
         }
 
-        public override string ToString()
-        {
-            return Content;
-        }
+        public override string ToString() => Content;
     }
 }

DiscordChatExporter.Core/Models/MessageGroup.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Models
-{
-    public class MessageGroup
-    {
-        public User Author { get; }
-
-        public DateTime TimeStamp { get; }
-
-        public IReadOnlyList<Message> Messages { get; }
-
-        public MessageGroup(User author, DateTime timeStamp, IReadOnlyList<Message> messages)
-        {
-            Author = author;
-            TimeStamp = timeStamp;
-            Messages = messages;
-        }
-    }
-}

DiscordChatExporter.Core/Models/MessageType.cs

@@ -1,5 +1,7 @@
 namespace DiscordChatExporter.Core.Models
 {
+    // https://discordapp.com/developers/docs/resources/channel#message-object-message-types
+
     public enum MessageType
     {
         Default,

DiscordChatExporter.Core/Models/Reaction.cs

@@ -0,0 +1,20 @@
+namespace DiscordChatExporter.Core.Models
+{
+    // https://discordapp.com/developers/docs/resources/channel#reaction-object
+
+    public class Reaction
+    {
+        public int Count { get; }
+
+        public string EmojiId { get; }
+
+        public string EmojiName { get; }
+
+        public Reaction(int count, string emojiId, string emojiName) 
+        {
+            Count = count;
+            EmojiId = emojiId;
+            EmojiName = emojiName;
+        }
+    }
+}

DiscordChatExporter.Core/Models/Role.cs

@@ -1,5 +1,7 @@
 namespace DiscordChatExporter.Core.Models
 {
+    // https://discordapp.com/developers/docs/topics/permissions#role-object
+
     public partial class Role
     {
         public string Id { get; }
@@ -12,17 +14,12 @@
             Name = name;
         }
 
-        public override string ToString()
-        {
-            return Name;
-        }
+        public override string ToString() => Name;
     }
 
     public partial class Role
     {
-        public static Role CreateDeletedRole(string id)
-        {
-            return new Role(id, "deleted-role");
-        }
+        public static Role CreateDeletedRole(string id) =>
+            new Role(id, "deleted-role");
     }
 }

DiscordChatExporter.Core/Models/User.cs

@@ -1,8 +1,11 @@
-using Tyrrrz.Extensions;
+using System;
+using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Models
 {
-    public class User
+    // https://discordapp.com/developers/docs/topics/permissions#role-object
+
+    public partial class User
     {
         public string Id { get; }
 
@@ -12,13 +15,32 @@ namespace DiscordChatExporter.Core.Models
 
         public string FullName => $"{Name}#{Discriminator:0000}";
 
-        public string AvatarHash { get; }
-
         public string DefaultAvatarHash => $"{Discriminator % 5}";
 
-        public string AvatarUrl => AvatarHash.IsNotBlank()
-            ? $"https://cdn.discordapp.com/avatars/{Id}/{AvatarHash}.png"
-            : $"https://cdn.discordapp.com/embed/avatars/{DefaultAvatarHash}.png";
+        public string AvatarHash { get; }
+
+        public bool IsAvatarAnimated =>
+            AvatarHash.IsNotBlank() && AvatarHash.StartsWith("a_", StringComparison.Ordinal);
+
+        public string AvatarUrl
+        {
+            get
+            {
+                // Custom avatar
+                if (AvatarHash.IsNotBlank())
+                {
+                    // Animated
+                    if (IsAvatarAnimated)
+                        return $"https://cdn.discordapp.com/avatars/{Id}/{AvatarHash}.gif";
+
+                    // Non-animated
+                    return $"https://cdn.discordapp.com/avatars/{Id}/{AvatarHash}.png";
+                }
+
+                // Default avatar
+                return $"https://cdn.discordapp.com/embed/avatars/{DefaultAvatarHash}.png";
+            }
+        }
 
         public User(string id, int discriminator, string name, string avatarHash)
         {
@@ -28,9 +50,12 @@ namespace DiscordChatExporter.Core.Models
             AvatarHash = avatarHash;
         }
 
-        public override string ToString()
-        {
-            return FullName;
-        }
+        public override string ToString() => FullName;
+    }
+
+    public partial class User
+    {
+        public static User CreateUnknownUser(string id) =>
+            new User(id, 0, "Unknown", null);
     }
 }

DiscordChatExporter.Core/Resources/ExportService/DarkTheme.css

@@ -1,142 +0,0 @@
-body {
-    background-color: #36393E;
-    color: rgba(255, 255, 255, 0.7);
-    font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
-    font-size: 16px;
-}
-
-a {
-    color: #0096CF;
-    text-decoration: none;
-}
-
-a:hover {
-     text-decoration: underline;
-}
-
-div.pre {
-    background-color: #2F3136;
-    color: rgb(131, 148, 150);
-    font-family: Consolas, Courier New, Courier, Monospace;
-    margin-top: 4px;
-    padding: 8px;
-    white-space: pre-wrap;
-}
-
-span.pre {
-    background-color: #2F3136;
-    font-family: Consolas, Courier New, Courier, Monospace;
-    padding-left: 2px;
-    padding-right: 2px;
-    white-space: pre-wrap;
-}
-
-div#info {
-    display: flex;
-    margin-bottom: 10px;
-    margin-left: 5px;
-    margin-right: 5px;
-    max-width: 100%;
-}
-
-div#log {
-     max-width: 100%;
-}
-
-img.guild-icon {
-    max-height: 64px;
-    max-width: 64px;
-}
-
-div.info-right {
-    flex: 1;
-    margin-left: 10px;
-}
-
-div.guild-name {
-    color: #FFFFFF;
-    font-size: 1.4em;
-}
-
-div.channel-name {
-    color: #FFFFFF;
-    font-size: 1.2em;
-}
-
-div.channel-topic {
-    margin-top: 2px;
-    color: #FFFFFF;
-}
-
-div.channel-messagecount {
-    margin-top: 2px;
-}
-
-div.msg {
-    border-top: 1px solid rgba(255, 255, 255, 0.04);
-    display: flex;
-    margin-left: 10px;
-    margin-right: 10px;
-    padding-bottom: 15px;
-    padding-top: 15px;
-}
-
-div.msg-left {
-    height: 40px;
-    width: 40px;
-}
-
-img.msg-avatar {
-    border-radius: 50%;
-    height: 40px;
-    width: 40px;
-}
-
-div.msg-right {
-    flex: 1;
-    margin-left: 20px;
-    min-width: 50%;
-}
-
-span.msg-user {
-    color: #FFFFFF;
-    font-size: 1em;
-}
-
-span.msg-date {
-    color: rgba(255, 255, 255, 0.2);
-    font-size: .75em;
-    margin-left: 5px;
-}
-
-span.msg-edited {
-    color: rgba(255, 255, 255, 0.2);
-    font-size: .8em;
-    margin-left: 5px;
-}
-
-div.msg-content {
-    font-size: .9375em;
-    padding-top: 5px;
-    word-wrap: break-word;
-}
-
-div.msg-attachment {
-    margin-bottom: 5px;
-    margin-top: 5px;
-}
-
-img.msg-attachment {
-    max-height: 500px;
-    max-width: 50%;
-}
-
-img.emoji {
-    height: 24px;
-    width: 24px;
-    vertical-align: -.4em;
-}
-
-span.mention {
-    font-weight: 600;
-}

DiscordChatExporter.Core/Resources/ExportService/LightTheme.css

@@ -1,142 +0,0 @@
-body {
-    background-color: #FFFFFF;
-    color: #737F8D;
-    font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
-    font-size: 16px;
-}
-
-a {
-    color: #00B0F4;
-    text-decoration: none;
-}
-
-a:hover {
-     text-decoration: underline;
-}
-
-div.pre {
-    background-color: #F9F9F9;
-    color: rgb(101, 123, 131);
-    font-family: Consolas, Courier New, Courier, Monospace;
-    margin-top: 4px;
-    padding: 8px;
-    white-space: pre-wrap;
-}
-
-span.pre {
-    background-color: #F9F9F9;
-    font-family: Consolas, Courier New, Courier, Monospace;
-    padding-left: 2px;
-    padding-right: 2px;
-    white-space: pre-wrap;
-}
-
-div#info {
-    display: flex;
-    margin-bottom: 10px;
-    margin-left: 5px;
-    margin-right: 5px;
-    max-width: 100%;
-}
-
-div#log {
-     max-width: 100%;
-}
-
-img.guild-icon {
-    max-height: 64px;
-    max-width: 64px;
-}
-
-div.info-right {
-    flex: 1;
-    margin-left: 10px;
-}
-
-div.guild-name {
-    color: #2F3136;
-    font-size: 1.4em;
-}
-
-div.channel-name {
-    color: #2F3136;
-    font-size: 1.2em;
-}
-
-div.channel-topic {
-    margin-top: 2px;
-    color: #2F3136;
-}
-
-div.channel-messagecount {
-    margin-top: 2px;
-}
-
-div.msg {
-    border-top: 1px solid #ECEEEF;
-    display: flex;
-    margin-left: 10px;
-    margin-right: 10px;
-    padding-bottom: 15px;
-    padding-top: 15px;
-}
-
-div.msg-left {
-    height: 40px;
-    width: 40px;
-}
-
-img.msg-avatar {
-    border-radius: 50%;
-    height: 40px;
-    width: 40px;
-}
-
-div.msg-right {
-    flex: 1;
-    margin-left: 20px;
-    min-width: 50%;
-}
-
-span.msg-user {
-    color: #2F3136;
-    font-size: 1em;
-}
-
-span.msg-date {
-    color: #99AAB5;
-    font-size: .75em;
-    margin-left: 5px;
-}
-
-span.msg-edited {
-    color: #99AAB5;
-    font-size: .8em;
-    margin-left: 5px;
-}
-
-div.msg-content {
-    font-size: .9375em;
-    padding-top: 5px;
-    word-wrap: break-word;
-}
-
-div.msg-attachment {
-    margin-bottom: 5px;
-    margin-top: 5px;
-}
-
-img.msg-attachment {
-    max-height: 500px;
-    max-width: 50%;
-}
-
-img.emoji {
-    height: 24px;
-    width: 24px;
-    vertical-align: -.4em;
-}
-
-span.mention {
-    font-weight: 600;
-}

DiscordChatExporter.Core/Resources/ExportTemplates/Csv.csv

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

DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html

@@ -0,0 +1,216 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <title>{{ Model.Guild.Name | html.escape }} - {{ Model.Channel.Name | html.escape }}</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <style>
+        {{ StyleSheet }}
+    </style>
+</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 | Format "N0" }} messages</div>
+        
+        {{~ if Model.From || Model.To ~}}
+            <div class="info__channel-date-range">
+                {{~ if Model.From && Model.To ~}}
+                    Between {{ Model.From | FormatDate | html.escape }} and {{ Model.To | FormatDate | html.escape }}
+                {{~ else if Model.From ~}}
+                    After {{ Model.From | FormatDate | html.escape }}
+                {{~ else if Model.To ~}}
+                    Before {{ Model.To | FormatDate | html.escape }}
+                {{~ 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 }}">{{ group.Author.Name | html.escape }}</span>
+                <span class="chatlog__timestamp">{{ group.Timestamp | FormatDate | html.escape }}</span>
+
+                {{~ # Messages ~}}
+                {{~ for message in group.Messages ~}}
+                    {{~ # Content ~}}
+                    {{~ if message.Content ~}}
+                        <div class="chatlog__content">
+                            {{ message.Content | FormatContent }}
+
+                            {{~ # 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 | FormatFileSize }})
+                                {{~ 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 | FormatColor }})"></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 }}">{{ embed.Title | FormatContent }}</a>
+                                                {{~ else ~}}
+                                                    {{ embed.Title | FormatContent }}
+                                                {{~ end ~}}
+                                            </div>
+                                        {{~ end ~}}
+
+                                        {{~ # Description ~}}
+                                        {{~ if embed.Description ~}}
+                                            <div class="chatlog__embed-description">{{ embed.Description | FormatContent true }}</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">{{ field.Name | FormatContent }}</div>
+                                                        {{~ end ~}}
+                                                        {{~ if field.Value ~}}
+                                                            <div class="chatlog__embed-field-value">{{ field.Value | FormatContent true }}</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">
+                                    <span class="chatlog__reaction-emoji">
+                                        {{~ # Custom emoji ~}}
+                                        {{~ if reaction.EmojiId ~}}
+                                            <img class="emoji emoji--small" title="{{ reaction.EmojiName }}" src="https://cdn.discordapp.com/emojis/{{ reaction.EmojiId }}.png" />
+                                        {{~ # Default emoji ~}}
+                                        {{~ else ~}}
+                                            {{ reaction.EmojiName }}
+                                        {{~ end ~}}
+                                    </span>
+                                    <span class="chatlog__reaction-count">{{ reaction.Count }}</span>
+                                </div>
+                            {{~ end ~}}
+                        </div>
+                    {{~ end ~}}
+                {{~ end ~}}
+            </div>
+        </div>
+    {{~ end ~}}
+</div>
+
+</body>
+</html>

DiscordChatExporter.Core/Resources/ExportTemplates/Html/DarkTheme.css

@@ -0,0 +1,97 @@
+/* === GENERAL === */
+
+body {
+    background-color: #36393e;
+    color: #ffffffb3;
+}
+
+a {
+    color: #0096cf;
+}
+
+.pre {
+    background-color: #2f3136;
+}
+
+.pre--multiline {
+    border-color: #282b30;
+    color: #839496;
+}
+
+.mention {
+    background-color: #738bd71a;
+    color: #7289da;
+}
+
+/* === INFO === */
+
+.info__guild-name {
+    color: #ffffff;
+}
+
+.info__channel-name {
+    color: #ffffff;
+}
+
+.info__channel-topic {
+    color: #ffffff;
+}
+
+/* === CHATLOG === */
+
+.chatlog__message-group {
+    border-color: #ffffff0a;
+}
+
+.chatlog__author-name {
+    color: #ffffff;
+}
+
+.chatlog__timestamp {
+    color: #ffffff33;
+}
+
+.chatlog__edited-timestamp {
+    color: #ffffff33;
+}
+
+.chatlog__embed-content-container {
+    background-color: #2e30364d;
+    border-color: #2e303699;
+}
+
+.chatlog__embed-author-name {
+    color: #ffffff;
+}
+
+.chatlog__embed-author-name-link {
+    color: #ffffff;
+}
+
+.chatlog__embed-title {
+    color: #ffffff;
+}
+
+.chatlog__embed-description {
+    color: #ffffff99;
+}
+
+.chatlog__embed-field-name {
+    color: #ffffff;
+}
+
+.chatlog__embed-field-value {
+    color: #ffffff99;
+}
+
+.chatlog__embed-footer {
+    color: #ffffff99;
+}
+
+.chatlog__reaction {
+    background-color: #ffffff0a;
+}
+
+.chatlog__reaction-count {
+    color: #ffffff4d;
+}

DiscordChatExporter.Core/Resources/ExportTemplates/Html/LightTheme.css

@@ -0,0 +1,97 @@
+/* === GENERAL === */
+
+body {
+    background-color: #ffffff;
+    color: #737f8d;
+}
+
+a {
+    color: #00b0f4;
+}
+
+.pre {
+    background-color: #f9f9f9;
+}
+
+.pre--multiline {
+    border-color: #f3f3f3;
+    color: #657b83;
+}
+
+.mention {
+    background-color: #f1f3fb;
+    color: #7289da;
+}
+
+/* === INFO === */
+
+.info__guild-name {
+    color: #2f3136;
+}
+
+.info__channel-name {
+    color: #2f3136;
+}
+
+.info__channel-topic {
+    color: #2f3136;
+}
+
+/* === CHATLOG === */
+
+.chatlog__message-group {
+    border-color: #eceeef;
+}
+
+.chatlog__author-name {
+    color: #2f3136;
+}
+
+.chatlog__timestamp {
+    color: #99aab5;
+}
+
+.chatlog__edited-timestamp {
+    color: #99aab5;
+}
+
+.chatlog__embed-content-container {
+    background-color: #f9f9f94d;
+    border-color: #cccccc4d;
+}
+
+.chatlog__embed-author-name {
+    color: #4f545c;
+}
+
+.chatlog__embed-author-name-link {
+    color: #4f545c;
+}
+
+.chatlog__embed-title {
+    color: #4f545c;
+}
+
+.chatlog__embed-description {
+    color: #737f8d;
+}
+
+.chatlog__embed-field-name {
+    color: #36393e;
+}
+
+.chatlog__embed-field-value {
+    color: #737f8d;
+}
+
+.chatlog__embed-footer {
+    color: #4f535b99;
+}
+
+.chatlog__reaction {
+    background-color: #4f545c0f;
+}
+
+.chatlog__reaction-count {
+    color: #99aab5;
+}

DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css

@@ -0,0 +1,303 @@
+/* === GENERAL === */
+
+body {
+    font-family: "Whitney", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 16px;
+}
+
+a {
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+img {
+    object-fit: contain;
+}
+
+.pre {
+    font-family: "Consolas", "Courier New", Courier, Monospace;
+    white-space: pre-wrap;
+}
+
+.pre--multiline {
+    margin-top: 4px;
+    padding: 8px;
+    border: 2px solid;
+    border-radius: 5px;    
+}
+
+.pre--inline {
+    padding: 2px;
+    border-radius: 3px;
+}
+
+.emoji {
+    width: 24px;
+    height: 24px;
+    margin: 0 1px;
+    vertical-align: middle;
+}
+
+.emoji--small {
+    width: 16px;
+    height: 16px;
+}
+
+.emoji--large {
+    width: 32px;
+    height: 32px;
+}
+
+.mention {
+    font-weight: 600;
+}
+
+/* === INFO === */
+
+.info {
+    display: flex;
+    max-width: 100%;
+    margin: 0 5px 10px 5px;    
+}
+
+.info__guild-icon-container {
+    flex: 0;
+}
+
+.info__guild-icon {
+    max-width: 88px;
+    max-height: 88px;
+}
+
+.info__metadata {
+    flex: 1;
+    margin-left: 10px;
+}
+
+.info__guild-name {
+    font-size: 1.4em;
+}
+
+.info__channel-name {
+    font-size: 1.2em;
+}
+
+.info__channel-topic {
+    margin-top: 2px;
+}
+
+.info__channel-message-count {
+    margin-top: 2px;
+}
+
+.info__channel-date-range {
+    margin-top: 2px;
+}
+
+/* === CHATLOG === */
+
+.chatlog {
+    max-width: 100%;
+}
+
+.chatlog__message-group {
+    display: flex;
+    margin: 0 10px;
+    padding: 15px 0;
+    border-top: 1px solid;
+}
+
+.chatlog__author-avatar-container {
+    flex: 0;
+    width: 40px;
+    height: 40px;
+}
+
+.chatlog__author-avatar {
+    border-radius: 50%;
+    height: 40px;
+    width: 40px;
+}
+
+.chatlog__messages {
+    flex: 1;
+    min-width: 50%;
+    margin-left: 20px;
+}
+
+.chatlog__author-name {
+    font-size: 1em;
+}
+
+.chatlog__timestamp {
+    margin-left: 5px;
+    font-size: .75em;
+}
+
+.chatlog__content {
+    padding-top: 5px;
+    font-size: .9375em;
+    word-wrap: break-word;
+}
+
+.chatlog__edited-timestamp {
+    margin-left: 5px;
+    font-size: .8em;
+}
+
+.chatlog__attachment {
+    margin: 5px 0;
+}
+
+.chatlog__attachment-thumbnail {
+    max-width: 50%;
+    max-height: 500px;
+    border-radius: 3px;
+}
+
+.chatlog__embed {
+    display: flex;
+    max-width: 520px;
+    margin-top: 5px;
+}
+
+.chatlog__embed-color-pill {
+    flex-shrink: 0;
+    width: 4px;
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
+}
+
+.chatlog__embed-content-container {
+    display: flex;
+    flex-direction: column;
+    padding: 8px 10px;
+    border: 1px solid;
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+}
+
+.chatlog__embed-content {
+    width: 100%;
+    display: flex;
+}
+
+.chatlog__embed-text {
+    flex: 1;
+}
+
+.chatlog__embed-author {
+    display: flex;
+    align-items: center;
+    margin-bottom: 5px;
+}
+
+.chatlog__embed-author-icon {
+    width: 20px;
+    height: 20px;
+    margin-right: 9px;
+    border-radius: 50%;
+}
+
+.chatlog__embed-author-name {
+    font-size: .875em;
+    font-weight: 600;
+}
+
+.chatlog__embed-title {
+    margin-bottom: 4px;
+    font-size: .875em;
+    font-weight: 600;
+}
+
+.chatlog__embed-description {
+    font-weight: 500;
+    font-size: 14px;
+}
+
+.chatlog__embed-fields {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.chatlog__embed-field {
+    flex: 0;
+    min-width: 100%;
+    max-width: 506px;
+    padding-top: 10px;
+}
+
+.chatlog__embed-field--inline {
+    flex: 1;
+    flex-basis: auto;
+    min-width: 150px;
+}
+
+.chatlog__embed-field-name {
+    margin-bottom: 4px;
+    font-size: .875em;
+    font-weight: 600;
+}
+
+.chatlog__embed-field-value {
+    font-size: .875em;
+    font-weight: 500;
+}
+
+.chatlog__embed-thumbnail {
+    flex: 0;
+    margin-left: 20px;
+    max-width: 80px;
+    max-height: 80px;
+    border-radius: 3px;
+}
+
+.chatlog__embed-image-container {
+    margin-top: 10px;
+}
+
+.chatlog__embed-image {    
+    max-width: 500px;
+    max-height: 400px;
+    border-radius: 3px;
+}
+
+.chatlog__embed-footer {
+    margin-top: 10px;
+}
+
+.chatlog__embed-footer-icon {
+    margin-right: 4px;
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    vertical-align: middle;
+}
+
+.chatlog__embed-footer-text {
+    font-weight: 600;
+    font-size: .75em;
+}
+
+.chatlog__reactions {
+    display: flex;    
+}
+
+.chatlog__reaction {
+    margin: 6px 2px 2px 2px;
+    padding: 2px 6px 2px 2px;
+    border-radius: 3px;
+}
+
+.chatlog__reaction-emoji {
+    margin-left: 3px;
+    vertical-align: middle;
+}
+
+.chatlog__reaction-count {
+    font-size: .875em;
+    vertical-align: middle;
+}

DiscordChatExporter.Core/Resources/ExportTemplates/HtmlDark.html

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

DiscordChatExporter.Core/Resources/ExportTemplates/HtmlLight.html

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

DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt

@@ -0,0 +1,21 @@
+{{~ # Info ~}}
+==============================================================
+Guild:    {{ Model.Guild.Name }}
+Channel:  {{ Model.Channel.Name }}
+Topic:    {{ Model.Channel.Topic }}
+Messages: {{ Model.Messages | array.size | Format "N0" }}
+Range:    {{ if Model.From }}{{ Model.From | FormatDate }} {{ end }}{{ if Model.From || Model.To }}->{{ end }}{{ if Model.To }} {{ Model.To | FormatDate }}{{ end }}
+==============================================================
+
+{{~ # Log ~}}
+{{~ for message in Model.Messages ~}}
+  {{~ # Author name and timestamp ~}}
+  {{~ }}[{{ message.Timestamp | FormatDate }}] {{ message.Author.FullName }}
+  {{~ # Content ~}}
+  {{~ message.Content | FormatContent }}
+  {{~ # Attachments ~}}
+  {{~ for attachment in message.Attachments ~}}
+    {{~ attachment.Url }}
+  {{~ end ~}}
+
+{{~ end ~}}

DiscordChatExporter.Core/Services/DataService.Parsers.cs

@@ -0,0 +1,197 @@
+using System;
+using System.Drawing;
+using System.Linq;
+using DiscordChatExporter.Core.Internal;
+using DiscordChatExporter.Core.Models;
+using Newtonsoft.Json.Linq;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Services
+{
+    public partial class DataService
+    {
+        private User ParseUser(JToken json)
+        {
+            var id = json["id"].Value<string>();
+            var discriminator = json["discriminator"].Value<int>();
+            var name = json["username"].Value<string>();
+            var avatarHash = json["avatar"].Value<string>();
+
+            return new User(id, discriminator, name, avatarHash);
+        }
+
+        private Guild ParseGuild(JToken json)
+        {
+            var id = json["id"].Value<string>();
+            var name = json["name"].Value<string>();
+            var iconHash = json["icon"].Value<string>();
+
+            return new Guild(id, name, iconHash);
+        }
+
+        private Channel ParseChannel(JToken json)
+        {
+            // Get basic data
+            var id = json["id"].Value<string>();
+            var parentId = json["parent_id"]?.Value<string>();
+            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.IsBlank())
+                guildId = Guild.DirectMessages.Id;
+
+            // Try to extract name
+            var name = json["name"]?.Value<string>();
+
+            // If the name is blank, it's direct messages
+            if (name.IsBlank())
+                name = json["recipients"].Select(ParseUser).Select(u => u.Name).JoinToString(", ");
+
+            return new Channel(id, parentId, guildId, name, topic, type);
+        }
+
+        private Role ParseRole(JToken json)
+        {
+            var id = json["id"].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 url = json["url"].Value<string>();
+            var width = json["width"]?.Value<int>();
+            var height = json["height"]?.Value<int>();
+            var fileName = json["filename"].Value<string>();
+            var fileSize = json["size"].Value<long>();
+
+            return new Attachment(id, width, height, url, fileName, fileSize);
+        }
+
+        private EmbedAuthor ParseEmbedAuthor(JToken json)
+        {
+            var name = json["name"]?.Value<string>();
+            var url = json["url"]?.Value<string>();
+            var iconUrl = json["icon_url"]?.Value<string>();
+
+            return new EmbedAuthor(name, url, iconUrl);
+        }
+
+        private EmbedField ParseEmbedField(JToken json)
+        {
+            var name = json["name"].Value<string>();
+            var value = json["value"].Value<string>();
+            var isInline = json["inline"]?.Value<bool>() ?? false;
+
+            return new EmbedField(name, value, isInline);
+        }
+
+        private EmbedImage ParseEmbedImage(JToken json)
+        {
+            var url = json["url"]?.Value<string>();
+            var width = json["width"]?.Value<int>();
+            var height = json["height"]?.Value<int>();
+
+            return new EmbedImage(url, width, height);
+        }
+
+        private EmbedFooter ParseEmbedFooter(JToken json)
+        {
+            var text = json["text"].Value<string>();
+            var iconUrl = json["icon_url"]?.Value<string>();
+
+            return new EmbedFooter(text, iconUrl);
+        }
+
+        private Embed ParseEmbed(JToken json)
+        {
+            // Get basic data
+            var title = json["title"]?.Value<string>();
+            var description = json["description"]?.Value<string>();
+            var url = json["url"]?.Value<string>();
+            var timestamp = json["timestamp"]?.Value<DateTime>();
+
+            // Get color
+            var color = json["color"] != null
+                ? Color.FromArgb(json["color"].Value<int>()).ResetAlpha()
+                : Color.FromArgb(79, 84, 92); // default color
+
+            // Get author
+            var author = json["author"] != null ? ParseEmbedAuthor(json["author"]) : null;
+
+            // Get fields
+            var fields = json["fields"].EmptyIfNull().Select(ParseEmbedField).ToArray();
+
+            // Get thumbnail
+            var thumbnail = json["thumbnail"] != null ? ParseEmbedImage(json["thumbnail"]) : null;
+
+            // Get image
+            var image = json["image"] != null ? ParseEmbedImage(json["image"]) : null;
+
+            // Get footer
+            var footer = json["footer"] != null ? ParseEmbedFooter(json["footer"]) : null;
+
+            return new Embed(title, url, timestamp, color, author, description, fields, thumbnail, image, footer);
+        }
+
+        private Reaction ParseReaction(JToken json)
+        {
+            var count = json["count"].Value<int>();
+            var emojiId = json["emoji"]["id"]?.Value<string>();
+            var emojiName = json["emoji"]["name"].Value<string>();
+
+            return new Reaction(count, emojiId, emojiName);
+        }
+
+        private Message ParseMessage(JToken json)
+        {
+            // Get basic data
+            var id = json["id"].Value<string>();
+            var channelId = json["channel_id"].Value<string>();
+            var timestamp = json["timestamp"].Value<DateTime>();
+            var editedTimestamp = json["edited_timestamp"]?.Value<DateTime?>();
+            var content = json["content"].Value<string>();
+            var type = (MessageType) json["type"].Value<int>();
+
+            // Workarounds for non-default types
+            if (type == MessageType.RecipientAdd)
+                content = "Added a recipient.";
+            else if (type == MessageType.RecipientRemove)
+                content = "Removed a recipient.";
+            else if (type == MessageType.Call)
+                content = "Started a call.";
+            else if (type == MessageType.ChannelNameChange)
+                content = "Changed the channel name.";
+            else if (type == MessageType.ChannelIconChange)
+                content = "Changed the channel icon.";
+            else if (type == MessageType.ChannelPinnedMessage)
+                content = "Pinned a message.";
+            else if (type == MessageType.GuildMemberJoin)
+                content = "Joined the server.";
+
+            // Get author
+            var author = ParseUser(json["author"]);
+
+            // Get attachments
+            var attachments = json["attachments"].EmptyIfNull().Select(ParseAttachment).ToArray();
+
+            // Get embeds
+            var embeds = json["embeds"].EmptyIfNull().Select(ParseEmbed).ToArray();
+
+            // Get reactions
+            var reactions = json["reactions"].EmptyIfNull().Select(ParseReaction).ToArray();
+
+            // Get mentioned users
+            var mentionedUsers = json["mentions"].EmptyIfNull().Select(ParseUser).ToArray();
+
+            return new Message(id, channelId, type, author, timestamp, editedTimestamp, content, attachments, embeds,
+                reactions, mentionedUsers);
+        }
+    }
+}

DiscordChatExporter.Core/Services/DataService.cs

@@ -1,326 +1,257 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
-using System.Text.RegularExpressions;
+using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Models;
 using Newtonsoft.Json.Linq;
+using DiscordChatExporter.Core.Internal;
+using Failsafe;
 using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Services
 {
-    public partial class DataService : IDataService, IDisposable
+    public partial class DataService : IDisposable
     {
-        private const string ApiRoot = "https://discordapp.com/api/v6";
-
         private readonly HttpClient _httpClient = new HttpClient();
-        private readonly Dictionary<string, Role> _roleCache = new Dictionary<string, Role>();
-        private readonly Dictionary<string, Channel> _channelCache = new Dictionary<string, Channel>();
 
-        private User ParseUser(JToken token)
+        private async Task<JToken> GetApiResponseAsync(AuthToken token, string resource, string endpoint,
+            params string[] parameters)
         {
-            var id = token["id"].Value<string>();
-            var discriminator = token["discriminator"].Value<int>();
-            var name = token["username"].Value<string>();
-            var avatarHash = token["avatar"].Value<string>();
+            // Create retry policy
+            var retry = Retry.Create()
+                .Catch<HttpErrorStatusCodeException>(false, e => e.StatusCode == HttpStatusCode.ServiceUnavailable)
+                .Catch<HttpErrorStatusCodeException>(false, e => (int) e.StatusCode == 429)
+                .WithMaxTryCount(10)
+                .WithDelay(TimeSpan.FromSeconds(0.4));
 
-            return new User(id, discriminator, name, avatarHash);
-        }
-
-        private Role ParseRole(JToken token)
-        {
-            var id = token["id"].Value<string>();
-            var name = token["name"].Value<string>();
-
-            return new Role(id, name);
-        }
-
-        private Guild ParseGuild(JToken token)
-        {
-            var id = token["id"].Value<string>();
-            var name = token["name"].Value<string>();
-            var iconHash = token["icon"].Value<string>();
-            var roles = token["roles"].Select(ParseRole).ToArray();
-
-            return new Guild(id, name, iconHash, roles);
-        }
-
-        private Channel ParseChannel(JToken token)
-        {
-            // Get basic data
-            var id = token["id"].Value<string>();
-            var guildId = token["guild_id"]?.Value<string>();
-            var type = (ChannelType) token["type"].Value<int>();
-            var topic = token["topic"]?.Value<string>();
-
-            // Extract name based on type
-            string name;
-            if (type.IsEither(ChannelType.DirectTextChat, ChannelType.DirectGroupTextChat))
+            // Send request
+            return await retry.ExecuteAsync(async () =>
             {
-                guildId = Guild.DirectMessages.Id;
+                // Create request
+                const string apiRoot = "https://discordapp.com/api/v6";
+                using (var request = new HttpRequestMessage(HttpMethod.Get, $"{apiRoot}/{resource}/{endpoint}"))
+                {
+                    // Set authorization header
+                    request.Headers.Authorization = token.Type == AuthTokenType.Bot
+                        ? new AuthenticationHeaderValue("Bot", token.Value)
+                        : new AuthenticationHeaderValue(token.Value);
 
-                // Try to get name if it's set
-                name = token["name"]?.Value<string>();
+                    // Add parameters
+                    foreach (var parameter in parameters.ExceptBlank())
+                    {
+                        var key = parameter.SubstringUntil("=");
+                        var value = parameter.SubstringAfter("=");
 
-                // Otherwise use recipients as the name
-                if (name.IsBlank())
-                    name = token["recipients"].Select(ParseUser).Select(u => u.Name).JoinToString(", ");
-            }
-            else
-            {
-                name = token["name"].Value<string>();
-            }
+                        // Skip empty values
+                        if (value.IsBlank())
+                            continue;
 
-            return new Channel(id, guildId, name, topic, type);
+                        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 raw = await response.Content.ReadAsStringAsync();
+
+                        // Parse
+                        return JToken.Parse(raw);
+                    }
+                }
+            });
         }
 
-        private Message ParseMessage(JToken token)
+        public async Task<Guild> GetGuildAsync(AuthToken token, string guildId)
         {
-            // Get basic data
-            var id = token["id"].Value<string>();
-            var channelId = token["channel_id"].Value<string>();
-            var timeStamp = token["timestamp"].Value<DateTime>();
-            var editedTimeStamp = token["edited_timestamp"]?.Value<DateTime?>();
-            var content = token["content"].Value<string>();
-            var type = (MessageType) token["type"].Value<int>();
+            // Special case for direct messages pseudo-guild
+            if (guildId == Guild.DirectMessages.Id)
+                return Guild.DirectMessages;
 
-            // Workarounds for non-default types
-            if (type == MessageType.RecipientAdd)
-                content = "Added a recipient.";
-            else if (type == MessageType.RecipientRemove)
-                content = "Removed a recipient.";
-            else if (type == MessageType.Call)
-                content = "Started a call.";
-            else if (type == MessageType.ChannelNameChange)
-                content = "Changed the channel name.";
-            else if (type == MessageType.ChannelIconChange)
-                content = "Changed the channel icon.";
-            else if (type == MessageType.ChannelPinnedMessage)
-                content = "Pinned a message.";
-            else if (type == MessageType.GuildMemberJoin)
-                content = "Joined the server.";
-
-            // Get author
-            var author = ParseUser(token["author"]);
-
-            // Get attachment
-            var attachments = new List<Attachment>();
-            foreach (var attachmentJson in token["attachments"].EmptyIfNull())
-            {
-                var attachmentId = attachmentJson["id"].Value<string>();
-                var attachmentUrl = attachmentJson["url"].Value<string>();
-                var attachmentType = attachmentJson["width"] != null
-                    ? AttachmentType.Image
-                    : AttachmentType.Other;
-                var attachmentFileName = attachmentJson["filename"].Value<string>();
-                var attachmentFileSize = attachmentJson["size"].Value<long>();
-
-                var attachment = new Attachment(
-                    attachmentId, attachmentType, attachmentUrl,
-                    attachmentFileName, attachmentFileSize);
-                attachments.Add(attachment);
-            }
-
-            // Get user mentions
-            var mentionedUsers = token["mentions"].Select(ParseUser).ToArray();
-
-            // Get role mentions
-            var mentionedRoles = token["mention_roles"]
-                .Values<string>()
-                .Select(i => _roleCache.GetOrDefault(i) ?? Role.CreateDeletedRole(id))
-                .ToArray();
-
-            // Get channel mentions
-            var mentionedChannels = Regex.Matches(content, "<#(\\d+)>")
-                .Cast<Match>()
-                .Select(m => m.Groups[1].Value)
-                .ExceptBlank()
-                .Select(i => _channelCache.GetOrDefault(i) ?? Channel.CreateDeletedChannel(id))
-                .ToArray();
-
-            return new Message(id, channelId, type, author, timeStamp, editedTimeStamp, content, attachments,
-                mentionedUsers, mentionedRoles, mentionedChannels);
-        }
-
-        private async Task<string> GetStringAsync(string url)
-        {
-            using (var response = await _httpClient.GetAsync(url))
-            {
-                // 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);
-
-                // Get content
-                return await response.Content.ReadAsStringAsync();
-            }
-        }
-
-        public async Task<Guild> GetGuildAsync(string token, string guildId)
-        {
-            // Form request url
-            var url = $"{ApiRoot}/guilds/{guildId}?token={token}";
-
-            // Get response
-            var content = await GetStringAsync(url);
-
-            // Parse
-            var guild = ParseGuild(JToken.Parse(content));
-
-            // Add roles to cache
-            foreach (var role in guild.Roles)
-                _roleCache[role.Id] = role;
+            var response = await GetApiResponseAsync(token, "guilds", guildId);
+            var guild = ParseGuild(response);
 
             return guild;
         }
 
-        public async Task<Channel> GetChannelAsync(string token, string channelId)
+        public async Task<Channel> GetChannelAsync(AuthToken token, string channelId)
         {
-            // Form request url
-            var url = $"{ApiRoot}/channels/{channelId}?token={token}";
-
-            // Get response
-            var content = await GetStringAsync(url);
-
-            // Parse
-            var channel = ParseChannel(JToken.Parse(content));
-
-            // Add channel to cache
-            _channelCache[channel.Id] = channel;
+            var response = await GetApiResponseAsync(token, "channels", channelId);
+            var channel = ParseChannel(response);
 
             return channel;
         }
 
-        public async Task<IReadOnlyList<Channel>> GetGuildChannelsAsync(string token, string guildId)
+        public async Task<IReadOnlyList<Guild>> GetUserGuildsAsync(AuthToken token)
         {
-            // Form request url
-            var url = $"{ApiRoot}/guilds/{guildId}/channels?token={token}";
-
-            // Get response
-            var content = await GetStringAsync(url);
-
-            // Parse
-            var channels = JArray.Parse(content).Select(ParseChannel).ToArray();
-
-            // Add channels to cache
-            foreach (var channel in channels)
-                _channelCache[channel.Id] = channel;
-
-            return channels;
-        }
-
-        public async Task<IReadOnlyList<Guild>> GetUserGuildsAsync(string token)
-        {
-            // Form request url
-            var url = $"{ApiRoot}/users/@me/guilds?token={token}&limit=100";
-
-            // Get response
-            var content = await GetStringAsync(url);
-
-            // Parse IDs
-            var guildIds = JArray.Parse(content).Select(t => t["id"].Value<string>());
-
-            // Get full guild infos
-            var guilds = new List<Guild>();
-            foreach (var guildId in guildIds)
-            {
-                var guild = await GetGuildAsync(token, guildId);
-                guilds.Add(guild);
-            }
+            var response = await GetApiResponseAsync(token, "users", "@me/guilds", "limit=100");
+            var guilds = response.Select(ParseGuild).ToArray();
 
             return guilds;
         }
 
-        public async Task<IReadOnlyList<Channel>> GetDirectMessageChannelsAsync(string token)
+        public async Task<IReadOnlyList<Channel>> GetDirectMessageChannelsAsync(AuthToken token)
         {
-            // Form request url
-            var url = $"{ApiRoot}/users/@me/channels?token={token}";
-
-            // Get response
-            var content = await GetStringAsync(url);
-
-            // Parse
-            var channels = JArray.Parse(content).Select(ParseChannel).ToArray();
+            var response = await GetApiResponseAsync(token, "users", "@me/channels");
+            var channels = response.Select(ParseChannel).ToArray();
 
             return channels;
         }
 
-        public async Task<IReadOnlyList<Message>> GetChannelMessagesAsync(string token, string channelId,
-            DateTime? from, DateTime? to)
+        public async Task<IReadOnlyList<Channel>> GetGuildChannelsAsync(AuthToken token, string guildId)
+        {
+            var response = await GetApiResponseAsync(token, "guilds", $"{guildId}/channels");
+            var channels = response.Select(ParseChannel).ToArray();
+
+            return channels;
+        }
+
+        public async Task<IReadOnlyList<Role>> GetGuildRolesAsync(AuthToken token, string guildId)
+        {
+            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,
+            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
         {
             var result = new List<Message>();
 
-            // We are going backwards from last message to first
-            // collecting everything between them in batches
-            var beforeId = to != null ? DateTimeToSnowflake(to.Value) : null;
-            while (true)
+            // Get the last message
+            var response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
+                "limit=1", $"before={to?.ToSnowflake()}");
+            var lastMessage = response.Select(ParseMessage).FirstOrDefault();
+
+            // If the last message doesn't exist or it's outside of range - return
+            if (lastMessage == null || lastMessage.Timestamp < from)
             {
-                // Form request url
-                var url = $"{ApiRoot}/channels/{channelId}/messages?token={token}&limit=100";
-                if (beforeId.IsNotBlank())
-                    url += $"&before={beforeId}";
-
-                // Get response
-                var content = await GetStringAsync(url);
-
-                // Parse
-                var messages = JArray.Parse(content).Select(ParseMessage);
-
-                // Add messages to list
-                string currentMessageId = null;
-                foreach (var message in messages)
-                {
-                    // Break when the message is older than from date
-                    if (from != null && message.TimeStamp < from)
-                    {
-                        currentMessageId = null;
-                        break;
-                    }
-
-                    // Add message
-                    result.Add(message);
-                    currentMessageId = message.Id;
-                }
-
-                // If no messages - break
-                if (currentMessageId == null)
-                    break;
-
-                // Otherwise offset the next request
-                beforeId = currentMessageId;
+                progress?.Report(1);
+                return result;
             }
 
-            // Messages appear newest first, we need to reverse
-            result.Reverse();
+            // Get other messages
+            var offsetId = from?.ToSnowflake() ?? "0";
+            while (true)
+            {
+                // Get message batch
+                response = await GetApiResponseAsync(token, "channels", $"{channelId}/messages",
+                    "limit=100", $"after={offsetId}");
+
+                // Parse
+                var messages = response
+                    .Select(ParseMessage)
+                    .Reverse() // reverse because messages appear newest first
+                    .ToArray();
+
+                // Break if there are no messages (can happen if messages are deleted during execution)
+                if (!messages.Any())
+                    break;
+
+                // Trim messages to range (until last message)
+                var messagesInRange = messages
+                    .TakeWhile(m => m.Id != lastMessage.Id && m.Timestamp < lastMessage.Timestamp)
+                    .ToArray();
+
+                // Add to result
+                result.AddRange(messagesInRange);
+
+                // 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
+            result.Add(lastMessage);
+
+            // Report progress
+            progress?.Report(1);
 
             return result;
         }
 
-        protected virtual void Dispose(bool disposing)
+        public async Task<Mentionables> GetMentionablesAsync(AuthToken token, string guildId,
+            IEnumerable<Message> messages)
         {
-            if (disposing)
+            // 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)
             {
-                _httpClient.Dispose();
+                // 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,
+            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
+        {
+            // Get messages
+            var messages = await GetChannelMessagesAsync(token, channel.Id, from, to, progress);
+
+            // Get mentionables
+            var mentionables = await GetMentionablesAsync(token, guild.Id, messages);
+
+            return new ChatLog(guild, channel, from, to, messages, mentionables);
+        }
+
+        public async Task<ChatLog> GetChatLogAsync(AuthToken token, Channel channel,
+            DateTime? from = null, DateTime? to = 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, from, to, progress);
+        }
+
+        public async Task<ChatLog> GetChatLogAsync(AuthToken token, string channelId,
+            DateTime? from = null, DateTime? to = null, IProgress<double> progress = null)
+        {
+            // Get channel
+            var channel = await GetChannelAsync(token, channelId);
+
+            // Get the chat log
+            return await GetChatLogAsync(token, channel, from, to, progress);
         }
 
         public void Dispose()
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-    }
-
-    public partial class DataService
-    {
-        private static string DateTimeToSnowflake(DateTime dateTime)
-        {
-            const long epoch = 62135596800000;
-            var unixTime = dateTime.ToUniversalTime().Ticks / TimeSpan.TicksPerMillisecond - epoch;
-            var value = ((ulong) unixTime - 1420070400000UL) << 22;
-            return value.ToString();
+            _httpClient.Dispose();
         }
     }
 }

DiscordChatExporter.Core/Services/ExportService.Csv.cs

@@ -1,76 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using CsvHelper;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private string FormatMessageContentCsv(Message message)
-        {
-            var content = message.Content;
-
-            // New lines
-            content = content.Replace("\n", ", ");
-
-            // User mentions (<@id> and <@!id>)
-            foreach (var mentionedUser in message.MentionedUsers)
-                content = Regex.Replace(content, $"<@!?{mentionedUser.Id}>", $"@{mentionedUser}");
-
-            // Role mentions (<@&id>)
-            foreach (var mentionedRole in message.MentionedRoles)
-                content = content.Replace($"<@&{mentionedRole.Id}>", $"@{mentionedRole.Name}");
-
-            // Channel mentions (<#id>)
-            foreach (var mentionedChannel in message.MentionedChannels)
-                content = content.Replace($"<#{mentionedChannel.Id}>", $"#{mentionedChannel.Name}");
-
-            // Custom emojis (<:name:id>)
-            content = Regex.Replace(content, "<(:.*?:)\\d*>", "$1");
-
-            return content;
-        }
-
-        private async Task ExportAsCsvAsync(ChannelChatLog log, TextWriter output)
-        {
-            using (var writer = new CsvWriter(output))
-            {
-                // Headers
-                writer.WriteField("Author");
-                writer.WriteField("Date");
-                writer.WriteField("Content");
-                writer.WriteField("Attachments");
-                await writer.NextRecordAsync();
-
-                // Chat log
-                foreach (var group in log.MessageGroups)
-                {
-                    // Messages
-                    foreach (var msg in group.Messages)
-                    {
-                        // Author
-                        writer.WriteField(msg.Author.FullName);
-
-                        // Date
-                        var timeStampFormatted = msg.TimeStamp.ToString(_settingsService.DateFormat);
-                        writer.WriteField(timeStampFormatted);
-
-                        // Content
-                        var contentFormatted = msg.Content.IsNotBlank() ? FormatMessageContentCsv(msg) : null;
-                        writer.WriteField(contentFormatted);
-
-                        // Attachments
-                        var attachmentsFormatted = msg.Attachments.Select(a => a.Url).JoinToString(",");
-                        writer.WriteField(attachmentsFormatted);
-
-                        await writer.NextRecordAsync();
-                    }
-                }
-            }
-        }
-    }
-}

DiscordChatExporter.Core/Services/ExportService.Html.cs

@@ -1,208 +0,0 @@
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private string FormatMessageContentHtml(Message message)
-        {
-            // A lot of these regexes were inspired by or taken from MarkdownSharp
-
-            var content = message.Content;
-
-            // HTML-encode content
-            content = HtmlEncode(content);
-
-            // Encode multiline codeblocks (```text```)
-            content = Regex.Replace(content,
-                @"```+(?:[^`]*?\n)?([^`]+)\n?```+",
-                m => $"\x1AM{Base64Encode(m.Groups[1].Value)}\x1AM");
-
-            // Encode inline codeblocks (`text`)
-            content = Regex.Replace(content,
-                @"`([^`]+)`",
-                m => $"\x1AI{Base64Encode(m.Groups[1].Value)}\x1AI");
-
-            // Encode URLs
-            content = Regex.Replace(content,
-                @"((https?|ftp)://[-a-zA-Z0-9+&@#/%?=~_|!:,\.\[\]\(\);]*[-a-zA-Z0-9+&@#/%=~_|\[\])])(?=$|\W)",
-                m => $"\x1AL{Base64Encode(m.Groups[1].Value)}\x1AL");
-
-            // Process bold (**text**)
-            content = Regex.Replace(content, @"(\*\*)(?=\S)(.+?[*_]*)(?<=\S)\1", "<b>$2</b>");
-
-            // Process underline (__text__)
-            content = Regex.Replace(content, @"(__)(?=\S)(.+?)(?<=\S)\1", "<u>$2</u>");
-
-            // Process italic (*text* or _text_)
-            content = Regex.Replace(content, @"(\*|_)(?=\S)(.+?)(?<=\S)\1", "<i>$2</i>");
-
-            // Process strike through (~~text~~)
-            content = Regex.Replace(content, @"(~~)(?=\S)(.+?)(?<=\S)\1", "<s>$2</s>");
-
-            // Decode and process multiline codeblocks
-            content = Regex.Replace(content, "\x1AM(.*?)\x1AM",
-                m => $"<div class=\"pre\">{Base64Decode(m.Groups[1].Value)}</div>");
-
-            // Decode and process inline codeblocks
-            content = Regex.Replace(content, "\x1AI(.*?)\x1AI",
-                m => $"<span class=\"pre\">{Base64Decode(m.Groups[1].Value)}</span>");
-
-            // Decode and process URLs
-            content = Regex.Replace(content, "\x1AL(.*?)\x1AL",
-                m => $"<a href=\"{Base64Decode(m.Groups[1].Value)}\">{Base64Decode(m.Groups[1].Value)}</a>");
-
-            // New lines
-            content = content.Replace("\n", "<br />");
-
-            // Meta mentions (@everyone)
-            content = content.Replace("@everyone", "<span class=\"mention\">@everyone</span>");
-
-            // Meta mentions (@here)
-            content = content.Replace("@here", "<span class=\"mention\">@here</span>");
-
-            // User mentions (<@id> and <@!id>)
-            foreach (var mentionedUser in message.MentionedUsers)
-            {
-                content = Regex.Replace(content, $"&lt;@!?{mentionedUser.Id}&gt;",
-                    $"<span class=\"mention\" title=\"{HtmlEncode(mentionedUser.FullName)}\">" +
-                    $"@{HtmlEncode(mentionedUser.Name)}" +
-                    "</span>");
-            }
-
-            // Role mentions (<@&id>)
-            foreach (var mentionedRole in message.MentionedRoles)
-            {
-                content = content.Replace($"&lt;@&amp;{mentionedRole.Id}&gt;",
-                    "<span class=\"mention\">" +
-                    $"@{HtmlEncode(mentionedRole.Name)}" +
-                    "</span>");
-            }
-
-            // Channel mentions (<#id>)
-            foreach (var mentionedChannel in message.MentionedChannels)
-            {
-                content = content.Replace($"&lt;#{mentionedChannel.Id}&gt;",
-                    "<span class=\"mention\">" +
-                    $"#{HtmlEncode(mentionedChannel.Name)}" +
-                    "</span>");
-            }
-
-            // Custom emojis (<:name:id>)
-            content = Regex.Replace(content, "&lt;(:.*?:)(\\d*)&gt;",
-                "<img class=\"emoji\" title=\"$1\" src=\"https://cdn.discordapp.com/emojis/$2.png\" />");
-
-            return content;
-        }
-
-        private async Task ExportAsHtmlAsync(ChannelChatLog log, TextWriter output, string css)
-        {
-            // Generation info
-            await output.WriteLineAsync("<!-- https://github.com/Tyrrrz/DiscordChatExporter -->");
-
-            // Html start
-            await output.WriteLineAsync("<!DOCTYPE html>");
-            await output.WriteLineAsync("<html lang=\"en\">");
-
-            // HEAD
-            await output.WriteLineAsync("<head>");
-            await output.WriteLineAsync($"<title>{log.Guild.Name} - {log.Channel.Name}</title>");
-            await output.WriteLineAsync("<meta charset=\"utf-8\" />");
-            await output.WriteLineAsync("<meta name=\"viewport\" content=\"width=device-width\" />");
-            await output.WriteLineAsync($"<style>{css}</style>");
-            await output.WriteLineAsync("</head>");
-
-            // Body start
-            await output.WriteLineAsync("<body>");
-
-            // Guild and channel info
-            await output.WriteLineAsync("<div id=\"info\">");
-            await output.WriteLineAsync("<div class=\"info-left\">");
-            await output.WriteLineAsync($"<img class=\"guild-icon\" src=\"{log.Guild.IconUrl}\" />");
-            await output.WriteLineAsync("</div>"); // info-left
-            await output.WriteLineAsync("<div class=\"info-right\">");
-            await output.WriteLineAsync($"<div class=\"guild-name\">{log.Guild.Name}</div>");
-            await output.WriteLineAsync($"<div class=\"channel-name\">{log.Channel.Name}</div>");
-            await output.WriteLineAsync($"<div class=\"channel-topic\">{log.Channel.Topic}</div>");
-            await output.WriteLineAsync(
-                $"<div class=\"channel-messagecount\">{log.TotalMessageCount:N0} messages</div>");
-            await output.WriteLineAsync("</div>"); // info-right
-            await output.WriteLineAsync("</div>"); // info
-
-            // Chat log
-            await output.WriteLineAsync("<div id=\"log\">");
-            foreach (var group in log.MessageGroups)
-            {
-                await output.WriteLineAsync("<div class=\"msg\">");
-                await output.WriteLineAsync("<div class=\"msg-left\">");
-                await output.WriteLineAsync($"<img class=\"msg-avatar\" src=\"{group.Author.AvatarUrl}\" />");
-                await output.WriteLineAsync("</div>");
-
-                await output.WriteLineAsync("<div class=\"msg-right\">");
-                await output.WriteAsync(
-                    $"<span class=\"msg-user\" title=\"{HtmlEncode(group.Author.FullName)}\">");
-                await output.WriteAsync(HtmlEncode(group.Author.Name));
-                await output.WriteLineAsync("</span>");
-                var timeStampFormatted = HtmlEncode(group.TimeStamp.ToString(_settingsService.DateFormat));
-                await output.WriteLineAsync($"<span class=\"msg-date\">{timeStampFormatted}</span>");
-
-                // Messages
-                foreach (var message in group.Messages)
-                {
-                    // Content
-                    if (message.Content.IsNotBlank())
-                    {
-                        await output.WriteLineAsync("<div class=\"msg-content\">");
-                        var contentFormatted = FormatMessageContentHtml(message);
-                        await output.WriteAsync(contentFormatted);
-
-                        // Edited timestamp
-                        if (message.EditedTimeStamp != null)
-                        {
-                            var editedTimeStampFormatted =
-                                HtmlEncode(message.EditedTimeStamp.Value.ToString(_settingsService.DateFormat));
-                            await output.WriteAsync(
-                                $"<span class=\"msg-edited\" title=\"{editedTimeStampFormatted}\">(edited)</span>");
-                        }
-
-                        await output.WriteLineAsync("</div>"); // msg-content
-                    }
-
-                    // Attachments
-                    foreach (var attachment in message.Attachments)
-                    {
-                        if (attachment.Type == AttachmentType.Image)
-                        {
-                            await output.WriteLineAsync("<div class=\"msg-attachment\">");
-                            await output.WriteLineAsync($"<a href=\"{attachment.Url}\">");
-                            await output.WriteLineAsync($"<img class=\"msg-attachment\" src=\"{attachment.Url}\" />");
-                            await output.WriteLineAsync("</a>");
-                            await output.WriteLineAsync("</div>");
-                        }
-                        else
-                        {
-                            await output.WriteLineAsync("<div class=\"msg-attachment\">");
-                            await output.WriteLineAsync($"<a href=\"{attachment.Url}\">");
-                            var fileSizeFormatted = FormatFileSize(attachment.FileSize);
-                            await output.WriteLineAsync($"Attachment: {attachment.FileName} ({fileSizeFormatted})");
-                            await output.WriteLineAsync("</a>");
-                            await output.WriteLineAsync("</div>");
-                        }
-                    }
-                }
-
-                await output.WriteLineAsync("</div>"); // msg-right
-                await output.WriteLineAsync("</div>"); // msg
-            }
-
-            await output.WriteLineAsync("</div>"); // log
-
-            await output.WriteLineAsync("</body>");
-            await output.WriteLineAsync("</html>");
-        }
-    }
-}

DiscordChatExporter.Core/Services/ExportService.MessageGroup.cs

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

DiscordChatExporter.Core/Services/ExportService.PlainText.cs

@@ -1,79 +0,0 @@
-using System;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public partial class ExportService
-    {
-        private string FormatMessageContentPlainText(Message message)
-        {
-            var content = message.Content;
-
-            // New lines
-            content = content.Replace("\n", Environment.NewLine);
-
-            // User mentions (<@id> and <@!id>)
-            foreach (var mentionedUser in message.MentionedUsers)
-                content = Regex.Replace(content, $"<@!?{mentionedUser.Id}>", $"@{mentionedUser}");
-
-            // Role mentions (<@&id>)
-            foreach (var mentionedRole in message.MentionedRoles)
-                content = content.Replace($"<@&{mentionedRole.Id}>", $"@{mentionedRole.Name}");
-
-            // Channel mentions (<#id>)
-            foreach (var mentionedChannel in message.MentionedChannels)
-                content = content.Replace($"<#{mentionedChannel.Id}>", $"#{mentionedChannel.Name}");
-
-            // Custom emojis (<:name:id>)
-            content = Regex.Replace(content, "<(:.*?:)\\d*>", "$1");
-
-            return content;
-        }
-
-        private async Task ExportAsPlainTextAsync(ChannelChatLog log, TextWriter output)
-        {
-            // Generation info
-            await output.WriteLineAsync("https://github.com/Tyrrrz/DiscordChatExporter");
-            await output.WriteLineAsync();
-
-            // Guild and channel info
-            await output.WriteLineAsync('='.Repeat(48));
-            await output.WriteLineAsync($"Guild: {log.Guild.Name}");
-            await output.WriteLineAsync($"Channel: {log.Channel.Name}");
-            await output.WriteLineAsync($"Topic: {log.Channel.Topic}");
-            await output.WriteLineAsync($"Messages: {log.TotalMessageCount:N0}");
-            await output.WriteLineAsync('='.Repeat(48));
-            await output.WriteLineAsync();
-
-            // Chat log
-            foreach (var group in log.MessageGroups)
-            {
-                var timeStampFormatted = group.TimeStamp.ToString(_settingsService.DateFormat);
-                await output.WriteLineAsync($"{group.Author.FullName}  [{timeStampFormatted}]");
-
-                // Messages
-                foreach (var message in group.Messages)
-                {
-                    // Content
-                    if (message.Content.IsNotBlank())
-                    {
-                        var contentFormatted = FormatMessageContentPlainText(message);
-                        await output.WriteLineAsync(contentFormatted);
-                    }
-
-                    // Attachments
-                    foreach (var attachment in message.Attachments)
-                    {
-                        await output.WriteLineAsync(attachment.Url);
-                    }
-                }
-
-                await output.WriteLineAsync();
-            }
-        }
-    }
-}

DiscordChatExporter.Core/Services/ExportService.TemplateLoader.cs

@@ -0,0 +1,37 @@
+using System.Reflection;
+using DiscordChatExporter.Core.Models;
+using Scriban;
+using Scriban.Parsing;
+using Scriban.Runtime;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Services
+{
+    public partial class ExportService
+    {
+        private class TemplateLoader : ITemplateLoader
+        {
+            private const string ResourceRootNamespace = "DiscordChatExporter.Core.Resources.ExportTemplates";
+
+            public string GetPath(TemplateContext context, SourceSpan callerSpan, string templateName)
+            {
+                return $"{ResourceRootNamespace}.{templateName}";
+            }
+
+            public string GetPath(ExportFormat format)
+            {
+                return $"{ResourceRootNamespace}.{format}.{format.GetFileExtension()}";
+            }
+
+            public string Load(TemplateContext context, SourceSpan callerSpan, string templatePath)
+            {
+                return Assembly.GetExecutingAssembly().GetManifestResourceString(templatePath);
+            }
+
+            public string Load(ExportFormat format)
+            {
+                return Assembly.GetExecutingAssembly().GetManifestResourceString(GetPath(format));
+            }
+        }
+    }
+}

DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs

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

DiscordChatExporter.Core/Services/ExportService.cs

@@ -1,86 +1,130 @@
-using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Internal;
 using DiscordChatExporter.Core.Models;
+using Scriban;
+using Scriban.Runtime;
 using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Services
 {
-    public partial class ExportService : IExportService
+    public partial class ExportService
     {
-        private readonly ISettingsService _settingsService;
+        private readonly SettingsService _settingsService;
 
-        public ExportService(ISettingsService settingsService)
+        public ExportService(SettingsService settingsService)
         {
             _settingsService = settingsService;
         }
 
-        public async Task ExportAsync(ExportFormat format, string filePath, ChannelChatLog log)
+        private void ExportChatLogSingle(ChatLog chatLog, string filePath, ExportFormat format)
         {
+            // Create template loader
+            var loader = new TemplateLoader();
+
+            // Get template
+            var templateCode = loader.Load(format);
+            var template = Template.Parse(templateCode);
+
+            // Create template context
+            var context = new TemplateContext
+            {
+                TemplateLoader = loader,
+                MemberRenamer = m => m.Name,
+                MemberFilter = m => true,
+                LoopLimit = int.MaxValue,
+                StrictVariables = true
+            };
+
+            // Create template model
+            var templateModel = new TemplateModel(format, chatLog,
+                _settingsService.DateFormat, _settingsService.MessageGroupLimit);
+
+            context.PushGlobal(templateModel.GetScriptObject());
+
+            // Create directory
+            var dirPath = Path.GetDirectoryName(filePath);
+            if (dirPath.IsNotBlank())
+                Directory.CreateDirectory(dirPath);
+
+            // Render output
             using (var output = File.CreateText(filePath))
             {
-                if (format == ExportFormat.PlainText)
-                {
-                    await ExportAsPlainTextAsync(log, output);
-                }
+                // Configure output
+                context.PushOutput(new TextWriterOutput(output));
 
-                else if (format == ExportFormat.HtmlDark)
-                {
-                    var css = Assembly.GetExecutingAssembly()
-                        .GetManifestResourceString("DiscordChatExporter.Core.Resources.ExportService.DarkTheme.css");
-                    await ExportAsHtmlAsync(log, output, css);
-                }
-
-                else if (format == ExportFormat.HtmlLight)
-                {
-                    var css = Assembly.GetExecutingAssembly()
-                        .GetManifestResourceString("DiscordChatExporter.Core.Resources.ExportService.LightTheme.css");
-                    await ExportAsHtmlAsync(log, output, css);
-                }
-
-                else if (format == ExportFormat.Csv)
-                {
-                    await ExportAsCsvAsync(log, output);
-                }
-
-                else throw new ArgumentOutOfRangeException(nameof(format));
+                // Render output
+                context.Evaluate(template.Page);
             }
         }
-    }
 
-    public partial class ExportService
-    {
-        private static string Base64Encode(string str)
+        private void ExportChatLogPartitioned(IReadOnlyList<ChatLog> partitions, string filePath, ExportFormat format)
         {
-            return str.GetBytes().ToBase64();
-        }
+            // Split file path into components
+            var dirPath = Path.GetDirectoryName(filePath);
+            var fileNameWithoutExt = Path.GetFileNameWithoutExtension(filePath);
+            var fileExt = Path.GetExtension(filePath);
 
-        private static string Base64Decode(string str)
-        {
-            return str.FromBase64().GetString();
-        }
-
-        private static string HtmlEncode(string str)
-        {
-            return WebUtility.HtmlEncode(str);
-        }
-
-        private static string FormatFileSize(long fileSize)
-        {
-            string[] units = {"B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
-            double size = fileSize;
-            var unit = 0;
-
-            while (size >= 1024)
+            // Export each partition separately
+            var partitionNumber = 1;
+            foreach (var partition in partitions)
             {
-                size /= 1024;
-                ++unit;
+                // Compose new file name
+                var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Count}]{fileExt}";
+
+                // Compose full file path
+                if (dirPath.IsNotBlank())
+                    partitionFilePath = Path.Combine(dirPath, partitionFilePath);
+
+                // Export
+                ExportChatLogSingle(partition, partitionFilePath, format);
+
+                // Increment partition number
+                partitionNumber++;
+            }
+        }
+
+        private IReadOnlyList<ChatLog> SplitIntoPartitions(ChatLog chatLog, int partitionLimit)
+        {
+            var result = new List<ChatLog>();
+
+            // Loop through all messages with an increment of partition limit
+            for (var i = 0; i < chatLog.Messages.Count; i += partitionLimit)
+            {
+                // Calculate how many messages left in total
+                var remainingMessageCount = chatLog.Messages.Count - i;
+
+                // Decide how many messages are going into this partition
+                // Each partition will have the same number of messages except the last one that might have fewer (all remaining messages)
+                var partitionMessageCount = partitionLimit.ClampMax(remainingMessageCount);
+
+                // Get messages that belong to this partition
+                var partitionMessages = new List<Message>();
+                for (var j = i; j < i + partitionMessageCount; j++)
+                    partitionMessages.Add(chatLog.Messages[j]);
+
+                // Create a partition and add to list
+                var partition = new ChatLog(chatLog.Guild, chatLog.Channel, chatLog.From, chatLog.To, partitionMessages,
+                    chatLog.Mentionables);
+                result.Add(partition);
             }
 
-            return $"{size:0.#} {units[unit]}";
+            return result;
+        }
+
+        public void ExportChatLog(ChatLog chatLog, string filePath, ExportFormat format,
+            int? partitionLimit = null)
+        {
+            // If partitioning is disabled or there are fewer messages in chat log than the limit - process it without partitioning
+            if (partitionLimit == null || partitionLimit <= 0 || chatLog.Messages.Count <= partitionLimit)
+            {
+                ExportChatLogSingle(chatLog, filePath, format);
+            }
+            // Otherwise split into partitions and export separately
+            else
+            {
+                var partitions = SplitIntoPartitions(chatLog, partitionLimit.Value);
+                ExportChatLogPartitioned(partitions, filePath, format);
+            }
         }
     }
 }

DiscordChatExporter.Core/Services/IDataService.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public interface IDataService
-    {
-        Task<Guild> GetGuildAsync(string token, string guildId);
-
-        Task<Channel> GetChannelAsync(string token, string channelId);
-
-        Task<IReadOnlyList<Channel>> GetGuildChannelsAsync(string token, string guildId);
-
-        Task<IReadOnlyList<Guild>> GetUserGuildsAsync(string token);
-
-        Task<IReadOnlyList<Channel>> GetDirectMessageChannelsAsync(string token);
-
-        Task<IReadOnlyList<Message>> GetChannelMessagesAsync(string token, string channelId,
-            DateTime? from, DateTime? to);
-    }
-}

DiscordChatExporter.Core/Services/IExportService.cs

@@ -1,10 +0,0 @@
-using System.Threading.Tasks;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public interface IExportService
-    {
-        Task ExportAsync(ExportFormat format, string filePath, ChannelChatLog log);
-    }
-}

DiscordChatExporter.Core/Services/IMessageGroupService.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public interface IMessageGroupService
-    {
-        IReadOnlyList<MessageGroup> GroupMessages(IReadOnlyList<Message> messages);
-    }
-}

DiscordChatExporter.Core/Services/ISettingsService.cs

@@ -1,18 +0,0 @@
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public interface ISettingsService
-    {
-        bool IsAutoUpdateEnabled { get; set; }
-
-        string DateFormat { get; set; }
-        int MessageGroupLimit { get; set; }
-
-        string LastToken { get; set; }
-        ExportFormat LastExportFormat { get; set; }
-
-        void Load();
-        void Save();
-    }
-}

DiscordChatExporter.Core/Services/IUpdateService.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public interface IUpdateService
-    {
-        bool NeedRestart { get; set; }
-
-        Task<Version> CheckPrepareUpdateAsync();
-
-        void FinalizeUpdate();
-    }
-}

DiscordChatExporter.Core/Services/MessageGroupService.cs

@@ -1,59 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Core.Services
-{
-    public class MessageGroupService : IMessageGroupService
-    {
-        private readonly ISettingsService _settingsService;
-
-        public MessageGroupService(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-        }
-
-        public IReadOnlyList<MessageGroup> GroupMessages(IReadOnlyList<Message> messages)
-        {
-            var result = new List<MessageGroup>();
-
-            // Group adjacent messages by timestamp and author
-            var groupBuffer = new List<Message>();
-            foreach (var message in messages)
-            {
-                var groupFirst = groupBuffer.FirstOrDefault();
-
-                // Group break condition
-                var breakCondition =
-                    groupFirst != null &&
-                    (
-                        message.Author.Id != groupFirst.Author.Id ||
-                        (message.TimeStamp - groupFirst.TimeStamp).TotalHours > 1 ||
-                        message.TimeStamp.Hour != groupFirst.TimeStamp.Hour ||
-                        groupBuffer.Count >= _settingsService.MessageGroupLimit
-                    );
-
-                // If condition is true - flush buffer
-                if (breakCondition)
-                {
-                    var group = new MessageGroup(groupFirst.Author, groupFirst.TimeStamp, groupBuffer.ToArray());
-                    result.Add(group);
-                    groupBuffer.Clear();
-                }
-
-                // Add message to buffer
-                groupBuffer.Add(message);
-            }
-
-            // Add what's remaining in buffer
-            if (groupBuffer.Any())
-            {
-                var groupFirst = groupBuffer.First();
-                var group = new MessageGroup(groupFirst.Author, groupFirst.TimeStamp, groupBuffer.ToArray());
-                result.Add(group);
-            }
-
-            return result;
-        }
-    }
-}

DiscordChatExporter.Core/Services/SettingsService.cs

@@ -3,15 +3,16 @@ using Tyrrrz.Settings;
 
 namespace DiscordChatExporter.Core.Services
 {
-    public class SettingsService : SettingsManager, ISettingsService
+    public class SettingsService : SettingsManager
     {
         public bool IsAutoUpdateEnabled { get; set; } = true;
 
         public string DateFormat { get; set; } = "dd-MMM-yy hh:mm tt";
         public int MessageGroupLimit { get; set; } = 20;
 
-        public string LastToken { get; set; }
+        public AuthToken LastToken { get; set; }
         public ExportFormat LastExportFormat { get; set; } = ExportFormat.HtmlDark;
+        public int? LastPartitionLimit { get; set; }
 
         public SettingsService()
         {

DiscordChatExporter.Core/Services/UpdateService.cs

@@ -5,23 +5,20 @@ using Onova.Services;
 
 namespace DiscordChatExporter.Core.Services
 {
-    public class UpdateService : IUpdateService
+    public class UpdateService
     {
-        private readonly ISettingsService _settingsService;
-        private readonly IUpdateManager _manager;
+        private readonly SettingsService _settingsService;
+
+        private readonly IUpdateManager _updateManager = new UpdateManager(
+            new GithubPackageResolver("Tyrrrz", "DiscordChatExporter", "DiscordChatExporter.zip"),
+            new ZipPackageExtractor());
 
         private Version _updateVersion;
-        private bool _updateFinalized;
+        private bool _updaterLaunched;
 
-        public bool NeedRestart { get; set; }
-
-        public UpdateService(ISettingsService settingsService)
+        public UpdateService(SettingsService settingsService)
         {
             _settingsService = settingsService;
-
-            _manager = new UpdateManager(
-                new GithubPackageResolver("Tyrrrz", "DiscordChatExporter", "DiscordChatExporter.zip"),
-                new ZipPackageExtractor());
         }
 
         public async Task<Version> CheckPrepareUpdateAsync()
@@ -31,33 +28,33 @@ namespace DiscordChatExporter.Core.Services
                 return null;
 
             // Cleanup leftover files
-            _manager.Cleanup();
+            _updateManager.Cleanup();
 
             // Check for updates
-            var check = await _manager.CheckForUpdatesAsync();
+            var check = await _updateManager.CheckForUpdatesAsync();
             if (!check.CanUpdate)
                 return null;
 
             // Prepare the update
-            if (!_manager.IsUpdatePrepared(check.LastVersion))
-                await _manager.PrepareUpdateAsync(check.LastVersion);
+            if (!_updateManager.IsUpdatePrepared(check.LastVersion))
+                await _updateManager.PrepareUpdateAsync(check.LastVersion);
 
             return _updateVersion = check.LastVersion;
         }
 
-        public void FinalizeUpdate()
+        public void FinalizeUpdate(bool needRestart)
         {
             // Check if an update is pending
             if (_updateVersion == null)
                 return;
 
-            // Check if the update has already been finalized
-            if (_updateFinalized)
+            // Check if the updater has already been launched
+            if (_updaterLaunched)
                 return;
 
             // Launch the updater
-            _manager.LaunchUpdater(_updateVersion, NeedRestart);
-            _updateFinalized = true;
+            _updateManager.LaunchUpdater(_updateVersion, needRestart);
+            _updaterLaunched = true;
         }
     }
 }

DiscordChatExporter.Gui/App.xaml

@@ -2,17 +2,19 @@
     x:Class="DiscordChatExporter.Gui.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
     xmlns:local="clr-namespace:DiscordChatExporter.Gui"
-    Exit="App_Exit"
-    Startup="App_Startup"
-    StartupUri="Views/MainWindow.xaml">
+    xmlns:s="https://github.com/canton7/Stylet">
     <Application.Resources>
-        <ResourceDictionary>
+        <s:ApplicationLoader>
+            <!--  Bootstrapper  -->
+            <s:ApplicationLoader.Bootstrapper>
+                <local:Bootstrapper />
+            </s:ApplicationLoader.Bootstrapper>
+
+            <!--  Merged dictionaries  -->
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Tyrrrz.WpfExtensions;component/ConvertersDictionary.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <!--  Colors  -->
@@ -75,9 +77,16 @@
                 Color="{DynamicResource InverseTextColor}" />
 
             <!--  Styles  -->
-            <Style TargetType="{x:Type Image}">
+            <Style x:Key="MaterialDesignRoot" TargetType="{x:Type Control}">
+                <Setter Property="FontFamily" Value="{DynamicResource MaterialDesignFont}" />
                 <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
-                <Setter Property="RenderOptions.EdgeMode" Value="Aliased" />
+                <Setter Property="SnapsToDevicePixels" Value="True" />
+                <Setter Property="TextElement.FontSize" Value="13" />
+                <Setter Property="TextElement.FontWeight" Value="Regular" />
+                <Setter Property="TextElement.Foreground" Value="{DynamicResource SecondaryTextBrush}" />
+                <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
+                <Setter Property="TextOptions.TextRenderingMode" Value="Auto" />
+                <Setter Property="UseLayoutRounding" Value="True" />
             </Style>
 
             <Style BasedOn="{StaticResource MaterialDesignLinearProgressBar}" TargetType="{x:Type ProgressBar}">
@@ -96,11 +105,35 @@
                 <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
             </Style>
 
-            <!--  Converters  -->
-            <converters:ExportFormatToStringConverter x:Key="ExportFormatToStringConverter" />
+            <Style BasedOn="{StaticResource MaterialDesignDatePicker}" TargetType="{x:Type DatePicker}">
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+            </Style>
 
-            <!--  Container  -->
-            <local:Container x:Key="Container" />
-        </ResourceDictionary>
+            <Style
+                x:Key="MaterialDesignFlatDarkButton"
+                BasedOn="{StaticResource MaterialDesignFlatButton}"
+                TargetType="{x:Type Button}">
+                <Style.Resources>
+                    <SolidColorBrush x:Key="MaterialDesignFlatButtonClick" Color="#4C4C4C" />
+                </Style.Resources>
+
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
+            </Style>
+
+            <Style
+                x:Key="MaterialDesignFlatActionToggleButton"
+                BasedOn="{StaticResource MaterialDesignActionToggleButton}"
+                TargetType="{x:Type ToggleButton}">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
+
+                <Style.Triggers>
+                    <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesignFlatButtonClick}" />
+                        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFlatButtonClick}" />
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
+        </s:ApplicationLoader>
     </Application.Resources>
 </Application>

DiscordChatExporter.Gui/App.xaml.cs

@@ -1,19 +1,6 @@
-using System.Windows;
-
-namespace DiscordChatExporter.Gui
+namespace DiscordChatExporter.Gui
 {
     public partial class App
-    {
-        private Container Container => (Container) Resources["Container"];
-
-        private void App_Startup(object sender, StartupEventArgs e)
-        {
-            Container.Init();
-        }
-
-        private void App_Exit(object sender, ExitEventArgs e)
-        {
-            Container.Cleanup();
-        }
+    {        
     }
 }

DiscordChatExporter.Gui/Behaviors/ChannelViewModelMultiSelectionListBoxBehavior.cs

@@ -0,0 +1,8 @@
+using DiscordChatExporter.Gui.ViewModels.Components;
+
+namespace DiscordChatExporter.Gui.Behaviors
+{
+    public class ChannelViewModelMultiSelectionListBoxBehavior : MultiSelectionListBoxBehavior<ChannelViewModel>
+    {
+    }
+}

DiscordChatExporter.Gui/Behaviors/MultiSelectionListBoxBehavior.cs

@@ -0,0 +1,92 @@
+using System.Collections;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Interactivity;
+
+namespace DiscordChatExporter.Gui.Behaviors
+{
+    public class MultiSelectionListBoxBehavior<T> : Behavior<ListBox>
+    {
+        public static readonly DependencyProperty SelectedItemsProperty =
+            DependencyProperty.Register(nameof(SelectedItems), typeof(IList),
+                typeof(MultiSelectionListBoxBehavior<T>),
+                new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+                    OnSelectedItemsChanged));
+
+        private static void OnSelectedItemsChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
+        {
+            var behavior = (MultiSelectionListBoxBehavior<T>) sender;
+            if (behavior._modelHandled) return;
+
+            if (behavior.AssociatedObject == null)
+                return;
+
+            behavior._modelHandled = true;
+            behavior.SelectItems();
+            behavior._modelHandled = false;
+        }
+
+        private bool _viewHandled;
+        private bool _modelHandled;
+
+        public IList SelectedItems
+        {
+            get => (IList) GetValue(SelectedItemsProperty);
+            set => SetValue(SelectedItemsProperty, value);
+        }
+
+        // Propagate selected items from model to view
+        private void SelectItems()
+        {
+            _viewHandled = true;
+
+            AssociatedObject.SelectedItems.Clear();
+            if (SelectedItems != null)
+            {
+                foreach (var item in SelectedItems)
+                    AssociatedObject.SelectedItems.Add(item);
+            }
+
+            _viewHandled = false;
+        }
+
+        // Propagate selected items from view to model
+        private void OnListBoxSelectionChanged(object sender, SelectionChangedEventArgs args)
+        {
+            if (_viewHandled) return;
+            if (AssociatedObject.Items.SourceCollection == null) return;
+
+            SelectedItems = AssociatedObject.SelectedItems.Cast<T>().ToArray();
+        }
+
+        // Re-select items when the set of items changes
+        private void OnListBoxItemsChanged(object sender, NotifyCollectionChangedEventArgs args)
+        {
+            if (_viewHandled) return;
+            if (AssociatedObject.Items.SourceCollection == null) return;
+            SelectItems();
+        }
+
+        protected override void OnAttached()
+        {
+            base.OnAttached();
+
+            AssociatedObject.SelectionChanged += OnListBoxSelectionChanged;
+            ((INotifyCollectionChanged) AssociatedObject.Items).CollectionChanged += OnListBoxItemsChanged;
+        }
+
+        /// <inheritdoc />
+        protected override void OnDetaching()
+        {
+            base.OnDetaching();
+
+            if (AssociatedObject != null)
+            {
+                AssociatedObject.SelectionChanged -= OnListBoxSelectionChanged;
+                ((INotifyCollectionChanged) AssociatedObject.Items).CollectionChanged -= OnListBoxItemsChanged;
+            }
+        }
+    }
+}

DiscordChatExporter.Gui/Bootstrapper.cs

@@ -0,0 +1,34 @@
+using System.Windows;
+using System.Windows.Threading;
+using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Gui.ViewModels;
+using DiscordChatExporter.Gui.ViewModels.Framework;
+using Stylet;
+using StyletIoC;
+
+namespace DiscordChatExporter.Gui
+{
+    public class Bootstrapper : Bootstrapper<RootViewModel>
+    {
+        protected override void ConfigureIoC(IStyletIoCBuilder builder)
+        {
+            base.ConfigureIoC(builder);
+
+            // Autobind services in the .Core assembly
+            builder.Autobind(typeof(DataService).Assembly);
+
+            // Bind settings as singleton
+            builder.Bind<SettingsService>().ToSelf().InSingletonScope();
+
+            // Bind view model factory
+            builder.Bind<IViewModelFactory>().ToAbstractFactory();
+        }
+
+        protected override void OnUnhandledException(DispatcherUnhandledExceptionEventArgs e)
+        {
+            base.OnUnhandledException(e);
+
+            MessageBox.Show(e.Exception.ToString(), "Error occured", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+    }
+}

DiscordChatExporter.Gui/Container.cs

@@ -1,41 +0,0 @@
-using CommonServiceLocator;
-using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Gui.ViewModels;
-using GalaSoft.MvvmLight.Ioc;
-
-namespace DiscordChatExporter.Gui
-{
-    public class Container
-    {
-        public IExportSetupViewModel ExportSetupViewModel => Resolve<IExportSetupViewModel>();
-        public IMainViewModel MainViewModel => Resolve<IMainViewModel>();
-        public ISettingsViewModel SettingsViewModel => Resolve<ISettingsViewModel>();
-
-        private T Resolve<T>(string key = null)
-        {
-            return ServiceLocator.Current.GetInstance<T>(key);
-        }
-
-        public void Init()
-        {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-            SimpleIoc.Default.Reset();
-
-            // Services
-            SimpleIoc.Default.Register<IDataService, DataService>();
-            SimpleIoc.Default.Register<IExportService, ExportService>();
-            SimpleIoc.Default.Register<IMessageGroupService, MessageGroupService>();
-            SimpleIoc.Default.Register<ISettingsService, SettingsService>();
-            SimpleIoc.Default.Register<IUpdateService, UpdateService>();
-
-            // View models
-            SimpleIoc.Default.Register<IExportSetupViewModel, ExportSetupViewModel>(true);
-            SimpleIoc.Default.Register<IMainViewModel, MainViewModel>(true);
-            SimpleIoc.Default.Register<ISettingsViewModel, SettingsViewModel>(true);
-        }
-
-        public void Cleanup()
-        {
-        }
-    }
-}

DiscordChatExporter.Gui/Converters/ExportFormatToStringConverter.cs

@@ -8,10 +8,12 @@ namespace DiscordChatExporter.Gui.Converters
     [ValueConversion(typeof(ExportFormat), typeof(string))]
     public class ExportFormatToStringConverter : IValueConverter
     {
+        public static ExportFormatToStringConverter Instance { get; } = new ExportFormatToStringConverter();
+
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var format = (ExportFormat) value;
-            return format.GetDisplayName();
+            var format = value as ExportFormat?;
+            return format?.GetDisplayName();
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -42,39 +42,11 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
-    </Reference>
-    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
-    </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.0.1044, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.2.4.0.1044\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MvvmLightLibs.5.4.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="Tyrrrz.Extensions, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Tyrrrz.Extensions.1.5.0\lib\net45\Tyrrrz.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="Tyrrrz.Settings, Version=1.3.2.0, Culture=neutral, PublicKeyToken=null" />
-    <Reference Include="Tyrrrz.WpfExtensions, Version=1.0.6269.37170, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Tyrrrz.WpfExtensions.1.0.5\lib\net45\Tyrrrz.WpfExtensions.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -83,26 +55,27 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Behaviors\ChannelViewModelMultiSelectionListBoxBehavior.cs" />
+    <Compile Include="Behaviors\MultiSelectionListBoxBehavior.cs" />
+    <Compile Include="Bootstrapper.cs" />
     <Compile Include="Converters\ExportFormatToStringConverter.cs" />
-    <Compile Include="Messages\ShowExportSetupMessage.cs" />
-    <Compile Include="Messages\ShowNotificationMessage.cs" />
-    <Compile Include="Messages\ShowSettingsMessage.cs" />
-    <Compile Include="Messages\StartExportMessage.cs" />
-    <Compile Include="ViewModels\ExportSetupViewModel.cs" />
-    <Compile Include="ViewModels\IExportSetupViewModel.cs" />
-    <Compile Include="ViewModels\ISettingsViewModel.cs" />
-    <Compile Include="ViewModels\SettingsViewModel.cs" />
-    <Compile Include="Container.cs" />
-    <Compile Include="ViewModels\IMainViewModel.cs" />
-    <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="Views\ExportSetupDialog.xaml.cs">
-      <DependentUpon>ExportSetupDialog.xaml</DependentUpon>
+    <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\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
+    <Compile Include="Views\RootView.xaml.cs">
+      <DependentUpon>RootView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\SettingsDialog.xaml.cs">
-      <DependentUpon>SettingsDialog.xaml</DependentUpon>
+    <Compile Include="Views\Dialogs\SettingsView.xaml.cs">
+      <DependentUpon>SettingsView.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -118,10 +91,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="..\favicon.ico" />
@@ -137,19 +106,45 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="Views\ExportSetupDialog.xaml">
+    <Page Include="Views\Dialogs\ExportSetupView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\MainWindow.xaml">
+    <Page Include="Views\RootView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\SettingsDialog.xaml">
+    <Page Include="Views\Dialogs\SettingsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Gress">
+      <Version>1.0.2</Version>
+    </PackageReference>
+    <PackageReference Include="MaterialDesignColors">
+      <Version>1.1.3</Version>
+    </PackageReference>
+    <PackageReference Include="MaterialDesignThemes">
+      <Version>2.5.0.1205</Version>
+    </PackageReference>
+    <PackageReference Include="Ookii.Dialogs.Wpf">
+      <Version>1.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="PropertyChanged.Fody">
+      <Version>2.6.0</Version>
+    </PackageReference>
+    <PackageReference Include="Stylet">
+      <Version>1.1.22</Version>
+    </PackageReference>
+    <PackageReference Include="System.Windows.Interactivity.WPF">
+      <Version>2.0.20525</Version>
+    </PackageReference>
+    <PackageReference Include="Tyrrrz.Extensions">
+      <Version>1.5.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

DiscordChatExporter.Gui/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <PropertyChanged />
+</Weavers>

DiscordChatExporter.Gui/FodyWeavers.xsd

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="EventInvokerNames" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="CheckForEquality" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

DiscordChatExporter.Gui/Messages/ShowExportSetupMessage.cs

@@ -1,17 +0,0 @@
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Gui.Messages
-{
-    public class ShowExportSetupMessage
-    {
-        public Guild Guild { get; }
-
-        public Channel Channel { get; }
-
-        public ShowExportSetupMessage(Guild guild, Channel channel)
-        {
-            Guild = guild;
-            Channel = channel;
-        }
-    }
-}

DiscordChatExporter.Gui/Messages/ShowNotificationMessage.cs

@@ -1,25 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Gui.Messages
-{
-    public class ShowNotificationMessage
-    {
-        public string Message { get; }
-
-        public string CallbackCaption { get; }
-
-        public Action Callback { get; }
-
-        public ShowNotificationMessage(string message)
-        {
-            Message = message;
-        }
-
-        public ShowNotificationMessage(string message, string callbackCaption, Action callback)
-            : this(message)
-        {
-            CallbackCaption = callbackCaption;
-            Callback = callback;
-        }
-    }
-}

DiscordChatExporter.Gui/Messages/ShowSettingsMessage.cs

@@ -1,6 +0,0 @@
-namespace DiscordChatExporter.Gui.Messages
-{
-    public class ShowSettingsMessage
-    {
-    }
-}

DiscordChatExporter.Gui/Messages/StartExportMessage.cs

@@ -1,28 +0,0 @@
-using System;
-using DiscordChatExporter.Core.Models;
-
-namespace DiscordChatExporter.Gui.Messages
-{
-    public class StartExportMessage
-    {
-        public Channel Channel { get; }
-
-        public string FilePath { get; }
-
-        public ExportFormat Format { get; }
-
-        public DateTime? From { get; }
-
-        public DateTime? To { get; }
-
-        public StartExportMessage(Channel channel, string filePath, ExportFormat format,
-            DateTime? from, DateTime? to)
-        {
-            Channel = channel;
-            FilePath = filePath;
-            Format = format;
-            From = from;
-            To = to;
-        }
-    }
-}

DiscordChatExporter.Gui/Properties/AssemblyInfo.cs

@@ -3,5 +3,5 @@
 [assembly: AssemblyTitle("DiscordChatExporter")]
 [assembly: AssemblyCompany("Tyrrrz")]
 [assembly: AssemblyCopyright("Copyright (c) 2017-2018 Alexey Golub")]
-[assembly: AssemblyVersion("2.4.1")]
-[assembly: AssemblyFileVersion("2.4.1")]
+[assembly: AssemblyVersion("2.9.1")]
+[assembly: AssemblyFileVersion("2.9.1")]

DiscordChatExporter.Gui/ViewModels/Components/ChannelViewModel.cs

@@ -0,0 +1,17 @@
+using DiscordChatExporter.Core.Models;
+using Stylet;
+
+namespace DiscordChatExporter.Gui.ViewModels.Components
+{
+    public partial class ChannelViewModel : PropertyChangedBase
+    {
+        public Channel Model { get; set; }
+
+        public string Category { get; set; }
+    }
+
+    public partial class ChannelViewModel
+    {
+        public static implicit operator Channel(ChannelViewModel viewModel) => viewModel.Model;
+    }
+}

DiscordChatExporter.Gui/ViewModels/Components/GuildViewModel.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using DiscordChatExporter.Core.Models;
+using Stylet;
+
+namespace DiscordChatExporter.Gui.ViewModels.Components
+{
+    public partial class GuildViewModel : PropertyChangedBase
+    {
+        public Guild Model { get; set; }
+
+        public IReadOnlyList<ChannelViewModel> Channels { get; set; }
+    }
+
+    public partial class GuildViewModel
+    {
+        public static implicit operator Guild(GuildViewModel viewModel) => viewModel.Model;
+    }
+}

DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using DiscordChatExporter.Core.Helpers;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Core.Services;
+using DiscordChatExporter.Gui.ViewModels.Components;
+using DiscordChatExporter.Gui.ViewModels.Framework;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Gui.ViewModels.Dialogs
+{
+    public class ExportSetupViewModel : DialogScreen
+    {
+        private readonly DialogManager _dialogManager;
+        private readonly SettingsService _settingsService;
+
+        public GuildViewModel Guild { get; set; }
+
+        public IReadOnlyList<ChannelViewModel> Channels { get; set; }
+
+        public bool IsSingleChannel => Channels.Count == 1;
+
+        public string OutputPath { get; set; }
+
+        public IReadOnlyList<ExportFormat> AvailableFormats =>
+            Enum.GetValues(typeof(ExportFormat)).Cast<ExportFormat>().ToArray();
+
+        public ExportFormat SelectedFormat { get; set; } = ExportFormat.HtmlDark;
+
+        public DateTime? From { get; set; }
+
+        public DateTime? To { get; set; }
+
+        public int? PartitionLimit { get; set; }
+
+        public ExportSetupViewModel(DialogManager dialogManager, SettingsService settingsService)
+        {
+            _dialogManager = dialogManager;
+            _settingsService = settingsService;
+        }
+
+        protected override void OnViewLoaded()
+        {
+            base.OnViewLoaded();
+
+            // Persist preferences
+            SelectedFormat = _settingsService.LastExportFormat;
+            PartitionLimit = _settingsService.LastPartitionLimit;
+        }
+
+        public void Confirm()
+        {
+            // Persist preferences
+            _settingsService.LastExportFormat = SelectedFormat;
+            _settingsService.LastPartitionLimit = PartitionLimit;
+
+            // Clamp 'from' and 'to' values
+            if (From > To)
+                From = To;
+            if (To < From)
+                To = From;
+
+            // If single channel - prompt file path
+            if (IsSingleChannel)
+            {
+                // Get single channel
+                var channel = Channels.Single();
+
+                // Generate default file name
+                var defaultFileName = ExportHelper.GetDefaultExportFileName(SelectedFormat, Guild, channel, From, To);
+
+                // Generate filter
+                var ext = SelectedFormat.GetFileExtension();
+                var filter = $"{ext.ToUpperInvariant()} files|*.{ext}";
+
+                // Prompt user
+                OutputPath = _dialogManager.PromptSaveFilePath(filter, defaultFileName);
+            }
+            // If multiple channels - prompt dir path
+            else
+            {
+                // Prompt user
+                OutputPath = _dialogManager.PromptDirectoryPath();
+            }
+
+            // If canceled - return
+            if (OutputPath.IsBlank())
+                return;
+
+            // Close dialog
+            Close(true);
+        }
+    }
+}

DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs

@@ -1,12 +1,12 @@
 using DiscordChatExporter.Core.Services;
-using GalaSoft.MvvmLight;
+using DiscordChatExporter.Gui.ViewModels.Framework;
 using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Gui.ViewModels
+namespace DiscordChatExporter.Gui.ViewModels.Dialogs
 {
-    public class SettingsViewModel : ViewModelBase, ISettingsViewModel
+    public class SettingsViewModel : DialogScreen
     {
-        private readonly ISettingsService _settingsService;
+        private readonly SettingsService _settingsService;
 
         public bool IsAutoUpdateEnabled
         {
@@ -26,7 +26,7 @@ namespace DiscordChatExporter.Gui.ViewModels
             set => _settingsService.MessageGroupLimit = value.ClampMin(0);
         }
 
-        public SettingsViewModel(ISettingsService settingsService)
+        public SettingsViewModel(SettingsService settingsService)
         {
             _settingsService = settingsService;
         }

DiscordChatExporter.Gui/ViewModels/ExportSetupViewModel.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using DiscordChatExporter.Core.Models;
-using DiscordChatExporter.Core.Services;
-using DiscordChatExporter.Gui.Messages;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.CommandWpf;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Gui.ViewModels
-{
-    public class ExportSetupViewModel : ViewModelBase, IExportSetupViewModel
-    {
-        private readonly ISettingsService _settingsService;
-
-        private string _filePath;
-        private ExportFormat _format;
-        private DateTime? _from;
-        private DateTime? _to;
-
-        public Guild Guild { get; private set; }
-
-        public Channel Channel { get; private set; }
-
-        public string FilePath
-        {
-            get => _filePath;
-            set
-            {
-                Set(ref _filePath, value);
-                ExportCommand.RaiseCanExecuteChanged();
-            }
-        }
-
-        public IReadOnlyList<ExportFormat> AvailableFormats { get; }
-
-        public ExportFormat SelectedFormat
-        {
-            get => _format;
-            set
-            {
-                Set(ref _format, value);
-
-                // Replace extension in path
-                var newExt = value.GetFileExtension();
-                if (FilePath != null && !FilePath.EndsWith(newExt))
-                    FilePath = FilePath.SubstringUntilLast(".") + "." + newExt;
-            }
-        }
-
-        public DateTime? From
-        {
-            get => _from;
-            set => Set(ref _from, value);
-        }
-
-        public DateTime? To
-        {
-            get => _to;
-            set => Set(ref _to, value);
-        }
-
-        // Commands
-        public RelayCommand ExportCommand { get; }
-
-        public ExportSetupViewModel(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-
-            // Defaults
-            AvailableFormats = Enum.GetValues(typeof(ExportFormat)).Cast<ExportFormat>().ToArray();
-
-            // Commands
-            ExportCommand = new RelayCommand(Export, () => FilePath.IsNotBlank());
-
-            // Messages
-            MessengerInstance.Register<ShowExportSetupMessage>(this, m =>
-            {
-                Guild = m.Guild;
-                Channel = m.Channel;
-                SelectedFormat = _settingsService.LastExportFormat;
-                FilePath = $"{Guild.Name} - {Channel.Name}.{SelectedFormat.GetFileExtension()}"
-                    .Replace(Path.GetInvalidFileNameChars(), '_');
-                From = null;
-                To = null;
-            });
-        }
-
-        private void Export()
-        {
-            // Save format
-            _settingsService.LastExportFormat = SelectedFormat;
-
-            // Start export
-            MessengerInstance.Send(new StartExportMessage(Channel, FilePath, SelectedFormat, From, To));
-        }
-    }
-}

DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs

@@ -0,0 +1,71 @@
+using System.IO;
+using System.Threading.Tasks;
+using MaterialDesignThemes.Wpf;
+using Microsoft.Win32;
+using Ookii.Dialogs.Wpf;
+using Stylet;
+
+namespace DiscordChatExporter.Gui.ViewModels.Framework
+{
+    public class DialogManager
+    {
+        private readonly IViewManager _viewManager;
+
+        public DialogManager(IViewManager viewManager)
+        {
+            _viewManager = viewManager;
+        }
+
+        public async Task<T> ShowDialogAsync<T>(DialogScreen<T> dialogScreen)
+        {
+            // Get the view that renders this viewmodel
+            var view = _viewManager.CreateAndBindViewForModelIfNecessary(dialogScreen);
+
+            // Set up event routing that will close the view when called from viewmodel
+            DialogOpenedEventHandler onDialogOpened = (sender, e) =>
+            {
+                // Delegate to close the dialog and unregister event handler
+                void OnScreenClosed(object o, CloseEventArgs args)
+                {
+                    e.Session.Close();
+                    dialogScreen.Closed -= OnScreenClosed;
+                }
+
+                dialogScreen.Closed += OnScreenClosed;
+            };
+
+            // Show view
+            await DialogHost.Show(view, onDialogOpened);
+
+            // Return the result
+            return dialogScreen.DialogResult;
+        }
+
+        public string PromptSaveFilePath(string filter = "All files|*.*", string initialFilePath = "")
+        {
+            // Create dialog
+            var dialog = new SaveFileDialog
+            {
+                Filter = filter,
+                AddExtension = true,
+                FileName = initialFilePath,
+                DefaultExt = Path.GetExtension(initialFilePath) ?? ""
+            };
+
+            // Show dialog and return result
+            return dialog.ShowDialog() == true ? dialog.FileName : null;
+        }
+
+        public string PromptDirectoryPath(string initialDirPath = "")
+        {
+            // Create dialog
+            var dialog = new VistaFolderBrowserDialog
+            {
+                SelectedPath = initialDirPath
+            };
+
+            // Show dialog and return result
+            return dialog.ShowDialog() == true ? dialog.SelectedPath : null;
+        }
+    }
+}

DiscordChatExporter.Gui/ViewModels/Framework/DialogScreen.cs

@@ -0,0 +1,26 @@
+using Stylet;
+
+namespace DiscordChatExporter.Gui.ViewModels.Framework
+{
+    public abstract class DialogScreen<T> : Screen
+    {
+        public T DialogResult { get; private set; }
+
+        public void Close(T dialogResult = default(T))
+        {
+            // Set the result
+            DialogResult = dialogResult;
+
+            // 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();
+        }
+    }
+
+    public abstract class DialogScreen : DialogScreen<bool?>
+    {        
+    }
+}

DiscordChatExporter.Gui/ViewModels/Framework/Extensions.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using DiscordChatExporter.Core.Models;
+using DiscordChatExporter.Gui.ViewModels.Components;
+using DiscordChatExporter.Gui.ViewModels.Dialogs;
+
+namespace DiscordChatExporter.Gui.ViewModels.Framework
+{
+    public static class Extensions
+    {
+        public static ChannelViewModel CreateChannelViewModel(this IViewModelFactory factory, Channel model,
+            string category = null)
+        {
+            var viewModel = factory.CreateChannelViewModel();
+            viewModel.Model = model;
+            viewModel.Category = category;
+
+            return viewModel;
+        }
+
+        public static GuildViewModel CreateGuildViewModel(this IViewModelFactory factory, Guild model,
+            IReadOnlyList<ChannelViewModel> channels)
+        {
+            var viewModel = factory.CreateGuildViewModel();
+            viewModel.Model = model;
+            viewModel.Channels = channels;
+
+            return viewModel;
+        }
+
+        public static ExportSetupViewModel CreateExportSetupViewModel(this IViewModelFactory factory,
+            GuildViewModel guild, IReadOnlyList<ChannelViewModel> channels)
+        {
+            var viewModel = factory.CreateExportSetupViewModel();
+            viewModel.Guild = guild;
+            viewModel.Channels = channels;
+
+            return viewModel;
+        }
+
+        public static ExportSetupViewModel CreateExportSetupViewModel(this IViewModelFactory factory,
+            GuildViewModel guild, ChannelViewModel channel)
+            => factory.CreateExportSetupViewModel(guild, new[] {channel});
+    }
+}

DiscordChatExporter.Gui/ViewModels/Framework/IViewModelFactory.cs

@@ -0,0 +1,17 @@
+using DiscordChatExporter.Gui.ViewModels.Components;
+using DiscordChatExporter.Gui.ViewModels.Dialogs;
+
+namespace DiscordChatExporter.Gui.ViewModels.Framework
+{
+    // Used to instantiate new view models while making use of dependency injection
+    public interface IViewModelFactory
+    {
+        ChannelViewModel CreateChannelViewModel();
+
+        GuildViewModel CreateGuildViewModel();
+
+        ExportSetupViewModel CreateExportSetupViewModel();
+
+        SettingsViewModel CreateSettingsViewModel();
+    }
+}

DiscordChatExporter.Gui/ViewModels/IExportSetupViewModel.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Models;
-using GalaSoft.MvvmLight.CommandWpf;
-
-namespace DiscordChatExporter.Gui.ViewModels
-{
-    public interface IExportSetupViewModel
-    {
-        Guild Guild { get; }
-        Channel Channel { get; }
-        string FilePath { get; set; }
-        IReadOnlyList<ExportFormat> AvailableFormats { get; }
-        ExportFormat SelectedFormat { get; set; }
-        DateTime? From { get; set; }
-        DateTime? To { get; set; }
-
-        RelayCommand ExportCommand { get; }
-    }
-}

DiscordChatExporter.Gui/ViewModels/IMainViewModel.cs

@@ -1,25 +0,0 @@
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Models;
-using GalaSoft.MvvmLight.CommandWpf;
-
-namespace DiscordChatExporter.Gui.ViewModels
-{
-    public interface IMainViewModel
-    {
-        bool IsBusy { get; }
-        bool IsDataAvailable { get; }
-
-        string Token { get; set; }
-
-        IReadOnlyList<Guild> AvailableGuilds { get; }
-        Guild SelectedGuild { get; set; }
-        IReadOnlyList<Channel> AvailableChannels { get; }
-
-        RelayCommand ViewLoadedCommand { get; }
-        RelayCommand ViewClosedCommand { get; }
-        RelayCommand PullDataCommand { get; }
-        RelayCommand ShowSettingsCommand { get; }
-        RelayCommand ShowAboutCommand { get; }
-        RelayCommand<Channel> ShowExportSetupCommand { get; }
-    }
-}