From 33f71c16126ba733020b2718e0041c3dadaf5a78 Mon Sep 17 00:00:00 2001 From: Alexey Golub Date: Thu, 7 Mar 2019 21:14:11 +0200 Subject: [PATCH] Remove message group limit setting --- DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs | 2 -- DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs | 2 -- DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs | 2 -- DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs | 3 --- .../Services/ExportService.TemplateModel.cs | 7 ++----- DiscordChatExporter.Core/Services/ExportService.cs | 3 +-- DiscordChatExporter.Core/Services/SettingsService.cs | 1 - .../ViewModels/Dialogs/SettingsViewModel.cs | 7 ------- DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml | 7 ------- 9 files changed, 3 insertions(+), 31 deletions(-) diff --git a/DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs b/DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs index 7b2c5e9..5835414 100644 --- a/DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs +++ b/DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs @@ -26,8 +26,6 @@ namespace DiscordChatExporter.Cli.Verbs // Configure settings if (Options.DateFormat.IsNotBlank()) settingsService.DateFormat = Options.DateFormat; - if (Options.MessageGroupLimit > 0) - settingsService.MessageGroupLimit = Options.MessageGroupLimit; // Track progress Console.Write($"Exporting channel [{Options.ChannelId}]... "); diff --git a/DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs b/DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs index 5d49bd3..71bd295 100644 --- a/DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs +++ b/DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs @@ -29,8 +29,6 @@ namespace DiscordChatExporter.Cli.Verbs // Configure settings if (Options.DateFormat.IsNotBlank()) settingsService.DateFormat = Options.DateFormat; - if (Options.MessageGroupLimit > 0) - settingsService.MessageGroupLimit = Options.MessageGroupLimit; // Get channels var channels = await dataService.GetDirectMessageChannelsAsync(Options.GetToken()); diff --git a/DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs b/DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs index 7fa39ce..ceb95f3 100644 --- a/DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs +++ b/DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs @@ -30,8 +30,6 @@ namespace DiscordChatExporter.Cli.Verbs // Configure settings if (Options.DateFormat.IsNotBlank()) settingsService.DateFormat = Options.DateFormat; - if (Options.MessageGroupLimit > 0) - settingsService.MessageGroupLimit = Options.MessageGroupLimit; // Get channels var channels = await dataService.GetGuildChannelsAsync(Options.GetToken(), Options.GuildId); diff --git a/DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs b/DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs index 766504d..cd121b1 100644 --- a/DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs +++ b/DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs @@ -23,8 +23,5 @@ namespace DiscordChatExporter.Cli.Verbs.Options [Option("dateformat", Default = null, HelpText = "Date format used in output.")] public string DateFormat { get; set; } - - [Option("grouplimit", Default = 0, HelpText = "Message group limit.")] - public int MessageGroupLimit { get; set; } } } \ No newline at end of file diff --git a/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs b/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs index 204227a..2ee647d 100644 --- a/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs +++ b/DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs @@ -18,14 +18,12 @@ namespace DiscordChatExporter.Core.Services private readonly ExportFormat _format; private readonly ChatLog _log; private readonly string _dateFormat; - private readonly int _messageGroupLimit; - public TemplateModel(ExportFormat format, ChatLog log, string dateFormat, int messageGroupLimit) + public TemplateModel(ExportFormat format, ChatLog log, string dateFormat) { _format = format; _log = log; _dateFormat = dateFormat; - _messageGroupLimit = messageGroupLimit; } private IEnumerable GroupMessages(IEnumerable messages) @@ -39,8 +37,7 @@ namespace DiscordChatExporter.Core.Services buffer.Any() && ( message.Author.Id != buffer.First().Author.Id || // when author changes - (message.Timestamp - buffer.Last().Timestamp).TotalMinutes > 7 || // when more than 7 minutes passed since last message - buffer.Count >= _messageGroupLimit // when group is full + (message.Timestamp - buffer.Last().Timestamp).TotalMinutes > 7 // when more than 7 minutes passed since last message ); // If condition is true - flush buffer diff --git a/DiscordChatExporter.Core/Services/ExportService.cs b/DiscordChatExporter.Core/Services/ExportService.cs index 9ffbdea..3d1fc42 100644 --- a/DiscordChatExporter.Core/Services/ExportService.cs +++ b/DiscordChatExporter.Core/Services/ExportService.cs @@ -36,8 +36,7 @@ namespace DiscordChatExporter.Core.Services }; // Create template model - var templateModel = new TemplateModel(format, chatLog, - _settingsService.DateFormat, _settingsService.MessageGroupLimit); + var templateModel = new TemplateModel(format, chatLog, _settingsService.DateFormat); context.PushGlobal(templateModel.GetScriptObject()); diff --git a/DiscordChatExporter.Core/Services/SettingsService.cs b/DiscordChatExporter.Core/Services/SettingsService.cs index 611dba7..b36445b 100644 --- a/DiscordChatExporter.Core/Services/SettingsService.cs +++ b/DiscordChatExporter.Core/Services/SettingsService.cs @@ -8,7 +8,6 @@ namespace DiscordChatExporter.Core.Services public bool IsAutoUpdateEnabled { get; set; } = true; public string DateFormat { get; set; } = "dd-MMM-yy hh:mm tt"; - public int MessageGroupLimit { get; set; } = 20; public AuthToken LastToken { get; set; } public ExportFormat LastExportFormat { get; set; } = ExportFormat.HtmlDark; diff --git a/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs index 47c3a3d..57bcb4d 100644 --- a/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs +++ b/DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs @@ -1,6 +1,5 @@ using DiscordChatExporter.Core.Services; using DiscordChatExporter.Gui.ViewModels.Framework; -using Tyrrrz.Extensions; namespace DiscordChatExporter.Gui.ViewModels.Dialogs { @@ -20,12 +19,6 @@ namespace DiscordChatExporter.Gui.ViewModels.Dialogs set => _settingsService.DateFormat = value; } - public int MessageGroupLimit - { - get => _settingsService.MessageGroupLimit; - set => _settingsService.MessageGroupLimit = value.ClampMin(0); - } - public SettingsViewModel(SettingsService settingsService) { _settingsService = settingsService; diff --git a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml index 38123e8..e02e257 100644 --- a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml +++ b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml @@ -25,13 +25,6 @@ materialDesign:HintAssist.IsFloating="True" Text="{Binding DateFormat}" /> - - -