Update version

Addresses the other part of #168

Changelog.md

@@ -1,3 +1,10 @@
+### v2.14 (15-Jun-2019)
+
+- [TXT] Added support for embeds.
+- [TXT] Added support for reactions.
+- [CSV] Added support for reactions.
+- [TXT] Changed how attachments are rendered.
+
 ### v2.13.1 (06-Jun-2019)
 
 - Fixed an issue where the app sometimes crashed when exporting due to `System.InvalidCastException`.

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

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

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

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

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

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

DiscordChatExporter.Core.Rendering/CsvChatLogRenderer.cs

@@ -96,6 +96,10 @@ namespace DiscordChatExporter.Core.Rendering
             var formattedAttachments = message.Attachments.Select(a => a.Url).JoinToString(",");
             await RenderFieldAsync(writer, formattedAttachments);
 
+            // Reactions
+            var formattedReactions = message.Reactions.Select(r => r.Emoji.Name + $"({r.Count})").JoinToString(",");
+            await RenderFieldAsync(writer, formattedReactions);
+
             // Line break
             await writer.WriteLineAsync();
         }
@@ -103,7 +107,7 @@ namespace DiscordChatExporter.Core.Rendering
         public async Task RenderAsync(TextWriter writer)
         {
             // Headers
-            await writer.WriteLineAsync("Author;Date;Content;Attachments;");
+            await writer.WriteLineAsync("Author;Date;Content;Attachments;Reactions;");
 
             // Log
             foreach (var message in _chatLog.Messages)

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

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Scriban" Version="2.0.0" />
+    <PackageReference Include="Scriban" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Core.Rendering/PlainTextChatLogRenderer.cs

@@ -93,6 +93,90 @@ namespace DiscordChatExporter.Core.Rendering
 
         private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.Parse(markdown));
 
+        private async Task RenderAttachmentsAsync(TextWriter writer, IReadOnlyList<Attachment> attachments)
+        {
+            if (attachments.Any())
+            {
+                await writer.WriteLineAsync("{Attachments}");
+
+                foreach (var attachment in attachments)
+                    await writer.WriteLineAsync(attachment.Url);
+
+                await writer.WriteLineAsync();
+            }
+        }
+
+        private async Task RenderEmbedsAsync(TextWriter writer, IReadOnlyList<Embed> embeds)
+        {
+            foreach (var embed in embeds)
+            {
+                await writer.WriteLineAsync("{Embed}");
+
+                // Author name
+                if (!(embed.Author?.Name).IsNullOrWhiteSpace())
+                    await writer.WriteLineAsync(embed.Author?.Name);
+
+                // URL
+                if (!embed.Url.IsNullOrWhiteSpace())
+                    await writer.WriteLineAsync(embed.Url);
+
+                // Title
+                if (!embed.Title.IsNullOrWhiteSpace())
+                    await writer.WriteLineAsync(FormatMarkdown(embed.Title));
+
+                // Description
+                if (!embed.Description.IsNullOrWhiteSpace())
+                    await writer.WriteLineAsync(FormatMarkdown(embed.Description));
+
+                // Fields
+                foreach (var field in embed.Fields)
+                {
+                    // Name
+                    if (!field.Name.IsNullOrWhiteSpace())
+                        await writer.WriteLineAsync(field.Name);
+
+                    // Value
+                    if (!field.Value.IsNullOrWhiteSpace())
+                        await writer.WriteLineAsync(field.Value);
+                }
+
+                // Thumbnail URL
+                if (!(embed.Thumbnail?.Url).IsNullOrWhiteSpace())
+                    await writer.WriteLineAsync(embed.Thumbnail?.Url);
+
+                // Image URL
+                if (!(embed.Image?.Url).IsNullOrWhiteSpace())
+                    await writer.WriteLineAsync(embed.Image?.Url);
+
+                // Footer text
+                if (!(embed.Footer?.Text).IsNullOrWhiteSpace())
+                    await writer.WriteLineAsync(embed.Footer?.Text);
+
+                await writer.WriteLineAsync();
+            }
+        }
+
+        private async Task RenderReactionsAsync(TextWriter writer, IReadOnlyList<Reaction> reactions)
+        {
+            if (reactions.Any())
+            {
+                await writer.WriteLineAsync("{Reactions}");
+
+                foreach (var reaction in reactions)
+                {
+                    await writer.WriteAsync(reaction.Emoji.Name);
+
+                    if (reaction.Count > 1)
+                        await writer.WriteAsync($" ({reaction.Count})");
+
+                    await writer.WriteAsync(" ");
+                }
+
+                await writer.WriteLineAsync();
+                await writer.WriteLineAsync();
+            }
+        }
+
         private async Task RenderMessageAsync(TextWriter writer, Message message)
         {
             // Timestamp and author
@@ -101,9 +185,17 @@ namespace DiscordChatExporter.Core.Rendering
             // Content
             await writer.WriteLineAsync(FormatMarkdown(message.Content));
 
+            // Separator
+            await writer.WriteLineAsync();
+
             // Attachments
-            foreach (var attachment in message.Attachments)
+            await RenderAttachmentsAsync(writer, message.Attachments);
-                await writer.WriteLineAsync(attachment.Url);
+
+            // Embeds
+            await RenderEmbedsAsync(writer, message.Embeds);
+
+            // Reactions
+            await RenderReactionsAsync(writer, message.Reactions);
         }
 
         public async Task RenderAsync(TextWriter writer)
@@ -120,10 +212,7 @@ namespace DiscordChatExporter.Core.Rendering
 
             // Log
             foreach (var message in _chatLog.Messages)
-            {
                 await RenderMessageAsync(writer, message);
-                await writer.WriteLineAsync();
-            }
         }
     }
 }

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

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

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -130,7 +130,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Gress">
-      <Version>1.0.2</Version>
+      <Version>1.1.1</Version>
     </PackageReference>
     <PackageReference Include="MaterialDesignColors">
       <Version>1.1.3</Version>
@@ -139,19 +139,19 @@
       <Version>2.5.1</Version>
     </PackageReference>
     <PackageReference Include="Ookii.Dialogs.Wpf">
-      <Version>1.0.0</Version>
+      <Version>1.1.0</Version>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
       <Version>2.6.1</Version>
     </PackageReference>
     <PackageReference Include="Stylet">
-      <Version>1.1.22</Version>
+      <Version>1.2.0</Version>
     </PackageReference>
     <PackageReference Include="System.Windows.Interactivity.WPF">
       <Version>2.0.20525</Version>
     </PackageReference>
     <PackageReference Include="Tyrrrz.Extensions">
-      <Version>1.6.1</Version>
+      <Version>1.6.2</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.13.1")]
+[assembly: AssemblyVersion("2.14")]
-[assembly: AssemblyFileVersion("2.13.1")]
+[assembly: AssemblyFileVersion("2.14")]