mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-23 11:16:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[HTML] Fix multiple emojis not getting jumbo

Browse source
This commit is contained in:
Alexey Golub 2019-04-11 23:31:29 +03:00
parent 30cba7959f
commit ffdca7b799
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
DiscordChatExporter.Core.Rendering/HtmlChatLogRenderer.cs
View file

@ -46,7 +46,7 @@ namespace DiscordChatExporter.Core.Rendering
return true; return true;
}).Select(g => new MessageGroup(g.First().Author, g.First().Timestamp, g)); }).Select(g => new MessageGroup(g.First().Author, g.First().Timestamp, g));
private string FormatMarkdown(Node node, bool isTopLevel, bool isSingle) private string FormatMarkdown(Node node, bool isJumbo)
{ {
// Text node // Text node
if (node is TextNode textNode) if (node is TextNode textNode)
@ -136,8 +136,8 @@ namespace DiscordChatExporter.Core.Rendering
// Get emoji image URL // Get emoji image URL
var emojiImageUrl = Emoji.GetImageUrl(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated); var emojiImageUrl = Emoji.GetImageUrl(emojiNode.Id, emojiNode.Name, emojiNode.IsAnimated);
// Emoji can be jumboable if it's the only top-level node // Make emoji large if it's jumbo
var jumboableCssClass = isTopLevel && isSingle ? "emoji--large" : null; var jumboableCssClass = isJumbo ? "emoji--large" : null;
return $"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />"; return $"<img class=\"emoji {jumboableCssClass}\" alt=\"{emojiNode.Name}\" title=\"{emojiNode.Name}\" src=\"{emojiImageUrl}\" />";
} }
@ -154,8 +154,10 @@ namespace DiscordChatExporter.Core.Rendering
private string FormatMarkdown(IReadOnlyList<Node> nodes, bool isTopLevel) private string FormatMarkdown(IReadOnlyList<Node> nodes, bool isTopLevel)
{ {
var isSingle = nodes.Count == 1; // Emojis are jumbo if all top-level nodes are emoji nodes, disregarding whitespace
return nodes.Select(n => FormatMarkdown(n, isTopLevel, isSingle)).JoinToString(""); var isJumbo = isTopLevel && nodes.Where(n => !n.Source.IsNullOrWhiteSpace()).All(n => n is EmojiNode);
return nodes.Select(n => FormatMarkdown(n, isJumbo)).JoinToString("");
} }
private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.Parse(markdown), true); private string FormatMarkdown(string markdown) => FormatMarkdown(MarkdownParser.Parse(markdown), true);