From ad81e76c5e3c72f283733a23cdc740bbf8a8e3cc Mon Sep 17 00:00:00 2001 From: RogueException Date: Tue, 27 Oct 2015 10:49:38 -0300 Subject: [PATCH] Added message length check. --- src/Discord.Net/DiscordClient.Messages.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Discord.Net/DiscordClient.Messages.cs b/src/Discord.Net/DiscordClient.Messages.cs index ebf9e748a..28b3c068c 100644 --- a/src/Discord.Net/DiscordClient.Messages.cs +++ b/src/Discord.Net/DiscordClient.Messages.cs @@ -93,6 +93,7 @@ namespace Discord { if (channel == null) throw new ArgumentNullException(nameof(channel)); if (text == null) throw new ArgumentNullException(nameof(text)); + if (text.Length > MaxMessageSize) throw new ArgumentOutOfRangeException(nameof(text), $"Message must be {MaxMessageSize} characters or less."); CheckReady(); return SendMessage(channel, text, false); @@ -102,6 +103,7 @@ namespace Discord { if (channel == null) throw new ArgumentNullException(nameof(channel)); if (text == null) throw new ArgumentNullException(nameof(text)); + if (text.Length > MaxMessageSize) throw new ArgumentOutOfRangeException(nameof(text), $"Message must be {MaxMessageSize} characters or less."); CheckReady(); return SendMessage(channel, text, false); @@ -111,7 +113,8 @@ namespace Discord { if (user == null) throw new ArgumentNullException(nameof(user)); if (text == null) throw new ArgumentNullException(nameof(text)); - CheckReady(); + if (text.Length > MaxMessageSize) throw new ArgumentOutOfRangeException(nameof(text), $"Message must be {MaxMessageSize} characters or less."); + CheckReady(); var channel = await CreatePMChannel(user).ConfigureAwait(false); return await SendMessage(channel, text).ConfigureAwait(false); @@ -164,6 +167,8 @@ namespace Discord public Task EditMessage(Message message, string text) { if (message == null) throw new ArgumentNullException(nameof(message)); + if (text == null) throw new ArgumentNullException(nameof(text)); + if (text.Length > MaxMessageSize) throw new ArgumentOutOfRangeException(nameof(text), $"Message must be {MaxMessageSize} characters or less."); CheckReady(); if (text != null && text.Length > MaxMessageSize)