Merge pull request #43 from Microsoft/eanders-MS

support for bot reconnecting to previous conversation
microsoft · Dec 8, 2016 · bf180bb · bf180bb
2 parents c8a89f6 + 9018049
commit bf180bb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/client/index.tsx b/src/client/index.tsx
@@ -51,7 +51,6 @@ window.onerror = (message: string, filename?: string, lineno?: number, colno?: n
 }
 
 webFrame.setZoomLevel(1);
-webFrame.setZoomLevelLimits(1, 1);
 webFrame.setZoomFactor(1);
 webFrame.registerURLSchemeAsPrivileged('emulator');
 

diff --git a/src/server/controllers/connector/conversationsController.ts b/src/server/controllers/connector/conversationsController.ts
@@ -109,7 +109,13 @@ export class ConversationsController {
                 state: { users: newUsers }
             });
 
-            let newConversation = emulator.conversations.newConversation(activeBot.botId, users.usersById[conversationParameters.members[0].id]);
+            let newConversation;
+            if (conversationParameters.conversationId) {
+                newConversation = emulator.conversations.conversationById(activeBot.botId, conversationParameters.conversationId);
+            }
+            if (!newConversation) {
+                newConversation = emulator.conversations.newConversation(activeBot.botId, users.usersById[conversationParameters.members[0].id], conversationParameters.conversationId);
+            }
             let activityId: string = null;
             if (conversationParameters.activity != null) {
                 // set routing information for new conversation

diff --git a/src/types/activityTypes.ts b/src/types/activityTypes.ts
@@ -72,7 +72,8 @@ export interface IConversationParameters extends IActivity {
     membersRemoved?: IChannelAccount[],
     topicName?: string,
     activity?: IActivity,
-    channelData : any
+    channelData?: any,
+    conversationId?: string
 }
 
 export interface IContactRelationUpdateActivity extends IActivity {