Skip to content

Commit 45a9668

Browse files
authored
Community content live sync work (#509)
* Update azure-bot-service-continuous-deployment.md (#75) * Add Content-Type header in doc (#76) Without a Content-Type header of ``application/json`` the DirectLine service returns a 500. * Remove high-speed storage reference (#78) High-speed storage is on for all bots and the option has been removed from the config page. * Some templates are ItemTemplates (#80) * Some templates are ItemTemplates Indicates that `Bot Controller.zip` and `Bot Dialog.zip` should go on the item templates folder instead of the project template folder. Added the default route for item templates folders. * Update bot-builder-dotnet-quickstart.md * Update bot-builder-dotnet-quickstart.md * Sample code is missing IConfiguration (#86) * Removing "confirmPrompt" on reload action (#85) * Removing "confirmPrompt" on reload action As documentation is saying here: https://docs.botframework.com/en-us/node/builder/chat-reference/classes/_botbuilder_d_.dialog.html#reloadaction , reload action doesn't handle "confirmPrompt" (more details available on IBeginDialogActionOptions documentation about what is really available for reloadAction) * Remove confirmPrompt from reloadAction snippet Removing the other confirmPrompt in the topic. * Release 12-13-2017 for GA (#407) (#91) * fixed broken links to the "Channel Inspector" (#93) * Resolve syncing conflicts from live-sync-work to live (#95) * Update bot-service-scenario-overview.md (#96) * Correcting internal link typo (#99) * Updated node-send-card-buttons.js to support latest documentation (#94) Action.Http was updated to Action.OpenUrl in documentation * Update env variable naming to work with post-GA bot service Per bug report - fix for microsoft/botframework-sdk#4068 * Release 'live' 03-14-18 (#508) * content vs. contentUrl for attachment in base64 (#88) * Fix syntax error (#97) There should be a comma between two key-value pairs in JSON. * Updated state azure cosmos db file (#98) Fixed the class structure as earlier there were just namespaces and code without any names of class and methods. * Correcting incorrect link to C# SDK (#100) * Correcting incorrect link to C# SDK * Update ConnectorClient.xml Update link to NET/Node overview topics... * Fix typo (#104) * Typo in bot-service-scenario-cortana-skill.md (#111) Remove duplicated 'the'. * Update bot-builder-dotnet-overview.md (#110) July 31, 2017 is long gone. update note. * Corrected link error on page (#115) Fixed Facebook link on page * Update bot-service-channel-connect-facebook.md (#114) Fix Facebook subscription field name * Update bot-service-scenario-informational.md (#107) Correct "now" as "know", as per the context
1 parent 0d5fc08 commit 45a9668

12 files changed

+71
-35
lines changed

articles/bot-service-channel-connect-facebook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Return to the [Bot Framework Portal](https://dev.botframework.com/). Open the bo
6464
![Copy values](~/media/channels/fb-callbackVerify.png)
6565

6666
1. Return to Facebook Messenger and paste the **Callback URL** and **Verify Token** values.
67-
2. Under **Subscription Fields**, select *message\_deliveries*, *messages*, *messaging\_options*, and *messaging_postbacks*.
67+
2. Under **Subscription Fields**, select *message\_deliveries*, *messages*, *messaging\_optins*, and *messaging_postbacks*.
6868
3. Click **Verify and Save**.
6969

7070
![Configure webhook](~/media/channels/FB-webhookConfig.png)

articles/bot-service-scenario-cortana-skill.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The Cortana Bot uses the following components:
3535
- Application Insights
3636

3737
### Cortana
38-
Now you can add support to your Bot by creating a Cortana Skill. You use the the Cortana skills kit to build new features (called skills) for Cortana. A skill is a construct that allows Cortana to do more. You build skills to integrate with your Bots allowing Cortana to complete tasks and get things done. As part of the invocation process, Cortana can (with the user's consent) pass information about the user to a skill at runtime, so that the skill can customize its experience accordingly. Cortana's contextual knowledge allows your Bot to be useful and possibly even clever for them. Once invoked, certain types of skills can manipulate Cortana's interface to have a conversation between the skill and the end user. Once published, users can see and use your skill on Cortana for Windows 10 Anniversary Update+ (Desktop and Mobile), iOS, and Android.
38+
Now you can add support to your Bot by creating a Cortana Skill. You use the Cortana skills kit to build new features (called skills) for Cortana. A skill is a construct that allows Cortana to do more. You build skills to integrate with your Bots allowing Cortana to complete tasks and get things done. As part of the invocation process, Cortana can (with the user's consent) pass information about the user to a skill at runtime, so that the skill can customize its experience accordingly. Cortana's contextual knowledge allows your Bot to be useful and possibly even clever for them. Once invoked, certain types of skills can manipulate Cortana's interface to have a conversation between the skill and the end user. Once published, users can see and use your skill on Cortana for Windows 10 Anniversary Update+ (Desktop and Mobile), iOS, and Android.
3939

4040
### Application Insights
4141
Application Insights helps you get actionable insights through application performance management (APM) and instant analytics. Out of the box you get rich performance monitoring, powerful alerting, and easy-to-consume dashboards to help ensure your Bot is available and performing as you expect. You can quickly see if you have a problem, then perform a root cause analysis to find and fix the issue.
@@ -44,4 +44,4 @@ Application Insights helps you get actionable insights through application perfo
4444
Next, learn about the Enterprise Productivity bot scenario.
4545

4646
> [!div class="nextstepaction"]
47-
> [Enterprise Productivity bot scenario](bot-service-scenario-enterprise-productivity.md)
47+
> [Enterprise Productivity bot scenario](bot-service-scenario-enterprise-productivity.md)

articles/bot-service-scenario-informational.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The Information Bot uses the following components:
4141
Azure Active Directory (Azure AD) is Microsoft’s multi-tenant cloud based directory and identity management service. As a Bot developer, Azure AD lets you focus on building your Bot by making it fast and simple to integrate with a world class identity management solution used by millions of organizations around the world. By defining an Azure AD app, you can control who has access to your Bot and the data it exposes, without implementing your own complex authentication and authorization system.
4242

4343
### Cognitive Services: QnA Maker
44-
Cognitive Services QnA Maker helps you provide an FAQ data source which your users can query from your Bot. When approaching vast amounts of information stored in different systems, it can be useful to help users filter down the information source and set. A single SQL database can have enormous amounts of information that when a free form search is applied brings back too much information. By first using QnA Maker, you can define a road map for your Bot users so they now how to ask intelligent questions that can then be retrieved via Azure Search.
44+
Cognitive Services QnA Maker helps you provide an FAQ data source which your users can query from your Bot. When approaching vast amounts of information stored in different systems, it can be useful to help users filter down the information source and set. A single SQL database can have enormous amounts of information that when a free form search is applied brings back too much information. By first using QnA Maker, you can define a road map for your Bot users so they know how to ask intelligent questions that can then be retrieved via Azure Search.
4545

4646
### Azure Search
4747
Azure Search is a cloud search service for apps that let you get your search indices up and running quickly. Running on top of Microsoft Azure, you can easily scale up and down as your usage demands. You can connect search results to business goals with great control over search ranking and surface data hidden in your databases.

articles/dotnet/bot-builder-dotnet-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ Using the SDK, you can build bots that take advantage of the following SDK featu
2929
conversation, providing help, navigation, clarification, and confirmation as needed
3030

3131
> [!IMPORTANT]
32-
> On July 31, 2017 breaking changes will be implemented in the Bot Framework security protocol.
32+
> On July 31, 2017 breaking changes have been implemented in the Bot Framework security protocol.
3333
> To prevent these changes from adversely impacting your bot, you must ensure that your application is
3434
> using Bot Builder SDK v3.5 or greater. If you've built a bot using an
3535
> SDK that you obtained prior to January 5, 2017 (the release date for Bot Builder SDK v3.5),
36-
> be sure to upgrade to Bot Builder SDK v3.5 or later before July 31, 2017.
36+
> be sure to upgrade to Bot Builder SDK v3.5 or later.
3737
3838
## Get the SDK
3939

articles/dotnet/bot-builder-dotnet-state-azure-cosmosdb.md

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Add the following entries into the Web.config file:
4848
You'll replace the value with your URI and Primary Key found in your Azure Cosmos DB. Save the Web.config file.
4949

5050
## Modify your bot code
51-
To use **Azure Cosmos DB** storage, add the following lines of code to your bot's **Global.asax.cs** file.
51+
To use **Azure Cosmos DB** storage, add the following lines of code to your bot's **Global.asax.cs** file inside the **Application_Start()** method.
5252

5353
```cs
5454
using System;
@@ -60,25 +60,34 @@ using Microsoft.Bot.Builder.Azure;
6060
using Microsoft.Bot.Builder.Dialogs;
6161
using Microsoft.Bot.Builder.Dialogs.Internals;
6262

63-
var uri = new Uri(ConfigurationManager.AppSettings["DocumentDbUrl"]);
64-
var key = ConfigurationManager.AppSettings["DocumentDbKey"];
65-
var store = new DocumentDbBotDataStore(uri, key);
66-
67-
Conversation.UpdateContainer(
68-
builder =>
69-
{
70-
builder.Register(c => store)
71-
.Keyed<IBotDataStore<BotData>>(AzureModule.Key_DataStore)
72-
.AsSelf()
73-
.SingleInstance();
74-
75-
builder.Register(c => new CachingBotDataStore(store, CachingBotDataStoreConsistencyPolicy.ETagBasedConsistency))
76-
.As<IBotDataStore<BotData>>()
77-
.AsSelf()
78-
.InstancePerLifetimeScope();
79-
80-
});
81-
63+
namespace SampleApp
64+
{
65+
public class WebApiApplication : System.Web.HttpApplication
66+
{
67+
protected void Application_Start()
68+
{
69+
var uri = new Uri(ConfigurationManager.AppSettings["DocumentDbUrl"]);
70+
var key = ConfigurationManager.AppSettings["DocumentDbKey"];
71+
var store = new DocumentDbBotDataStore(uri, key);
72+
73+
Conversation.UpdateContainer(
74+
builder =>
75+
{
76+
builder.Register(c => store)
77+
.Keyed<IBotDataStore<BotData>>(AzureModule.Key_DataStore)
78+
.AsSelf()
79+
.SingleInstance();
80+
81+
builder.Register(c => new CachingBotDataStore(store, CachingBotDataStoreConsistencyPolicy.ETagBasedConsistency))
82+
.As<IBotDataStore<BotData>>()
83+
.AsSelf()
84+
.InstancePerLifetimeScope();
85+
86+
});
87+
88+
}
89+
}
90+
}
8291
```
8392

8493
Save the global.asax.cs file. Now you are ready to test the bot with the emulator.
-73.3 KB
Loading
-51.9 KB
Loading

articles/nodejs/bot-builder-nodejs-dialog-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ bot.dialog('orderDinner', [
257257
// Confirm before triggering the action.
258258
// Once triggered, will end the dialog.
259259
.cancelAction('cancelAction', 'Ok, cancel order.', {
260-
matches: /^nevermind$|^cancel$|^cancel.*order/i
260+
matches: /^nevermind$|^cancel$|^cancel.*order/i,
261261
confirmPrompt: "Are you sure?"
262262
});
263263
```
@@ -284,4 +284,4 @@ Once this action is triggered, it will ask the user "Are you sure?" The user wil
284284

285285
[RecognizeIntent]: bot-builder-nodejs-recognize-intent-messages.md
286286

287-
[CardAction]: https://docs.botframework.com/en-us/node/builder/chat-reference/classes/_botbuilder_d_.cardaction#dialogaction
287+
[CardAction]: https://docs.botframework.com/en-us/node/builder/chat-reference/classes/_botbuilder_d_.cardaction#dialogaction

articles/nodejs/bot-builder-nodejs-dialog-waterfall.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var bot = new builder.UniversalBot(connector, [
5555
},
5656
function (session, results) {
5757
session.dialogData.partySize = results.response;
58-
builder.Prompts.text(session, "Who's name will this reservation be under?");
58+
builder.Prompts.text(session, "Whose name will this reservation be under?");
5959
},
6060
function (session, results) {
6161
session.dialogData.reservationName = results.response;

articles/rest-api/bot-framework-rest-connector-add-media-attachments.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,34 @@ Content-Type: application/json
6060
}
6161
```
6262

63-
For channels that support inline binaries of an image, you can set the `content` property of the `Attachment` to a base64 binary of the image (for example, **data:image/png;base64,iVBORw0KGgo…**). The channel will display the image or the image's URL next to the message's text string.
63+
For channels that support inline binaries of an image, you can set the `contentUrl` property of the `Attachment` to a base64 binary of the image (for example, **data:image/png;base64,iVBORw0KGgo…**). The channel will display the image or the image's URL next to the message's text string.
64+
65+
```json
66+
{
67+
"type": "message",
68+
"from": {
69+
"id": "12345678",
70+
"name": "sender's name"
71+
},
72+
"conversation": {
73+
"id": "abcd1234",
74+
"name": "conversation's name"
75+
},
76+
"recipient": {
77+
"id": "1234abcd",
78+
"name": "recipient's name"
79+
},
80+
"text": "Here's a picture of the duck I was telling you about.",
81+
"attachments": [
82+
{
83+
"contentType": "image/png",
84+
"contentUrl": "data:image/png;base64,iVBORw0KGgo…",
85+
"name": "duck-on-a-rock.jpg"
86+
}
87+
],
88+
"replyToId": "5d5cdc723"
89+
}
90+
```
6491

6592
You can attach a video file or audio file to a message by using the same process as described above for an image file. Depending on the channel, the video and audio may be played inline or it may be displayed as a link.
6693

0 commit comments

Comments
 (0)