diff --git a/DiscordChatExporter.Cli/ViewModels/MainViewModel.cs b/DiscordChatExporter.Cli/ViewModels/MainViewModel.cs index 74eed676..afa073fc 100644 --- a/DiscordChatExporter.Cli/ViewModels/MainViewModel.cs +++ b/DiscordChatExporter.Cli/ViewModels/MainViewModel.cs @@ -47,7 +47,7 @@ namespace DiscordChatExporter.Cli.ViewModels var mentionables = await _dataService.GetMentionablesAsync(token, guild.Id, messages); // Create log - var log = new ChatLog(guild, channel, messageGroups, mentionables); + var log = new ChatLog(guild, channel, from, to, messageGroups, mentionables); // Export _exportService.Export(format, filePath, log); diff --git a/DiscordChatExporter.Core/Models/ChatLog.cs b/DiscordChatExporter.Core/Models/ChatLog.cs index c1b385a6..a5c38f05 100644 --- a/DiscordChatExporter.Core/Models/ChatLog.cs +++ b/DiscordChatExporter.Core/Models/ChatLog.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; namespace DiscordChatExporter.Core.Models @@ -9,17 +10,23 @@ namespace DiscordChatExporter.Core.Models public Channel Channel { get; } + public DateTime? From { get; } + + public DateTime? To { get; } + public IReadOnlyList MessageGroups { get; } public int TotalMessageCount => MessageGroups.Sum(g => g.Messages.Count); public Mentionables Mentionables { get; } - public ChatLog(Guild guild, Channel channel, IReadOnlyList messageGroups, - Mentionables mentionables) + public ChatLog(Guild guild, Channel channel, DateTime? from, DateTime? to, + IReadOnlyList messageGroups, Mentionables mentionables) { Guild = guild; Channel = channel; + From = from; + To = to; MessageGroups = messageGroups; Mentionables = mentionables; } diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html index b4aa607f..4eab157d 100644 --- a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html +++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Core.html @@ -17,8 +17,24 @@ diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css index fd2bf9b8..95842c38 100644 --- a/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css +++ b/DiscordChatExporter.Core/Resources/ExportTemplates/Html/Shared.css @@ -65,8 +65,8 @@ img { } .info__guild-icon { - max-width: 64px; - max-height: 64px; + max-width: 88px; + max-height: 88px; } .info__metadata { @@ -90,6 +90,10 @@ img { margin-top: 2px; } +.info__channel-date-range { + margin-top: 2px; +} + /* === CHATLOG === */ .chatlog { diff --git a/DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt b/DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt index ca0bf09e..c1342b81 100644 --- a/DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt +++ b/DiscordChatExporter.Core/Resources/ExportTemplates/PlainText.txt @@ -3,6 +3,7 @@ Guild: {{ Guild.Name }} Channel: {{ Channel.Name }} Topic: {{ Channel.Topic }} Messages: {{ TotalMessageCount | Format "N0" }} +Range: {{ if From }}{{ From | FormatDate }} {{ end }}{{ if From || To }}->{{ end }}{{ if To }} {{ To | FormatDate }}{{ end }} ============================================================== {{~ for group in MessageGroups ~}} diff --git a/DiscordChatExporter.Gui/ViewModels/MainViewModel.cs b/DiscordChatExporter.Gui/ViewModels/MainViewModel.cs index 79c314dd..0b496f00 100644 --- a/DiscordChatExporter.Gui/ViewModels/MainViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/MainViewModel.cs @@ -237,7 +237,7 @@ namespace DiscordChatExporter.Gui.ViewModels var mentionables = await _dataService.GetMentionablesAsync(token, guild.Id, messages); // Create log - var log = new ChatLog(guild, channel, messageGroups, mentionables); + var log = new ChatLog(guild, channel, from, to, messageGroups, mentionables); // Export _exportService.Export(format, filePath, log);