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

Added AddParameter<T>. Fixed AddParameter ignoring default typereaders.

Browse Source
This commit is contained in:
RogueException
2016-12-16 10:00:39 -04:00
parent 2dd62ba5e7
commit d623b18dff
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Discord.Net.Commands/Builders/CommandBuilder.cs
View File

@@ -80,6 +80,13 @@ namespace Discord.Commands.Builders
_preconditions.Add(precondition); _preconditions.Add(precondition);
return this; return this;
} }
public CommandBuilder AddParameter<T>(string name, Action<ParameterBuilder> createFunc)
{
var param = new ParameterBuilder(this, name, typeof(T));
createFunc(param);
_parameters.Add(param);
return this;
}
public CommandBuilder AddParameter(string name, Type type, Action<ParameterBuilder> createFunc) public CommandBuilder AddParameter(string name, Type type, Action<ParameterBuilder> createFunc)
{ {
var param = new ParameterBuilder(this, name, type); var param = new ParameterBuilder(this, name, type);

9
src/Discord.Net.Commands/Builders/ParameterBuilder.cs
View File

@@ -43,10 +43,13 @@ namespace Discord.Commands.Builders
internal void SetType(Type type) internal void SetType(Type type)
{ {
var readers = Command.Module.Service.GetTypeReaders(type); var readers = Command.Module.Service.GetTypeReaders(type);
if (readers == null) if (readers != null)
throw new InvalidOperationException($"{type} does not have a TypeReader registered for it"); TypeReader = readers.FirstOrDefault().Value;
else
TypeReader = Command.Module.Service.GetDefaultTypeReader(type);
TypeReader = readers.FirstOrDefault().Value; if (TypeReader == null)
throw new InvalidOperationException($"{type} does not have a TypeReader registered for it");
if (type.GetTypeInfo().IsValueType) if (type.GetTypeInfo().IsValueType)
DefaultValue = Activator.CreateInstance(type); DefaultValue = Activator.CreateInstance(type);