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

Add support for keyed services. (#3017)

Browse Source 
* Add support for keyed services in ReflectionUtils.GetMember.

* Remove package reference to DI and add ref to Abstractions in Commands.
This commit is contained in:
Nora
2024-10-12 21:44:46 +02:00
committed by GitHub
parent de8da0d3b9
commit 3017f6b463
4 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discord.Net.Commands/Discord.Net.Commands.csproj
View File

@@ -19,4 +19,7 @@
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) AND '$(MSBuildRuntimeType)' == 'Core' AND '$(OS)' != 'Windows_NT'"> <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) AND '$(MSBuildRuntimeType)' == 'Core' AND '$(OS)' != 'Windows_NT'">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
</ItemGroup>
</Project> </Project>

16
src/Discord.Net.Commands/Utilities/ReflectionUtils.cs
View File

@@ -1,3 +1,4 @@
using Microsoft.Extensions.DependencyInjection;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -21,11 +22,11 @@ namespace Discord.Commands
{ {
var args = new object[parameters.Length]; var args = new object[parameters.Length];
for (int i = 0; i < parameters.Length; i++) for (int i = 0; i < parameters.Length; i++)
args[i] = GetMember(commands, services, parameters[i].ParameterType, typeInfo); args[i] = GetMember(commands, services, parameters[i].ParameterType, typeInfo, parameters[i].GetCustomAttributes());
var obj = InvokeConstructor<T>(constructor, args, typeInfo); var obj = InvokeConstructor<T>(constructor, args, typeInfo);
foreach (var property in properties) foreach (var property in properties)
property.SetValue(obj, GetMember(commands, services, property.PropertyType, typeInfo)); property.SetValue(obj, GetMember(commands, services, property.PropertyType, typeInfo, null));
return obj; return obj;
}; };
} }
@@ -64,13 +65,20 @@ namespace Discord.Commands
} }
return result.ToArray(); return result.ToArray();
} }
private static object GetMember(CommandService commands, IServiceProvider services, Type memberType, TypeInfo ownerType) private static object GetMember(CommandService commands, IServiceProvider services, Type memberType, TypeInfo ownerType, IEnumerable<object> attributes)
{ {
if (memberType == typeof(CommandService)) if (memberType == typeof(CommandService))
return commands; return commands;
if (memberType == typeof(IServiceProvider) || memberType == services.GetType()) if (memberType == typeof(IServiceProvider) || memberType == services.GetType())
return services; return services;
var service = services.GetService(memberType);
var keyedAttribute = attributes?.FirstOrDefault(x => x.GetType() == typeof(FromKeyedServicesAttribute));
object service;
if (keyedAttribute != null)
service = services.GetKeyedServices(memberType, ((FromKeyedServicesAttribute)keyedAttribute).Key).First();
else
service = services.GetService(memberType);
if (service != null) if (service != null)
return service; return service;
throw new InvalidOperationException($"Failed to create \"{ownerType.FullName}\", dependency \"{memberType.Name}\" was not found."); throw new InvalidOperationException($"Failed to create \"{ownerType.FullName}\", dependency \"{memberType.Name}\" was not found.");

2
src/Discord.Net.Interactions/Discord.Net.Interactions.csproj
View File

@@ -20,7 +20,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" /> <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Include="System.Reactive" Version="6.0.0" /> <PackageReference Include="System.Reactive" Version="6.0.0" />
</ItemGroup> </ItemGroup>

20
src/Discord.Net.Interactions/Utilities/ReflectionUtils.cs
View File

@@ -1,3 +1,4 @@
using Microsoft.Extensions.DependencyInjection;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -23,11 +24,11 @@ namespace Discord.Interactions
{ {
var args = new object[parameters.Length]; var args = new object[parameters.Length];
for (int i = 0; i < parameters.Length; i++) for (int i = 0; i < parameters.Length; i++)
args[i] = GetMember(commandService, services, parameters[i].ParameterType, typeInfo); args[i] = GetMember(commandService, services, parameters[i].ParameterType, typeInfo, parameters[i].GetCustomAttributes());
var obj = InvokeConstructor(constructor, args, typeInfo); var obj = InvokeConstructor(constructor, args, typeInfo);
foreach (var property in properties) foreach (var property in properties)
property.SetValue(obj, GetMember(commandService, services, property.PropertyType, typeInfo)); property.SetValue(obj, GetMember(commandService, services, property.PropertyType, typeInfo, null));
return obj; return obj;
}; };
} }
@@ -66,13 +67,20 @@ namespace Discord.Interactions
} }
return result.ToArray(); return result.ToArray();
} }
private static object GetMember(InteractionService commandService, IServiceProvider services, Type memberType, TypeInfo ownerType) private static object GetMember(InteractionService commandService, IServiceProvider services, Type memberType, TypeInfo ownerType, IEnumerable<object> attributes)
{ {
if (memberType == typeof(InteractionService)) if (memberType == typeof(InteractionService))
return commandService; return commandService;
if (memberType == typeof(IServiceProvider) || memberType == services.GetType()) if (memberType == typeof(IServiceProvider) || memberType == services.GetType())
return services; return services;
var service = services.GetService(memberType);
var keyedAttribute = attributes?.FirstOrDefault(x => x.GetType() == typeof(FromKeyedServicesAttribute));
object service;
if (keyedAttribute != null)
service = services.GetKeyedServices(memberType, ((FromKeyedServicesAttribute)keyedAttribute).Key).First();
else
service = services.GetService(memberType);
if (service != null) if (service != null)
return service; return service;
throw new InvalidOperationException($"Failed to create \"{ownerType.FullName}\", dependency \"{memberType.Name}\" was not found."); throw new InvalidOperationException($"Failed to create \"{ownerType.FullName}\", dependency \"{memberType.Name}\" was not found.");
@@ -119,10 +127,10 @@ namespace Discord.Interactions
var props = new object[properties.Length]; var props = new object[properties.Length];
for (int i = 0; i < parameters.Length; i++) for (int i = 0; i < parameters.Length; i++)
args[i] = GetMember(commandService, services, parameters[i].ParameterType, typeInfo); args[i] = GetMember(commandService, services, parameters[i].ParameterType, typeInfo, parameters[i].GetCustomAttributes());
for (int i = 0; i < properties.Length; i++) for (int i = 0; i < properties.Length; i++)
props[i] = GetMember(commandService, services, properties[i].PropertyType, typeInfo); props[i] = GetMember(commandService, services, properties[i].PropertyType, typeInfo, null);
var instance = lambda(args, props); var instance = lambda(args, props);