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

Revert "Implement configurable command node separators"

Browse Source
This commit is contained in:
Christopher F
2016-12-17 16:34:04 -05:00
committed by GitHub
parent 18de2ecac7
commit 604d69fb7f
6 changed files with 33 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.Commands/Info/CommandInfo.cs
View File

@@ -44,7 +44,7 @@ namespace Discord.Commands
// both command and module provide aliases
if (module.Aliases.Count > 0 && builder.Aliases.Count > 0)
Aliases = module.Aliases.Permutate(builder.Aliases, (first, second) => second != null ? first + service._splitCharacter + second : first).Select(x => service._caseSensitive ? x : x.ToLowerInvariant()).ToImmutableArray();
Aliases = module.Aliases.Permutate(builder.Aliases, (first, second) => second != null ? first + " " + second : first).Select(x => service._caseSensitive ? x : x.ToLowerInvariant()).ToImmutableArray();
// only module provides aliases
else if (module.Aliases.Count > 0)
Aliases = module.Aliases.Select(x => service._caseSensitive ? x : x.ToLowerInvariant()).ToImmutableArray();

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

@@ -30,14 +30,14 @@ namespace Discord.Commands
Remarks = builder.Remarks;
Parent = parent;
Aliases = BuildAliases(builder, service).ToImmutableArray();
Aliases = BuildAliases(builder).ToImmutableArray();
Commands = builder.Commands.Select(x => x.Build(this, service));
Preconditions = BuildPreconditions(builder).ToImmutableArray();
Submodules = BuildSubmodules(builder, service).ToImmutableArray();
}
private static IEnumerable<string> BuildAliases(ModuleBuilder builder, CommandService service)
private static IEnumerable<string> BuildAliases(ModuleBuilder builder)
{
IEnumerable<string> result = null;
@@ -60,9 +60,9 @@ namespace Discord.Commands
result = level.Aliases.ToList(); //create a shallow copy so we don't overwrite the builder unexpectedly
}
else if (result.Count() > level.Aliases.Count)
result = result.Permutate(level.Aliases, (first, second) => first + service._splitCharacter + second);
result = result.Permutate(level.Aliases, (first, second) => first + " " + second);
else
result = level.Aliases.Permutate(result, (second, first) => first + service._splitCharacter + second);
result = level.Aliases.Permutate(result, (second, first) => first + " " + second);
}
if (result == null) //there were no aliases; default to an empty list