Browse Source

Clean up removed owned IServiceProvider

pull/946/head
Christopher F 7 years ago
parent
commit
8042767579
1 changed files with 0 additions and 7 deletions
  1. +0
    -7
      src/Discord.Net.Commands/CommandService.cs

+ 0
- 7
src/Discord.Net.Commands/CommandService.cs View File

@@ -28,8 +28,6 @@ namespace Discord.Commands
private readonly HashSet<ModuleInfo> _moduleDefs; private readonly HashSet<ModuleInfo> _moduleDefs;
private readonly CommandMap _map; private readonly CommandMap _map;


//internal readonly IServiceProvider _serviceProvider;

internal readonly bool _caseSensitive, _throwOnError, _ignoreExtraArgs; internal readonly bool _caseSensitive, _throwOnError, _ignoreExtraArgs;
internal readonly char _separatorChar; internal readonly char _separatorChar;
internal readonly RunMode _defaultRunMode; internal readonly RunMode _defaultRunMode;
@@ -77,10 +75,6 @@ namespace Discord.Commands
entityTypeReaders.Add(new Tuple<Type, Type>(typeof(IRole), typeof(RoleTypeReader<>))); entityTypeReaders.Add(new Tuple<Type, Type>(typeof(IRole), typeof(RoleTypeReader<>)));
entityTypeReaders.Add(new Tuple<Type, Type>(typeof(IUser), typeof(UserTypeReader<>))); entityTypeReaders.Add(new Tuple<Type, Type>(typeof(IUser), typeof(UserTypeReader<>)));
_entityTypeReaders = entityTypeReaders.ToImmutable(); _entityTypeReaders = entityTypeReaders.ToImmutable();

//_serviceProvider = config.ServiceProvider
// ?? config.ServiceProviderFactory?.Invoke(this)
// ?? EmptyServiceProvider.Instance;
} }


//Modules //Modules
@@ -285,7 +279,6 @@ namespace Discord.Commands
public async Task<IResult> ExecuteAsync(ICommandContext context, string input, IServiceProvider services = null, MultiMatchHandling multiMatchHandling = MultiMatchHandling.Exception) public async Task<IResult> ExecuteAsync(ICommandContext context, string input, IServiceProvider services = null, MultiMatchHandling multiMatchHandling = MultiMatchHandling.Exception)
{ {
services = services ?? EmptyServiceProvider.Instance; services = services ?? EmptyServiceProvider.Instance;
//using (var scope = _serviceProvider.CreateScope())
using (var scope = services.CreateScope()) using (var scope = services.CreateScope())
{ {
var searchResult = Search(context, input); var searchResult = Search(context, input);


Loading…
Cancel
Save