From 5b5a53dbf4e7df147b87eaf49e87c6f1b9c608c4 Mon Sep 17 00:00:00 2001 From: Tyrrrz Date: Tue, 22 Jun 2021 20:03:30 +0300 Subject: [PATCH] [HTML] More template cleanup --- .../Discord/Data/Attachment.cs | 11 +- .../DiscordChatExporter.Core.csproj | 5 +- .../Writers/Html/MessageGroupTemplate.cshtml | 136 ++-- .../Writers/Html/PostambleTemplate.cshtml | 1 + .../Writers/Html/PreambleTemplate.cshtml | 612 +++++++++++++++++- .../Writers/Html/StylesheetTemplate.cshtml | 596 ----------------- .../MarkdownVisitors/HtmlMarkdownVisitor.cs | 4 +- 7 files changed, 695 insertions(+), 670 deletions(-) delete mode 100644 DiscordChatExporter.Core/Exporting/Writers/Html/StylesheetTemplate.cshtml diff --git a/DiscordChatExporter.Core/Discord/Data/Attachment.cs b/DiscordChatExporter.Core/Discord/Data/Attachment.cs index 799b3446..d46e52ee 100644 --- a/DiscordChatExporter.Core/Discord/Data/Attachment.cs +++ b/DiscordChatExporter.Core/Discord/Data/Attachment.cs @@ -17,18 +17,19 @@ namespace DiscordChatExporter.Core.Discord.Data public string FileName { get; } + public string FileExtension => Path.GetExtension(FileName); + public int? Width { get; } public int? Height { get; } - public bool IsImage => ImageFileExtensions.Contains(Path.GetExtension(FileName)); + public bool IsImage => ImageFileExtensions.Contains(FileExtension); - public bool IsVideo => VideoFileExtensions.Contains(Path.GetExtension(FileName)); + public bool IsVideo => VideoFileExtensions.Contains(FileExtension); - public bool IsAudio => AudioFileExtensions.Contains(Path.GetExtension(FileName)); + public bool IsAudio => AudioFileExtensions.Contains(FileExtension); - public bool IsSpoiler => - (IsImage || IsVideo || IsAudio) && FileName.StartsWith("SPOILER_", StringComparison.Ordinal); + public bool IsSpoiler => FileName.StartsWith("SPOILER_", StringComparison.Ordinal); public FileSize FileSize { get; } diff --git a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj index b0989242..9651a8f2 100644 --- a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj +++ b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj @@ -12,10 +12,7 @@ - - - - + \ No newline at end of file diff --git a/DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplate.cshtml b/DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplate.cshtml index b4712ef4..caf84ce2 100644 --- a/DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplate.cshtml +++ b/DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplate.cshtml @@ -46,17 +46,17 @@ }
+ @{/* Referenced message */} @if (Model.MessageGroup.Reference is not null) { -
-
+
@if (Model.MessageGroup.ReferencedMessage is not null) { - Avatar + Avatar @referencedUserNick -
- +
+ @if (!string.IsNullOrWhiteSpace(Model.MessageGroup.ReferencedMessage.Content)) { @Raw(FormatEmbedMarkdown(Model.MessageGroup.ReferencedMessage.Content)) @@ -81,30 +81,37 @@ }
} + + @{/* Avatar */}
- Avatar + Avatar
+
+ @{/* Author name */} @userNick + @{/* Bot tag */} @if (Model.MessageGroup.Author.IsBot) { BOT } + @{/* Message timestamp */} @FormatDate(Model.MessageGroup.Timestamp) + @{/* Messages in a group */} @foreach (var message in Model.MessageGroup.Messages) { - var isPinnedStyle = message.IsPinned ? "chatlog__message--pinned" : null; - -
+
@if (!string.IsNullOrWhiteSpace(message.Content) || message.EditedTimestamp is not null) {
+ @{/* Message content */} @Raw(FormatMarkdown(message.Content)) + @{/* Edit timestamp */} @if (message.EditedTimestamp is not null) { (edited) @@ -113,62 +120,64 @@
} + @{/* Attachments */} @foreach (var attachment in message.Attachments) { -
-
-
- @if (attachment.IsImage) - { +
+ @{/* Spoiler caption */} + @if (attachment.IsSpoiler) + { +
SPOILER
+ } + + @{/* Attachment preview */} + @if (attachment.IsImage) + { + + Image attachment + + } + else if (attachment.IsVideo) + { + + } + else if (attachment.IsAudio) + { + + } + else + { +
+ + + +
- Image attachment + @attachment.FileName - } - else if (attachment.IsVideo) - { - - } - else if (attachment.IsAudio) - { - - } - else - { -
- - - - - - -
- - @attachment.FileName - -
-
- @attachment.FileSize -
-
- } +
+
+ @attachment.FileSize +
-
+ }
} + @{/* Embeds */} @foreach (var embed in message.Embeds) { var youTubeVideo = embed.TryGetYouTubeVideo();
+ @{/* Color pill */} @if (embed.Color is not null) { - var embedColorStyle = $"background-color: rgba({embed.Color?.R},{embed.Color?.G},{embed.Color?.B},{embed.Color?.A})"; -
+
} else { @@ -178,12 +187,13 @@
+ @{/* Embed author */} @if (embed.Author is not null) {
@if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl)) { - Author icon + Author icon } @if (!string.IsNullOrWhiteSpace(embed.Author.Name)) @@ -202,6 +212,7 @@
} + @{/* Embed title */} @if (!string.IsNullOrWhiteSpace(embed.Title)) {
@@ -218,6 +229,7 @@
} + @{/* Embed description (with special casing for YouTube videos) */} @if (youTubeVideo is not null) {
@@ -231,14 +243,13 @@
} + @{/* Embed fields */} @if (embed.Fields.Any()) {
@foreach (var field in embed.Fields) { - var isInlineStyle = field.IsInline ? "chatlog__embed-field--inline" : null; - -
+
@if (!string.IsNullOrWhiteSpace(field.Name)) {
@@ -258,34 +269,39 @@ }
+ @{/* Embed content (not shown for YouTube videos) */} @if (embed.Thumbnail is not null && !string.IsNullOrWhiteSpace(embed.Thumbnail.Url) && youTubeVideo is null) {
- Thumbnail + Thumbnail
}
+ @{/* Embed image */} @if (embed.Image is not null && !string.IsNullOrWhiteSpace(embed.Image.Url)) {
- Image + Image
} + @{/* Embed footer & icon */} @if (embed.Footer is not null || embed.Timestamp is not null) {
+ @{/* Footer icon */} @if (!string.IsNullOrWhiteSpace(embed.Footer?.IconUrl)) { - Footer icon + Footer icon } + @{/* Footer text */} @if (!string.IsNullOrWhiteSpace(embed.Footer?.Text)) { @embed.Footer.Text @@ -296,6 +312,7 @@ @(" • ") } + @{/* Embed timestamp */} @if (embed.Timestamp is not null) { @FormatDate(embed.Timestamp.Value) @@ -307,13 +324,14 @@
} + @{/* Message reactions */} @if (message.Reactions.Any()) {
@foreach (var reaction in message.Reactions) {
- @reaction.Emoji.Name + @reaction.Emoji.Name @reaction.Count
} @@ -322,4 +340,4 @@
}
-
+
\ No newline at end of file diff --git a/DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplate.cshtml b/DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplate.cshtml index a35ac47f..fc4638a0 100644 --- a/DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplate.cshtml +++ b/DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplate.cshtml @@ -1,6 +1,7 @@ @namespace DiscordChatExporter.Core.Exporting.Writers.Html @inherits MiniRazor.TemplateBase +@{/* Close elements opened by preamble */}
diff --git a/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml b/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml index 640ec478..a61009a2 100644 --- a/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml +++ b/DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml @@ -5,6 +5,11 @@ @inherits MiniRazor.TemplateBase @{ + string Themed(string darkVariant, string lightVariant) => + string.Equals(Model.ThemeName, "Dark", StringComparison.OrdinalIgnoreCase) + ? darkVariant + : lightVariant; + string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date); ValueTask ResolveUrlAsync(string url) => Model.ExportContext.ResolveMediaUrlAsync(url); @@ -18,8 +23,591 @@ - @{ await StylesheetTemplate.RenderAsync(Output, Model); } + @{/* Styling */} + + + @{/* Syntax highlighting */} + @{/* Scripts */} + + @{/* Icons */} + + + + + + + +
- Guild icon + Guild icon
@Model.ExportContext.Request.Guild.Name
@@ -91,4 +694,5 @@
+@{/* Preamble cuts off at this point */}
\ No newline at end of file diff --git a/DiscordChatExporter.Core/Exporting/Writers/Html/StylesheetTemplate.cshtml b/DiscordChatExporter.Core/Exporting/Writers/Html/StylesheetTemplate.cshtml deleted file mode 100644 index 8b638bd5..00000000 --- a/DiscordChatExporter.Core/Exporting/Writers/Html/StylesheetTemplate.cshtml +++ /dev/null @@ -1,596 +0,0 @@ -@using System - -@namespace DiscordChatExporter.Core.Exporting.Writers.Html -@inherits MiniRazor.TemplateBase - -@{ - string Themed(string darkVariant, string lightVariant) => - string.Equals(Model.ThemeName, "Dark", StringComparison.OrdinalIgnoreCase) - ? darkVariant - : lightVariant; -} - - \ No newline at end of file diff --git a/DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs b/DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs index 9f122e4a..f6e17767 100644 --- a/DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs +++ b/DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs @@ -39,7 +39,7 @@ namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors TextFormatting.Underline => ("", ""), TextFormatting.Strikethrough => ("", ""), TextFormatting.Spoiler => ( - "", ""), + "", ""), TextFormatting.Quote => ("
", "
"), _ => throw new ArgumentOutOfRangeException(nameof(formatted.Formatting)) }; @@ -179,4 +179,4 @@ namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors return buffer.ToString(); } } -} +} \ No newline at end of file