Update version

Related to #1012

Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.39.1 (10-Mar-2023)
+
+- Fixed an issue where messages containing mentions of users that left the server (but haven't deleted their account) were incorrectly rendered as `@Unknown`.
+- Fixed an issue where messages containing video links were not rendered correctly in the HTML export. Now, they are rendered using a video player and the referenced assets are pulled if the "download assets" option is enabled.
+
 ## v2.39 (25-Feb-2023)
 
 - Added an option to specify the directory path for downloaded assets. This can be used, in combination with the "reuse assets" option, to have a shared asset directory for multiple exports. In GUI, this option can be found in the advanced setion of the export dialog. In CLI, it's available as `--media-dir <path>`. (Thanks [@96-LB](https://github.com/96-LB))

Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>2.39</Version>
+    <Version>2.39.1</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Oleksii Holub</Copyright>
     <LangVersion>preview</LangVersion>

DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Utils.Extensions;
 using FluentAssertions;
 using Xunit;
 
@@ -46,7 +47,8 @@ public class HtmlEmbedSpecs
         message
             .QuerySelectorAll("img")
             .Select(e => e.GetAttribute("src"))
-            .Where(s => s?.EndsWith("i.redd.it/f8w05ja8s4e61.png") ?? false)
+            .WhereNotNull()
+            .Where(s => s.EndsWith("f8w05ja8s4e61.png"))
             .Should()
             .ContainSingle();
     }
@@ -67,6 +69,25 @@ public class HtmlEmbedSpecs
         content.Should().BeNullOrEmpty();
     }
 
+    [Fact]
+    public async Task Message_with_a_video_link_is_rendered_with_a_video_embed()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("1083751036596002856")
+        );
+
+        // Assert
+        message
+            .QuerySelectorAll("source")
+            .Select(e => e.GetAttribute("src"))
+            .WhereNotNull()
+            .Where(s => s.EndsWith("i_am_currently_feeling_slight_displeasure_of_what_you_have_just_sent_lqrem.mp4"))
+            .Should()
+            .ContainSingle();
+    }
+
     [Fact]
     public async Task Message_with_a_GIFV_link_is_rendered_with_a_video_embed()
     {
@@ -80,7 +101,8 @@ public class HtmlEmbedSpecs
         message
             .QuerySelectorAll("source")
             .Select(e => e.GetAttribute("src"))
-            .Where(s => s?.EndsWith("media.tenor.com/DDAJeW6BQKkAAAPo/tooncasm-test-copy.mp4") ?? false)
+            .WhereNotNull()
+            .Where(s => s.EndsWith("tooncasm-test-copy.mp4"))
             .Should()
             .ContainSingle();
     }

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -23,19 +23,6 @@ public partial record Channel(
 
 public partial record Channel
 {
-    private static ChannelCategory GetFallbackCategory(ChannelKind channelKind) => new(
-        Snowflake.Zero,
-        channelKind switch
-        {
-            ChannelKind.GuildTextChat => "Text",
-            ChannelKind.DirectTextChat => "Private",
-            ChannelKind.DirectGroupTextChat => "Group",
-            ChannelKind.GuildNews => "News",
-            _ => "Default"
-        },
-        null
-    );
-
     public static Channel Parse(JsonElement json, ChannelCategory? categoryHint = null, int? positionHint = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
@@ -45,7 +32,7 @@ public partial record Channel
             json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse) ??
             Guild.DirectMessages.Id;
 
-        var category = categoryHint ?? GetFallbackCategory(kind);
+        var category = categoryHint ?? ChannelCategory.CreateDefault(kind);
 
         var name =
             // Guild channel

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -7,6 +7,19 @@ namespace DiscordChatExporter.Core.Discord.Data;
 
 public record ChannelCategory(Snowflake Id, string Name, int? Position) : IHasId
 {
+    public static ChannelCategory CreateDefault(ChannelKind channelKind) => new(
+        Snowflake.Zero,
+        channelKind switch
+        {
+            ChannelKind.GuildTextChat => "Text",
+            ChannelKind.DirectTextChat => "Private",
+            ChannelKind.DirectGroupTextChat => "Group",
+            ChannelKind.GuildNews => "News",
+            _ => "Default"
+        },
+        null
+    );
+
     public static ChannelCategory Parse(JsonElement json, int? positionHint = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);

DiscordChatExporter.Core/Discord/Data/Member.cs

@@ -20,6 +20,8 @@ public partial record Member(
 
 public partial record Member
 {
+    public static Member CreateDefault(User user) => new(user, null, null, Array.Empty<Snowflake>());
+
     public static Member Parse(JsonElement json, Snowflake? guildId = null)
     {
         var user = json.GetProperty("user").Pipe(User.Parse);

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -150,6 +150,14 @@ public class DiscordClient
             : null;
     }
 
+    public async ValueTask<User?> TryGetUserAsync(
+        Snowflake userId,
+        CancellationToken cancellationToken = default)
+    {
+        var response = await TryGetJsonResponseAsync($"users/{userId}", cancellationToken);
+        return response?.Pipe(User.Parse);
+    }
+
     public async IAsyncEnumerable<Guild> GetUserGuildsAsync(
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AsyncKeyedLock" Version="6.1.1" />
+    <PackageReference Include="AsyncKeyedLock" Version="6.2.0" />
     <PackageReference Include="Gress" Version="2.0.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
     <PackageReference Include="Polly" Version="7.2.3" />
@@ -14,4 +14,4 @@
     <PackageReference Include="WebMarkupMin.Core" Version="2.13.8" />
   </ItemGroup>
 
-</Project>
+</Project>

DiscordChatExporter.Core/Exporting/ChannelExporter.cs

@@ -34,7 +34,7 @@ public class ChannelExporter
         {
             // Resolve members for referenced users
             foreach (var user in message.GetReferencedUsers())
-                await context.PopulateMemberAsync(user.Id, cancellationToken);
+                await context.PopulateMemberAsync(user, cancellationToken);
 
             // Export the message
             if (request.MessageFilter.IsMatch(message))

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -20,6 +20,7 @@ internal class ExportContext
     private readonly ExportAssetDownloader _assetDownloader;
 
     public DiscordClient Discord { get; }
+
     public ExportRequest Request { get; }
 
     public ExportContext(DiscordClient discord,
@@ -43,18 +44,35 @@ internal class ExportContext
             _roles[role.Id] = role;
     }
 
-    // Because members are not pulled in bulk, we need to populate them on demand
+    // Because members cannot be pulled in bulk, we need to populate them on demand
-    public async ValueTask PopulateMemberAsync(Snowflake id, CancellationToken cancellationToken = default)
+    private async ValueTask PopulateMemberAsync(
+        Snowflake id,
+        User? fallbackUser,
+        CancellationToken cancellationToken = default)
     {
         if (_members.ContainsKey(id))
             return;
 
         var member = await Discord.TryGetGuildMemberAsync(Request.Guild.Id, id, cancellationToken);
 
+        // User may have left the guild since they were mentioned
+        if (member is null)
+        {
+            var user = fallbackUser ?? await Discord.TryGetUserAsync(id, cancellationToken);
+            if (user is not null)
+                member = Member.CreateDefault(user);
+        }
+
         // Store the result even if it's null, to avoid re-fetching non-existing members
         _members[id] = member;
     }
 
+    public async ValueTask PopulateMemberAsync(Snowflake id, CancellationToken cancellationToken = default) =>
+        await PopulateMemberAsync(id, null, cancellationToken);
+
+    public async ValueTask PopulateMemberAsync(User user, CancellationToken cancellationToken = default) =>
+        await PopulateMemberAsync(user.Id, user, cancellationToken);
+
     public string FormatDate(DateTimeOffset instant) => Request.DateFormat switch
     {
         "unix" => instant.ToUnixTimeSeconds().ToString(),

DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml

@@ -447,6 +447,19 @@
                                 </a>
                             </div>
                         }
+                        // Generic video embed
+                        else if (embed.Kind == EmbedKind.Video && !string.IsNullOrWhiteSpace(embed.Url))
+                        {
+                            var embedVideoUrl =
+                                embed.Video?.ProxyUrl ?? embed.Video?.Url ??
+                                embed.Url;
+
+                            <div class="chatlog__embed">
+                                <video class="chatlog__embed-generic-video" width="@embed.Video?.Width" height="@embed.Video?.Height" controls>
+                                    <source src="@await ResolveAssetUrlAsync(embedVideoUrl)" alt="Embedded video">
+                                </video>
+                            </div>
+                        }
                         // Generic gifv embed
                         else if (embed.Kind == EmbedKind.Gifv && !string.IsNullOrWhiteSpace(embed.Url))
                         {
@@ -455,8 +468,8 @@
                                 embed.Url;
 
                             <div class="chatlog__embed">
-                                <video class="chatlog__embed-generic-gifv" loop width="@embed.Video?.Width" height="@embed.Video?.Height" onmouseover="this.play()" onmouseout="this.pause()">
+                                <video class="chatlog__embed-generic-gifv" width="@embed.Video?.Width" height="@embed.Video?.Height" loop onmouseover="this.play()" onmouseout="this.pause()">
-                                    <source src="@await ResolveAssetUrlAsync(embedVideoUrl)" alt="Embedded video">
+                                    <source src="@await ResolveAssetUrlAsync(embedVideoUrl)" alt="Embedded gifv">
                                 </video>
                             </div>
                         }

DiscordChatExporter.Core/Exporting/PreambleTemplate.cshtml

@@ -622,24 +622,6 @@
             font-weight: 500;
         }
 
-        .chatlog__embed-generic-image {
-            object-fit: contain;
-            object-position: left;
-            max-width: 45vw;
-            max-height: 500px;
-            vertical-align: top;
-            border-radius: 3px;
-        }
-
-        .chatlog__embed-generic-gifv {
-            object-fit: contain;
-            object-position: left;
-            max-width: 45vw;
-            max-height: 500px;
-            vertical-align: top;
-            border-radius: 3px;
-        }
-
         .chatlog__embed-invite-container {
             min-width: 320px;
             padding: 0.6rem 0.7rem;
@@ -690,6 +672,33 @@
             font-weight: 600;
         }
 
+        .chatlog__embed-generic-image {
+            object-fit: contain;
+            object-position: left;
+            max-width: 45vw;
+            max-height: 500px;
+            vertical-align: top;
+            border-radius: 3px;
+        }
+
+        .chatlog__embed-generic-video {
+            object-fit: contain;
+            object-position: left;
+            max-width: 45vw;
+            max-height: 500px;
+            vertical-align: top;
+            border-radius: 3px;
+        }
+
+        .chatlog__embed-generic-gifv {
+            object-fit: contain;
+            object-position: left;
+            max-width: 45vw;
+            max-height: 500px;
+            vertical-align: top;
+            border-radius: 3px;
+        }
+
         .chatlog__embed-spotify {
             border: 0;
         }