diff --git a/DiscordChatExporter.Cli.Tests/Infra/ChannelIds.cs b/DiscordChatExporter.Cli.Tests/Infra/ChannelIds.cs index e380e136..81ab8791 100644 --- a/DiscordChatExporter.Cli.Tests/Infra/ChannelIds.cs +++ b/DiscordChatExporter.Cli.Tests/Infra/ChannelIds.cs @@ -1,4 +1,4 @@ -using DiscordChatExporter.Core.Discord; +using DiscordChatExporter.Core.Discord; namespace DiscordChatExporter.Cli.Tests.Infra; @@ -15,7 +15,7 @@ public static class ChannelIds public static Snowflake GroupingTestCases { get; } = Snowflake.Parse("992092091545034842"); public static Snowflake FilterTestCases { get; } = Snowflake.Parse("866744075033641020"); - + public static Snowflake ForwardTestCases { get; } = Snowflake.Parse("1455202357204877477"); public static Snowflake MarkdownTestCases { get; } = Snowflake.Parse("866459526819348521"); diff --git a/DiscordChatExporter.Cli.Tests/Specs/HtmlForwardSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/HtmlForwardSpecs.cs index 1322008c..c3dbfe5f 100644 --- a/DiscordChatExporter.Cli.Tests/Specs/HtmlForwardSpecs.cs +++ b/DiscordChatExporter.Cli.Tests/Specs/HtmlForwardSpecs.cs @@ -19,9 +19,6 @@ public class HtmlForwardSpecs ); // Assert - message - .Text() - .Should() - .ContainAll("Forwarded", @"¯\_(ツ)_/¯", "December 29, 2025"); + message.Text().Should().ContainAll("Forwarded", @"¯\_(ツ)_/¯", "December 29, 2025"); } } diff --git a/DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs index ca2ddd4e..b68f155b 100644 --- a/DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs +++ b/DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs @@ -24,7 +24,6 @@ public class JsonForwardSpecs var forwardedMessage = message.GetProperty("forwardedMessage"); forwardedMessage.GetProperty("content").GetString().Should().Contain(@"¯\_(ツ)_/¯"); - forwardedMessage.GetProperty("timestamp").GetString().Should().StartWith("2025-12-29"); + forwardedMessage.GetProperty("timestamp").GetString().Should().StartWith("2025-12-28T22:52:42.175+00:00"); } } - diff --git a/DiscordChatExporter.Cli.Tests/Specs/PlainTextForwardSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/PlainTextForwardSpecs.cs index 7d543a8d..099996f2 100644 --- a/DiscordChatExporter.Cli.Tests/Specs/PlainTextForwardSpecs.cs +++ b/DiscordChatExporter.Cli.Tests/Specs/PlainTextForwardSpecs.cs @@ -14,8 +14,6 @@ public class PlainTextForwardSpecs var document = await ExportWrapper.ExportAsPlainTextAsync(ChannelIds.ForwardTestCases); // Assert - document - .Should() - .ContainAll("{Forwarded Message}", @"¯\_(ツ)_/¯", "December 29, 2025"); + document.Should().ContainAll("{Forwarded Message}", @"¯\_(ツ)_/¯", "12/28/2025 10:52 PM"); } } diff --git a/DiscordChatExporter.Core/Discord/Data/MessageSnapshot.cs b/DiscordChatExporter.Core/Discord/Data/MessageSnapshot.cs index 212502b4..1df2ac47 100644 --- a/DiscordChatExporter.Core/Discord/Data/MessageSnapshot.cs +++ b/DiscordChatExporter.Core/Discord/Data/MessageSnapshot.cs @@ -8,7 +8,6 @@ using JsonExtensions.Reading; namespace DiscordChatExporter.Core.Discord.Data; // https://docs.discord.com/developers/resources/message#message-snapshot-object -// Message snapshots contain a subset of message fields for forwarded messages public record MessageSnapshot( DateTimeOffset Timestamp, DateTimeOffset? EditedTimestamp, diff --git a/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml b/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml index 10bab26e..cefb8bfb 100644 --- a/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml +++ b/DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml @@ -262,7 +262,7 @@ } - @* Forwarded message content *@ + @* Forwarded message *@ @if (message is { IsForwarded: true, ForwardedMessage: not null }) {
@@ -273,7 +273,7 @@ Forwarded
- @* Forwarded text content *@ + @* Forwarded content *@ @if (!string.IsNullOrWhiteSpace(message.ForwardedMessage.Content)) {
diff --git a/DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs b/DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs index c25c6395..4bb53ed6 100644 --- a/DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs +++ b/DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs @@ -275,7 +275,7 @@ internal static partial class MarkdownParser // Capture the shrug kaomoji. // This escapes it from matching for formatting. @"¯\_(ツ)_/¯", - (s, _) => new TextNode(s.ToString()) + (_, s) => new TextNode(s.ToString()) ); private static readonly IMatcher IgnoredEmojiTextNodeMatcher = diff --git a/DiscordChatExporter.Gui/App.axaml b/DiscordChatExporter.Gui/App.axaml index 66ee7b9c..15ca4489 100644 --- a/DiscordChatExporter.Gui/App.axaml +++ b/DiscordChatExporter.Gui/App.axaml @@ -116,6 +116,11 @@ + + +