Add support for parsing multiple types of quotation marks in commands, Fix #942

src/Discord.Net.Commands/CommandParser.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Text;
 using System.Threading.Tasks;
@@ -13,7 +14,7 @@ private enum ParserPart
             Parameter,
             QuotedParameter
         }
-
+                        
         public static async Task<ParseResult> ParseArgsAsync(CommandInfo command, ICommandContext context, bool ignoreExtraArgs, IServiceProvider services, string input, int startPos)
         {
             ParameterInfo curParam = null;
@@ -24,7 +25,32 @@ public static async Task<ParseResult> ParseArgsAsync(CommandInfo command, IComma
             var argList = ImmutableArray.CreateBuilder<TypeReaderResult>();
             var paramList = ImmutableArray.CreateBuilder<TypeReaderResult>();
             bool isEscaping = false;
-            char c;
+            char c, matchQuote = '\0';
+
+            // local helper functions
+            bool IsOpenQuote(IReadOnlyDictionary<char, char> dict, char ch)
+            {
+                // return if the key is contained in the dictionary if it exists
+                if (dict != null)
+                    return dict.ContainsKey(ch);
+                // or otherwise if it is the default double quote
+                return c == '\"';
+            }
+
+            char GetMatch(IReadOnlyDictionary<char, char> dict, char ch)
+            {
+                // get the corresponding value for the key, if it exists
+                if (dict != null)
+                {
+                    char value;
+                    if (dict.TryGetValue(c, out value))
+                    {
+                        return value;
+                    }
+                }
+                // or get the default pair of the default double quote
+                return '\"';
+            }
 
             for (int curPos = startPos; curPos <= endPos; curPos++)
             {
@@ -74,9 +100,11 @@ public static async Task<ParseResult> ParseArgsAsync(CommandInfo command, IComma
                             argBuilder.Append(c);
                             continue;
                         }
-                        if (c == '\"')
+
+                        if(IsOpenQuote(command._quotationAliases, c))
                         {
                             curPart = ParserPart.QuotedParameter;
+                            matchQuote = GetMatch(command._quotationAliases, c);
                             continue;
                         }
                         curPart = ParserPart.Parameter;
@@ -97,7 +125,7 @@ public static async Task<ParseResult> ParseArgsAsync(CommandInfo command, IComma
                 }
                 else if (curPart == ParserPart.QuotedParameter)
                 {
-                    if (c == '\"')
+                    if(c == matchQuote)
                     {
                         argString = argBuilder.ToString(); //Remove quotes
                         lastArgEndPos = curPos + 1;

src/Discord.Net.Commands/CommandService.cs

@@ -32,6 +32,7 @@ public class CommandService
         internal readonly RunMode _defaultRunMode;
         internal readonly Logger _cmdLogger;
         internal readonly LogManager _logManager;
+        internal readonly IReadOnlyDictionary<char, char> _quotationMarkAliasMap;
 
         public IEnumerable<ModuleInfo> Modules => _moduleDefs.Select(x => x);
         public IEnumerable<CommandInfo> Commands => _moduleDefs.SelectMany(x => x.Commands);
@@ -45,6 +46,7 @@ public CommandService(CommandServiceConfig config)
             _ignoreExtraArgs = config.IgnoreExtraArgs;
             _separatorChar = config.SeparatorChar;
             _defaultRunMode = config.DefaultRunMode;
+            _quotationMarkAliasMap = config.QuotationMarkAliasMap;
             if (_defaultRunMode == RunMode.Default)
                 throw new InvalidOperationException("The default run mode cannot be set to Default.");
 
@@ -277,7 +279,6 @@ public Task<IResult> ExecuteAsync(ICommandContext context, int argPos, IServiceP
         public async Task<IResult> ExecuteAsync(ICommandContext context, string input, IServiceProvider services = null, MultiMatchHandling multiMatchHandling = MultiMatchHandling.Exception)
         {
             services = services ?? EmptyServiceProvider.Instance;
-
             var searchResult = Search(context, input);
             if (!searchResult.IsSuccess)
                 return searchResult;

src/Discord.Net.Commands/CommandServiceConfig.cs

@@ -1,4 +1,5 @@
-namespace Discord.Commands
+using System.Collections.Generic;
+namespace Discord.Commands
 {
     public class CommandServiceConfig
     {
@@ -16,6 +17,30 @@ public class CommandServiceConfig
         /// <summary> Determines whether RunMode.Sync commands should push exceptions up to the caller. </summary>
         public bool ThrowOnError { get; set; } = true;
 
+        /// <summary> Collection of aliases that can wrap strings for command parsing. 
+        /// represents the opening quotation mark and the value is the corresponding closing mark.</summary>
+        public Dictionary<char, char> QuotationMarkAliasMap { get; set; }
+        = new Dictionary<char, char>()
+        {
+            {'\"', '\"' },
+            {'«', '»' },
+            {'‘', '’' },
+            {'“', '”' },
+            {'„', '‟' },
+            {'‹', '›' },
+            {'‚', '‛' },
+            {'《', '》' },
+            {'〈', '〉' },
+            {'「', '」' },
+            {'『', '』' },
+            {'〝', '〞' },
+            {'﹁', '﹂' },
+            {'﹃', '﹄' },
+            {'＂', '＂' },
+            {'＇', '＇' },
+            {'｢', '｣' }
+        };
+
         /// <summary> Determines whether extra parameters should be ignored. </summary>
         public bool IgnoreExtraArgs { get; set; } = false;
     }

src/Discord.Net.Commands/Info/CommandInfo.cs

@@ -1,4 +1,4 @@
-using Discord.Commands.Builders;
+using Discord.Commands.Builders;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -20,6 +20,7 @@ public class CommandInfo
 
         private readonly CommandService _commandService;
         private readonly Func<ICommandContext, object[], IServiceProvider, CommandInfo, Task> _action;
+        internal readonly IReadOnlyDictionary<char,char> _quotationAliases;
 
         public ModuleInfo Module { get; }
         public string Name { get; }
@@ -65,6 +66,7 @@ internal CommandInfo(CommandBuilder builder, ModuleInfo module, CommandService s
             HasVarArgs = builder.Parameters.Count > 0 ? builder.Parameters[builder.Parameters.Count - 1].IsMultiple : false;
 
             _action = builder.Callback;
+            _quotationAliases = service._quotationMarkAliasMap;
             _commandService = service;
         }