Browse Source

Default constructor back, name changed to AppendWhitespace

pull/193/head
Kwoth 9 years ago
parent
commit
cf911456a7
2 changed files with 8 additions and 6 deletions
  1. +4
    -2
      src/Discord.Net.Commands/Attributes/ModuleAttribute.cs
  2. +4
    -4
      src/Discord.Net.Commands/Module.cs

+ 4
- 2
src/Discord.Net.Commands/Attributes/ModuleAttribute.cs View File

@@ -7,13 +7,15 @@ namespace Discord.Commands
{ {
public string Prefix { get; } public string Prefix { get; }
public bool AutoLoad { get; set; } public bool AutoLoad { get; set; }
public bool ForceWhitespace { get; set; }
public bool AppendSpace { get; set; }

public ModuleAttribute() : this(null) { }


public ModuleAttribute(string prefix = null) public ModuleAttribute(string prefix = null)
{ {
Prefix = prefix; Prefix = prefix;
AutoLoad = true; AutoLoad = true;
ForceWhitespace = true;
AppendSpace = true;
} }
} }
} }

+ 4
- 4
src/Discord.Net.Commands/Module.cs View File

@@ -34,15 +34,15 @@ namespace Discord.Commands
Description = descriptionAttr.Text; Description = descriptionAttr.Text;


List<Command> commands = new List<Command>(); List<Command> commands = new List<Command>();
SearchClass(source, instance, commands, moduleAttr.Prefix ?? "", moduleAttr.ForceWhitespace);
SearchClass(source, instance, commands, moduleAttr.Prefix ?? "", moduleAttr.AppendSpace);
Commands = commands; Commands = commands;


Preconditions = BuildPreconditions(); Preconditions = BuildPreconditions();
} }


private void SearchClass(TypeInfo parentType, object instance, List<Command> commands, string groupPrefix, bool forceWhitespace)
private void SearchClass(TypeInfo parentType, object instance, List<Command> commands, string groupPrefix, bool appendWhitespace)
{ {
if (groupPrefix != "" && forceWhitespace)
if (groupPrefix != "" && appendWhitespace)
groupPrefix += " "; groupPrefix += " ";
foreach (var method in parentType.DeclaredMethods) foreach (var method in parentType.DeclaredMethods)
{ {
@@ -60,7 +60,7 @@ namespace Discord.Commands
nextGroupPrefix = groupPrefix + groupAttrib.Prefix ?? type.Name; nextGroupPrefix = groupPrefix + groupAttrib.Prefix ?? type.Name;
else else
nextGroupPrefix = groupPrefix; nextGroupPrefix = groupPrefix;
SearchClass(type, ReflectionUtils.CreateObject(type, Service), commands, nextGroupPrefix, forceWhitespace);
SearchClass(type, ReflectionUtils.CreateObject(type, Service), commands, nextGroupPrefix, appendWhitespace);
} }
} }
} }


Loading…
Cancel
Save