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

Add support for 'params' arguments

Browse Source
This commit is contained in:
Finite Reality
2016-07-30 21:37:55 +01:00
committed by RogueException
parent 724dbf0abf
commit c8fc0ffa33
3 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Discord.Net.Commands/Command.cs
View File

@@ -71,6 +71,7 @@ namespace Discord.Commands
{
var parameter = parameters[i];
var type = parameter.ParameterType;
Type underlyingType = null;
if (i == 0)
{
@@ -80,10 +81,24 @@ namespace Discord.Commands
continue;
}
var typeInfo = type.GetTypeInfo();
var reader = Module.Service.GetTypeReader(type);
if (reader == null && typeInfo.IsEnum)
// TODO: is there a better way of detecting 'params'?
bool isParams = type.IsArray && i == parameters.Length - 1;
if (isParams)
{
underlyingType = type.GetElementType();
reader = Module.Service.GetTypeReader(underlyingType);
}
else
{
underlyingType = type;
}
var underlyingTypeInfo = underlyingType.GetTypeInfo();
var typeInfo = type.GetTypeInfo();
if (reader == null && underlyingTypeInfo.IsEnum)
{
reader = EnumTypeReader.GetReader(type);
Module.Service.AddTypeReader(type, reader);
@@ -101,7 +116,7 @@ namespace Discord.Commands
bool isOptional = parameter.IsOptional;
object defaultValue = parameter.HasDefaultValue ? parameter.DefaultValue : null;
paramBuilder.Add(new CommandParameter(name, description, type, reader, isOptional, isRemainder, defaultValue));
paramBuilder.Add(new CommandParameter(name, description, type, underlyingType, reader, isOptional, isRemainder, isParams, defaultValue));
}
return paramBuilder.ToImmutable();
}