Merge pull request #713 from wcao-lessen/update/intent

fix states query parameter

Author: Oceania2018

src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs

@@ -32,7 +32,7 @@ public TwilioVoiceController(TwilioSetting settings, IServiceProvider services,
     /// <exception cref="ArgumentNullException"></exception>
     [ValidateRequest]
     [HttpPost("twilio/voice/welcome")]
-    public async Task<TwiMLResult> InitiateConversation(VoiceRequest request, [FromQuery] string states, [FromQuery] string intent)
+    public async Task<TwiMLResult> InitiateConversation(VoiceRequest request, [FromQuery] string[] states, [FromQuery] string intent)
     {
         if (request?.CallSid == null)
         {
@@ -44,7 +44,7 @@ public async Task<TwiMLResult> InitiateConversation(VoiceRequest request, [FromQ
         VoiceResponse response;
         if (string.IsNullOrWhiteSpace(intent))
         {
-            var url = $"twilio/voice/{conversationId}/receive/0?states={states}";
+            var url = $"twilio/voice/{conversationId}/receive/0?{GenerateStatesParameter(states)}";
             response = twilio.ReturnNoninterruptedInstructions(new List<string> { "twilio/welcome.mp3" }, url, true, timeout: 2);
         }
         else
@@ -62,14 +62,14 @@ public async Task<TwiMLResult> InitiateConversation(VoiceRequest request, [FromQ
                 States = ParseStates(states)
             };
             await messageQueue.EnqueueAsync(callerMessage);
-            response = new VoiceResponse().Redirect(new Uri($"{_settings.CallbackHost}/twilio/voice/{conversationId}/reply/{seqNum}?states={states}"), HttpMethod.Post);
+            response = new VoiceResponse().Redirect(new Uri($"{_settings.CallbackHost}/twilio/voice/{conversationId}/reply/{seqNum}?{GenerateStatesParameter(states)}"), HttpMethod.Post);
         }
         return TwiML(response);
     }
 
     [ValidateRequest]
     [HttpPost("twilio/voice/{conversationId}/receive/{seqNum}")]
-    public async Task<TwiMLResult> ReceiveCallerMessage([FromRoute] string conversationId, [FromRoute] int seqNum, [FromQuery] string states, VoiceRequest request, [FromQuery] int attempts = 1)
+    public async Task<TwiMLResult> ReceiveCallerMessage([FromRoute] string conversationId, [FromRoute] int seqNum, [FromQuery] string[] states, VoiceRequest request, [FromQuery] int attempts = 1)
     {
         var twilio = _services.GetRequiredService<TwilioService>();
         var messageQueue = _services.GetRequiredService<TwilioMessageQueue>();
@@ -99,7 +99,7 @@ public async Task<TwiMLResult> ReceiveCallerMessage([FromRoute] string conversat
             };
             await messageQueue.EnqueueAsync(callerMessage);
 
-            response = new VoiceResponse().Redirect(new Uri($"{_settings.CallbackHost}/twilio/voice/{conversationId}/reply/{seqNum}?states={states}"), HttpMethod.Post);
+            response = new VoiceResponse().Redirect(new Uri($"{_settings.CallbackHost}/twilio/voice/{conversationId}/reply/{seqNum}?{GenerateStatesParameter(states)}"), HttpMethod.Post);
         }
         else
         {
@@ -117,11 +117,11 @@ public async Task<TwiMLResult> ReceiveCallerMessage([FromRoute] string conversat
                     speechPaths.Add($"twilio/say-it-again-{Random.Shared.Next(1, 5)}.mp3");
                     speechPaths.Add($"twilio/voice/speeches/{conversationId}/{lastRepy.SpeechFileName}");
                 }
-                response = twilio.ReturnInstructions(speechPaths, $"twilio/voice/{conversationId}/receive/{seqNum}?states={states}", true);
+                response = twilio.ReturnInstructions(speechPaths, $"twilio/voice/{conversationId}/receive/{seqNum}?{GenerateStatesParameter(states)}", true);
             }
             else
             {
-                response = twilio.ReturnInstructions(null, $"twilio/voice/{conversationId}/receive/{seqNum}?states={states}&attempts={++attempts}", true);
+                response = twilio.ReturnInstructions(null, $"twilio/voice/{conversationId}/receive/{seqNum}?{GenerateStatesParameter(states)}&attempts={++attempts}", true);
             }
         }
         return TwiML(response);
@@ -130,7 +130,7 @@ public async Task<TwiMLResult> ReceiveCallerMessage([FromRoute] string conversat
     [ValidateRequest]
     [HttpPost("twilio/voice/{conversationId}/reply/{seqNum}")]
     public async Task<TwiMLResult> ReplyCallerMessage([FromRoute] string conversationId, [FromRoute] int seqNum,
-        [FromQuery] string states, VoiceRequest request)
+        [FromQuery] string[] states, VoiceRequest request)
     {
         var nextSeqNum = seqNum + 1;
         var sessionManager = _services.GetRequiredService<ITwilioSessionManager>();
@@ -185,7 +185,7 @@ public async Task<TwiMLResult> ReplyCallerMessage([FromRoute] string conversatio
                         segIndex++;
                     }
                 }
-                response = twilio.ReturnInstructions(speechPaths, $"twilio/voice/{conversationId}/reply/{seqNum}?states={states}", true);
+                response = twilio.ReturnInstructions(speechPaths, $"twilio/voice/{conversationId}/reply/{seqNum}?{GenerateStatesParameter(states)}", true);
                 await sessionManager.RemoveReplyIndicationAsync(conversationId, seqNum);
             }
             else
@@ -208,7 +208,7 @@ public async Task<TwiMLResult> ReplyCallerMessage([FromRoute] string conversatio
                     instructions.Add($"twilio/typing-{typingIndex}.mp3");
                 }
 
-                response = twilio.ReturnInstructions(instructions, $"twilio/voice/{conversationId}/reply/{seqNum}?states={states}", true);
+                response = twilio.ReturnInstructions(instructions, $"twilio/voice/{conversationId}/reply/{seqNum}?{GenerateStatesParameter(states)}", true);
             }
         }
         else
@@ -226,7 +226,7 @@ public async Task<TwiMLResult> ReplyCallerMessage([FromRoute] string conversatio
                 response = twilio.ReturnInstructions(new List<string>
                 {
                     $"twilio/voice/speeches/{conversationId}/{reply.SpeechFileName}"
-                }, $"twilio/voice/{conversationId}/receive/{nextSeqNum}?states={states}", true, hints: reply.Hints);
+                }, $"twilio/voice/{conversationId}/receive/{nextSeqNum}?{GenerateStatesParameter(states)}", true, hints: reply.Hints);
             }
         }
 
@@ -246,22 +246,30 @@ public async Task<FileContentResult> GetSpeechFile([FromRoute] string conversati
         return result;
     }
 
-    private Dictionary<string, string> ParseStates(string? states)
+    private Dictionary<string, string> ParseStates(string[] states)
     {
         var result = new Dictionary<string, string>();
-        if (string.IsNullOrWhiteSpace(states))
+        if (states is null || !states.Any())
         {
             return result;
         }
-        var kvps = states.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
-        foreach (var kvp in kvps)
+        foreach (var kvp in states)
         {
-            var parts = kvp.Split(':');
+            var parts = kvp.Split(':', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
             if (parts.Length == 2)
             {
                 result.Add(parts[0], parts[1]);
             }
         }
         return result;
     }
+
+    private string GenerateStatesParameter(string[] states)
+    {
+        if (states is null || states.Length == 0)
+        {
+            return null;
+        }
+        return string.Join("&", states.Select(x => $"states={x}"));
+    }
 }