AutoServiceScopes strikes again (#3072)

discord-net · Mar 1, 2025 · d71fcb1 · d71fcb1
1 parent 6fb2a29
commit d71fcb1
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Discord.Net.Interactions/AutocompleteHandlers/AutocompleteHandler.cs b/src/Discord.Net.Interactions/AutocompleteHandlers/AutocompleteHandler.cs
@@ -30,9 +30,6 @@ protected virtual string GetLogString(IInteractionContext context)
         public Task<IResult> ExecuteAsync(IInteractionContext context, IAutocompleteInteraction autocompleteInteraction, IParameterInfo parameter,
             IServiceProvider services)
         {
-            using IServiceScope scope = InteractionService._autoServiceScopes ? services?.CreateScope() : null;
-            services = InteractionService._autoServiceScopes ? scope?.ServiceProvider ?? EmptyServiceProvider.Instance : services;
-
             switch (InteractionService._runMode)
             {
                 case RunMode.Sync:
@@ -57,6 +54,14 @@ private async Task<IResult> ExecuteInternalAsync(IInteractionContext context, IA
         {
             try
             {
+                await using var scope = InteractionService._autoServiceScopes
+                    ? services?.CreateAsyncScope()
+                    : null;
+
+                services = (InteractionService._autoServiceScopes
+                    ? scope?.ServiceProvider
+                    : services) ?? EmptyServiceProvider.Instance;
+
                 var result = await GenerateSuggestionsAsync(context, autocompleteInteraction, parameter, services).ConfigureAwait(false);
 
                 if (result.IsSuccess)