From 0d209b3fdbfd732a2e74c5f3faa3191fbded2e1f Mon Sep 17 00:00:00 2001 From: RogueException Date: Sun, 18 Dec 2016 14:18:33 -0400 Subject: [PATCH] Added internal error for if a matching alias cannot be found --- src/Discord.Net.Commands/Info/CommandInfo.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net.Commands/Info/CommandInfo.cs b/src/Discord.Net.Commands/Info/CommandInfo.cs index a6ac50005..c24d35f6a 100644 --- a/src/Discord.Net.Commands/Info/CommandInfo.cs +++ b/src/Discord.Net.Commands/Info/CommandInfo.cs @@ -93,15 +93,18 @@ namespace Discord.Commands return ParseResult.FromError(preconditionResult.Value); string input = searchResult.Text; - var matchingAliases = Aliases.Where(alias => input.StartsWith(alias)); - - string matchingAlias = ""; + var matchingAliases = Aliases.Where(alias => input.StartsWith(alias)).ToArray(); + + string matchingAlias = null; foreach (string alias in matchingAliases) { if (alias.Length > matchingAlias.Length) matchingAlias = alias; } - + + if (matchingAlias == null) + return ParseResult.FromError(CommandError.ParseFailed, "Unable to find matching alias"); + input = input.Substring(matchingAlias.Length); return await CommandParser.ParseArgs(this, context, input, 0).ConfigureAwait(false);