diff --git a/src/Discord.Net/Models/Channel.cs b/src/Discord.Net/Models/Channel.cs index a6ff1162b..29e2f1a51 100644 --- a/src/Discord.Net/Models/Channel.cs +++ b/src/Discord.Net/Models/Channel.cs @@ -328,27 +328,17 @@ namespace Discord public IEnumerable FindUsers(string name, bool exactMatch = false) { if (name == null) throw new ArgumentNullException(nameof(name)); - return _users.Select(x => x.Value.User).Find(name, exactMatch: exactMatch); } - public Task SendMessage(string text) - { - if (text == null) throw new ArgumentNullException(nameof(text)); - if (text == "") throw new ArgumentException("Value cannot be blank", nameof(text)); - return SendMessageInternal(text, false); - } - public Task SendTTSMessage(string text) + public Task SendMessage(string text) => SendMessageInternal(text, false); + public Task SendTTSMessage(string text) => SendMessageInternal(text, true); + private Task SendMessageInternal(string text, bool isTTS) { if (text == null) throw new ArgumentNullException(nameof(text)); if (text == "") throw new ArgumentException("Value cannot be blank", nameof(text)); - return SendMessageInternal(text, true); - } - private Task SendMessageInternal(string text, bool isTTS) - { if (text.Length > DiscordConfig.MaxMessageSize) - throw new ArgumentOutOfRangeException(nameof(text), $"Message must be {DiscordConfig.MaxMessageSize} characters or less."); - + throw new ArgumentOutOfRangeException(nameof(text), $"Message must be {DiscordConfig.MaxMessageSize} characters or less."); return Task.FromResult(Client.MessageQueue.QueueSend(this, text, isTTS)); } @@ -374,8 +364,7 @@ namespace Discord return msg; } - public Task SendIsTyping() - => Client.ClientAPI.Send(new SendIsTypingRequest(Id)); + public Task SendIsTyping() => Client.ClientAPI.Send(new SendIsTypingRequest(Id)); #endregion #region Permissions