Skip to content

Send context.Activity if none provided in BeginSkill #4705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2020
Merged

Send context.Activity if none provided in BeginSkill #4705

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/BeginSkill.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,20 +167,16 @@ public override async Task<DialogTurnResult> BeginDialogAsync(DialogContext dc,
dc.ActiveDialog.State[_dialogOptionsStateKey] = DialogOptions;

// Get the activity to send to the skill.
Activity activity;
if (ActivityProcessed.GetValue(dc.State))
Activity activity = null;
if (Activity != null && ActivityProcessed.GetValue(dc.State))
{
// The parent consumed the activity in context, use the Activity property to start the skill.
activity = await Activity.BindAsync(dc, cancellationToken: cancellationToken).ConfigureAwait(false);
}
else
{
// Send the turn context activity to the skill (pass through).
activity = dc.Context.Activity;
}

// Call the base to invoke the skill
return await base.BeginDialogAsync(dc, new BeginSkillDialogOptions { Activity = activity }, cancellationToken).ConfigureAwait(false);
// (If the activity has not been processed, send the turn context activity to the skill (pass through)).
return await base.BeginDialogAsync(dc, new BeginSkillDialogOptions { Activity = activity ?? dc.Context.Activity }, cancellationToken).ConfigureAwait(false);
}

/// <summary>
Expand Down