- @{/* Left side */}
-
- @if (isSystemMessage)
- {
-
- }
- else if(isFirst)
- {
- // Reference symbol
- if (message.Reference is not null)
- {
-
- }
-
- // Avatar
- )
- }
- else
- {
-
- }
-
-
- @{/* Right side */}
-
- @if (isSystemMessage)
- {
-
- // system messages are grouped even if the message author is different
- // that's why we have to update the user values with the author of the current message
- userMember = Model.ExportContext.TryGetMember(message.Author.Id);
-
- userColor = Model.ExportContext.TryGetUserColor(message.Author.Id);
-
- userNick = message.Author.IsBot
- ? message.Author.Name
- : userMember?.Nick ?? message.Author.Name;
-
+ @{/* System notification */}
+ @if (message.Kind.IsSystemNotification())
+ {
+ // System notifications are grouped even if the message author is different.
+ // That's why we have to update the user values with the author of the current message.
+ userMember = Model.ExportContext.TryGetMember(message.Author.Id);
+ userColor = Model.ExportContext.TryGetUserColor(message.Author.Id);
+ userNick = message.Author.IsBot
+ ? message.Author.Name
+ : userMember?.Nick ?? message.Author.Name;
+
+
+
+
+ }
+ // Regular message
+ else
+ {
+
+ @if (isFirst)
{
-
- @if (message.ReferencedMessage is not null)
- {
- )
-
-
-
- @if (!string.IsNullOrWhiteSpace(message.ReferencedMessage.Content) && !message.ReferencedMessage.IsContentHidden())
- {
- @Raw(FormatEmbedMarkdown(message.ReferencedMessage.Content))
- }
- else if (message.ReferencedMessage.Attachments.Any() || message.ReferencedMessage.Embeds.Any())
- {
- Click to see attachment
- 🖼️
- }
- else
+ // Reference symbol
+ if (message.Reference is not null)
+ {
+
+ }
+
+ // Avatar
+
+ }
+ else
+ {
+
+ }
+
+
+
+ @if (isFirst)
+ {
+ // Reference
+ if (message.Reference is not null)
+ {
+
- }
- else
+ // Header
+
+ @if (message.ReferencedMessage is not null)
+ {
+
+
+
+ }
- @if (message.ReferencedMessage.EditedTimestamp is not null)
- {
-
- }
-
+
+ @if (!string.IsNullOrWhiteSpace(message.ReferencedMessage.Content) && !message.ReferencedMessage.IsContentHidden())
+ {
+ @Raw(FormatEmbedMarkdown(message.ReferencedMessage.Content))
+ }
+ else if (message.ReferencedMessage.Attachments.Any() || message.ReferencedMessage.Embeds.Any())
+ {
+ Click to see attachment
+ 🖼️
+ }
+ else
+ {
+ Click to see original message
+ }
+
+
+ @if (message.ReferencedMessage.EditedTimestamp is not null)
{
- Click to see original message
+
}
-
+
+ }
+ else
+ {
+
+ Original message was deleted or could not be loaded.
+
+ }
+
+ @{/* Author name */}
+
+
+ @{/* Bot label */}
+ @if (message.Author.IsBot)
{
-
}
- // Header
-
- Original message was deleted or could not be loaded.
-
+ BOT
}
+
+ @{/* Timestamp */}
+
- @{/* Author name */}
-
-
- @{/* Bot label */}
- @if (message.Author.IsBot)
- {
- BOT
- }
-
- @{/* Timestamp */}
-
-
- }
-
- @{/* Content */}
- @if (!isSystemMessage)
- {
+ @{/* Content */}
@if (!string.IsNullOrWhiteSpace(message.Content) || message.EditedTimestamp is not null)
{
@@ -185,340 +182,340 @@
}
}
- }
-
- @{/* Attachments */}
- @foreach (var attachment in message.Attachments)
- {
-
- @{/* Spoiler caption */}
- @if (attachment.IsSpoiler)
- {
-
- }
-
- @{/* Attachment preview */}
- @if (attachment.IsImage)
- {
-
-  "Image: @attachment.FileName (@attachment.FileSize)")
-
- }
- else if (attachment.IsVideo)
- {
-
- }
- else if (attachment.IsAudio)
- {
-
- }
- else
- {
-
- }
-
- }
- @{/* Embeds */}
- @foreach (var embed in message.Embeds)
- {
- // Spotify embed
- if (embed.TryGetSpotifyTrack() is { } spotifyTrackEmbed)
+ @{/* Attachments */}
+ @foreach (var attachment in message.Attachments)
{
-
- }
- // YouTube embed
- else if (embed.TryGetYouTubeVideo() is { } youTubeVideoEmbed)
- {
-
- @{/* Color pill */}
- @if (embed.Color is not null)
+
+ @{/* Spoiler caption */}
+ @if (attachment.IsSpoiler)
{
-
+
+ }
+
+ @{/* Attachment preview */}
+ @if (attachment.IsImage)
+ {
+
+
+
+ }
+ else if (attachment.IsVideo)
+ {
+
+ }
+ else if (attachment.IsAudio)
+ {
+
}
else
{
-
+
}
+
+ }
-
-
-
- @{/* Embed author */}
- @if (embed.Author is not null)
- {
-
- @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
- {
- )
- }
+ @{/* Embeds */}
+ @foreach (var embed in message.Embeds)
+ {
+ // Spotify embed
+ if (embed.TryGetSpotifyTrack() is { } spotifyTrackEmbed)
+ {
+
+ }
+ // YouTube embed
+ else if (embed.TryGetYouTubeVideo() is { } youTubeVideoEmbed)
+ {
+
+ @{/* Color pill */}
+ @if (embed.Color is not null)
+ {
+
+ }
+ else
+ {
+
+ }
- @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
- {
- if (!string.IsNullOrWhiteSpace(embed.Author.Url))
+
- }
- // Generic image embed
- else if (embed.Kind == EmbedKind.Image && !string.IsNullOrWhiteSpace(embed.Url))
- {
-
+
-
+
+ @{/* Embed author */}
+ @if (embed.Author is not null)
+ {
+
+ }
- @{/* Embed title */}
- @if (!string.IsNullOrWhiteSpace(embed.Title))
- {
-
+ @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
{
-
+
+ }
+
+ @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
+ {
+ if (!string.IsNullOrWhiteSpace(embed.Author.Url))
+ {
+
+
+
+ }
+ else
+ {
+ }
+ }
+
+ }
+
+ @{/* Embed title */}
+ @if (!string.IsNullOrWhiteSpace(embed.Title))
+ {
+
- }
+
-
- )
-
-
- }
- // Generic gifv embed
- else if (embed.Kind == EmbedKind.Gifv && !string.IsNullOrWhiteSpace(embed.Video?.Url))
- {
-
- }
- // Rich embed
- else
- {
-
- @{/* Color pill */}
- @if (embed.Color is not null)
- {
-
- }
- else
- {
-
- }
+ }
+ // Generic image embed
+ else if (embed.Kind == EmbedKind.Image && !string.IsNullOrWhiteSpace(embed.Url))
+ {
+
}
diff --git a/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml b/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml
index b7dc92c..97379a3 100644
--- a/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml
+++ b/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml
@@ -254,19 +254,18 @@
unicode-bidi: bidi-override;
}
- .chatlog__system-message{
- color: #96989D
+ .chatlog__system-notification {
+ color: @Themed("rgb(150, 152, 157)", "rgb(94, 103, 114)")
}
- .chatlog__system-message-reference-link{
+ .chatlog__system-notification-reference-link {
font-weight: 500;
color: #ffffff
}
- .chatlog__system-message-icon{
+ .chatlog__system-notification-icon {
width: 18px;
height: 18px;
- margin-right: 0.25rem;
}
.chatlog__header {
@@ -804,22 +803,19 @@
diff --git a/DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs b/DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs
index afb26dc..b821639 100644
--- a/DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs
+++ b/DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs
@@ -27,29 +27,43 @@ internal class HtmlMessageWriter : MessageWriter
private bool CanJoinGroup(Message message)
{
- // First message in the group can always join
- if(_messageGroup.LastOrDefault() is not { } lastMessage)
- {
+ // If the group is empty, any message can join it
+ if (_messageGroup.LastOrDefault() is not { } lastMessage)
return true;
- }
- // Group system messages with other system messages, regardless of author
- if (message.Kind.IsSystemMessage())
+ // Reply messages cannot join existing groups because they need to appear first
+ if (message.Kind == MessageKind.Reply)
+ return false;
+
+ // Grouping for system notifications
+ if (message.Kind.IsSystemNotification())
+ {
+ // Can only be grouped with other system notifications
+ if (!lastMessage.Kind.IsSystemNotification())
+ return false;
+ }
+ // Grouping for normal messages
+ else
{
- return lastMessage.Kind.IsSystemMessage();
+ // Can only be grouped with other normal messages
+ if (lastMessage.Kind.IsSystemNotification())
+ return false;
+
+ // Messages must be within 7 minutes of each other
+ if ((message.Timestamp - lastMessage.Timestamp).Duration().TotalMinutes > 7)
+ return false;
+
+ // Messages must be from the same author
+ if (message.Author.Id != lastMessage.Author.Id)
+ return false;
+
+ // If the user changed their name after the last message, their new messages
+ // cannot join an existing group.
+ if (!string.Equals(message.Author.FullName, lastMessage.Author.FullName, StringComparison.Ordinal))
+ return false;
}
- return
- // Must be a non system message
- !message.Kind.IsSystemMessage() &&
- // Must be from the same author
- lastMessage.Author.Id == message.Author.Id &&
- // Author's name must not have changed between messages
- string.Equals(lastMessage.Author.FullName, message.Author.FullName, StringComparison.Ordinal) &&
- // Duration between messages must be 7 minutes or less
- (message.Timestamp - lastMessage.Timestamp).Duration().TotalMinutes <= 7 &&
- // Other message must not be a reply
- message.Reference is null;
+ return true;
}
// Use to preserve blocks of code inside the templates
diff --git a/DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs b/DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs
index 336b7db..8868355 100644
--- a/DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs
+++ b/DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Text;
+using System.Text.RegularExpressions;
namespace DiscordChatExporter.Core.Utils.Extensions;
@@ -25,6 +26,9 @@ public static class StringExtensions
}
}
+ public static string ToDashCase(this string str) =>
+ Regex.Replace(str, @"(\p{Ll})(\p{Lu})", "$1-$2");
+
public static StringBuilder AppendIfNotEmpty(this StringBuilder builder, char value) =>
builder.Length > 0
? builder.Append(value)
+
+
+
+
+ }
+ // Generic gifv embed
+ else if (embed.Kind == EmbedKind.Gifv && !string.IsNullOrWhiteSpace(embed.Video?.Url))
+ {
+
+ }
+ // Rich embed
+ else
+ {
+
+ @{/* Color pill */}
+ @if (embed.Color is not null)
+ {
+
+ }
+ else
+ {
+
+ }
-
-
+ }
-
+ @{/* Message reactions */}
+ @if (message.Reactions.Any())
+ {
+
- @{/* Embed author */}
- @if (embed.Author is not null)
- {
-
+ }
}
- }
- @{/* Stickers */}
- @foreach (var sticker in message.Stickers)
- {
-
- @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
- {
-
- }
+
-
+
+
- @{/* Embed fields */}
- @if (embed.Fields.Any())
+ @{/* Embed content */}
+ @if (embed.Thumbnail is not null && !string.IsNullOrWhiteSpace(embed.Thumbnail.Url))
{
-
+ @{/* Embed author */}
+ @if (embed.Author is not null)
+ {
+
+ }
- @{/* Embed title */}
- @if (!string.IsNullOrWhiteSpace(embed.Title))
- {
-
- }
+ @{/* Embed description */}
+ @if (!string.IsNullOrWhiteSpace(embed.Description))
+ {
+
+ }
- @{/* Embed description */}
- @if (!string.IsNullOrWhiteSpace(embed.Description))
- {
-
- }
+ @{/* Embed fields */}
+ @if (embed.Fields.Any())
+ {
+
+ }
+
+ @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
+ {
+
+ }
- @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
- {
- if (!string.IsNullOrWhiteSpace(embed.Author.Url))
+ @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
{
-
+ if (!string.IsNullOrWhiteSpace(embed.Author.Url))
+ {
+
+
+
+ }
+ else
+ {
+ }
+ }
+
+ }
+
+ @{/* Embed title */}
+ @if (!string.IsNullOrWhiteSpace(embed.Title))
+ {
+
- }
+
- @foreach (var field in embed.Fields)
- {
-
- }
+
- @{/* Embed content */}
- @if (embed.Thumbnail is not null && !string.IsNullOrWhiteSpace(embed.Thumbnail.Url))
+ @{/* Embed images */}
+ @if (embed.Images.Any())
{
-
+
+ )
+
}
-
-
-
+
- @{/* Embed images */}
- @if (embed.Images.Any())
- {
-
+ @foreach (var image in embed.Images)
+ {
+ if (!string.IsNullOrWhiteSpace(image.Url))
+ {
+
}
-
+
+ )
+
+
+ }
+ }
- @foreach (var image in embed.Images)
- {
- if (!string.IsNullOrWhiteSpace(image.Url))
+ @{/* Embed footer & icon */}
+ @if (embed.Footer is not null || embed.Timestamp is not null)
+ {
+
+ }
+
+ @{/* Footer icon */}
+ @if (!string.IsNullOrWhiteSpace(embed.Footer?.IconUrl))
{
- )
}
- }
-
- }
- @{/* Embed footer & icon */}
- @if (embed.Footer is not null || embed.Timestamp is not null)
- {
-
-
-
-
-
+
- @{/* Footer icon */}
- @if (!string.IsNullOrWhiteSpace(embed.Footer?.IconUrl))
- {
-
- }
-
-
- }
+ @{/* Embed timestamp */}
+ @if (embed.Timestamp is not null)
+ {
+ @FormatDate(embed.Timestamp.Value)
+ }
+
+
- @if (sticker.Format is StickerFormat.Png or StickerFormat.PngAnimated)
- {
- )
- }
- else if (sticker.Format == StickerFormat.Lottie)
- {
-
- }
-
- }
+ @{/* Stickers */}
+ @foreach (var sticker in message.Stickers)
+ {
+
+ @if (sticker.Format is StickerFormat.Png or StickerFormat.PngAnimated)
+ {
+
+ }
+ else if (sticker.Format == StickerFormat.Lottie)
+ {
+
+ }
+
+ }
- @{/* Message reactions */}
- @if (message.Reactions.Any())
- {
-
- @foreach (var reaction in message.Reactions)
- {
-
- }
-
- )
- @reaction.Count
-
- }
-
+ @foreach (var reaction in message.Reactions)
+ {
+
+ }
+
+
+ @reaction.Count
+
+ }
+