mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-06-01 07:18:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove message group limit setting

Browse source
This commit is contained in:
Alexey Golub 2019-03-07 21:14:11 +02:00
parent 9b78472e05
commit 33f71c1612
9 changed files with 3 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DiscordChatExporter.Cli/Verbs/ExportChannelVerb.cs
View file

@ -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}]... ");

2
DiscordChatExporter.Cli/Verbs/ExportDirectMessagesVerb.cs
View file

@ -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());

2
DiscordChatExporter.Cli/Verbs/ExportGuildVerb.cs
View file

@ -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);

3
DiscordChatExporter.Cli/Verbs/Options/ExportOptions.cs
View file

@ -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; }
}
}

7
DiscordChatExporter.Core/Services/ExportService.TemplateModel.cs
View file

@ -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<MessageGroup> GroupMessages(IEnumerable<Message> 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

3
DiscordChatExporter.Core/Services/ExportService.cs
View file

@ -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());

1
DiscordChatExporter.Core/Services/SettingsService.cs
View file

@ -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;

7
DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs
View file

@ -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;

7
DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
View file

@ -25,13 +25,6 @@
materialDesign:HintAssist.IsFloating="True"
Text="{Binding DateFormat}" />
<!-- Message group limit -->
<TextBox
Margin="16,8"
materialDesign:HintAssist.Hint="Message group limit"
materialDesign:HintAssist.IsFloating="True"
Text="{Binding MessageGroupLimit}" />
<!-- Auto-updates -->
<DockPanel LastChildFill="False">
<TextBlock