From cf911456a751f4778fe4789973e028560624cfe8 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 13 Aug 2016 04:18:05 +0200 Subject: [PATCH] Default constructor back, name changed to AppendWhitespace --- src/Discord.Net.Commands/Attributes/ModuleAttribute.cs | 6 ++++-- src/Discord.Net.Commands/Module.cs | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Discord.Net.Commands/Attributes/ModuleAttribute.cs b/src/Discord.Net.Commands/Attributes/ModuleAttribute.cs index 0ed43db3c..1bf83dbc0 100644 --- a/src/Discord.Net.Commands/Attributes/ModuleAttribute.cs +++ b/src/Discord.Net.Commands/Attributes/ModuleAttribute.cs @@ -7,13 +7,15 @@ namespace Discord.Commands { public string Prefix { get; } public bool AutoLoad { get; set; } - public bool ForceWhitespace { get; set; } + public bool AppendSpace { get; set; } + + public ModuleAttribute() : this(null) { } public ModuleAttribute(string prefix = null) { Prefix = prefix; AutoLoad = true; - ForceWhitespace = true; + AppendSpace = true; } } } diff --git a/src/Discord.Net.Commands/Module.cs b/src/Discord.Net.Commands/Module.cs index 1dcd95801..565e9699d 100644 --- a/src/Discord.Net.Commands/Module.cs +++ b/src/Discord.Net.Commands/Module.cs @@ -34,15 +34,15 @@ namespace Discord.Commands Description = descriptionAttr.Text; List commands = new List(); - SearchClass(source, instance, commands, moduleAttr.Prefix ?? "", moduleAttr.ForceWhitespace); + SearchClass(source, instance, commands, moduleAttr.Prefix ?? "", moduleAttr.AppendSpace); Commands = commands; Preconditions = BuildPreconditions(); } - private void SearchClass(TypeInfo parentType, object instance, List commands, string groupPrefix, bool forceWhitespace) + private void SearchClass(TypeInfo parentType, object instance, List commands, string groupPrefix, bool appendWhitespace) { - if (groupPrefix != "" && forceWhitespace) + if (groupPrefix != "" && appendWhitespace) groupPrefix += " "; foreach (var method in parentType.DeclaredMethods) { @@ -60,7 +60,7 @@ namespace Discord.Commands nextGroupPrefix = groupPrefix + groupAttrib.Prefix ?? type.Name; else nextGroupPrefix = groupPrefix; - SearchClass(type, ReflectionUtils.CreateObject(type, Service), commands, nextGroupPrefix, forceWhitespace); + SearchClass(type, ReflectionUtils.CreateObject(type, Service), commands, nextGroupPrefix, appendWhitespace); } } }