Merge branch 'main' into patch-1

bobisai · Aug 21, 2020 · e29ddbf · e29ddbf
2 parents 0b2d92a + 74da283
commit e29ddbf
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/packages/botbuilder-adapter-slack/CHANGELOG.md b/packages/botbuilder-adapter-slack/CHANGELOG.md
@@ -1,5 +1,9 @@
 # botbuilder-adapter-slack changelog
 
+# 1.0.12
+
+* Adjust startPrivateConversation to use converations.open instead of im.open
+
 # 1.0.11
 
 * Update dependencies to Botkit 4.9, Bot Framework 4.9

diff --git a/packages/botbuilder-adapter-slack/package.json b/packages/botbuilder-adapter-slack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "botbuilder-adapter-slack",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Connect Botkit or BotBuilder to Slack",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",

diff --git a/packages/botbuilder-adapter-slack/src/botworker.ts b/packages/botbuilder-adapter-slack/src/botworker.ts
@@ -100,7 +100,7 @@ export class SlackBotWorker extends BotWorker {
      */
     public async startPrivateConversation(userId: string): Promise<any> {
         // create the new IM channel
-        const channel: any = await this.api.im.open({ user: userId });
+        const channel: any = await this.api.conversations.open({ users: userId });
 
         if (channel.ok === true) {
             // now, switch contexts

diff --git a/packages/botbuilder-adapter-webex/src/webex_adapter.ts b/packages/botbuilder-adapter-webex/src/webex_adapter.ts
@@ -398,7 +398,7 @@ export class WebexAdapter extends BotAdapter {
                 if (activity.conversation && activity.conversation.parentId) {
                     // @ts-ignore ignore this webex specific field
                     message.parentId = activity.conversation.parentId;
-                } else if (activity.channelData.parentId) {
+                } else if (activity.channelData && activity.channelData.parentId) {
                     message.parentId = activity.channelData.parentId;
                 }
 

diff --git a/packages/botkit/src/conversation.ts b/packages/botkit/src/conversation.ts
@@ -857,8 +857,13 @@ export class BotkitConversation<O extends object = {}> extends Dialog<O> {
         }
 
         // copy all the values in channelData fields
-        for (const key in line.channelData) {
-            outgoing.channelData = this.parseTemplatesRecursive(JSON.parse(JSON.stringify(line.channelData)), vars)
+        if (line.channelData && Object.keys(line.channelData).length > 0) {
+            const channelDataParsed = this.parseTemplatesRecursive(JSON.parse(JSON.stringify(line.channelData)), vars);
+
+            outgoing.channelData = {
+                ...outgoing.channelData,
+                ...channelDataParsed
+            };
         }
 
         /*******************************************************************************************************************/

diff --git a/packages/botkit/src/core.ts b/packages/botkit/src/core.ts
@@ -47,7 +47,7 @@ export interface BotkitConfiguration {
     adapterConfig?: {[key: string]: any}; // object with stuff in it
 
     /**
-     * An instance of Express used to define web endpoints.  If not specified, oen will be created internally.
+     * An instance of Express used to define web endpoints.  If not specified, one will be created internally.
      * Note: only use your own Express if you absolutely must for some reason. Otherwise, use `controller.webserver`
      */
     webserver?: any;

diff --git a/packages/docs/core.md b/packages/docs/core.md
@@ -513,7 +513,7 @@ or one of the remixable starter kits.
 
 A Botkit application usually has 2 main components: a main app file called `bot.js` where Botkit is configured, and a folder of modules that get automatically loaded into the application.
 
-The bot's features - all of the stuff involved in defining trigger patterns, dialogs, custom middlewares and handlers - are organized into JavaScript modules, and then loaded into the app using [controller.loadModules()](reference/core.md#loadmodules). Each feature file should contain only the code required for a specific feature. This will help to keep the project code well organized and modular.
+The bot's features - all of the stuff involved in defining trigger patterns, dialogs, custom middlewares and handlers - are organized into JavaScript modules, and then loaded into the app using [controller.loadModules()](reference/core.md#loadmodules). If you are using Typescript, make sure to include `ts` extension into the second parameter as a string array (default is `['.js']`, and you probably want it to be `['.js', '.ts']`). Each feature file should contain only the code required for a specific feature. This will help to keep the project code well organized and modular.
 
 The feature modules follow the form below: