calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-02-01 07:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Tyrrrz
2025-06-08 22:53:10 +03:00
parent 08718425f1
commit cc92b2cbe6
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
View File

@@ -147,9 +147,22 @@ public abstract class ExportCommandBase : DiscordCommandBase
{
var cancellationToken = console.RegisterCancellationHandler();
var unwrappedChannels = new List<Channel>();
unwrappedChannels.AddRange(channels);
// Threads
// Asset reuse can only be enabled if the download assets option is set
// https://github.com/Tyrrrz/DiscordChatExporter/issues/425
if (ShouldReuseAssets && !ShouldDownloadAssets)
{
throw new CommandException("Option --reuse-media cannot be used without --media.");
}
// Assets directory can only be specified if the download assets option is set
if (!string.IsNullOrWhiteSpace(AssetsDirPath) && !ShouldDownloadAssets)
{
throw new CommandException("Option --media-dir cannot be used without --media.");
}
var unwrappedChannels = new List<Channel>(channels);
// Unwrap threads
if (ThreadInclusionMode != ThreadInclusionMode.None)
{
await console.Output.WriteLineAsync("Fetching threads...");
@@ -163,7 +176,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
{
await foreach (
var thread in Discord.GetChannelThreadsAsync(
unwrappedChannels,
channels,
ThreadInclusionMode == ThreadInclusionMode.All,
Before,
After,
@@ -180,25 +193,13 @@ public abstract class ExportCommandBase : DiscordCommandBase
}
);
// Remove unneeded forums, as they cannot be crawled directly.
// Remove forums, as they cannot be exported directly and their constituent threads
// have already been fetched.
unwrappedChannels.RemoveAll(channel => channel.Kind == ChannelKind.GuildForum);
await console.Output.WriteLineAsync($"Fetched {fetchedThreadsCount} thread(s).");
}
// Asset reuse can only be enabled if the download assets option is set
// https://github.com/Tyrrrz/DiscordChatExporter/issues/425
if (ShouldReuseAssets && !ShouldDownloadAssets)
{
throw new CommandException("Option --reuse-media cannot be used without --media.");
}
// Assets directory can only be specified if the download assets option is set
if (!string.IsNullOrWhiteSpace(AssetsDirPath) && !ShouldDownloadAssets)
{
throw new CommandException("Option --media-dir cannot be used without --media.");
}
// Make sure the user does not try to export multiple channels into one file.
// Output path must either be a directory or contain template tokens for this to work.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/799

2
DiscordChatExporter.Core/Discord/DiscordClient.cs
View File

@@ -389,7 +389,7 @@ public class DiscordClient(
}
public async IAsyncEnumerable<Channel> GetChannelThreadsAsync(
IEnumerable<Channel> channels,
IReadOnlyList<Channel> channels,
bool includeArchived = false,
Snowflake? before = null,
Snowflake? after = null,