diff --git a/DiscordChatExporter.Cli.Tests/Utils/TempDir.cs b/DiscordChatExporter.Cli.Tests/Utils/TempDir.cs index 4cae7ff0..e907755d 100644 --- a/DiscordChatExporter.Cli.Tests/Utils/TempDir.cs +++ b/DiscordChatExporter.Cli.Tests/Utils/TempDir.cs @@ -24,7 +24,7 @@ internal partial class TempDir { var dirPath = System.IO.Path.Combine( System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) - ?? Directory.GetCurrentDirectory(), + ?? Directory.GetCurrentDirectory(), "Temp", Guid.NewGuid().ToString() ); diff --git a/DiscordChatExporter.Cli.Tests/Utils/TempFile.cs b/DiscordChatExporter.Cli.Tests/Utils/TempFile.cs index 1c6e79b3..0a686a65 100644 --- a/DiscordChatExporter.Cli.Tests/Utils/TempFile.cs +++ b/DiscordChatExporter.Cli.Tests/Utils/TempFile.cs @@ -24,7 +24,7 @@ internal partial class TempFile { var dirPath = System.IO.Path.Combine( System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) - ?? Directory.GetCurrentDirectory(), + ?? Directory.GetCurrentDirectory(), "Temp" ); diff --git a/DiscordChatExporter.Core/Discord/Data/Channel.cs b/DiscordChatExporter.Core/Discord/Data/Channel.cs index 255ad395..8511b47d 100644 --- a/DiscordChatExporter.Core/Discord/Data/Channel.cs +++ b/DiscordChatExporter.Core/Discord/Data/Channel.cs @@ -69,7 +69,8 @@ public partial record Channel var guildId = json.GetPropertyOrNull("guild_id") ?.GetNonWhiteSpaceStringOrNull() - ?.Pipe(Snowflake.Parse) ?? Guild.DirectMessages.Id; + ?.Pipe(Snowflake.Parse) + ?? Guild.DirectMessages.Id; var name = // Guild channel @@ -96,7 +97,8 @@ public partial record Channel var isArchived = json.GetPropertyOrNull("thread_metadata") ?.GetPropertyOrNull("archived") - ?.GetBooleanOrNull() ?? false; + ?.GetBooleanOrNull() + ?? false; var lastMessageId = json.GetPropertyOrNull("last_message_id") ?.GetNonWhiteSpaceStringOrNull() diff --git a/DiscordChatExporter.Core/Discord/Data/Embeds/Embed.cs b/DiscordChatExporter.Core/Discord/Data/Embeds/Embed.cs index 66d8553e..caa474e1 100644 --- a/DiscordChatExporter.Core/Discord/Data/Embeds/Embed.cs +++ b/DiscordChatExporter.Core/Discord/Data/Embeds/Embed.cs @@ -49,7 +49,8 @@ public partial record Embed ?.GetStringOrNull() ?.Pipe(s => Enum.TryParse(s, true, out var result) ? result : (EmbedKind?)null - ) ?? EmbedKind.Rich; + ) + ?? EmbedKind.Rich; var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull(); var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffsetOrNull(); @@ -66,7 +67,8 @@ public partial record Embed json.GetPropertyOrNull("fields") ?.EnumerateArrayOrNull() ?.Select(EmbedField.Parse) - .ToArray() ?? []; + .ToArray() + ?? []; var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse); @@ -81,7 +83,8 @@ public partial record Embed json.GetPropertyOrNull("image") ?.Pipe(EmbedImage.Parse) .ToSingletonEnumerable() - .ToArray() ?? []; + .ToArray() + ?? []; var video = json.GetPropertyOrNull("video")?.Pipe(EmbedVideo.Parse); diff --git a/DiscordChatExporter.Core/Discord/Data/Guild.cs b/DiscordChatExporter.Core/Discord/Data/Guild.cs index 98ba4d18..fa2ade07 100644 --- a/DiscordChatExporter.Core/Discord/Data/Guild.cs +++ b/DiscordChatExporter.Core/Discord/Data/Guild.cs @@ -25,7 +25,8 @@ public partial record Guild var iconUrl = json.GetPropertyOrNull("icon") ?.GetNonWhiteSpaceStringOrNull() - ?.Pipe(h => ImageCdn.GetGuildIconUrl(id, h)) ?? ImageCdn.GetFallbackUserAvatarUrl(); + ?.Pipe(h => ImageCdn.GetGuildIconUrl(id, h)) + ?? ImageCdn.GetFallbackUserAvatarUrl(); return new Guild(id, name, iconUrl); } diff --git a/DiscordChatExporter.Core/Discord/Data/Member.cs b/DiscordChatExporter.Core/Discord/Data/Member.cs index fbfff9e6..ec9487f4 100644 --- a/DiscordChatExporter.Core/Discord/Data/Member.cs +++ b/DiscordChatExporter.Core/Discord/Data/Member.cs @@ -32,7 +32,8 @@ public partial record Member ?.EnumerateArray() .Select(j => j.GetNonWhiteSpaceString()) .Select(Snowflake.Parse) - .ToArray() ?? []; + .ToArray() + ?? []; var avatarUrl = guildId is not null ? json.GetPropertyOrNull("avatar") diff --git a/DiscordChatExporter.Core/Discord/Data/Message.cs b/DiscordChatExporter.Core/Discord/Data/Message.cs index 56b3b87b..22407f6f 100644 --- a/DiscordChatExporter.Core/Discord/Data/Message.cs +++ b/DiscordChatExporter.Core/Discord/Data/Message.cs @@ -143,7 +143,8 @@ public partial record Message json.GetPropertyOrNull("attachments") ?.EnumerateArrayOrNull() ?.Select(Attachment.Parse) - .ToArray() ?? []; + .ToArray() + ?? []; var embeds = NormalizeEmbeds( json.GetPropertyOrNull("embeds")?.EnumerateArrayOrNull()?.Select(Embed.Parse).ToArray() @@ -154,13 +155,15 @@ public partial record Message json.GetPropertyOrNull("sticker_items") ?.EnumerateArrayOrNull() ?.Select(Sticker.Parse) - .ToArray() ?? []; + .ToArray() + ?? []; var reactions = json.GetPropertyOrNull("reactions") ?.EnumerateArrayOrNull() ?.Select(Reaction.Parse) - .ToArray() ?? []; + .ToArray() + ?? []; var mentionedUsers = json.GetPropertyOrNull("mentions")?.EnumerateArrayOrNull()?.Select(User.Parse).ToArray() diff --git a/DiscordChatExporter.Core/Exporting/ExportContext.cs b/DiscordChatExporter.Core/Exporting/ExportContext.cs index ce6e783a..0ecc12b1 100644 --- a/DiscordChatExporter.Core/Exporting/ExportContext.cs +++ b/DiscordChatExporter.Core/Exporting/ExportContext.cs @@ -99,7 +99,8 @@ internal class ExportContext(DiscordClient discord, ExportRequest request) ?.RoleIds.Select(TryGetRole) .WhereNotNull() .OrderByDescending(r => r.Position) - .ToArray() ?? []; + .ToArray() + ?? []; public Color? TryGetUserColor(Snowflake id) => GetUserRoles(id).Where(r => r.Color is not null).Select(r => r.Color).FirstOrDefault(); diff --git a/DiscordChatExporter.Core/Exporting/ExportRequest.cs b/DiscordChatExporter.Core/Exporting/ExportRequest.cs index a513e637..c814df8a 100644 --- a/DiscordChatExporter.Core/Exporting/ExportRequest.cs +++ b/DiscordChatExporter.Core/Exporting/ExportRequest.cs @@ -178,7 +178,8 @@ public partial class ExportRequest ?? "", "%b" => before ?.ToDate() - .ToString("yyyy-MM-dd", CultureInfo.InvariantCulture) ?? "", + .ToString("yyyy-MM-dd", CultureInfo.InvariantCulture) + ?? "", "%d" => DateTimeOffset.Now.ToString( "yyyy-MM-dd", CultureInfo.InvariantCulture