From 605630f46c9392d5e7690c184ea44c6f65b470aa Mon Sep 17 00:00:00 2001
From: Chris Johnston <Chris-Johnston@users.noreply.github.com>
Date: Sun, 28 Jan 2018 04:12:58 -0800
Subject: [PATCH] Add ability to support different types of quotation marks

---
 src/Discord.Net.Commands/CommandParser.cs       | 17 +++++++++++++++--
 src/Discord.Net.Commands/CommandService.cs      |  4 +++-
 .../CommandServiceConfig.cs                     |  3 +++
 src/Discord.Net.Commands/Info/CommandInfo.cs    |  4 +++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/Discord.Net.Commands/CommandParser.cs b/src/Discord.Net.Commands/CommandParser.cs
index 28e36d54d..1b3f6067b 100644
--- a/src/Discord.Net.Commands/CommandParser.cs
+++ b/src/Discord.Net.Commands/CommandParser.cs
@@ -13,6 +13,19 @@ namespace Discord.Commands
             Parameter,
             QuotedParameter
         }
+
+        /// <summary>
+        /// Checks to see if the supplied character is a quotation mark
+        /// from either the default " character, or the list of aliases
+        /// if they are provided.
+        /// </summary>
+        /// <param name="c"></param>
+        /// <param name="aliases"></param>
+        private static bool isQuotationChar(char c, char[] aliases)
+        {
+            if (aliases == null) return c == '\"';
+            return Array.Exists(aliases, x => x == c);
+        }
         
         public static async Task<ParseResult> ParseArgsAsync(CommandInfo command, ICommandContext context, IServiceProvider services, string input, int startPos)
         {
@@ -74,7 +87,7 @@ namespace Discord.Commands
                             argBuilder.Append(c);
                             continue;
                         }
-                        if (c == '\"')
+                        if (isQuotationChar(c, command._quotationAliases))
                         {
                             curPart = ParserPart.QuotedParameter;
                             continue;
@@ -97,7 +110,7 @@ namespace Discord.Commands
                 }
                 else if (curPart == ParserPart.QuotedParameter)
                 {
-                    if (c == '\"')
+                    if (isQuotationChar(c, command._quotationAliases))
                     {
                         argString = argBuilder.ToString(); //Remove quotes
                         lastArgEndPos = curPos + 1;
diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs
index cf2b93277..99d333ee5 100644
--- a/src/Discord.Net.Commands/CommandService.cs
+++ b/src/Discord.Net.Commands/CommandService.cs
@@ -32,6 +32,7 @@ namespace Discord.Commands
         internal readonly RunMode _defaultRunMode;
         internal readonly Logger _cmdLogger;
         internal readonly LogManager _logManager;
+        internal readonly char[] _quotationMarkAliases;
 
         public IEnumerable<ModuleInfo> Modules => _moduleDefs.Select(x => x);
         public IEnumerable<CommandInfo> Commands => _moduleDefs.SelectMany(x => x.Commands);
@@ -44,6 +45,7 @@ namespace Discord.Commands
             _throwOnError = config.ThrowOnError;
             _separatorChar = config.SeparatorChar;
             _defaultRunMode = config.DefaultRunMode;
+            _quotationMarkAliases = config.QuotationMarkAliases;
             if (_defaultRunMode == RunMode.Default)
                 throw new InvalidOperationException("The default run mode cannot be set to Default.");
 
@@ -276,7 +278,7 @@ namespace Discord.Commands
         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;
diff --git a/src/Discord.Net.Commands/CommandServiceConfig.cs b/src/Discord.Net.Commands/CommandServiceConfig.cs
index b53b0248c..86e05e619 100644
--- a/src/Discord.Net.Commands/CommandServiceConfig.cs
+++ b/src/Discord.Net.Commands/CommandServiceConfig.cs
@@ -15,5 +15,8 @@
 
         /// <summary> Determines whether RunMode.Sync commands should push exceptions up to the caller. </summary>
         public bool ThrowOnError { get; set; } = true;
+
+        /// <summary> List of aliases for string parsing </summary>
+        public char[] QuotationMarkAliases { get; set; } = new char[] { '“', '”', '\'', '«', '»', '‹', '›' };
     }
 }
diff --git a/src/Discord.Net.Commands/Info/CommandInfo.cs b/src/Discord.Net.Commands/Info/CommandInfo.cs
index 6bb621f94..e563f904d 100644
--- a/src/Discord.Net.Commands/Info/CommandInfo.cs
+++ b/src/Discord.Net.Commands/Info/CommandInfo.cs
@@ -19,6 +19,7 @@ namespace Discord.Commands
         private static readonly ConcurrentDictionary<Type, Func<IEnumerable<object>, object>> _arrayConverters = new ConcurrentDictionary<Type, Func<IEnumerable<object>, object>>();
 
         private readonly Func<ICommandContext, object[], IServiceProvider, CommandInfo, Task> _action;
+        internal readonly char[] _quotationAliases;
 
         public ModuleInfo Module { get; }
         public string Name { get; }
@@ -64,6 +65,7 @@ namespace Discord.Commands
             HasVarArgs = builder.Parameters.Count > 0 ? builder.Parameters[builder.Parameters.Count - 1].IsMultiple : false;
 
             _action = builder.Callback;
+            _quotationAliases = service._quotationMarkAliases;
         }
 
         public async Task<PreconditionResult> CheckPreconditionsAsync(ICommandContext context, IServiceProvider services = null)
@@ -107,7 +109,7 @@ namespace Discord.Commands
             return PreconditionResult.FromSuccess();
         }
 
-        public async Task<ParseResult> ParseAsync(ICommandContext context, int startIndex, SearchResult searchResult, PreconditionResult preconditionResult = null, IServiceProvider services = null)
+        public async Task<ParseResult> ParseAsync(ICommandContext context, int startIndex, SearchResult searchResult, PreconditionResult preconditionResult = null, IServiceProvider services = null, char[] quotationAliases = null)
         {
             services = services ?? EmptyServiceProvider.Instance;