Update version

Fixes a part of #146

Changelog.md

@@ -1,3 +1,8 @@
+### v2.12.1 (12-Apr-2019)
+
+- [GUI] Fixed an issue where the app crashed when trying to export multiple channels.
+- [HTML] Fixed an issue where some of the emojis were rendered via Twemoji while Discord renders them as plain text.
+
 ### v2.12 (11-Apr-2019)
 
 - Improved markdown parsing performance which speeds up the final stage of exporting by around 4.5 times.

Deploy/Choco/discordchatexporter.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>discordchatexporter</id>
     <title>DiscordChatExporter</title>
-    <version>2.12</version>
+    <version>2.12.1</version>
     <owners>Tyrrrz</owners>
     <authors>Tyrrrz</authors>
     <copyright>Copyright (C) Alexey Golub</copyright>

Deploy/Choco/tools/chocolateyinstall.ps1

@@ -7,7 +7,7 @@ $installDirPath = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 $packageArgs = @{
     packageName   = $packageName
     unzipLocation = $installDirPath
-    url           = 'https://github.com/Tyrrrz/DiscordChatExporter/releases/download/2.12/DiscordChatExporter.zip'
+    url           = 'https://github.com/Tyrrrz/DiscordChatExporter/releases/download/2.12.1/DiscordChatExporter.zip'
 }
 Install-ChocolateyZipPackage @packageArgs
 
@@ -19,6 +19,6 @@ New-Item (Join-Path $installDirPath "DiscordChatExporter.exe.gui") -ItemType Fil
 $packageArgs = @{
     packageName   = $packageName
     unzipLocation = $installDirPath
-    url           = 'https://github.com/Tyrrrz/DiscordChatExporter/releases/download/2.12/DiscordChatExporter.CLI.zip'
+    url           = 'https://github.com/Tyrrrz/DiscordChatExporter/releases/download/2.12.1/DiscordChatExporter.CLI.zip'
 }
 Install-ChocolateyZipPackage @packageArgs

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
-    <Version>2.12</Version>
+    <Version>2.12.1</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Alexey Golub</Copyright>
     <ApplicationIcon>..\favicon.ico</ApplicationIcon>
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.3.0" />
     <PackageReference Include="Stylet" Version="1.1.22" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs

@@ -24,7 +24,7 @@ namespace DiscordChatExporter.Cli.Verbs
             var exportService = Container.Instance.Get<ExportService>();
 
             // Configure settings
-            if (!Options.DateFormat.EmptyIfNull().IsWhiteSpace())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                 settingsService.DateFormat = Options.DateFormat;
 
             // Track progress
@@ -37,7 +37,7 @@ namespace DiscordChatExporter.Cli.Verbs
 
                 // Generate file path if not set or is a directory
                 var filePath = Options.OutputPath;
-                if (filePath.EmptyIfNull().IsWhiteSpace() || ExportHelper.IsDirectoryPath(filePath))
+                if (filePath.IsNullOrWhiteSpace() || ExportHelper.IsDirectoryPath(filePath))
                 {
                     // Generate default file name
                     var fileName = ExportHelper.GetDefaultExportFileName(Options.ExportFormat, chatLog.Guild,

DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs

@@ -27,7 +27,7 @@ namespace DiscordChatExporter.Cli.Verbs
             var exportService = Container.Instance.Get<ExportService>();
 
             // Configure settings
-            if (!Options.DateFormat.EmptyIfNull().IsWhiteSpace())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                 settingsService.DateFormat = Options.DateFormat;
 
             // Get channels

DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs

@@ -28,7 +28,7 @@ namespace DiscordChatExporter.Cli.Verbs
             var exportService = Container.Instance.Get<ExportService>();
 
             // Configure settings
-            if (!Options.DateFormat.EmptyIfNull().IsWhiteSpace())
+            if (!Options.DateFormat.IsNullOrWhiteSpace())
                 settingsService.DateFormat = Options.DateFormat;
 
             // Get channels

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

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core.Markdown/MarkdownParser.cs

@@ -113,7 +113,7 @@ namespace DiscordChatExporter.Core.Markdown
         // Capture <:lul:123456> or <a:lul:123456>
         private static readonly IMatcher<Node> CustomEmojiNodeMatcher = new RegexMatcher<Node>(
             new Regex("<(a)?:(.+?):(\\d+?)>", DefaultRegexOptions),
-            m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, !m.Groups[1].Value.IsEmpty()));
+            m => new EmojiNode(m.Value, m.Groups[3].Value, m.Groups[2].Value, !m.Groups[1].Value.IsNullOrWhiteSpace()));
 
         /* Links */
 
@@ -140,6 +140,12 @@ namespace DiscordChatExporter.Core.Markdown
             @"¯\_(ツ)_/¯",
             s => new TextNode(s));
 
+        // Capture some specific emojis that don't get rendered
+        // This escapes it from matching for emoji
+        private static readonly IMatcher<Node> IgnoredEmojiTextNodeMatcher = new RegexMatcher<Node>(
+            new Regex("(\\u26A7|\\u2640|\\u2642|\\u2695|\\u267E|\\u00A9|\\u00AE|\\u2122)", DefaultRegexOptions),
+            m => new TextNode(m.Value, m.Groups[1].Value));
+
         // Capture any "symbol/other" character or surrogate pair preceeded by a backslash
         // This escapes it from matching for emoji
         private static readonly IMatcher<Node> EscapedSymbolTextNodeMatcher = new RegexMatcher<Node>(
@@ -155,6 +161,13 @@ namespace DiscordChatExporter.Core.Markdown
         // Combine all matchers into one
         // Matchers that have similar patterns are ordered from most specific to least specific
         private static readonly IMatcher<Node> AggregateNodeMatcher = new AggregateMatcher<Node>(
+            // Escaped text
+            ShrugTextNodeMatcher,
+            IgnoredEmojiTextNodeMatcher,
+            EscapedSymbolTextNodeMatcher,
+            EscapedCharacterTextNodeMatcher,
+
+            // Formatting
             ItalicBoldFormattedNodeMatcher,
             ItalicUnderlineFormattedNodeMatcher,
             BoldFormattedNodeMatcher,
@@ -163,21 +176,26 @@ namespace DiscordChatExporter.Core.Markdown
             ItalicAltFormattedNodeMatcher,
             StrikethroughFormattedNodeMatcher,
             SpoilerFormattedNodeMatcher,
+
+            // Code blocks
             MultilineCodeBlockNodeMatcher,
             InlineCodeBlockNodeMatcher,
+
+            // Mentions
             EveryoneMentionNodeMatcher,
             HereMentionNodeMatcher,
             UserMentionNodeMatcher,
             ChannelMentionNodeMatcher,
             RoleMentionNodeMatcher,
-            StandardEmojiNodeMatcher,
+
-            CustomEmojiNodeMatcher,
+            // Links
             TitledLinkNodeMatcher,
             AutoLinkNodeMatcher,
             HiddenLinkNodeMatcher,
-            ShrugTextNodeMatcher,
+
-            EscapedSymbolTextNodeMatcher,
+            // Emoji
-            EscapedCharacterTextNodeMatcher);
+            StandardEmojiNodeMatcher,
+            CustomEmojiNodeMatcher);
 
         private static IReadOnlyList<Node> Parse(string input, IMatcher<Node> matcher) =>
             matcher.MatchAll(input, s => new TextNode(s)).Select(r => r.Value).ToArray();

DiscordChatExporter.Core.Markdown/Nodes/EmojiNode.cs

@@ -1,4 +1,6 @@
-namespace DiscordChatExporter.Core.Markdown.Nodes
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Markdown.Nodes
 {
     public class EmojiNode : Node
     {
@@ -8,7 +10,7 @@
 
         public bool IsAnimated { get; }
 
-        public bool IsCustomEmoji => Id != null;
+        public bool IsCustomEmoji => !Id.IsNullOrWhiteSpace();
 
         public EmojiNode(string source, string id, string name, bool isAnimated)
             : base(source)

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

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core.Models/Emoji.cs

@@ -40,7 +40,7 @@ namespace DiscordChatExporter.Core.Models
         public static string GetImageUrl(string id, string name, bool isAnimated)
         {
             // Custom emoji
-            if (id != null)
+            if (!id.IsNullOrWhiteSpace())
             {
                 // Animated
                 if (isAnimated)

DiscordChatExporter.Core.Models/Guild.cs

@@ -1,4 +1,6 @@
-namespace DiscordChatExporter.Core.Models
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Models
 {
     // https://discordapp.com/developers/docs/resources/guild#guild-object
 
@@ -28,7 +30,7 @@
     {
         public static string GetIconUrl(string id, string iconHash)
         {
-            return iconHash != null
+            return !iconHash.IsNullOrWhiteSpace()
                 ? $"https://cdn.discordapp.com/icons/{id}/{iconHash}.png"
                 : "https://cdn.discordapp.com/embed/avatars/0.png";
         }

DiscordChatExporter.Core.Models/User.cs

@@ -1,4 +1,5 @@
 using System;
+using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Models
 {
@@ -39,7 +40,7 @@ namespace DiscordChatExporter.Core.Models
         public static string GetAvatarUrl(string id, int discriminator, string avatarHash)
         {
             // Custom avatar
-            if (avatarHash != null)
+            if (!avatarHash.IsNullOrWhiteSpace())
             {
                 // Animated
                 if (avatarHash.StartsWith("a_", StringComparison.Ordinal))

DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.cs

@@ -46,7 +46,7 @@ namespace DiscordChatExporter.Core.Rendering
                 return true;
             }).Select(g => new MessageGroup(g.First().Author, g.First().Timestamp, g));
 
-        private string FormatMarkdown(Node node, bool isTopLevel, bool isSingle)
+        private string FormatMarkdown(Node node, bool isJumbo)
         {
             // Text node
             if (node is TextNode textNode)
@@ -92,7 +92,7 @@ namespace DiscordChatExporter.Core.Rendering
             if (node is MultilineCodeBlockNode multilineCodeBlockNode)
             {
                 // Set language class for syntax highlighting
-                var languageCssClass = multilineCodeBlockNode.Language != null
+                var languageCssClass = !multilineCodeBlockNode.Language.IsNullOrWhiteSpace()
                     ? "language-" + multilineCodeBlockNode.Language
                     : null;
 
@@ -136,8 +136,8 @@ namespace DiscordChatExporter.Core.Rendering
                 // Get emoji image URL
                 var emojiImageUrl = Emoji.GetImageUrl(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated);
 
-                // Emoji can be jumboable if it's the only top-level node
+                // Make emoji large if it's jumbo
-                var jumboableCssClass = isTopLevel && isSingle ? "emoji--large" : null;
+                var jumboableCssClass = isJumbo ? "emoji--large" : null;
 
                 return $"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />";
             }
@@ -154,8 +154,10 @@ namespace DiscordChatExporter.Core.Rendering
 
         private string FormatMarkdown(IReadOnlyList<Node> nodes, bool isTopLevel)
         {
-            var isSingle = nodes.Count == 1;
+            // Emojis are jumbo if all top-level nodes are emoji nodes, disregarding whitespace
-            return nodes.Select(n => FormatMarkdown(n, isTopLevel, isSingle)).JoinToString("");
+            var isJumbo = isTopLevel && nodes.Where(n => !n.Source.IsNullOrWhiteSpace()).All(n => n is EmojiNode);
+
+            return nodes.Select(n => FormatMarkdown(n, isJumbo)).JoinToString("");
         }
 
         private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.Parse(markdown), true);

DiscordChatExporter.Core.Services/DataService.Parsers.cs

@@ -41,14 +41,14 @@ namespace DiscordChatExporter.Core.Services
             var guildId = json["guild_id"]?.Value<string>();
 
             // If the guild ID is blank, it's direct messages
-            if (guildId == null)
+            if (guildId.IsNullOrWhiteSpace())
                 guildId = Guild.DirectMessages.Id;
 
             // Try to extract name
             var name = json["name"]?.Value<string>();
 
             // If the name is blank, it's direct messages
-            if (name == null)
+            if (name.IsNullOrWhiteSpace())
                 name = json["recipients"].Select(ParseUser).Select(u => u.Name).JoinToString(", ");
 
             return new Channel(id, parentId, guildId, name, topic, type);

DiscordChatExporter.Core.Services/DataService.cs

@@ -48,7 +48,7 @@ namespace DiscordChatExporter.Core.Services
                         var value = parameter.SubstringAfter("=");
 
                         // Skip empty values
-                        if (value.IsEmpty())
+                        if (value.IsNullOrWhiteSpace())
                             continue;
 
                         request.RequestUri = request.RequestUri.SetQueryParameter(key, value);

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

@@ -8,7 +8,7 @@
     <PackageReference Include="Failsafe" Version="1.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Onova" Version="2.4.2" />
-    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.0" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.1" />
     <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
   </ItemGroup>
 

DiscordChatExporter.Core.Services/ExportService.cs

@@ -38,7 +38,7 @@ namespace DiscordChatExporter.Core.Services
         {
             // Create output directory
             var dirPath = Path.GetDirectoryName(filePath);
-            if (!dirPath.EmptyIfNull().IsWhiteSpace())
+            if (!dirPath.IsNullOrWhiteSpace())
                 Directory.CreateDirectory(dirPath);
 
             // Render chat log to output file
@@ -74,7 +74,7 @@ namespace DiscordChatExporter.Core.Services
                     var partitionFilePath = $"{fileNameWithoutExt} [{partitionNumber} of {partitions.Length}]{fileExt}";
 
                     // Compose full file path
-                    if (!dirPath.EmptyIfNull().IsWhiteSpace())
+                    if (!dirPath.IsNullOrWhiteSpace())
                         partitionFilePath = Path.Combine(dirPath, partitionFilePath);
 
                     // Export

DiscordChatExporter.Core.Services/Helpers/ExportHelper.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using DiscordChatExporter.Core.Models;
+using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Core.Services.Helpers
 {
@@ -11,7 +12,7 @@ namespace DiscordChatExporter.Core.Services.Helpers
         public static bool IsDirectoryPath(string path) =>
             path.Last() == Path.DirectorySeparatorChar ||
             path.Last() == Path.AltDirectorySeparatorChar ||
-            Path.GetExtension(path) == null;
+            (Path.GetExtension(path).IsNullOrWhiteSpace() && !File.Exists(path));
 
         public static string GetDefaultExportFileName(ExportFormat format, Guild guild, Channel channel,
             DateTimeOffset? after = null, DateTimeOffset? before = null)

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -148,7 +148,7 @@
       <Version>2.0.20525</Version>
     </PackageReference>
     <PackageReference Include="Tyrrrz.Extensions">
-      <Version>1.6.0</Version>
+      <Version>1.6.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

DiscordChatExporter.Gui/Properties/AssemblyInfo.cs

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

DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs

@@ -6,6 +6,7 @@ using DiscordChatExporter.Core.Services;
 using DiscordChatExporter.Core.Services.Helpers;
 using DiscordChatExporter.Gui.ViewModels.Components;
 using DiscordChatExporter.Gui.ViewModels.Framework;
+using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Gui.ViewModels.Dialogs
 {
@@ -84,7 +85,7 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs
             }
 
             // If canceled - return
-            if (OutputPath == null)
+            if (OutputPath.IsNullOrWhiteSpace())
                 return;
 
             // Close dialog

DiscordChatExporter.Gui/ViewModels/RootViewModel.cs

@@ -122,7 +122,7 @@ namespace DiscordChatExporter.Gui.ViewModels
             await _dialogManager.ShowDialogAsync(dialog);
         }
 
-        public bool CanPopulateGuildsAndChannels => !IsBusy && !TokenValue.EmptyIfNull().IsWhiteSpace();
+        public bool CanPopulateGuildsAndChannels => !IsBusy && !TokenValue.IsNullOrWhiteSpace();
 
         public async void PopulateGuildsAndChannels()
         {
@@ -235,7 +235,7 @@ namespace DiscordChatExporter.Gui.ViewModels
             }
         }
 
-        public bool CanExportChannels => !IsBusy && SelectedChannels.EmptyIfNull().Any();
+        public bool CanExportChannels => !IsBusy && !SelectedChannels.IsNullOrEmpty();
 
         public async void ExportChannels()
         {