Release/06022020 (#268) · BotBuilderCommunity/botbuilder-community-dotnet@788e3b9

Silu321 · 2020-10-29T07:35:52Z

I implemented this code but, I don't get proper output can you provide the proper code and documentation.

arafattehsin · 2020-10-29T12:39:05Z

@Silu321 Can you please raise an issue instead? This will help us track in a better way and hopefully you will get a response on that.

-Original file line number
+Diff line change
@@ Expand Up @@
     EndProject
     Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zoom Adapter Sample", "samples\Zoom Adapter Sample\Zoom Adapter Sample.csproj", "{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}"
     EndProject
+    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infobip Adapter Sample", "samples\Infobip Adapter Sample\Infobip Adapter Sample.csproj", "{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}"
+    EndProject
     Global
     	GlobalSection(SolutionConfigurationPlatforms) = preSolution
     		Debug|Any CPU = Debug|Any CPU
     		Release|Any CPU = Release|Any CPU
     	EndGlobalSection
     	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    		{7927A7EE-C327-4403-A5F4-B5E2C0BF4D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    		{7927A7EE-C327-4403-A5F4-B5E2C0BF4D47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    		{7927A7EE-C327-4403-A5F4-B5E2C0BF4D47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    		{7927A7EE-C327-4403-A5F4-B5E2C0BF4D47}.Release|Any CPU.Build.0 = Release|Any CPU
     		{10BEDE11-C9DE-4B67-9467-4E48272229C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     		{10BEDE11-C9DE-4B67-9467-4E48272229C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
     		{10BEDE11-C9DE-4B67-9467-4E48272229C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ Expand All / @@ -60,14 +58,6 @@ Global @@
     		{55F863F1-9EC8-420C-9099-BD8378D72F18}.Debug|Any CPU.Build.0 = Debug|Any CPU
     		{55F863F1-9EC8-420C-9099-BD8378D72F18}.Release|Any CPU.ActiveCfg = Release|Any CPU
     		{55F863F1-9EC8-420C-9099-BD8378D72F18}.Release|Any CPU.Build.0 = Release|Any CPU
-    		{37ED6FBD-12B5-40CF-837F-6F75ACC65484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    		{37ED6FBD-12B5-40CF-837F-6F75ACC65484}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    		{37ED6FBD-12B5-40CF-837F-6F75ACC65484}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    		{37ED6FBD-12B5-40CF-837F-6F75ACC65484}.Release|Any CPU.Build.0 = Release|Any CPU
-    		{89A6903F-2911-4A27-B178-EA28D697D46B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    		{89A6903F-2911-4A27-B178-EA28D697D46B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    		{89A6903F-2911-4A27-B178-EA28D697D46B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    		{89A6903F-2911-4A27-B178-EA28D697D46B}.Release|Any CPU.Build.0 = Release|Any CPU
     		{D1C3490D-477A-4D79-A41C-4D15CA9DC183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     		{D1C3490D-477A-4D79-A41C-4D15CA9DC183}.Debug|Any CPU.Build.0 = Debug|Any CPU
     		{D1C3490D-477A-4D79-A41C-4D15CA9DC183}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ Expand All / @@ -84,10 +74,18 @@ Global @@
     		{53BCE929-C57D-4AF9-91C9-FCA5C7E2CE41}.Debug|Any CPU.Build.0 = Debug|Any CPU
     		{53BCE929-C57D-4AF9-91C9-FCA5C7E2CE41}.Release|Any CPU.ActiveCfg = Release|Any CPU
     		{53BCE929-C57D-4AF9-91C9-FCA5C7E2CE41}.Release|Any CPU.Build.0 = Release|Any CPU
+    		{89A6903F-2911-4A27-B178-EA28D697D46B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{89A6903F-2911-4A27-B178-EA28D697D46B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{89A6903F-2911-4A27-B178-EA28D697D46B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{89A6903F-2911-4A27-B178-EA28D697D46B}.Release|Any CPU.Build.0 = Release|Any CPU
     		{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     		{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
     		{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
     		{D5F5BFB0-CDEC-4980-9EBB-864724B6B2B6}.Release|Any CPU.Build.0 = Release|Any CPU
+    		{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{BC01A8C4-3FEB-46E8-AE39-D71F5CB7602F}.Release|Any CPU.Build.0 = Release|Any CPU
     	EndGlobalSection
     	GlobalSection(SolutionProperties) = preSolution
     		HideSolutionNode = FALSE
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     | [Google Adapter](libraries/Bot.Builder.Community.Adapters.Google) | An adapter to allow for Google Actions to be built using the Bot Builder SDK. Includes broad support for Google Actions capabilities, including Cards and suggestion chips | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/master/samples/Google%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.Google/) |
     | [Twitter Adapter](libraries/Bot.Builder.Community.Adapters.Twitter) | An adapter that integrates Twitter Direct Messages with the Bot Builder. The adapter sets up the required webhooks and responds to CRC requests. The webhooks code is based on the work by Tweety with modifications to support the Premium tier of the Account Activity API. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/master/samples/Twitter%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.Twitter/) |
     | [RingCentral Adapter](libraries/Bot.Builder.Community.Adapters.RingCentral) | An adapter that integrates the RingCentral Platform API with the Bot Builder. The adapter sets up the required webhooks and endpoints to RingCentral requests. Supporting features such as human handoff, activity publishing and WhatsApp support. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/master/samples/RingCentral%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.RingCentral/) |
-    | [Zoom Adapter](libraries/Bot.Builder.Community.Adapters.Zoom) | An adapter that accepts and hanldes Zoom app requests.  Specifically developed to handle Zoom chatbot app requests and allow for the sending of messages using Zoom Message Templates.  The adapter will also receieve any event subscribed to via Zoom, even those not chatbot related. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/samples/Zoom%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.Zoom/) |
-    | [InfoBip WhatsApp Adapter](libraries/Bot.Builder.Community.Adapters.InfoBip) | An adapter that accepts and hanldes WhatsApp app requests via InfoBip, including support for various message and template types. | | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/libraries/Bot.Builder.Community.Adapters.Infobip/) |
+    | [Zoom Adapter](libraries/Bot.Builder.Community.Adapters.Zoom) | An adapter that accepts and handles Zoom app requests.  Specifically developed to handle Zoom chatbot app requests and allow for the sending of messages using Zoom Message Templates.  The adapter will also receieve any event subscribed to via Zoom, even those not chatbot related. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/samples/Zoom%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://www.nuget.org/packages/Bot.Builder.Community.Adapters.Zoom/) |
+    | [Infobip WhatsApp Adapter](libraries/Bot.Builder.Community.Adapters.Infobip) | An adapter that accepts and hanldes WhatsApp app requests via Infobip, including support for various message and template types. | [Sample](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/samples/Infobip%20Adapter%20Sample) | [![NuGet version](https://img.shields.io/badge/NuGet-blue.svg)](https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/tree/develop/libraries/Bot.Builder.Community.Adapters.Infobip/) |
     ## Dialogs and Prompts
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,11 +19,11 @@ @@
       <ItemGroup>
-        <PackageReference Include="Alexa.NET" Version="1.13.0" />
+        <PackageReference Include="Alexa.NET" Version="1.13.3" />
         <PackageReference Include="Alexa.NET.CustomerProfile" Version="2.1.1" />
         <PackageReference Include="Microsoft.MarkedNet" Version="1.0.13" />
-        <PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0" />
-        <PackageReference Include="Microsoft.Bot.Schema" Version="4.8.0" />
+        <PackageReference Include="Microsoft.Bot.Builder" Version="4.9.2" />
+        <PackageReference Include="Microsoft.Bot.Schema" Version="4.9.2" />
       </ItemGroup>
     </Project>

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,10 +20,7 @@ @@
       </PropertyGroup>
       <ItemGroup>
-        <PackageReference Include="Alexa.NET" Version="1.13.0" />
-        <PackageReference Include="Alexa.NET.CustomerProfile" Version="2.1.1" />
-        <PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0" />
-        <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.8.0" />
+        <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.2" />
         <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.1.1" />
       </ItemGroup>
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
       <ItemGroup>
         <PackageReference Include="JWT" Version="5.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
-        <PackageReference Include="Microsoft.Bot.Schema" Version="4.8.0" />
+        <PackageReference Include="Microsoft.Bot.Schema" Version="4.9.2" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
         <PackageReference Include="Microsoft.MarkedNet" Version="1.0.13" />
         <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.21" />
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

2 comments on commit `788e3b9`

Silu321 commented on `788e3b9` Oct 29, 2020

arafattehsin commented on `788e3b9` Oct 29, 2020

-Original file line number
+Diff line change
@@ Expand Up @@
                 response.Payload.Google.RichResponse = new RichResponse()
                 {
-                    Items = responseItems.ToArray()
+                    Items = responseItems.ToArray(),
+                    LinkOutSuggestion = GetLinkOutSuggestionFromActivity(activity)
                 };
                 // ensure InputHint is set as required for response
@@ Expand All @@
                     case InputHints.ExpectingInput:
                         response.Payload.Google.ExpectUserResponse = true;
-                        var suggestionChips = ConvertSuggestedActionsToSuggestionChips(activity);
+                        var suggestionChips = ConvertIMAndMessageBackSuggestedActionsToSuggestionChips(activity);
                         if (suggestionChips.Any())
                         {
                             response.Payload.Google.RichResponse.Suggestions = suggestionChips.ToArray();
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
                 return query;
             }
-            public static List<Suggestion> ConvertSuggestedActionsToSuggestionChips(Activity activity)
+            public static List<Suggestion> ConvertIMAndMessageBackSuggestedActionsToSuggestionChips(Activity activity)
             {
                 var suggestions = new List<Suggestion>();
                 if (activity.SuggestedActions != null && activity.SuggestedActions.Actions != null && activity.SuggestedActions.Actions.Any())
                 {
                     foreach (var suggestion in activity.SuggestedActions.Actions)
                     {
-                        suggestions.Add(new Suggestion { Title = suggestion.Title });
+                        if (suggestion.Type == ActionTypes.ImBack || suggestion.Type == ActionTypes.MessageBack)
+                        {
+                            suggestions.Add(new Suggestion { Title = suggestion.Title });
+                        }
                     }
                 }
                 return suggestions;
             }
+            public static LinkOutSuggestion GetLinkOutSuggestionFromActivity(Activity activity)
+            {
+                var openUrlSuggestedAction = activity.SuggestedActions?.Actions?.Where(a => a.Type == ActionTypes.OpenUrl).FirstOrDefault();
+                if(openUrlSuggestedAction == null)
+                {
+                    return null;
+                }
+                return new LinkOutSuggestion()
+                {
+                    DestinationName = openUrlSuggestedAction.Title,
+                    OpenUrlAction = new OpenUrlAction()
+                    {
+                        Url = openUrlSuggestedAction.Value?.ToString(),
+                        UrlTypeHint = UrlTypeHint.URL_TYPE_HINT_UNSPECIFIED
+                    }
+                };
+            }
         }
     }

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ namespace Bot.Builder.Community.Adapters.Google.Core.Helpers @@
     {
         public static class GoogleCardFactory
         {
-            public static BasicCard CreateBasicCard(string title, string subtitle, string formattedText)
+            public static BasicCard CreateBasicCard(string title, string subtitle, string formattedText, List<Button> buttons = null, Image image = null, ImageDisplayOptions? displayOptions = null)
             {
                 return new BasicCard()
                 {
@@ Expand All @@
                         Title = title,
                         Subtitle = subtitle,
-                        FormattedText = formattedText
+                        FormattedText = formattedText,
+                        Buttons = buttons.ToArray(),
+                        Image = image,
+                        Display = displayOptions
                     }
                 };
             }
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    var conversationRequest = JsonConvert.DeserializeObject<ConversationRequest>(body);
-                    var requestMapper = new ConversationRequestMapper(_requestMapperOptions, _logger);
-                    activity = requestMapper.RequestToActivity(conversationRequest);
-                    var context = await CreateContextAndRunPipelineAsync(bot, cancellationToken, activity);
-                    var response = requestMapper.ActivityToResponse(ProcessOutgoingActivities(context.SentActivities),
-                        conversationRequest);
-                    responseJson = JsonConvert.SerializeObject(response, JsonSerializerSettings);
+                    try
+                    {
+                        var conversationRequest = JsonConvert.DeserializeObject<ConversationRequest>(body);
+                        var requestMapper = new ConversationRequestMapper(_requestMapperOptions, _logger);
+                        activity = requestMapper.RequestToActivity(conversationRequest);
+                        var context = await CreateContextAndRunPipelineAsync(bot, cancellationToken, activity);
+                        var response = requestMapper.ActivityToResponse(ProcessOutgoingActivities(context.SentActivities), conversationRequest);
+                        responseJson = JsonConvert.SerializeObject(response, JsonSerializerSettings);
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e);
+                        throw;
+                    }
                 }
                 httpResponse.ContentType = "application/json;charset=utf-8";
@@ Expand Down @@

Commit

There are no files selected for viewing

2 comments on commit 788e3b9

Silu321 commented on 788e3b9 Oct 29, 2020

Choose a reason for hiding this comment

arafattehsin commented on 788e3b9 Oct 29, 2020

Choose a reason for hiding this comment

2 comments on commit `788e3b9`

Silu321 commented on `788e3b9` Oct 29, 2020

arafattehsin commented on `788e3b9` Oct 29, 2020