Cleaned up the Azure QnA command

Author: csharpfritz

Fritz.Chatbot/Commands/AzureQnACommand.cs

@@ -36,7 +36,9 @@ public AzureQnACommand(IConfiguration configuration, ILogger<AzureQnACommand> lo
 
 		public bool CanExecute(string userName, string fullCommandText)
 		{
-			return fullCommandText.EndsWith("?");
+
+			return fullCommandText.Length >= 10 && fullCommandText.EndsWith("?");
+
 		}
 
 		public async Task Execute(IChatService chatService, string userName, string fullCommandText)
@@ -52,7 +54,7 @@ public async Task Execute(IChatService chatService, string userName, string full
 		public async Task Query(IChatService chatService, string userName, string query)
 		{
 			var responseString = string.Empty;
-			query = WebUtility.UrlEncode(query);
+			// query = WebUtility.UrlEncode(query);
 
 			//Build the URI
 			var qnamakerUriBase = new Uri("https://fritzbotqna.azurewebsites.net/qnamaker");
@@ -92,6 +94,7 @@ public async Task Query(IChatService chatService, string userName, string query)
 			QnAMakerResult response;
 			try
 			{
+
 				response = JsonConvert.DeserializeObject<QnAMakerResult>(responseString);
 
 				var thisAnswer = response.Answers.OrderByDescending(a => a.Score).FirstOrDefault();

Fritz.Chatbot/Fritz.Chatbot.csproj

@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+		<PackageReference Include="Markdig" Version="0.18.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />

Fritz.Chatbot/Helpers/StringExtensions.cs

@@ -7,19 +7,23 @@ namespace Fritz.Chatbot.Helpers
 {
   public static class StringExtensions
   {
-		private readonly static Regex _regex = new Regex(@"\[([\w\s?.-]+)\]\(((?:http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+(?:[\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(?:[0-9]{1,5})?(?:\/.*)?)\)");
+		// private readonly static Regex _regex = new Regex(@"\[([\w\s?.-]+)\]\(((?:http:\/\/(www\.)?|https:\/\/(www\.)?|http:\/\/|https:\/\/)?[a-z0-9]+(?:[\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(?:[0-9]{1,5})?(?:\/.*)?)\)");
 		public static string HandleMarkdownLinks(this string value)
 		{
 
-			foreach (Match match in _regex.Matches(value))
-			{
+			//foreach (Match match in _regex.Matches(value))
+			//{
 
-				var title = match.Groups[1]; // The link text (that between the [] in markdown)
-				var url = match.Groups[2];   // The url (that between the () in markdown)
+			//	var title = match.Groups[1]; // The link text (that between the [] in markdown)
+			//	var url = match.Groups[2];   // The url (that between the () in markdown)
 
-				value = value.Replace(match.Value, $"{title} found at {url} ").Replace("  ", " ");
+			//	value = value.Replace(match.Value, $"{title} found at {url} ").Replace("  ", " ");
 
-			}
+			//}
+
+			value = Markdig.Markdown.ToPlainText(value);
+
+			value = value.Replace("\n", " ");
 
 			return value;
 		}