From 8866a1499c33bf1bc585f1b95033379a7c03fef6 Mon Sep 17 00:00:00 2001 From: Christopher F Date: Sun, 13 Nov 2016 01:02:44 -0500 Subject: [PATCH] Allow content to be empty when sending a message --- src/Discord.Net.Core/API/DiscordRestApiClient.cs | 3 +-- src/Discord.Net.Core/API/Rest/CreateMessageParams.cs | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net.Core/API/DiscordRestApiClient.cs b/src/Discord.Net.Core/API/DiscordRestApiClient.cs index ac18e8ace..91bdbfd11 100644 --- a/src/Discord.Net.Core/API/DiscordRestApiClient.cs +++ b/src/Discord.Net.Core/API/DiscordRestApiClient.cs @@ -439,8 +439,7 @@ namespace Discord.API { Preconditions.NotEqual(channelId, 0, nameof(channelId)); Preconditions.NotNull(args, nameof(args)); - Preconditions.NotNullOrEmpty(args.Content, nameof(args.Content)); - if (args.Content.Length > DiscordConfig.MaxMessageSize) + if (args.Content.GetValueOrDefault()?.Length > DiscordConfig.MaxMessageSize) throw new ArgumentException($"Message content is too long, length must be less or equal to {DiscordConfig.MaxMessageSize}.", nameof(args.Content)); options = RequestOptions.CreateOrClone(options); diff --git a/src/Discord.Net.Core/API/Rest/CreateMessageParams.cs b/src/Discord.Net.Core/API/Rest/CreateMessageParams.cs index a0dbb59dd..a6b06f9f8 100644 --- a/src/Discord.Net.Core/API/Rest/CreateMessageParams.cs +++ b/src/Discord.Net.Core/API/Rest/CreateMessageParams.cs @@ -8,7 +8,7 @@ namespace Discord.API.Rest public class CreateMessageParams { [JsonProperty("content")] - public string Content { get; } + public Optional Content { get; } [JsonProperty("nonce")] public Optional Nonce { get; set; } @@ -19,7 +19,10 @@ namespace Discord.API.Rest public CreateMessageParams(string content) { - Content = content; + if (string.IsNullOrEmpty(content)) + Content = null; + else + Content = content; } } }