From 8b864d4b9e2bb424b0988b5aab64c3bea654b139 Mon Sep 17 00:00:00 2001 From: FiniteReality Date: Thu, 18 Aug 2016 13:50:02 +0100 Subject: [PATCH 1/2] Fix #203 by adding a NameAttribute to override Name --- .../Attributes/NameAttribute.cs | 15 +++++++++++++++ src/Discord.Net.Commands/Command.cs | 4 ++++ src/Discord.Net.Commands/Module.cs | 4 ++++ 3 files changed, 23 insertions(+) create mode 100644 src/Discord.Net.Commands/Attributes/NameAttribute.cs diff --git a/src/Discord.Net.Commands/Attributes/NameAttribute.cs b/src/Discord.Net.Commands/Attributes/NameAttribute.cs new file mode 100644 index 000000000..aeb301009 --- /dev/null +++ b/src/Discord.Net.Commands/Attributes/NameAttribute.cs @@ -0,0 +1,15 @@ +using System; + +namespace Discord.Commands +{ + // Full summary of method + [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)] + public class NameAttribute : Attribute + { + public string Text { get; } + public NameAttribute(string text) + { + Text = text; + } + } +} diff --git a/src/Discord.Net.Commands/Command.cs b/src/Discord.Net.Commands/Command.cs index 36cbdcc0f..f46fafb27 100644 --- a/src/Discord.Net.Commands/Command.cs +++ b/src/Discord.Net.Commands/Command.cs @@ -31,6 +31,10 @@ namespace Discord.Commands Name = source.Name; Text = groupPrefix + attribute.Text; + var nameAttr = source.GetCustomAttribute(); + if (nameAttr != null) + Name = nameAttr.Text; + var description = source.GetCustomAttribute(); if (description != null) Description = description.Text; diff --git a/src/Discord.Net.Commands/Module.cs b/src/Discord.Net.Commands/Module.cs index f965d78ab..ecbf0b400 100644 --- a/src/Discord.Net.Commands/Module.cs +++ b/src/Discord.Net.Commands/Module.cs @@ -25,6 +25,10 @@ namespace Discord.Commands Name = source.Name; Instance = instance; + var nameAttr = source.GetCustomAttribute(); + if (nameAttr != null) + Name = nameAttr.Text; + var summaryAttr = source.GetCustomAttribute(); if (summaryAttr != null) Summary = summaryAttr.Text; From 252d89000d2694059553a42afaf71a479fb7be51 Mon Sep 17 00:00:00 2001 From: FiniteReality Date: Thu, 18 Aug 2016 14:09:47 +0100 Subject: [PATCH 2/2] Fix comment copy+paste fail --- src/Discord.Net.Commands/Attributes/NameAttribute.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Discord.Net.Commands/Attributes/NameAttribute.cs b/src/Discord.Net.Commands/Attributes/NameAttribute.cs index aeb301009..3ea0abe24 100644 --- a/src/Discord.Net.Commands/Attributes/NameAttribute.cs +++ b/src/Discord.Net.Commands/Attributes/NameAttribute.cs @@ -2,7 +2,7 @@ using System; namespace Discord.Commands { - // Full summary of method + // Override public name of command/module [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)] public class NameAttribute : Attribute {