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

Added support for concrete Rest/Socket/RPC classes in command params

Browse Source
This commit is contained in:
RogueException
2016-12-23 16:03:19 -04:00
parent 572c0e6c6b
commit 1965c0539a
2 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
View File

@@ -215,20 +215,6 @@ namespace Discord.Commands
else
reader = service.GetDefaultTypeReader(paramType);
if (reader == null)
{
var paramTypeInfo = paramType.GetTypeInfo();
if (paramTypeInfo.IsEnum)
{
reader = EnumTypeReader.GetReader(paramType);
service.AddTypeReader(paramType, reader);
}
else
{
throw new InvalidOperationException($"{paramType.FullName} is not supported as a command parameter, are you missing a TypeReader?");
}
}
builder.ParameterType = paramType;
builder.TypeReader = reader;
}
@@ -239,10 +225,12 @@ namespace Discord.Commands
var readers = service.GetTypeReaders(paramType);
TypeReader reader = null;
if (readers != null)
{
if (readers.TryGetValue(typeReaderType, out reader))
return reader;
}
//could not find any registered type reader: try to create one
//We dont have a cached type reader, create one
reader = ReflectionUtils.CreateObject<TypeReader>(typeReaderType.GetTypeInfo(), service, DependencyMap.Empty);
service.AddTypeReader(paramType, reader);