[Fix] Interaction Service failing to create scopes with some DI provi…

…ders (#3031)
discord-net · Dec 1, 2024 · a884ad1 · a884ad1
1 parent 96a8327
commit a884ad1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Discord.Net.Interactions/Builders/ModuleBuilder.cs b/src/Discord.Net.Interactions/Builders/ModuleBuilder.cs
@@ -462,9 +462,12 @@ internal ModuleInfo Build(InteractionService interactionService, IServiceProvide
         {
             if (TypeInfo is not null && ModuleClassBuilder.IsValidModuleDefinition(TypeInfo))
             {
-                using var scope = services?.CreateScope();
+                IServiceScope scope = null;
                 if (interactionService._autoServiceScopes)
+                {
+                    scope = services?.CreateScope();
                     services = scope?.ServiceProvider ?? EmptyServiceProvider.Instance;
+                }
 
                 var instance = ReflectionUtils<IInteractionModuleBase>.CreateObject(TypeInfo, interactionService, services);
 
@@ -473,10 +476,13 @@ internal ModuleInfo Build(InteractionService interactionService, IServiceProvide
                     instance.Construct(this, interactionService);
                     var moduleInfo = new ModuleInfo(this, interactionService, services, parent);
                     instance.OnModuleBuilding(interactionService, moduleInfo);
+
+                    scope?.Dispose();
                     return moduleInfo;
                 }
                 finally
                 {
+                    scope?.Dispose();
                     (instance as IDisposable)?.Dispose();
                 }
             }

diff --git a/src/Discord.Net.Interactions/Info/Commands/CommandInfo.cs b/src/Discord.Net.Interactions/Info/Commands/CommandInfo.cs
@@ -113,10 +113,12 @@ private async Task<IResult> ExecuteInternalAsync(IInteractionContext context, IS
         {
             await CommandService._cmdLogger.DebugAsync($"Executing {GetLogString(context)}").ConfigureAwait(false);
 
-            using var scope = services?.CreateScope();
-
+            IServiceScope scope = null;
             if (CommandService._autoServiceScopes)
+            {
+                scope = services?.CreateScope();
                 services = scope?.ServiceProvider ?? EmptyServiceProvider.Instance;
+            }
 
             try
             {
@@ -179,11 +181,13 @@ private async Task<IResult> ExecuteInternalAsync(IInteractionContext context, IS
                         ExceptionDispatchInfo.Capture(ex).Throw();
                 }
 
+                scope?.Dispose();
                 return result;
             }
             finally
             {
                 await CommandService._cmdLogger.VerboseAsync($"Executed {GetLogString(context)}").ConfigureAwait(false);
+                scope?.Dispose();
             }
         }