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

Revert 3856d43 & rename CommandParameter.Description to Summary

Browse Source
This commit is contained in:
Finite Reality
2016-08-09 16:37:56 +01:00
parent 86092f9253
commit f7633ea3d7
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net.Commands/Command.cs
View File

@@ -103,11 +103,11 @@ namespace Discord.Commands
throw new InvalidOperationException("Remainder parameters must be the last parameter in a command.");
string name = parameter.Name;
string description = parameter.GetCustomAttribute<DescriptionAttribute>()?.Text;
string summary = parameter.GetCustomAttribute<DescriptionAttribute>()?.Text;
bool isOptional = parameter.IsOptional;
object defaultValue = parameter.HasDefaultValue ? parameter.DefaultValue : null;
paramBuilder.Add(new CommandParameter(name, description, type, reader, isOptional, isRemainder, isMultiple, defaultValue));
paramBuilder.Add(new CommandParameter(name, summary, type, reader, isOptional, isRemainder, isMultiple, defaultValue));
}
return paramBuilder.ToImmutable();
}

6
src/Discord.Net.Commands/CommandParameter.cs
View File

@@ -10,17 +10,17 @@ namespace Discord.Commands
private readonly TypeReader _reader;
public string Name { get; }
public string Description { get; }
public string Summary { get; }
public bool IsOptional { get; }
public bool IsRemainder { get; }
public bool IsMultiple { get; }
public Type Type { get; }
internal object DefaultValue { get; }
public CommandParameter(string name, string description, Type type, TypeReader reader, bool isOptional, bool isRemainder, bool isMultiple, object defaultValue)
public CommandParameter(string name, string summary, Type type, TypeReader reader, bool isOptional, bool isRemainder, bool isMultiple, object defaultValue)
{
Name = name;
Description = description;
Summary = summary;
Type = type;
_reader = reader;
IsOptional = isOptional;

3
src/Discord.Net.Commands/CommandService.cs
View File

@@ -16,7 +16,8 @@ namespace Discord.Commands
private readonly ConcurrentDictionary<Type, TypeReader> _typeReaders;
private readonly CommandMap _map;
public ILookup<Module, Command> Commands => _modules.SelectMany(x => x.Value.Commands).ToLookup(x => x.Module);
public IEnumerable<Module> Modules => _modules.Select(x => x.Value);
public IEnumerable<Command> Commands => _modules.SelectMany(x => x.Value.Commands);
public CommandService()
{