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

Merge pull request #546 from khionu/dev

Browse Source 
Fix detection of IDependencyMap impl
This commit is contained in:
RogueException
2017-03-18 08:42:57 -03:00
committed by GitHub
parent 84b3d24175 ba406bb646
commit 334ceacdbf
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +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))
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);
@@ -48,6 +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))
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;
} }

4
src/Discord.Net.Commands/Utilities/ReflectionUtils.cs
View File

@@ -51,6 +51,8 @@ namespace Discord.Commands
}; };
} }
private static readonly TypeInfo _dependencyTypeInfo = typeof(IDependencyMap).GetTypeInfo();
internal static object GetMember(Type targetType, IDependencyMap map, CommandService service, TypeInfo baseType) internal static object GetMember(Type targetType, IDependencyMap map, CommandService service, TypeInfo baseType)
{ {
object arg; object arg;
@@ -58,7 +60,7 @@ namespace Discord.Commands
{ {
if (targetType == typeof(CommandService)) if (targetType == typeof(CommandService))
arg = service; arg = service;
else if (targetType == typeof(IDependencyMap)) else if (targetType == typeof(IDependencyMap) || targetType == map.GetType())
arg = map; arg = map;
else else
throw new InvalidOperationException($"Failed to create \"{baseType.FullName}\", dependency \"{targetType.Name}\" was not found."); throw new InvalidOperationException($"Failed to create \"{baseType.FullName}\", dependency \"{targetType.Name}\" was not found.");