Browse Source

clean up leftover changes from testing

pull/943/head
Chris Johnston 7 years ago
parent
commit
4f6e29be8c
3 changed files with 4 additions and 5 deletions
  1. +0
    -1
      src/Discord.Net.Commands/CommandService.cs
  2. +1
    -1
      src/Discord.Net.Commands/CommandServiceConfig.cs
  3. +3
    -3
      src/Discord.Net.Commands/Info/CommandInfo.cs

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

@@ -279,7 +279,6 @@ namespace Discord.Commands
public async Task<IResult> ExecuteAsync(ICommandContext context, string input, IServiceProvider services = null, MultiMatchHandling multiMatchHandling = MultiMatchHandling.Exception) public async Task<IResult> ExecuteAsync(ICommandContext context, string input, IServiceProvider services = null, MultiMatchHandling multiMatchHandling = MultiMatchHandling.Exception)
{ {
services = services ?? EmptyServiceProvider.Instance; services = services ?? EmptyServiceProvider.Instance;
var searchResult = Search(context, input); var searchResult = Search(context, input);
if (!searchResult.IsSuccess) if (!searchResult.IsSuccess)
return searchResult; return searchResult;


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

@@ -17,7 +17,7 @@
public bool ThrowOnError { get; set; } = true; public bool ThrowOnError { get; set; } = true;


/// <summary> List of aliases for string parsing </summary> /// <summary> List of aliases for string parsing </summary>
public char[] QuotationMarkAliases { get; set; } = new char[] { '\"', '“', '”', '\'', '«', '»', '‹', '›' };
public char[] QuotationMarkAliases { get; set; } = new char[] { '\"', '“', '”', '«', '»', '‹', '›' };


/// <summary> Determines whether extra parameters should be ignored. </summary> /// <summary> Determines whether extra parameters should be ignored. </summary>
public bool IgnoreExtraArgs { get; set; } = false; public bool IgnoreExtraArgs { get; set; } = false;


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

@@ -1,4 +1,4 @@
using Discord.Commands.Builders;
using Discord.Commands.Builders;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable; using System.Collections.Immutable;
@@ -66,8 +66,8 @@ namespace Discord.Commands
HasVarArgs = builder.Parameters.Count > 0 ? builder.Parameters[builder.Parameters.Count - 1].IsMultiple : false; HasVarArgs = builder.Parameters.Count > 0 ? builder.Parameters[builder.Parameters.Count - 1].IsMultiple : false;


_action = builder.Callback; _action = builder.Callback;
_commandService = service;
_quotationAliases = service._quotationMarkAliases; _quotationAliases = service._quotationMarkAliases;
_commandService = service;
} }


public async Task<PreconditionResult> CheckPreconditionsAsync(ICommandContext context, IServiceProvider services = null) public async Task<PreconditionResult> CheckPreconditionsAsync(ICommandContext context, IServiceProvider services = null)
@@ -111,7 +111,7 @@ namespace Discord.Commands
return PreconditionResult.FromSuccess(); return PreconditionResult.FromSuccess();
} }


public async Task<ParseResult> ParseAsync(ICommandContext context, int startIndex, SearchResult searchResult, PreconditionResult preconditionResult = null, IServiceProvider services = null, char[] quotationAliases = null)
public async Task<ParseResult> ParseAsync(ICommandContext context, int startIndex, SearchResult searchResult, PreconditionResult preconditionResult = null, IServiceProvider services = null)
{ {
services = services ?? EmptyServiceProvider.Instance; services = services ?? EmptyServiceProvider.Instance;




Loading…
Cancel
Save