calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-04-21 05:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize message content intent check

Browse Source
This commit is contained in:
Tyrrrz
2023-10-04 15:24:48 +03:00
parent a8895663fe
commit 57ed5578c9
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscordChatExporter.Core/Discord/Data/Message.cs
View File

@@ -38,6 +38,12 @@ public partial record Message(
// App interactions are rendered as replies in the Discord client, but they are not actually replies // App interactions are rendered as replies in the Discord client, but they are not actually replies
public bool IsReplyLike => IsReply || Interaction is not null; public bool IsReplyLike => IsReply || Interaction is not null;
public bool IsEmpty =>
string.IsNullOrWhiteSpace(Content)
&& !Attachments.Any()
&& !Embeds.Any()
&& !Stickers.Any();
public IEnumerable<User> GetReferencedUsers() public IEnumerable<User> GetReferencedUsers()
{ {
yield return Author; yield return Author;

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

@@ -297,8 +297,6 @@ public class DiscordClient
if (guildId == Guild.DirectMessages.Id) if (guildId == Guild.DirectMessages.Id)
yield break; yield break;
var tokenKind = await ResolveTokenKindAsync(cancellationToken);
var channels = (await GetGuildChannelsAsync(guildId, cancellationToken)) var channels = (await GetGuildChannelsAsync(guildId, cancellationToken))
// Categories cannot have threads // Categories cannot have threads
.Where(c => !c.IsCategory) .Where(c => !c.IsCategory)
@@ -314,7 +312,7 @@ public class DiscordClient
.ToArray(); .ToArray();
// User accounts can only fetch threads using the search endpoint // User accounts can only fetch threads using the search endpoint
if (tokenKind == TokenKind.User) if (await ResolveTokenKindAsync(cancellationToken) == TokenKind.User)
{ {
// Active threads // Active threads
foreach (var channel in channels) foreach (var channel in channels)
@@ -571,22 +569,6 @@ public class DiscordClient
[EnumeratorCancellation] CancellationToken cancellationToken = default [EnumeratorCancellation] CancellationToken cancellationToken = default
) )
{ {
// If authenticating as a bot, ensure that we have the correct permissions to
// retrieve message content.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959
var tokenKind = await ResolveTokenKindAsync(cancellationToken);
if (tokenKind == TokenKind.Bot)
{
var application = await GetApplicationAsync(cancellationToken);
if (!application.IsMessageContentIntentEnabled)
{
throw new DiscordChatExporterException(
"Bot account does not have the Message Content Intent enabled.",
true
);
}
}
// Get the last message in the specified range, so we can later calculate the // Get the last message in the specified range, so we can later calculate the
// progress based on the difference between message timestamps. // progress based on the difference between message timestamps.
// This also snapshots the boundaries, which means that messages posted after // This also snapshots the boundaries, which means that messages posted after
@@ -620,6 +602,24 @@ public class DiscordClient
if (!messages.Any()) if (!messages.Any())
yield break; yield break;
// If all messages are empty, make sure that it's not because the bot account doesn't
// have the Message Content Intent enabled.
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959
if (
messages.All(m => m.IsEmpty)
&& await ResolveTokenKindAsync(cancellationToken) == TokenKind.Bot
)
{
var application = await GetApplicationAsync(cancellationToken);
if (!application.IsMessageContentIntentEnabled)
{
throw new DiscordChatExporterException(
"Bot account does not have the Message Content Intent enabled.",
true
);
}
}
foreach (var message in messages) foreach (var message in messages)
{ {
firstMessage ??= message; firstMessage ??= message;