From 444868b22d3d7787cad0fbeb01532b7dd1edd7ee Mon Sep 17 00:00:00 2001 From: Joe4evr Date: Sat, 24 Jun 2017 02:39:02 +0200 Subject: [PATCH 1/4] Fix attempting to inject into static properties --- src/Discord.Net.Commands/Utilities/ReflectionUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs b/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs index 4cca0e864..ca3e01ebd 100644 --- a/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs +++ b/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs @@ -58,7 +58,7 @@ namespace Discord.Commands { foreach (var prop in ownerType.DeclaredProperties) { - if (prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute() == null) + if (prop.GetMethod.IsStatic && prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute() == null) result.Add(prop); } ownerType = ownerType.BaseType.GetTypeInfo(); From 34917a35de48aea438aa4dda1a5789591753843a Mon Sep 17 00:00:00 2001 From: Joe4evr Date: Sat, 24 Jun 2017 02:50:30 +0200 Subject: [PATCH 2/4] In my defense, it was 2:40 AM --- src/Discord.Net.Commands/Utilities/ReflectionUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs b/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs index ca3e01ebd..d9956cdc0 100644 --- a/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs +++ b/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs @@ -58,7 +58,7 @@ namespace Discord.Commands { foreach (var prop in ownerType.DeclaredProperties) { - if (prop.GetMethod.IsStatic && prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute() == null) + if (!prop.GetMethod.IsStatic && prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute() == null) result.Add(prop); } ownerType = ownerType.BaseType.GetTypeInfo(); From cc390f03de4e583d9057091bc5e36e23b1eb472c Mon Sep 17 00:00:00 2001 From: Joe4evr Date: Sat, 24 Jun 2017 02:56:57 +0200 Subject: [PATCH 3/4] Fix the off-chance that someone has a property without a getter --- src/Discord.Net.Commands/Utilities/ReflectionUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs b/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs index d9956cdc0..b6ceda426 100644 --- a/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs +++ b/src/Discord.Net.Commands/Utilities/ReflectionUtils.cs @@ -58,7 +58,7 @@ namespace Discord.Commands { foreach (var prop in ownerType.DeclaredProperties) { - if (!prop.GetMethod.IsStatic && prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute() == null) + if (prop.GetMethod?.IsStatic == false && prop.SetMethod?.IsPublic == true && prop.GetCustomAttribute() == null) result.Add(prop); } ownerType = ownerType.BaseType.GetTypeInfo(); From 107f1b580380c8c5906fd61a3bdd86bc30c6ebc0 Mon Sep 17 00:00:00 2001 From: FiniteReality Date: Sat, 24 Jun 2017 22:09:46 +0100 Subject: [PATCH 4/4] Add 'tweet' embed type --- src/Discord.Net.Core/Entities/Messages/EmbedType.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedType.cs b/src/Discord.Net.Core/Entities/Messages/EmbedType.cs index ed39317a9..469e968a5 100644 --- a/src/Discord.Net.Core/Entities/Messages/EmbedType.cs +++ b/src/Discord.Net.Core/Entities/Messages/EmbedType.cs @@ -7,6 +7,7 @@ Video, Image, Gifv, - Article + Article, + Tweet } }