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

Added support for .NET Standard 1.1 and 1.2

Browse Source
This commit is contained in:
RogueException
2016-12-16 05:51:07 -04:00
parent a1addd4016
commit 8f87b2cc71
49 changed files with 533 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,8 +28,8 @@ namespace Discord.Commands
public static Dictionary<Type, ModuleInfo> Build(CommandService service, params TypeInfo[] validTypes) => Build(validTypes, service);
public static Dictionary<Type, ModuleInfo> Build(IEnumerable<TypeInfo> validTypes, CommandService service)
{
if (!validTypes.Any())
throw new InvalidOperationException("Could not find any valid modules from the given selection");
/*if (!validTypes.Any())
throw new InvalidOperationException("Could not find any valid modules from the given selection");*/
var topLevelGroups = validTypes.Where(x => x.DeclaringType == null);
var subGroups = validTypes.Intersect(topLevelGroups);
@@ -65,7 +65,8 @@ namespace Discord.Commands
if (builtTypes.Contains(typeInfo))
continue;
builder.AddModule((module) => {
builder.AddModule((module) =>
{
BuildModule(module, typeInfo, service);
BuildSubTypes(module, typeInfo.DeclaredNestedTypes, builtTypes, service);
});
@@ -106,7 +107,8 @@ namespace Discord.Commands
foreach (var method in validCommands)
{
builder.AddCommand((command) => {
builder.AddCommand((command) =>
{
BuildCommand(command, typeInfo, method, service);
});
}
@@ -147,21 +149,24 @@ namespace Discord.Commands
int pos = 0, count = parameters.Length;
foreach (var paramInfo in parameters)
{
builder.AddParameter((parameter) => {
builder.AddParameter((parameter) =>
{
BuildParameter(parameter, paramInfo, pos++, count, service);
});
}
var createInstance = ReflectionUtils.CreateBuilder<ModuleBase>(typeInfo, service);
builder.Callback = (ctx, args, map) => {
builder.Callback = (ctx, args, map) =>
{
var instance = createInstance(map);
instance.Context = ctx;
try
{
return method.Invoke(instance, args) as Task ?? Task.CompletedTask;
return method.Invoke(instance, args) as Task ?? Task.Delay(0);
}
finally{
finally
{
(instance as IDisposable)?.Dispose();
}
};