Update NuGet packages

DiscordChatExporter.Core/Discord/Data/Embeds/EmbedVideo.cs

@@ -1,5 +1,5 @@
-using JsonExtensions.Reading;
 using System.Text.Json;
+using JsonExtensions.Reading;
 
 namespace DiscordChatExporter.Core.Discord.Data.Embeds;
 

DiscordChatExporter.Core/Discord/Data/Embeds/SpotifyTrackEmbedProjection.cs

@@ -12,9 +12,11 @@ public partial record SpotifyTrackEmbedProjection
     private static string? TryParseTrackId(string embedUrl)
     {
         // https://open.spotify.com/track/1LHZMWefF9502NPfArRfvP?si=3efac6ce9be04f0a
-        var trackId = Regex.Match(embedUrl, @"spotify\.com/track/(.*?)(?:\?|&|/|$)").Groups[
-            1
-        ].Value;
+        var trackId = Regex
+            .Match(embedUrl, @"spotify\.com/track/(.*?)(?:\?|&|/|$)")
+            .Groups[1]
+            .Value;
+
         if (!string.IsNullOrWhiteSpace(trackId))
             return trackId;
 

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -99,7 +99,8 @@ public partial record Message
                 if (trailingEmbeds.Any())
                 {
                     // Concatenate all images into one embed
-                    var images = embed.Images
+                    var images = embed
+                        .Images
                         .Concat(trailingEmbeds.SelectMany(e => e.Images))
                         .ToArray();
 

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -40,10 +40,12 @@ public class DiscordClient
 
                 // 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,
@@ -58,11 +60,13 @@ public class DiscordClient
                 // require properly keeping track of Discord's global/per-route/per-resource
                 // rate limits and that's just way too much effort.
                 // https://discord.com/developers/docs/topics/rate-limits
-                var remainingRequestCount = response.Headers
+                var remainingRequestCount = response
+                    .Headers
                     .TryGetValue("X-RateLimit-Remaining")
                     ?.Pipe(s => int.Parse(s, CultureInfo.InvariantCulture));
 
-                var resetAfterDelay = response.Headers
+                var resetAfterDelay = response
+                    .Headers
                     .TryGetValue("X-RateLimit-Reset-After")
                     ?.Pipe(s => double.Parse(s, CultureInfo.InvariantCulture))
                     .Pipe(TimeSpan.FromSeconds);

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -2,14 +2,14 @@
 
   <ItemGroup>
     <PackageReference Include="AsyncKeyedLock" Version="6.2.2" />
-    <PackageReference Include="CSharpier.MsBuild" Version="0.25.0" PrivateAssets="all" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.26.1" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Polly" Version="8.0.0" />
+    <PackageReference Include="Polly" Version="8.1.0" />
     <PackageReference Include="RazorBlade" Version="0.4.4" />
     <PackageReference Include="Superpower" Version="3.0.0" />
     <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.6" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.7" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs

@@ -65,7 +65,9 @@ internal partial class ExportAssetDownloader
                 // Try to set the file date according to the last-modified header
                 try
                 {
-                    var lastModified = response.Content.Headers
+                    var lastModified = response
+                        .Content
+                        .Headers
                         .TryGetValue("Last-Modified")
                         ?.Pipe(
                             s =>

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -101,7 +101,8 @@ internal class ExportContext
     public Role? TryGetRole(Snowflake id) => _rolesById.GetValueOrDefault(id);
 
     public IReadOnlyList<Role> GetUserRoles(Snowflake id) =>
-        TryGetMember(id)?.RoleIds
+        TryGetMember(id)
+            ?.RoleIds
             .Select(TryGetRole)
             .WhereNotNull()
             .OrderByDescending(r => r.Position)

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -182,10 +182,9 @@ 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

DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs

@@ -26,12 +26,14 @@ internal class ContainsMessageFilter : 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))
+            );
 }

DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs

@@ -11,11 +11,13 @@ internal class MentionsMessageFilter : MessageFilter
     public MentionsMessageFilter(string value) => _value = value;
 
     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)
+            );
 }

DiscordChatExporter.Core/Exporting/Filtering/ReactionMessageFilter.cs

@@ -11,10 +11,16 @@ internal class ReactionMessageFilter : MessageFilter
     public ReactionMessageFilter(string value) => _value = value;
 
     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)
+            );
 }

DiscordChatExporter.Core/Exporting/HtmlMarkdownVisitor.cs

@@ -196,7 +196,8 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
         // Try to extract the message ID if the link points to a Discord message
         var linkedMessageId = Regex
             .Match(link.Url, @"^https?://(?:discord|discordapp)\.com/channels/.*?/(\d+)/?$")
-            .Groups[1].Value;
+            .Groups[1]
+            .Value;
 
         _buffer.Append(
             !string.IsNullOrWhiteSpace(linkedMessageId)

DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs

@@ -450,12 +450,14 @@ internal class JsonMessageWriter : MessageWriter
 
             _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();

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -44,10 +44,10 @@ internal partial class MessageExporter : 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);

DiscordChatExporter.Core/Markdown/Parsing/AggregateMatcher.cs

@@ -30,7 +30,8 @@ internal class AggregateMatcher<T> : IMatcher<T>
 
             // If this match is earlier than previous earliest - replace
             if (
-                earliestMatch is null || match.Segment.StartIndex < earliestMatch.Segment.StartIndex
+                earliestMatch is null
+                || match.Segment.StartIndex < earliestMatch.Segment.StartIndex
             )
                 earliestMatch = match;
 

DiscordChatExporter.Core/Markdown/Parsing/StringMatcher.cs

@@ -24,12 +24,10 @@ internal class StringMatcher<T> : IMatcher<T>
 
     public ParsedMatch<T>? TryMatch(StringSegment segment)
     {
-        var index = segment.Source.IndexOf(
-            _needle,
-            segment.StartIndex,
-            segment.Length,
-            _comparison
-        );
+        var index = segment
+            .Source
+            .IndexOf(_needle, segment.StartIndex, segment.Length, _comparison);
+
         if (index < 0)
             return null;