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

Add empty service scopes (#3078)

Browse Source
This commit is contained in:
Mihail Gribkov
2025-03-09 21:52:53 +03:00
committed by GitHub
parent 41ad6aceac
commit 54e841694e
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Discord.Net.Interactions/Builders/ModuleBuilder.cs
View File

@@ -467,12 +467,13 @@ namespace Discord.Interactions.Builders
{
if (TypeInfo is not null && ModuleClassBuilder.IsValidModuleDefinition(TypeInfo))
{
IServiceScope scope = null;
if (interactionService._autoServiceScopes)
{
scope = services?.CreateScope();
services = scope?.ServiceProvider ?? EmptyServiceProvider.Instance;
}
using var scope = InteractionService._autoServiceScopes
? services.CreateScope()
: null;
services = (InteractionService._autoServiceScopes
? scope?.ServiceProvider
: services) ?? EmptyServiceProvider.Instance;
var instance = ReflectionUtils<IInteractionModuleBase>.CreateObject(TypeInfo, interactionService, services);
@@ -482,12 +483,10 @@ namespace Discord.Interactions.Builders
var moduleInfo = new ModuleInfo(this, interactionService, services, parent);
instance.OnModuleBuilding(interactionService, moduleInfo);
scope?.Dispose();
return moduleInfo;
}
finally
{
scope?.Dispose();
(instance as IDisposable)?.Dispose();
}
}

32
src/Discord.Net.Interactions/Utilities/EmptyServiceProvider.cs
View File

@@ -1,11 +1,31 @@
using Microsoft.Extensions.DependencyInjection;
using System;
namespace Discord.Interactions
{
internal class EmptyServiceProvider : IServiceProvider
{
public static EmptyServiceProvider Instance => new EmptyServiceProvider();
namespace Discord.Interactions;
public object GetService(Type serviceType) => null;
internal class EmptyServiceProvider : IServiceProvider
{
public static EmptyServiceProvider Instance => new ();
public object GetService(Type serviceType)
{
if (serviceType == typeof(IServiceScopeFactory))
return EmptyServiceScopeFactory.Instance;
return null;
}
}
internal class EmptyServiceScopeFactory : IServiceScopeFactory
{
public static EmptyServiceScopeFactory Instance => new ();
public IServiceScope CreateScope() => new EmptyServiceScope();
}
internal class EmptyServiceScope : IServiceScope
{
public IServiceProvider ServiceProvider => EmptyServiceProvider.Instance;
public void Dispose() { }
}