Skip to content

port: Fix first activity from bot to user has fake replyToId value #2145

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 2 commits into from
Aug 5, 2024
Merged

port: Fix first activity from bot to user has fake replyToId value #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33ece7a
Fix first activity from bot to user has fake replyToId value
gandiddi Jul 30, 2024
ec9262b
Removed duplicate activity_id
gandiddi Jul 30, 2024
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
4 changes: 3 additions & 1 deletion libraries/botbuilder-core/botbuilder/core/adapters/test_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ async def process_activity(
if activity.type is None:
activity.type = ActivityTypes.message

activity.channel_id = self.template.channel_id
if activity.channel_id is None:
activity.channel_id = self.template.channel_id

activity.from_property = self.template.from_property
activity.recipient = self.template.recipient
activity.conversation = self.template.conversation
Expand Down
21 changes: 18 additions & 3 deletions libraries/botbuilder-schema/botbuilder/schema/_models_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,12 @@ def create_reply(self, text: str = None, locale: str = None):
id=self.from_property.id if self.from_property else None,
name=self.from_property.name if self.from_property else None,
),
reply_to_id=self.id,
reply_to_id=(
self.id
if not type == ActivityTypes.conversation_update
or self.channel_id not in ["directline", "webchat"]
else None
),
service_url=self.service_url,
channel_id=self.channel_id,
conversation=ConversationAccount(
Expand Down Expand Up @@ -681,7 +686,12 @@ def create_trace(
id=self.from_property.id if self.from_property else None,
name=self.from_property.name if self.from_property else None,
),
reply_to_id=self.id,
reply_to_id=(
self.id
if not type == ActivityTypes.conversation_update
or self.channel_id not in ["directline", "webchat"]
else None
),
service_url=self.service_url,
channel_id=self.channel_id,
conversation=ConversationAccount(
Expand Down Expand Up @@ -737,7 +747,12 @@ def get_conversation_reference(self):
:returns: A conversation reference for the conversation that contains this activity.
"""
return ConversationReference(
activity_id=self.id,
activity_id=(
self.id
if not type == ActivityTypes.conversation_update
or self.channel_id not in ["directline", "webchat"]
else None
),
user=self.from_property,
bot=self.recipient,
conversation=self.conversation,
Expand Down
Loading