Migrate to Avalonia (#1220)

Tyrrrz · Apr 27, 2024 · b9c1c47 · b9c1c47
1 parent 74f99b4
commit b9c1c47
Show file tree

Hide file tree

Showing 89 changed files with 2,451 additions and 2,794 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -106,6 +106,7 @@ jobs:
           -p:CSharpier_Bypass=true
           --output ${{ matrix.app }}/bin/publish/
           --configuration Release
+          --use-current-runtime
 
       - name: Upload artifacts
         uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0

diff --git a/DiscordChatExporter.Cli.Tests/DiscordChatExporter.Cli.Tests.csproj b/DiscordChatExporter.Cli.Tests/DiscordChatExporter.Cli.Tests.csproj
@@ -11,19 +11,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.0.7" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
+    <PackageReference Include="AngleSharp" Version="1.1.2" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.28.0" PrivateAssets="all" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="ReflectionMagic" Version="5.0.0" />
-    <PackageReference Include="xunit" Version="2.6.4" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/DiscordChatExporter.Cli.Tests/Infra/ExportWrapper.cs b/DiscordChatExporter.Cli.Tests/Infra/ExportWrapper.cs
@@ -93,13 +93,12 @@ Snowflake channelId
         Snowflake messageId
     )
     {
-        var message = (await GetMessagesAsHtmlAsync(channelId)).SingleOrDefault(
-            e =>
-                string.Equals(
-                    e.GetAttribute("data-message-id"),
-                    messageId.ToString(),
-                    StringComparison.OrdinalIgnoreCase
-                )
+        var message = (await GetMessagesAsHtmlAsync(channelId)).SingleOrDefault(e =>
+            string.Equals(
+                e.GetAttribute("data-message-id"),
+                messageId.ToString(),
+                StringComparison.OrdinalIgnoreCase
+            )
         );
 
         if (message is null)
@@ -117,13 +116,12 @@ Snowflake messageId
         Snowflake messageId
     )
     {
-        var message = (await GetMessagesAsJsonAsync(channelId)).SingleOrDefault(
-            j =>
-                string.Equals(
-                    j.GetProperty("id").GetString(),
-                    messageId.ToString(),
-                    StringComparison.OrdinalIgnoreCase
-                )
+        var message = (await GetMessagesAsJsonAsync(channelId)).SingleOrDefault(j =>
+            string.Equals(
+                j.GetProperty("id").GetString(),
+                messageId.ToString(),
+                StringComparison.OrdinalIgnoreCase
+            )
         );
 
         if (message.ValueKind == JsonValueKind.Undefined)

diff --git a/DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs
@@ -53,10 +53,8 @@ public async Task I_can_filter_the_export_to_only_include_messages_sent_after_th
                     new DateTimeOffset(2021, 09, 08, 14, 26, 35, TimeSpan.Zero)
                 ],
                 o =>
-                    o.Using<DateTimeOffset>(
-                            ctx =>
-                                ctx.Subject.Should()
-                                    .BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
                         )
                         .WhenTypeIs<DateTimeOffset>()
             );
@@ -97,10 +95,8 @@ public async Task I_can_filter_the_export_to_only_include_messages_sent_before_t
                     new DateTimeOffset(2021, 07, 19, 17, 23, 58, TimeSpan.Zero)
                 ],
                 o =>
-                    o.Using<DateTimeOffset>(
-                            ctx =>
-                                ctx.Subject.Should()
-                                    .BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
                         )
                         .WhenTypeIs<DateTimeOffset>()
             );
@@ -144,10 +140,8 @@ public async Task I_can_filter_the_export_to_only_include_messages_sent_between_
                     new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero)
                 ],
                 o =>
-                    o.Using<DateTimeOffset>(
-                            ctx =>
-                                ctx.Subject.Should()
-                                    .BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
                         )
                         .WhenTypeIs<DateTimeOffset>()
             );

diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs
@@ -90,12 +90,11 @@ public async Task I_can_export_a_channel_that_contains_a_message_with_a_video_em
             .QuerySelectorAll("source")
             .Select(e => e.GetAttribute("src"))
             .WhereNotNull()
-            .Where(
-                s =>
-                    s.Contains(
-                        "i_am_currently_feeling_slight_displeasure_of_what_you_have_just_sent_lqrem.mp4",
-                        StringComparison.Ordinal
-                    )
+            .Where(s =>
+                s.Contains(
+                    "i_am_currently_feeling_slight_displeasure_of_what_you_have_just_sent_lqrem.mp4",
+                    StringComparison.Ordinal
+                )
             )
             .Should()
             .ContainSingle();
@@ -205,42 +204,38 @@ public async Task I_can_export_a_channel_that_contains_a_message_with_a_Twitter_
 
         imageUrls
             .Should()
-            .Contain(
-                u =>
-                    u.EndsWith(
-                        "https/pbs.twimg.com/media/FVYIzYPWAAAMBqZ.png",
-                        StringComparison.Ordinal
-                    )
+            .Contain(u =>
+                u.EndsWith(
+                    "https/pbs.twimg.com/media/FVYIzYPWAAAMBqZ.png",
+                    StringComparison.Ordinal
+                )
             );
 
         imageUrls
             .Should()
-            .Contain(
-                u =>
-                    u.EndsWith(
-                        "https/pbs.twimg.com/media/FVYJBWJWAAMNAx2.png",
-                        StringComparison.Ordinal
-                    )
+            .Contain(u =>
+                u.EndsWith(
+                    "https/pbs.twimg.com/media/FVYJBWJWAAMNAx2.png",
+                    StringComparison.Ordinal
+                )
             );
 
         imageUrls
             .Should()
-            .Contain(
-                u =>
-                    u.EndsWith(
-                        "https/pbs.twimg.com/media/FVYJHiRX0AANZcz.png",
-                        StringComparison.Ordinal
-                    )
+            .Contain(u =>
+                u.EndsWith(
+                    "https/pbs.twimg.com/media/FVYJHiRX0AANZcz.png",
+                    StringComparison.Ordinal
+                )
             );
 
         imageUrls
             .Should()
-            .Contain(
-                u =>
-                    u.EndsWith(
-                        "https/pbs.twimg.com/media/FVYJNZNXwAAPnVG.png",
-                        StringComparison.Ordinal
-                    )
+            .Contain(u =>
+                u.EndsWith(
+                    "https/pbs.twimg.com/media/FVYJNZNXwAAPnVG.png",
+                    StringComparison.Ordinal
+                )
             );
 
         message.QuerySelectorAll(".chatlog__embed").Should().ContainSingle();

diff --git a/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj b/DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj
@@ -11,9 +11,9 @@
 
   <ItemGroup>
     <PackageReference Include="CliFx" Version="2.3.5" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.28.0" PrivateAssets="all" />
     <PackageReference Include="Deorcify" Version="1.0.2" PrivateAssets="all" />
-    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.5.2" PrivateAssets="all" />
+    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.5.3" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="Spectre.Console" Version="0.48.0" />
   </ItemGroup>

diff --git a/DiscordChatExporter.Core/Discord/Data/ChannelNode.cs b/DiscordChatExporter.Core/Discord/Data/ChannelNode.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DiscordChatExporter.Core.Discord.Data;
+
+public record ChannelNode(Channel Channel, IReadOnlyList<ChannelNode> Children)
+{
+    public static IReadOnlyList<ChannelNode> BuildTree(IReadOnlyList<Channel> channels)
+    {
+        IReadOnlyList<ChannelNode> GetChildren(Channel parent) =>
+            channels
+                .Where(c => c.Parent?.Id == parent.Id)
+                .Select(c => new ChannelNode(c, GetChildren(c)))
+                .ToArray();
+
+        return channels
+            .Where(c => c.Parent is null)
+            .Select(c => new ChannelNode(c, GetChildren(c)))
+            .ToArray();
+    }
+}
diff --git a/DiscordChatExporter.Core/Discord/Data/Message.cs b/DiscordChatExporter.Core/Discord/Data/Message.cs
@@ -83,16 +83,15 @@ private static IReadOnlyList<Embed> NormalizeEmbeds(IReadOnlyList<Embed> embeds)
                 // Find embeds with the same URL that only contain a single image and nothing else
                 var trailingEmbeds = embeds
                     .Skip(i + 1)
-                    .TakeWhile(
-                        e =>
-                            e.Url == embed.Url
-                            && e.Timestamp is null
-                            && e.Author is null
-                            && e.Color is null
-                            && string.IsNullOrWhiteSpace(e.Description)
-                            && !e.Fields.Any()
-                            && e.Images.Count == 1
-                            && e.Footer is null
+                    .TakeWhile(e =>
+                        e.Url == embed.Url
+                        && e.Timestamp is null
+                        && e.Author is null
+                        && e.Color is null
+                        && string.IsNullOrWhiteSpace(e.Description)
+                        && !e.Fields.Any()
+                        && e.Images.Count == 1
+                        && e.Footer is null
                     )
                     .ToArray();
 

diff --git a/DiscordChatExporter.Core/Discord/DiscordClient.cs b/DiscordChatExporter.Core/Discord/DiscordClient.cs
@@ -66,12 +66,12 @@ public class DiscordClient(string token)
                 if (remainingRequestCount <= 0 && resetAfterDelay is not null)
                 {
                     var delay =
-                    // Adding a small buffer to the reset time reduces the chance of getting
-                    // rate limited again, because it allows for more requests to be released.
-                    (resetAfterDelay.Value + TimeSpan.FromSeconds(1))
-                    // Sometimes Discord returns an absurdly high value for the reset time, which
-                    // is not actually enforced by the server. So we cap it at a reasonable value.
-                    .Clamp(TimeSpan.Zero, TimeSpan.FromSeconds(60));
+                        // Adding a small buffer to the reset time reduces the chance of getting
+                        // rate limited again, because it allows for more requests to be released.
+                        (resetAfterDelay.Value + TimeSpan.FromSeconds(1))
+                        // Sometimes Discord returns an absurdly high value for the reset time, which
+                        // is not actually enforced by the server. So we cap it at a reasonable value.
+                        .Clamp(TimeSpan.Zero, TimeSpan.FromSeconds(60));
 
                     await Task.Delay(delay, innerCancellationToken);
                 }
@@ -152,8 +152,13 @@ public class DiscordClient(string token)
                 _
                     => throw new DiscordChatExporterException(
                         $"""
-                        Request to '{url}' failed: {response.StatusCode.ToString().ToSpaceSeparatedWords().ToLowerInvariant()}.
-                        Response content: {await response.Content.ReadAsStringAsync(cancellationToken)}
+                        Request to '{url}' failed: {response
+                            .StatusCode.ToString()
+                            .ToSpaceSeparatedWords()
+                            .ToLowerInvariant()}.
+                        Response content: {await response.Content.ReadAsStringAsync(
+                            cancellationToken
+                        )}
                         """,
                         true
                     )

diff --git a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
@@ -2,14 +2,14 @@
 
   <ItemGroup>
     <PackageReference Include="AsyncKeyedLock" Version="6.3.4" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.28.0" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Polly" Version="8.2.0" />
-    <PackageReference Include="RazorBlade" Version="0.5.0" />
+    <PackageReference Include="Polly" Version="8.3.1" />
+    <PackageReference Include="RazorBlade" Version="0.6.0" />
     <PackageReference Include="Superpower" Version="3.0.0" />
-    <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.10" />
+    <PackageReference Include="WebMarkupMin.Core" Version="2.16.0" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.13" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs b/DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs
@@ -58,16 +58,15 @@ await using (var output = File.Create(filePath))
                 {
                     var lastModified = response
                         .Content.Headers.TryGetValue("Last-Modified")
-                        ?.Pipe(
-                            s =>
-                                DateTimeOffset.TryParse(
-                                    s,
-                                    CultureInfo.InvariantCulture,
-                                    DateTimeStyles.None,
-                                    out var instant
-                                )
-                                    ? instant
-                                    : (DateTimeOffset?)null
+                        ?.Pipe(s =>
+                            DateTimeOffset.TryParse(
+                                s,
+                                CultureInfo.InvariantCulture,
+                                DateTimeStyles.None,
+                                out var instant
+                            )
+                                ? instant
+                                : (DateTimeOffset?)null
                         );
 
                     if (lastModified is not null)

diff --git a/DiscordChatExporter.Core/Exporting/ExportContext.cs b/DiscordChatExporter.Core/Exporting/ExportContext.cs
@@ -93,8 +93,7 @@ await foreach (var role in Discord.GetGuildRolesAsync(Request.Guild.Id, cancella
 
     public IReadOnlyList<Role> GetUserRoles(Snowflake id) =>
         TryGetMember(id)
-            ?.RoleIds
-            .Select(TryGetRole)
+            ?.RoleIds.Select(TryGetRole)
             .WhereNotNull()
             .OrderByDescending(r => r.Position)
             .ToArray() ?? [];

diff --git a/DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs b/DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs
@@ -22,12 +22,11 @@ internal class ContainsMessageFilter(string text) : MessageFilter
 
     public override bool IsMatch(Message message) =>
         IsMatch(message.Content)
-        || message.Embeds.Any(
-            e =>
-                IsMatch(e.Title)
-                || IsMatch(e.Author?.Name)
-                || IsMatch(e.Description)
-                || IsMatch(e.Footer?.Text)
-                || e.Fields.Any(f => IsMatch(f.Name) || IsMatch(f.Value))
+        || message.Embeds.Any(e =>
+            IsMatch(e.Title)
+            || IsMatch(e.Author?.Name)
+            || IsMatch(e.Description)
+            || IsMatch(e.Footer?.Text)
+            || e.Fields.Any(f => IsMatch(f.Name) || IsMatch(f.Value))
         );
 }
diff --git a/DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs b/DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs
@@ -7,11 +7,10 @@ namespace DiscordChatExporter.Core.Exporting.Filtering;
 internal class MentionsMessageFilter(string value) : MessageFilter
 {
     public override bool IsMatch(Message message) =>
-        message.MentionedUsers.Any(
-            user =>
-                string.Equals(value, user.Name, StringComparison.OrdinalIgnoreCase)
-                || string.Equals(value, user.DisplayName, StringComparison.OrdinalIgnoreCase)
-                || string.Equals(value, user.FullName, StringComparison.OrdinalIgnoreCase)
-                || string.Equals(value, user.Id.ToString(), StringComparison.OrdinalIgnoreCase)
+        message.MentionedUsers.Any(user =>
+            string.Equals(value, user.Name, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(value, user.DisplayName, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(value, user.FullName, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(value, user.Id.ToString(), StringComparison.OrdinalIgnoreCase)
         );
 }
diff --git a/DiscordChatExporter.Core/Exporting/Filtering/Parsing/FilterGrammar.cs b/DiscordChatExporter.Core/Exporting/Filtering/Parsing/FilterGrammar.cs
@@ -30,8 +30,8 @@ internal static class FilterGrammar
         .OneOf(QuotedString, UnquotedString)
         .Named("text string");
 
-    private static readonly TextParser<MessageFilter> ContainsFilter = String.Select(
-        v => (MessageFilter)new ContainsMessageFilter(v)
+    private static readonly TextParser<MessageFilter> ContainsFilter = String.Select(v =>
+        (MessageFilter)new ContainsMessageFilter(v)
     );
 
     private static readonly TextParser<MessageFilter> FromFilter = Span.EqualToIgnoreCase("from:")