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

Split typechecks into their own conditions

Browse Source
This commit is contained in:
Khionu Sybiern
2017-03-02 01:39:45 -05:00
parent 4274900d43
commit ba406bb646
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Discord.Net.Commands/Dependencies/DependencyMap.cs
View File

@@ -38,8 +38,10 @@ namespace Discord.Commands
public void AddFactory<T>(Func<T> factory) where T : class public void AddFactory<T>(Func<T> factory) where T : class
{ {
var t = typeof(T); var t = typeof(T);
if (typeof(T) == typeof(IDependencyMap) || typeof(T) == typeof(CommandService)) if (typeof(T) == typeof(IDependencyMap))
throw new InvalidOperationException("The dependency map cannot contain services directly added as IDependencyMap or CommandService. Only Implimentations and Derivatives are permitted"); throw new InvalidOperationException("IDependencyMap is used internally and cannot be added as a dependency");
if (typeof(T) == typeof(CommandService))
throw new InvalidOperationException("CommandService is used internally and cannot be added as a dependency");
if (map.ContainsKey(t)) if (map.ContainsKey(t))
throw new InvalidOperationException($"The dependency map already contains \"{t.FullName}\""); throw new InvalidOperationException($"The dependency map already contains \"{t.FullName}\"");
map.Add(t, factory); map.Add(t, factory);
@@ -50,8 +52,10 @@ namespace Discord.Commands
var t = typeof(T); var t = typeof(T);
if (map.ContainsKey(t)) if (map.ContainsKey(t))
return false; return false;
if (typeof(T) == typeof(IDependencyMap) || typeof(T) == typeof(CommandService)) if (typeof(T) == typeof(IDependencyMap))
throw new InvalidOperationException("The dependency map cannot contain services directly added as IDependencyMap or CommandService. Only Implimentations and Derivatives are permitted"); throw new InvalidOperationException("IDependencyMap is used internally and cannot be added as a dependency");
if (typeof(T) == typeof(CommandService))
throw new InvalidOperationException("CommandService is used internally and cannot be added as a dependency");
map.Add(t, factory); map.Add(t, factory);
return true; return true;
} }