Archive/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-03-31 09:33:03 -06:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Clean up

Browse source
This commit is contained in:
Tyrrrz 2026-02-26 21:23:30 +02:00
parent c4bfb3424e
commit 01d0203445
2 changed files with 35 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
DiscordChatExporter.Core/Discord/DiscordClient.cs
View file

@ -194,6 +194,23 @@ public class DiscordClient(
return Application.Parse(response); return Application.Parse(response);
} }
private async ValueTask EnsureMessageContentIntentAsync(
CancellationToken cancellationToken = default
)
{
if (await ResolveTokenKindAsync(cancellationToken) != TokenKind.Bot)
return;
var application = await GetApplicationAsync(cancellationToken);
if (application.IsMessageContentIntentEnabled)
return;
throw new DiscordChatExporterException(
"Provided bot account is missing the MESSAGE_CONTENT privileged intent.",
true
);
}
public async ValueTask<User?> TryGetUserAsync( public async ValueTask<User?> TryGetUserAsync(
Snowflake userId, Snowflake userId,
CancellationToken cancellationToken = default CancellationToken cancellationToken = default
@ -581,7 +598,6 @@ public class DiscordClient(
private async ValueTask<Message?> TryGetFirstMessageAsync( private async ValueTask<Message?> TryGetFirstMessageAsync(
Snowflake channelId, Snowflake channelId,
Snowflake? after = null, Snowflake? after = null,
Snowflake? before = null,
CancellationToken cancellationToken = default CancellationToken cancellationToken = default
) )
{ {
@ -594,9 +610,6 @@ public class DiscordClient(
var response = await GetJsonResponseAsync(url, cancellationToken); var response = await GetJsonResponseAsync(url, cancellationToken);
var message = response.EnumerateArray().Select(Message.Parse).FirstOrDefault(); var message = response.EnumerateArray().Select(Message.Parse).FirstOrDefault();
if (message is null || before is not null && message.Timestamp > before.Value.ToDate())
return null;
return message; return message;
} }
@ -658,22 +671,10 @@ public class DiscordClient(
yield break; yield break;
// If all messages are empty, make sure that it's not because the bot account doesn't // If all messages are empty, make sure that it's not because the bot account doesn't
// have the Message Content Intent enabled. // have the MESSAGE_CONTENT intent enabled.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959 // https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959
if ( if (messages.All(m => m.IsEmpty))
messages.All(m => m.IsEmpty) await EnsureMessageContentIntentAsync(cancellationToken);
&& await ResolveTokenKindAsync(cancellationToken) == TokenKind.Bot
)
{
var application = await GetApplicationAsync(cancellationToken);
if (!application.IsMessageContentIntentEnabled)
{
throw new DiscordChatExporterException(
"Provided bot account does not have the Message Content Intent enabled.",
true
);
}
}
foreach (var message in messages) foreach (var message in messages)
{ {
@ -714,19 +715,16 @@ public class DiscordClient(
[EnumeratorCancellation] CancellationToken cancellationToken = default [EnumeratorCancellation] CancellationToken cancellationToken = default
) )
{ {
// Get the first message (oldest) in the range to use as the lower bound for // Get the first message in the specified range, so we can later calculate the
// progress calculation. // progress based on the difference between message timestamps.
var firstMessage = await TryGetFirstMessageAsync( // Snapshotting is not necessary here because new messages can't appear in the past.
channelId, var firstMessage = await TryGetFirstMessageAsync(channelId, after, cancellationToken);
after, if (firstMessage is null || firstMessage.Timestamp > before?.ToDate())
before,
cancellationToken
);
if (firstMessage is null)
yield break; yield break;
// Keep track of the last message in range in order to calculate the progress // Keep track of the last message in range in order to calculate the progress
var lastMessage = default(Message); var lastMessage = default(Message);
var currentBefore = before; var currentBefore = before;
while (true) while (true)
{ {
@ -745,22 +743,10 @@ public class DiscordClient(
yield break; yield break;
// If all messages are empty, make sure that it's not because the bot account doesn't // If all messages are empty, make sure that it's not because the bot account doesn't
// have the Message Content Intent enabled. // have the MESSAGE_CONTENT intent enabled.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959 // https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959
if ( if (messages.All(m => m.IsEmpty))
messages.All(m => m.IsEmpty) await EnsureMessageContentIntentAsync(cancellationToken);
&& await ResolveTokenKindAsync(cancellationToken) == TokenKind.Bot
)
{
var application = await GetApplicationAsync(cancellationToken);
if (!application.IsMessageContentIntentEnabled)
{
throw new DiscordChatExporterException(
"Provided bot account does not have the Message Content Intent enabled.",
true
);
}
}
foreach (var message in messages) foreach (var message in messages)
{ {
@ -774,7 +760,11 @@ public class DiscordClient(
progress.Report( progress.Report(
Percentage.FromFraction( Percentage.FromFraction(
totalDuration > TimeSpan.Zero ? exportedDuration / totalDuration : 1 // Avoid division by zero if all messages have the exact same timestamp
// (which happens when there's only one message in the channel)
totalDuration > TimeSpan.Zero
? exportedDuration / totalDuration
: 1
) )
); );
} }

2
DiscordChatExporter.Core/Exporting/HtmlMessageWriter.cs
View file

@ -17,7 +17,7 @@ internal class HtmlMessageWriter(Stream stream, ExportContext context, string th
private readonly HtmlMinifier _minifier = new(); private readonly HtmlMinifier _minifier = new();
private readonly List<Message> _messageGroup = []; private readonly List<Message> _messageGroup = [];
// Note: in reverse order, last message is earlier than first message // Note: in reverse order, last message appears earlier than the first message
private bool CanJoinGroup(Message message) private bool CanJoinGroup(Message message)
{ {
// If the group is empty, any message can join it // If the group is empty, any message can join it