Updated to onTurn.

cmayomsft · Jun 1, 2018 · 46c3b56 · 46c3b56
1 parent a8bb629
commit 46c3b56
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/samples/alarmbot-ts/src/app.ts b/samples/alarmbot-ts/src/app.ts
@@ -16,5 +16,5 @@ const alarmBot = new ServiceBot<BotConversationState, BotUserState>();
 alarmBot.onTurn(async context => {
 
         return new RootTopic(context)
-            .onReceiveActivity(context);
+            .onTurn(context);
 });
diff --git a/samples/alarmbot-ts/src/topics/addAlarmTopic.ts b/samples/alarmbot-ts/src/topics/addAlarmTopic.ts
@@ -31,7 +31,7 @@ export class AddAlarmTopic extends ConversationTopic<StateContext<BotConversatio
 
                     this.state.alarm.title = value;
 
-                    return this.onReceiveActivity(context);
+                    return this.onTurn(context);
                 })
                 .onFailure(async (context, reason) => {                    
                     this.clearActiveTopic();
@@ -54,7 +54,7 @@ export class AddAlarmTopic extends ConversationTopic<StateContext<BotConversatio
 
                     this.state.alarm.time = value;
 
-                    return this.onReceiveActivity(context);
+                    return this.onTurn(context);
                 })
                 .onFailure(async (context, reason) => {
                     this.clearActiveTopic();
@@ -68,20 +68,20 @@ export class AddAlarmTopic extends ConversationTopic<StateContext<BotConversatio
             );
     };
 
-    public onReceiveActivity(context: StateContext<BotConversationState, BotUserState>) {
+    public onTurn(context: StateContext<BotConversationState, BotUserState>) {
 
         if(this.hasActiveTopic) { 
-            return this.activeTopic!.onReceiveActivity(context);
+            return this.activeTopic!.onTurn(context);
         }
 
         if (!this.state.alarm.title) {
             return this.setActiveTopic("titlePrompt")
-                .onReceiveActivity(context);
+                .onTurn(context);
         } 
 
         if (!this.state.alarm.time) {
             return this.setActiveTopic("timePrompt")
-                .onReceiveActivity(context);
+                .onTurn(context);
         }
 
         return this._onSuccess!(context, this.state.alarm);

diff --git a/samples/alarmbot-ts/src/topics/deleteAlarmTopic.ts b/samples/alarmbot-ts/src/topics/deleteAlarmTopic.ts
@@ -44,7 +44,7 @@ export class DeleteAlarmTopic extends ConversationTopic<StateContext<BotConversa
 
                     this.state.alarmIndex = value;
 
-                    return this.onReceiveActivity(context);
+                    return this.onTurn(context);
                 })
                 .onFailure((context, reason) => {
                     this.clearActiveTopic();
@@ -72,7 +72,7 @@ export class DeleteAlarmTopic extends ConversationTopic<StateContext<BotConversa
 
                     this.state.deleteConfirmed = value;
 
-                    return this.onReceiveActivity(context);
+                    return this.onTurn(context);
                 })
                 .onFailure((context, reason) => {
                     this.clearActiveTopic();
@@ -86,10 +86,10 @@ export class DeleteAlarmTopic extends ConversationTopic<StateContext<BotConversa
             );
     }
 
-    public onReceiveActivity(context: StateContext<BotConversationState, BotUserState>) {
+    public onTurn(context: StateContext<BotConversationState, BotUserState>) {
 
         if(this.hasActiveTopic) { 
-            return this.activeTopic!.onReceiveActivity(context);
+            return this.activeTopic!.onTurn(context);
         }
 
         // If there are no alarms to delete...
@@ -105,15 +105,15 @@ export class DeleteAlarmTopic extends ConversationTopic<StateContext<BotConversa
                 this.state.alarmIndex = 0;
             } else {
                 return this.setActiveTopic("whichAlarmPrompt")
-                    .onReceiveActivity(context);
+                    .onTurn(context);
             }
         }
 
         this.state.alarm!.title = this.state.alarms![this.state.alarmIndex].title;
 
         if (this.state.deleteConfirmed === undefined) {
             return this.setActiveTopic("confirmDeletePrompt")
-                .onReceiveActivity(context);
+                .onTurn(context);
         }
 
         return this._onSuccess!(context, { alarm: this.state.alarm!, alarmIndex: this.state.alarmIndex, deleteConfirmed: this.state.deleteConfirmed });

diff --git a/samples/alarmbot-ts/src/topics/rootTopic.ts b/samples/alarmbot-ts/src/topics/rootTopic.ts
@@ -68,7 +68,7 @@ export class RootTopic
             );
     }
 
-    public onReceiveActivity(context: StateContext<BotConversationState, BotUserState>) { 
+    public onTurn(context: StateContext<BotConversationState, BotUserState>) { 
 
         if (context.activity.type === 'message' && context.activity.text.length > 0) {
 
@@ -81,11 +81,11 @@ export class RootTopic
 
                 // Set the active topic and let the active topic handle this turn.
                 return this.setActiveTopic("addAlarmTopic")
-                    .onReceiveActivity(context);
+                    .onTurn(context);
             } else if (/delete alarm/i.test(context.activity.text)) {
 
                 return this.setActiveTopic("deleteAlarmTopic", context.userState.alarms)
-                    .onReceiveActivity(context);
+                    .onTurn(context);
             } else if (/help/i.test(context.activity.text)) {
                 this.clearActiveTopic();
 
@@ -94,7 +94,7 @@ export class RootTopic
 
             // If there is an active topic, let it handle this turn.
             if (this.hasActiveTopic) {
-                return this.activeTopic!.onReceiveActivity(context);
+                return this.activeTopic!.onTurn(context);
             }
 
             return this.showDefaultMessage(context);