From 98e294f7e46b75b34eff45211da588ed9207f4ae Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Fri, 27 Feb 2026 18:36:16 +0200
Subject: [PATCH] Fix tests, clean up

---
 DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs       | 2 +-
 DiscordChatExporter.Cli.Tests/Specs/PlainTextForwardSpecs.cs  | 2 +-
 DiscordChatExporter.Core/Discord/Data/MessageSnapshot.cs      | 1 -
 .../Exporting/MessageGroupTemplate.cshtml                     | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs b/DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs
index 5e1237bf..b68f155b 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs
@@ -24,6 +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 2461af88..099996f2 100644
--- a/DiscordChatExporter.Cli.Tests/Specs/PlainTextForwardSpecs.cs
+++ b/DiscordChatExporter.Cli.Tests/Specs/PlainTextForwardSpecs.cs
@@ -14,6 +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 @@
                         </div>
                     }
 
-                    @* Forwarded message content *@
+                    @* Forwarded message *@
                     @if (message is { IsForwarded: true, ForwardedMessage: not null })
                     {
                         <div class="chatlog__forwarded">
@@ -273,7 +273,7 @@
                                 <em>Forwarded</em>
                             </div>
 
-                            @* Forwarded text content *@
+                            @* Forwarded content *@
                             @if (!string.IsNullOrWhiteSpace(message.ForwardedMessage.Content))
                             {
                                 <div class="chatlog__forwarded-content chatlog__markdown">