Merge pull request #275 from RogueException/issue/239

[breaking] Rename Cosmetic Command Attributes (Description/Summary) to Summary/Remarks (Short Description, Full Description)
This commit is contained in:
Christopher F
2016-09-08 14:32:34 -04:00
committed by GitHub
4 changed files with 13 additions and 13 deletions

View File

@@ -2,13 +2,13 @@
namespace Discord.Commands namespace Discord.Commands
{ {
// Full summary of method // Extension of the Cosmetic Summary, for Groups, Commands, and Parameters
[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)] [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
public class DescriptionAttribute : Attribute public class RemarksAttribute : Attribute
{ {
public string Text { get; } public string Text { get; }
public DescriptionAttribute(string text) public RemarksAttribute(string text)
{ {
Text = text; Text = text;
} }

View File

@@ -2,7 +2,7 @@
namespace Discord.Commands namespace Discord.Commands
{ {
// Brief summary of method/module/parameter // Cosmetic Summary, for Groups and Commands
[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Parameter)] [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Parameter)]
public class SummaryAttribute : Attribute public class SummaryAttribute : Attribute
{ {

View File

@@ -21,8 +21,8 @@ namespace Discord.Commands
public MethodInfo Source { get; } public MethodInfo Source { get; }
public Module Module { get; } public Module Module { get; }
public string Name { get; } public string Name { get; }
public string Description { get; }
public string Summary { get; } public string Summary { get; }
public string Remarks { get; }
public string Text { get; } public string Text { get; }
public bool HasVarArgs { get; } public bool HasVarArgs { get; }
public IReadOnlyList<string> Aliases { get; } public IReadOnlyList<string> Aliases { get; }
@@ -62,14 +62,14 @@ namespace Discord.Commands
if (nameAttr != null) if (nameAttr != null)
Name = nameAttr.Text; Name = nameAttr.Text;
var description = source.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
Description = description.Text;
var summary = source.GetCustomAttribute<SummaryAttribute>(); var summary = source.GetCustomAttribute<SummaryAttribute>();
if (summary != null) if (summary != null)
Summary = summary.Text; Summary = summary.Text;
var remarksAttr = source.GetCustomAttribute<RemarksAttribute>();
if (remarksAttr != null)
Remarks = remarksAttr.Text;
Parameters = BuildParameters(source); Parameters = BuildParameters(source);
HasVarArgs = Parameters.Count > 0 ? Parameters[Parameters.Count - 1].IsMultiple : false; HasVarArgs = Parameters.Count > 0 ? Parameters[Parameters.Count - 1].IsMultiple : false;
Preconditions = BuildPreconditions(source); Preconditions = BuildPreconditions(source);

View File

@@ -13,7 +13,7 @@ namespace Discord.Commands
public string Name { get; } public string Name { get; }
public string Prefix { get; } public string Prefix { get; }
public string Summary { get; } public string Summary { get; }
public string Description { get; } public string Remarks { get; }
public IEnumerable<Command> Commands { get; } public IEnumerable<Command> Commands { get; }
internal object Instance { get; } internal object Instance { get; }
@@ -35,9 +35,9 @@ namespace Discord.Commands
if (summaryAttr != null) if (summaryAttr != null)
Summary = summaryAttr.Text; Summary = summaryAttr.Text;
var descriptionAttr = source.GetCustomAttribute<DescriptionAttribute>(); var remarksAttr = source.GetCustomAttribute<RemarksAttribute>();
if (descriptionAttr != null) if (remarksAttr != null)
Description = descriptionAttr.Text; Remarks = remarksAttr.Text;
List<Command> commands = new List<Command>(); List<Command> commands = new List<Command>();
SearchClass(source, instance, commands, Prefix, dependencyMap); SearchClass(source, instance, commands, Prefix, dependencyMap);