AutoServiceScopes strikes again (#3072)

Misha-133 · web-flow · commit d71fcb1a4275 · 2025-03-02T00:55:59.000+03:00
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)

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,6 @@ protected virtual string GetLogString(IInteractionContext context)`
`30`	`30`	`public Task<IResult> ExecuteAsync(IInteractionContext context, IAutocompleteInteraction autocompleteInteraction, IParameterInfo parameter,`
`31`	`31`	`IServiceProvider services)`
`32`	`32`	`{`
`33`		`- using IServiceScope scope = InteractionService._autoServiceScopes ? services?.CreateScope() : null;`
`34`		`- services = InteractionService._autoServiceScopes ? scope?.ServiceProvider ?? EmptyServiceProvider.Instance : services;`
`35`		`-`
`36`	`33`	`switch (InteractionService._runMode)`
`37`	`34`	`{`
`38`	`35`	`case RunMode.Sync:`
`@@ -57,6 +54,14 @@ private async Task<IResult> ExecuteInternalAsync(IInteractionContext context, IA`
`57`	`54`	`{`
`58`	`55`	`try`
`59`	`56`	`{`
	`57`	`+ await using var scope = InteractionService._autoServiceScopes`
	`58`	`+ ? services?.CreateAsyncScope()`
	`59`	`+ : null;`
	`60`	`+`
	`61`	`+ services = (InteractionService._autoServiceScopes`
	`62`	`+ ? scope?.ServiceProvider`
	`63`	`+ : services) ?? EmptyServiceProvider.Instance;`
	`64`	`+`
`60`	`65`	`var result = await GenerateSuggestionsAsync(context, autocompleteInteraction, parameter, services).ConfigureAwait(false);`
`61`	`66`
`62`	`67`	`if (result.IsSuccess)`