From 91a221a9eb2ad08d88529d3c56e561b03e237dfd Mon Sep 17 00:00:00 2001 From: Haiping Chen Date: Thu, 29 Aug 2024 11:49:34 -0500 Subject: [PATCH] msg.Instruction?.ConversationEnd --- .../Controllers/TwilioVoiceController.cs | 14 +++++++------- .../Services/TwilioMessageQueueService.cs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs b/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs index b0745b3d..4cb1fa9c 100644 --- a/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs +++ b/src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioVoiceController.cs @@ -76,9 +76,8 @@ public class TwilioVoiceController : TwilioController } await messageQueue.EnqueueAsync(callerMessage); - int audioIndex = Random.Shared.Next(2, 5); response = new VoiceResponse() - .Redirect(new Uri($"{_settings.CallbackHost}/twilio/voice/{conversationId}/reply/{seqNum}?states={states}&play=%23hold-on-{audioIndex}%7c%23typing-2"), HttpMethod.Post); + .Redirect(new Uri($"{_settings.CallbackHost}/twilio/voice/{conversationId}/reply/{seqNum}?states={states}"), HttpMethod.Post); } else { @@ -104,9 +103,7 @@ public class TwilioVoiceController : TwilioController VoiceResponse response; if (reply == null) { - var indication = string.IsNullOrEmpty(play) ? - await sessionManager.GetReplyIndicationAsync(conversationId, seqNum) : - play; + var indication = await sessionManager.GetReplyIndicationAsync(conversationId, seqNum); if (indication != null) { var speechPaths = new List(); @@ -131,8 +128,11 @@ public class TwilioVoiceController : TwilioController } else { - int audioIndex = Random.Shared.Next(1, 4); - response = twilio.ReturnInstructions(new List { $"{_settings.CallbackHost}/twilio/typing-{audioIndex}.mp3" }, $"twilio/voice/{conversationId}/reply/{seqNum}?states={states}", true); + response = twilio.ReturnInstructions(new List + { + $"twilio/hold-on-{Random.Shared.Next(1, 5)}.mp3", + $"twilio/typing-{Random.Shared.Next(2, 4)}.mp3" + }, $"twilio/voice/{conversationId}/reply/{seqNum}?states={states}", true); } } else diff --git a/src/Plugins/BotSharp.Plugin.Twilio/Services/TwilioMessageQueueService.cs b/src/Plugins/BotSharp.Plugin.Twilio/Services/TwilioMessageQueueService.cs index 19e0ce68..3338c46d 100644 --- a/src/Plugins/BotSharp.Plugin.Twilio/Services/TwilioMessageQueueService.cs +++ b/src/Plugins/BotSharp.Plugin.Twilio/Services/TwilioMessageQueueService.cs @@ -82,7 +82,7 @@ namespace BotSharp.Plugin.Twilio.Services { reply = new AssistantMessage() { - ConversationEnd = msg.Instruction.ConversationEnd, + ConversationEnd = msg.Instruction?.ConversationEnd ?? false, Content = msg.Content, MessageId = msg.MessageId };