Browse Source

Merge fc00cfdf66 into 04e71129cf

pull/722/merge
aStonedPenguin GitHub 8 years ago
parent
commit
9684a17b78
2 changed files with 4 additions and 3 deletions
  1. +1
    -0
      src/Discord.Net.Commands/CommandError.cs
  2. +3
    -3
      src/Discord.Net.Commands/CommandService.cs

+ 1
- 0
src/Discord.Net.Commands/CommandError.cs View File

@@ -4,6 +4,7 @@
{ {
//Search //Search
UnknownCommand = 1, UnknownCommand = 1,
UnknownOverload,


//Parse //Parse
ParseFailed, ParseFailed,


+ 3
- 3
src/Discord.Net.Commands/CommandService.cs View File

@@ -235,13 +235,13 @@ namespace Discord.Commands
} }


//Execution //Execution
public SearchResult Search(ICommandContext context, int argPos)
public SearchResult Search(ICommandContext context, int argPos)
=> Search(context, context.Message.Content.Substring(argPos)); => Search(context, context.Message.Content.Substring(argPos));
public SearchResult Search(ICommandContext context, string input) public SearchResult Search(ICommandContext context, string input)
{ {
string searchInput = _caseSensitive ? input : input.ToLowerInvariant(); string searchInput = _caseSensitive ? input : input.ToLowerInvariant();
var matches = _map.GetCommands(searchInput).OrderByDescending(x => x.Command.Priority).ToImmutableArray(); var matches = _map.GetCommands(searchInput).OrderByDescending(x => x.Command.Priority).ToImmutableArray();
if (matches.Length > 0) if (matches.Length > 0)
return SearchResult.FromSuccess(input, matches); return SearchResult.FromSuccess(input, matches);
else else
@@ -298,7 +298,7 @@ namespace Discord.Commands
return await commands[i].ExecuteAsync(context, parseResult, services).ConfigureAwait(false); return await commands[i].ExecuteAsync(context, parseResult, services).ConfigureAwait(false);
} }


return SearchResult.FromError(CommandError.UnknownCommand, "This input does not match any overload.");
return SearchResult.FromError(CommandError.UnknownOverload, "This input does not match any overload.");
} }
} }
} }

Loading…
Cancel
Save