calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-03-28 17:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize thread inclusion UX across GUI and CLI

Browse Source 
Related to #1119
This commit is contained in:
Tyrrrz
2023-08-28 22:08:51 +03:00
parent d430f77ae1
commit 3740d64601
9 changed files with 49 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs
View File

@@ -8,6 +8,7 @@ using DiscordChatExporter.Core.Discord.Data;
using DiscordChatExporter.Core.Exceptions;
using DiscordChatExporter.Core.Exporting;
using DiscordChatExporter.Core.Utils.Extensions;
using DiscordChatExporter.Gui.Models;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.Utils;
using DiscordChatExporter.Gui.ViewModels.Dialogs;
@@ -169,12 +170,12 @@ public class DashboardViewModel : PropertyChangedBase
}
// Threads
if (_settingsService.ShouldShowThreads)
if (_settingsService.ThreadInclusion != ThreadInclusion.None)
{
await foreach (
var thread in _discord.GetGuildThreadsAsync(
SelectedGuild.Id,
_settingsService.ShouldShowArchivedThreads
_settingsService.ThreadInclusion == ThreadInclusion.All
)
)
{

22
DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs
View File

@@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using DiscordChatExporter.Gui.Models;
using DiscordChatExporter.Gui.Services;
using DiscordChatExporter.Gui.ViewModels.Framework;
@@ -26,23 +28,13 @@ public class SettingsViewModel : DialogScreen
set => _settingsService.IsTokenPersisted = value;
}
public bool ShouldShowThreads
{
get => _settingsService.ShouldShowThreads;
set => _settingsService.ShouldShowThreads = value;
}
public IReadOnlyList<ThreadInclusion> AvailableThreadInclusions { get; } =
Enum.GetValues<ThreadInclusion>();
public bool ShouldShowArchivedThreads
public ThreadInclusion ThreadInclusion
{
get => _settingsService.ShouldShowArchivedThreads;
set
{
_settingsService.ShouldShowArchivedThreads = value;
// Enabling archived threads implicitly enables threads
if (value)
ShouldShowThreads = true;
}
get => _settingsService.ThreadInclusion;
set => _settingsService.ThreadInclusion = value;
}
public string DateFormat