Merge pull request #926 from TwilioDevEd/dotnet-dtmf-tones-fix

bld010 · web-flow · commit 2cf4bb74a5a6 · 2021-08-05T09:49:59.000-06:00
Update C# DTMF guide examples
diff --git a/guides/voice/gather-dtmf-tones-guide/gather-example-step-0/example.5.x.cs b/guides/voice/gather-dtmf-tones-guide/gather-example-step-0/example.5.x.cs
@@ -3,20 +3,22 @@
 
 using System.Web.Mvc;
 using Twilio.AspNet.Mvc;
+using Twilio.AspNet.Common;
 using Twilio.TwiML;
+using System;
 
 public class VoiceController : TwilioController
 {
     [HttpPost]
-    public ActionResult Index()
+    public TwiMLResult Index()
     {
         var response = new VoiceResponse();
 
         // Use the <Gather> verb to collect user input
-        response.Gather(new Gather(numDigits: 1)
-		                .Say("For sales, press 1. For support, press 2."));
+        response.Gather(numDigits: 1)
+		                .Say("For sales, press 1. For support, press 2.");
         // If the user doesn't enter input, loop
-        response.Redirect("/voice");
+        response.Redirect(new Uri("/voice", UriKind.Relative));
 
         return TwiML(response);
     }
diff --git a/guides/voice/gather-dtmf-tones-guide/gather-example-step-1/example.5.x.cs b/guides/voice/gather-dtmf-tones-guide/gather-example-step-1/example.5.x.cs
@@ -3,18 +3,20 @@
 
 using System.Web.Mvc;
 using Twilio.AspNet.Mvc;
+using Twilio.AspNet.Common;
 using Twilio.TwiML;
+using System;
 
 public class VoiceController : TwilioController
 {
 	[HttpPost]
-	public ActionResult Index(string digits)
+	public TwiMLResult Index(VoiceRequest request)
 	{
 		var response = new VoiceResponse();
 
-		if (!string.IsNullOrEmpty(digits))
+		if (!string.IsNullOrEmpty(request.Digits))
 		{
-			switch (digits)
+			switch (request.Digits)
 			{
 				case "1":
 					response.Say("You selected sales. Good for you!");
@@ -39,11 +41,10 @@ public ActionResult Index(string digits)
 
 	private static void RenderMainMenu(VoiceResponse response)
 	{
-		response.Gather(
-			new Gather(numDigits: 1)
-			.Say("For sales, press 1. For support, press 2."));
+		response.Gather(numDigits: 1)
+			.Say("For sales, press 1. For support, press 2.");
 
 		// If the user doesn't enter input, loop
-		response.Redirect("/voice");
+		response.Redirect(new Uri("/voice", UriKind.Relative));
 	}
 }
diff --git a/guides/voice/gather-dtmf-tones-guide/gather-example-step-2.1/example.5.x.cs b/guides/voice/gather-dtmf-tones-guide/gather-example-step-2.1/example.5.x.cs
@@ -1,21 +1,24 @@
 // In Package Manager, run:
 // Install-Package Twilio.AspNet.Mvc -DependencyVersion HighestMinor
 
+
 using System.Web.Mvc;
 using Twilio.AspNet.Mvc;
+using Twilio.AspNet.Common;
 using Twilio.TwiML;
+using System;
 
 public class VoiceController : TwilioController
 {
 	[HttpPost]
-	public ActionResult Gather(string digits)
+	public TwiMLResult Gather(VoiceRequest request)
 	{
 		var response = new VoiceResponse();
 
 		// If the user entered digits, process their request
-		if (!string.IsNullOrEmpty(digits))
+		if (!string.IsNullOrEmpty(request.Digits))
 		{
-			switch (digits)
+			switch (request.Digits)
 			{
 				case "1":
 					response.Say("You selected sales. Good for you!");
@@ -25,14 +28,14 @@ public ActionResult Gather(string digits)
 					break;
 				default:
 					response.Say("Sorry, I don't understand that choice.").Pause();
-					response.Redirect("/voice");
+					response.Redirect(new Uri("/voice", UriKind.Relative));
 					break;
 			}
 		}
 		else
 		{
 			// If no input was sent, redirect to the /voice route
-			response.Redirect("/voice");
+			response.Redirect(new Uri("/voice", UriKind.Relative));
 		}
 
 		return TwiML(response);
diff --git a/guides/voice/gather-dtmf-tones-guide/gather-example-step-2/example.5.x.cs b/guides/voice/gather-dtmf-tones-guide/gather-example-step-2/example.5.x.cs
@@ -3,34 +3,35 @@
 
 using System.Web.Mvc;
 using Twilio.AspNet.Mvc;
+using Twilio.AspNet.Common;
 using Twilio.TwiML;
+using System;
 
 public class VoiceController : TwilioController
 {
 	[HttpPost]
-	public ActionResult Index()
+	public TwiMLResult Index()
 	{
 		var response = new VoiceResponse();
-		response.Gather(
-			new Gather(numDigits: 1, action: "/voice/gather")
-			    .Say("For sales, press 1. For support, press 2."));
+		response.Gather(numDigits: 1, action: new Uri("/voice/gather", UriKind.Relative))
+			    .Say("For sales, press 1. For support, press 2.");
 
 		// If the user doesn't enter input, loop
-		response.Redirect("/voice");
+		response.Redirect(new Uri("/voice", UriKind.Relative));
 
-		return Content(response.ToString(), "text/xml");
+		return TwiML(response);
 	}
 
 
 	[HttpPost]
-	public ActionResult Gather(string digits)
+	public TwiMLResult Gather(VoiceRequest request)
 	{
 		var response = new VoiceResponse();
 
 		// If the user entered digits, process their request
-		if (!string.IsNullOrEmpty(digits))
+		if (!string.IsNullOrEmpty(request.Digits))
 		{
-			switch (digits)
+			switch (request.Digits)
 			{
 				case "1":
 					response.Say("You selected sales. Good for you!");
@@ -40,14 +41,14 @@ public ActionResult Gather(string digits)
 					break;
 				default:
 					response.Say("Sorry, I don't understand that choice.").Pause();
-					response.Redirect("/voice");
+					response.Redirect(new Uri("/voice", UriKind.Relative));
 					break;
 			}
 		}
 		else
 		{
 			// If no input was sent, redirect to the /voice route
-			response.Redirect("/voice");
+			response.Redirect(new Uri("/voice", UriKind.Relative));
 		}
 
 		return TwiML(response);

Original file line number	Diff line number	Diff line change
`@@ -3,18 +3,20 @@`
`3`	`3`
`4`	`4`	`using System.Web.Mvc;`
`5`	`5`	`using Twilio.AspNet.Mvc;`
	`6`	`+using Twilio.AspNet.Common;`
`6`	`7`	`using Twilio.TwiML;`
	`8`	`+using System;`
`7`	`9`
`8`	`10`	`public class VoiceController : TwilioController`
`9`	`11`	`{`
`10`	`12`	`[HttpPost]`
`11`		`- public ActionResult Index(string digits)`
	`13`	`+ public TwiMLResult Index(VoiceRequest request)`
`12`	`14`	`{`
`13`	`15`	`var response = new VoiceResponse();`
`14`	`16`
`15`		`- if (!string.IsNullOrEmpty(digits))`
	`17`	`+ if (!string.IsNullOrEmpty(request.Digits))`
`16`	`18`	`{`
`17`		`- switch (digits)`
	`19`	`+ switch (request.Digits)`
`18`	`20`	`{`
`19`	`21`	`case "1":`
`20`	`22`	`response.Say("You selected sales. Good for you!");`
`@@ -39,11 +41,10 @@ public ActionResult Index(string digits)`
`39`	`41`
`40`	`42`	`private static void RenderMainMenu(VoiceResponse response)`
`41`	`43`	`{`
`42`		`- response.Gather(`
`43`		`- new Gather(numDigits: 1)`
`44`		`- .Say("For sales, press 1. For support, press 2."));`
	`44`	`+ response.Gather(numDigits: 1)`
	`45`	`+ .Say("For sales, press 1. For support, press 2.");`
`45`	`46`
`46`	`47`	`// If the user doesn't enter input, loop`
`47`		`- response.Redirect("/voice");`
	`48`	`+ response.Redirect(new Uri("/voice", UriKind.Relative));`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,24 @@`
`1`	`1`	`// In Package Manager, run:`
`2`	`2`	`// Install-Package Twilio.AspNet.Mvc -DependencyVersion HighestMinor`
`3`	`3`
	`4`	`+`
`4`	`5`	`using System.Web.Mvc;`
`5`	`6`	`using Twilio.AspNet.Mvc;`
	`7`	`+using Twilio.AspNet.Common;`
`6`	`8`	`using Twilio.TwiML;`
	`9`	`+using System;`
`7`	`10`
`8`	`11`	`public class VoiceController : TwilioController`
`9`	`12`	`{`
`10`	`13`	`[HttpPost]`
`11`		`- public ActionResult Gather(string digits)`
	`14`	`+ public TwiMLResult Gather(VoiceRequest request)`
`12`	`15`	`{`
`13`	`16`	`var response = new VoiceResponse();`
`14`	`17`
`15`	`18`	`// If the user entered digits, process their request`
`16`		`- if (!string.IsNullOrEmpty(digits))`
	`19`	`+ if (!string.IsNullOrEmpty(request.Digits))`
`17`	`20`	`{`
`18`		`- switch (digits)`
	`21`	`+ switch (request.Digits)`
`19`	`22`	`{`
`20`	`23`	`case "1":`
`21`	`24`	`response.Say("You selected sales. Good for you!");`
`@@ -25,14 +28,14 @@ public ActionResult Gather(string digits)`
`25`	`28`	`break;`
`26`	`29`	`default:`
`27`	`30`	`response.Say("Sorry, I don't understand that choice.").Pause();`
`28`		`- response.Redirect("/voice");`
	`31`	`+ response.Redirect(new Uri("/voice", UriKind.Relative));`
`29`	`32`	`break;`
`30`	`33`	`}`
`31`	`34`	`}`
`32`	`35`	`else`
`33`	`36`	`{`
`34`	`37`	`// If no input was sent, redirect to the /voice route`
`35`		`- response.Redirect("/voice");`
	`38`	`+ response.Redirect(new Uri("/voice", UriKind.Relative));`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`return TwiML(response);`
Original file line number	Diff line number	Diff line change
`@@ -3,34 +3,35 @@`
`3`	`3`
`4`	`4`	`using System.Web.Mvc;`
`5`	`5`	`using Twilio.AspNet.Mvc;`
	`6`	`+using Twilio.AspNet.Common;`
`6`	`7`	`using Twilio.TwiML;`
	`8`	`+using System;`
`7`	`9`
`8`	`10`	`public class VoiceController : TwilioController`
`9`	`11`	`{`
`10`	`12`	`[HttpPost]`
`11`		`- public ActionResult Index()`
	`13`	`+ public TwiMLResult Index()`
`12`	`14`	`{`
`13`	`15`	`var response = new VoiceResponse();`
`14`		`- response.Gather(`
`15`		`- new Gather(numDigits: 1, action: "/voice/gather")`
`16`		`- .Say("For sales, press 1. For support, press 2."));`
	`16`	`+ response.Gather(numDigits: 1, action: new Uri("/voice/gather", UriKind.Relative))`
	`17`	`+ .Say("For sales, press 1. For support, press 2.");`
`17`	`18`
`18`	`19`	`// If the user doesn't enter input, loop`
`19`		`- response.Redirect("/voice");`
	`20`	`+ response.Redirect(new Uri("/voice", UriKind.Relative));`
`20`	`21`
`21`		`- return Content(response.ToString(), "text/xml");`
	`22`	`+ return TwiML(response);`
`22`	`23`	`}`
`23`	`24`
`24`	`25`
`25`	`26`	`[HttpPost]`
`26`		`- public ActionResult Gather(string digits)`
	`27`	`+ public TwiMLResult Gather(VoiceRequest request)`
`27`	`28`	`{`
`28`	`29`	`var response = new VoiceResponse();`
`29`	`30`
`30`	`31`	`// If the user entered digits, process their request`
`31`		`- if (!string.IsNullOrEmpty(digits))`
	`32`	`+ if (!string.IsNullOrEmpty(request.Digits))`
`32`	`33`	`{`
`33`		`- switch (digits)`
	`34`	`+ switch (request.Digits)`
`34`	`35`	`{`
`35`	`36`	`case "1":`
`36`	`37`	`response.Say("You selected sales. Good for you!");`
`@@ -40,14 +41,14 @@ public ActionResult Gather(string digits)`
`40`	`41`	`break;`
`41`	`42`	`default:`
`42`	`43`	`response.Say("Sorry, I don't understand that choice.").Pause();`
`43`		`- response.Redirect("/voice");`
	`44`	`+ response.Redirect(new Uri("/voice", UriKind.Relative));`
`44`	`45`	`break;`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`else`
`48`	`49`	`{`
`49`	`50`	`// If no input was sent, redirect to the /voice route`
`50`		`- response.Redirect("/voice");`
	`51`	`+ response.Redirect(new Uri("/voice", UriKind.Relative));`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`return TwiML(response);`