From 8bbb8fa5ee292db8c40fcfa1c0480006d6c60e88 Mon Sep 17 00:00:00 2001 From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> Date: Wed, 3 Dec 2025 23:37:17 +0200 Subject: [PATCH] Clean up --- .../Exporting/HtmlMessageExtensions.cs | 18 ++++-- .../Exporting/PlainTextMessageExtensions.cs | 59 ++++++++++--------- 2 files changed, 43 insertions(+), 34 deletions(-) diff --git a/DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs b/DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs index 260579be..c7846795 100644 --- a/DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs +++ b/DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs @@ -8,14 +8,20 @@ internal static class HtmlMessageExtensions { // Message content is hidden if it's a link to an embedded media // https://github.com/Tyrrrz/DiscordChatExporter/issues/682 - public static bool IsContentHidden(this Message message) + extension(Message message) { - if (message.Embeds.Count != 1) - return false; + public bool IsContentHidden() + { + if (message.Embeds.Count != 1) + return false; - var embed = message.Embeds[0]; + var embed = message.Embeds[0]; - return string.Equals(message.Content.Trim(), embed.Url, StringComparison.OrdinalIgnoreCase) - && embed.Kind is EmbedKind.Image or EmbedKind.Gifv; + return string.Equals( + message.Content.Trim(), + embed.Url, + StringComparison.OrdinalIgnoreCase + ) && embed.Kind is EmbedKind.Image or EmbedKind.Gifv; + } } } diff --git a/DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs b/DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs index 023bf972..b8c89896 100644 --- a/DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs +++ b/DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs @@ -7,37 +7,40 @@ namespace DiscordChatExporter.Core.Exporting; internal static class PlainTextMessageExtensions { - public static string GetFallbackContent(this Message message) => - message.Kind switch - { - MessageKind.RecipientAdd => message.MentionedUsers.Any() - ? $"Added {message.MentionedUsers.First().DisplayName} to the group." - : "Added a recipient.", + extension(Message message) + { + public string GetFallbackContent() => + message.Kind switch + { + MessageKind.RecipientAdd => message.MentionedUsers.Any() + ? $"Added {message.MentionedUsers.First().DisplayName} to the group." + : "Added a recipient.", - MessageKind.RecipientRemove => message.MentionedUsers.Any() - ? message.Author.Id == message.MentionedUsers.First().Id - ? "Left the group." - : $"Removed {message.MentionedUsers.First().DisplayName} from the group." - : "Removed a recipient.", + MessageKind.RecipientRemove => message.MentionedUsers.Any() + ? message.Author.Id == message.MentionedUsers.First().Id + ? "Left the group." + : $"Removed {message.MentionedUsers.First().DisplayName} from the group." + : "Removed a recipient.", - MessageKind.Call => - $"Started a call that lasted { - message - .CallEndedTimestamp? - .Pipe(t => t - message.Timestamp) - .Pipe(t => t.TotalMinutes) - .ToString("n0", CultureInfo.InvariantCulture) ?? "0" - } minutes.", + MessageKind.Call => + $"Started a call that lasted { + message + .CallEndedTimestamp? + .Pipe(t => t - message.Timestamp) + .Pipe(t => t.TotalMinutes) + .ToString("n0", CultureInfo.InvariantCulture) ?? "0" + } minutes.", - MessageKind.ChannelNameChange => !string.IsNullOrWhiteSpace(message.Content) - ? $"Changed the channel name: {message.Content}" - : "Changed the channel name.", + MessageKind.ChannelNameChange => !string.IsNullOrWhiteSpace(message.Content) + ? $"Changed the channel name: {message.Content}" + : "Changed the channel name.", - MessageKind.ChannelIconChange => "Changed the channel icon.", - MessageKind.ChannelPinnedMessage => "Pinned a message.", - MessageKind.ThreadCreated => "Started a thread.", - MessageKind.GuildMemberJoin => "Joined the server.", + MessageKind.ChannelIconChange => "Changed the channel icon.", + MessageKind.ChannelPinnedMessage => "Pinned a message.", + MessageKind.ThreadCreated => "Started a thread.", + MessageKind.GuildMemberJoin => "Joined the server.", - _ => message.Content, - }; + _ => message.Content, + }; + } }