Browse Source

Fix issues with DefaultRunMode

For a command to use the DefaultRunMode, it must now have it's RunMode set to RunMode.Default (this is the default value on CommandAttribute now).
tags/1.0-rc
Christopher F 8 years ago
parent
commit
fb99b019a0
4 changed files with 4 additions and 3 deletions
  1. +1
    -1
      src/Discord.Net.Commands/Attributes/CommandAttribute.cs
  2. +1
    -1
      src/Discord.Net.Commands/Builders/CommandBuilder.cs
  3. +1
    -1
      src/Discord.Net.Commands/Info/CommandInfo.cs
  4. +1
    -0
      src/Discord.Net.Commands/RunMode.cs

+ 1
- 1
src/Discord.Net.Commands/Attributes/CommandAttribute.cs View File

@@ -6,7 +6,7 @@ namespace Discord.Commands
public class CommandAttribute : Attribute public class CommandAttribute : Attribute
{ {
public string Text { get; } public string Text { get; }
public RunMode RunMode { get; set; }
public RunMode RunMode { get; set; } = RunMode.Default;


public CommandAttribute() public CommandAttribute()
{ {


+ 1
- 1
src/Discord.Net.Commands/Builders/CommandBuilder.cs View File

@@ -17,7 +17,7 @@ namespace Discord.Commands.Builders
public string Name { get; set; } public string Name { get; set; }
public string Summary { get; set; } public string Summary { get; set; }
public string Remarks { get; set; } public string Remarks { get; set; }
public RunMode? RunMode { get; set; }
public RunMode RunMode { get; set; }
public int Priority { get; set; } public int Priority { get; set; }


public IReadOnlyList<PreconditionAttribute> Preconditions => _preconditions; public IReadOnlyList<PreconditionAttribute> Preconditions => _preconditions;


+ 1
- 1
src/Discord.Net.Commands/Info/CommandInfo.cs View File

@@ -37,7 +37,7 @@ namespace Discord.Commands
Summary = builder.Summary; Summary = builder.Summary;
Remarks = builder.Remarks; Remarks = builder.Remarks;


RunMode = builder.RunMode ?? service._defaultRunMode;
RunMode = (builder.RunMode == RunMode.Default ? service._defaultRunMode : builder.RunMode);
Priority = builder.Priority; Priority = builder.Priority;
if (module.Aliases.Count != 0) if (module.Aliases.Count != 0)


+ 1
- 0
src/Discord.Net.Commands/RunMode.cs View File

@@ -2,6 +2,7 @@
{ {
public enum RunMode public enum RunMode
{ {
Default,
Sync, Sync,
Mixed, Mixed,
Async Async


Loading…
Cancel
Save