Update NuGet packages

2026-01-28 22:01:55 +00:00 · 2023-12-29 00:08:16 +02:00
parent 512f181be2
commit 4e3deb409c
22 changed files with 144 additions and 203 deletions
--- a/DiscordChatExporter.Core/Discord/Data/Message.cs
+++ b/DiscordChatExporter.Core/Discord/Data/Message.cs
@@ -100,8 +100,7 @@ public partial record Message
                {
                    // Concatenate all images into one embed
                    var images = embed
-                        .Images
-                        .Concat(trailingEmbeds.SelectMany(e => e.Images))
+                        .Images.Concat(trailingEmbeds.SelectMany(e => e.Images))
                        .ToArray();

                    normalizedEmbeds.Add(embed with { Images = images });
--- a/DiscordChatExporter.Core/Discord/DiscordClient.cs
+++ b/DiscordChatExporter.Core/Discord/DiscordClient.cs
@@ -36,12 +36,10 @@ public class DiscordClient(string token)

                // Don't validate because the token can have special characters
                // https://github.com/Tyrrrz/DiscordChatExporter/issues/828
-                request
-                    .Headers
-                    .TryAddWithoutValidation(
-                        "Authorization",
-                        tokenKind == TokenKind.Bot ? $"Bot {token}" : token
-                    );
+                request.Headers.TryAddWithoutValidation(
+                    "Authorization",
+                    tokenKind == TokenKind.Bot ? $"Bot {token}" : token
+                );

                var response = await Http.Client.SendAsync(
                    request,
@@ -57,13 +55,11 @@ public class DiscordClient(string token)
                // rate limits and that's just way too much effort.
                // https://discord.com/developers/docs/topics/rate-limits
                var remainingRequestCount = response
-                    .Headers
-                    .TryGetValue("X-RateLimit-Remaining")
+                    .Headers.TryGetValue("X-RateLimit-Remaining")
                    ?.Pipe(s => int.Parse(s, CultureInfo.InvariantCulture));

                var resetAfterDelay = response
-                    .Headers
-                    .TryGetValue("X-RateLimit-Reset-After")
+                    .Headers.TryGetValue("X-RateLimit-Reset-After")
                    ?.Pipe(s => double.Parse(s, CultureInfo.InvariantCulture))
                    .Pipe(TimeSpan.FromSeconds);

--- a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
+++ b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
@@ -2,14 +2,14 @@

  <ItemGroup>
    <PackageReference Include="AsyncKeyedLock" Version="6.2.4" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.26.5" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.7" 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="Superpower" Version="3.0.0" />
    <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.9" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.10" />
  </ItemGroup>

 </Project>
--- a/DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs
+++ b/DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs
@@ -57,9 +57,7 @@ internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
                try
                {
                    var lastModified = response
-                        .Content
-                        .Headers
-                        .TryGetValue("Last-Modified")
+                        .Content.Headers.TryGetValue("Last-Modified")
                        ?.Pipe(
                            s =>
                                DateTimeOffset.TryParse(
--- a/DiscordChatExporter.Core/Exporting/ExportRequest.cs
+++ b/DiscordChatExporter.Core/Exporting/ExportRequest.cs
@@ -182,9 +182,10 @@ public partial class ExportRequest
                            => before?.ToDate().ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)
                                ?? "",
                        "%d"
-                            => DateTimeOffset
-                                .Now
-                                .ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
+                            => DateTimeOffset.Now.ToString(
+                                "yyyy-MM-dd",
+                                CultureInfo.InvariantCulture
+                            ),

                        "%%" => "%",
                        _ => m.Value
--- a/DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs
+++ b/DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs
@@ -22,14 +22,12 @@ 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))
+        );
 }
--- a/DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs
+++ b/DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs
@@ -7,13 +7,11 @@ 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)
+        );
 }
--- a/DiscordChatExporter.Core/Exporting/Filtering/ReactionMessageFilter.cs
+++ b/DiscordChatExporter.Core/Exporting/Filtering/ReactionMessageFilter.cs
@@ -7,12 +7,10 @@ namespace DiscordChatExporter.Core.Exporting.Filtering;
 internal class ReactionMessageFilter(string value) : MessageFilter
 {
    public override bool IsMatch(Message message) =>
-        message
-            .Reactions
-            .Any(
-                r =>
-                    string.Equals(value, r.Emoji.Id?.ToString(), StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(value, r.Emoji.Name, StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(value, r.Emoji.Code, StringComparison.OrdinalIgnoreCase)
-            );
+        message.Reactions.Any(
+            r =>
+                string.Equals(value, r.Emoji.Id?.ToString(), StringComparison.OrdinalIgnoreCase)
+                || string.Equals(value, r.Emoji.Name, StringComparison.OrdinalIgnoreCase)
+                || string.Equals(value, r.Emoji.Code, StringComparison.OrdinalIgnoreCase)
+        );
 }
--- a/DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs
+++ b/DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs
@@ -446,14 +446,12 @@ internal class JsonMessageWriter(Stream stream, ExportContext context)

            _writer.WriteStartArray("users");
            await foreach (
-                var user in Context
-                    .Discord
-                    .GetMessageReactionsAsync(
-                        Context.Request.Channel.Id,
-                        message.Id,
-                        reaction.Emoji,
-                        cancellationToken
-                    )
+                var user in Context.Discord.GetMessageReactionsAsync(
+                    Context.Request.Channel.Id,
+                    message.Id,
+                    reaction.Emoji,
+                    cancellationToken
+                )
            )
            {
                _writer.WriteStartObject();
--- a/DiscordChatExporter.Core/Exporting/MessageExporter.cs
+++ b/DiscordChatExporter.Core/Exporting/MessageExporter.cs
@@ -37,10 +37,10 @@ internal partial class MessageExporter(ExportContext context) : IAsyncDisposable
        // Ensure that the partition limit has not been reached
        if (
            _writer is not null
-            && context
-                .Request
-                .PartitionLimit
-                .IsReached(_writer.MessagesWritten, _writer.BytesWritten)
+            && context.Request.PartitionLimit.IsReached(
+                _writer.MessagesWritten,
+                _writer.BytesWritten
+            )
        )
        {
            await ResetWriterAsync(cancellationToken);