github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Correct IUserMessage.ModifyAsync precondition expression

Browse Source
This commit is contained in:
Mihail Gribkov
2025-10-31 23:19:25 +03:00
committed by GitHub
parent 80fbbc2e2b
commit 86680929ae
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
View File

@@ -38,9 +38,10 @@ namespace Discord.Rest
var embed = args.Embed; var embed = args.Embed;
var embeds = args.Embeds; var embeds = args.Embeds;
bool hasText = args.Content.IsSpecified && string.IsNullOrEmpty(args.Content.Value); bool hasText = args.Content.IsSpecified && !string.IsNullOrEmpty(args.Content.Value);
bool hasEmbeds = embed.IsSpecified && embed.Value != null || embeds.IsSpecified && embeds.Value?.Length > 0; bool hasEmbeds = embed is { IsSpecified: true, Value: not null }
bool hasComponents = args.Components.IsSpecified && args.Components.Value != null; || embeds is { IsSpecified: true, Value.Length: > 0 };
bool hasComponents = args.Components is { IsSpecified: true, Value: not null };
bool hasAttachments = args.Attachments.IsSpecified; bool hasAttachments = args.Attachments.IsSpecified;
bool hasFlags = args.Flags.IsSpecified; bool hasFlags = args.Flags.IsSpecified;
@@ -50,7 +51,7 @@ namespace Discord.Rest
if (args.AllowedMentions.IsSpecified) if (args.AllowedMentions.IsSpecified)
{ {
AllowedMentions allowedMentions = args.AllowedMentions.Value; var allowedMentions = args.AllowedMentions.Value;
Preconditions.AtMost(allowedMentions?.RoleIds?.Count ?? 0, 100, nameof(allowedMentions.RoleIds), "A max of 100 role Ids are allowed."); Preconditions.AtMost(allowedMentions?.RoleIds?.Count ?? 0, 100, nameof(allowedMentions.RoleIds), "A max of 100 role Ids are allowed.");
Preconditions.AtMost(allowedMentions?.UserIds?.Count ?? 0, 100, nameof(allowedMentions.UserIds), "A max of 100 user Ids are allowed."); Preconditions.AtMost(allowedMentions?.UserIds?.Count ?? 0, 100, nameof(allowedMentions.UserIds), "A max of 100 user Ids are allowed.");
@@ -73,12 +74,12 @@ namespace Discord.Rest
var apiEmbeds = embed.IsSpecified || embeds.IsSpecified ? new List<API.Embed>() : null; var apiEmbeds = embed.IsSpecified || embeds.IsSpecified ? new List<API.Embed>() : null;
if (embed.IsSpecified && embed.Value != null) if (embed is { IsSpecified: true, Value: not null })
{ {
apiEmbeds.Add(embed.Value.ToModel()); apiEmbeds.Add(embed.Value.ToModel());
} }
if (embeds.IsSpecified && embeds.Value != null) if (embeds is { IsSpecified: true, Value: not null })
{ {
apiEmbeds.AddRange(embeds.Value.Select(x => x.ToModel())); apiEmbeds.AddRange(embeds.Value.Select(x => x.ToModel()));
} }
@@ -87,7 +88,7 @@ namespace Discord.Rest
if (!args.Attachments.IsSpecified) if (!args.Attachments.IsSpecified)
{ {
var apiArgs = new API.Rest.ModifyMessageParams var apiArgs = new ModifyMessageParams
{ {
Content = args.Content, Content = args.Content,
Embeds = apiEmbeds?.ToArray() ?? Optional<API.Embed[]>.Unspecified, Embeds = apiEmbeds?.ToArray() ?? Optional<API.Embed[]>.Unspecified,