github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #482 from FiniteReality/issue/462

Browse Source 
Ensure aliases are built in the correct order
This commit is contained in:
RogueException
2017-01-26 10:57:46 -04:00
committed by GitHub
parent 3cf03fa7f8 c2b50b56d8
commit 55e9c7da5c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Discord.Net.Commands/Info/ModuleInfo.cs
View File

@@ -39,16 +39,17 @@ namespace Discord.Commands
private static IEnumerable<string> BuildAliases(ModuleBuilder builder, CommandService service) private static IEnumerable<string> BuildAliases(ModuleBuilder builder, CommandService service)
{ {
var result = builder.Aliases.ToList(); var result = builder.Aliases.ToList();
var builderStack = new Stack<ModuleBuilder>(); var builderQueue = new Queue<ModuleBuilder>();
var parent = builder; var parent = builder;
while ((parent = parent.Parent) != null) while ((parent = parent.Parent) != null)
builderStack.Push(parent); builderQueue.Enqueue(parent);
while (builderStack.Count > 0) while (builderQueue.Count > 0)
{ {
var level = builderStack.Pop(); var level = builderQueue.Dequeue();
result = result.Permutate(level.Aliases, (first, second) => // permute in reverse because we want to *prefix* our aliases
result = level.Aliases.Permutate(result, (first, second) =>
{ {
if (first == "") if (first == "")
return second; return second;