diff --git a/libraries/botbuilder-core/botbuilder/core/turn_context.py b/libraries/botbuilder-core/botbuilder/core/turn_context.py index a16eed975..5b3299d74 100644 --- a/libraries/botbuilder-core/botbuilder/core/turn_context.py +++ b/libraries/botbuilder-core/botbuilder/core/turn_context.py @@ -359,9 +359,11 @@ def remove_recipient_mention(activity: Activity) -> str: def remove_mention_text(activity: Activity, identifier: str) -> str: mentions = TurnContext.get_mentions(activity) for mention in mentions: - if mention.mentioned.id == identifier: + if mention.additional_properties["mentioned"]["id"] == identifier: mention_name_match = re.match( - r"(.*?)<\/at>", mention.text, re.IGNORECASE + r"(.*?)<\/at>", + mention.additional_properties["text"], + re.IGNORECASE, ) if mention_name_match: activity.text = re.sub( diff --git a/libraries/botbuilder-core/tests/test_inspection_middleware.py b/libraries/botbuilder-core/tests/test_inspection_middleware.py index 30c8ce7bf..68259a1b4 100644 --- a/libraries/botbuilder-core/tests/test_inspection_middleware.py +++ b/libraries/botbuilder-core/tests/test_inspection_middleware.py @@ -14,7 +14,7 @@ ) from botbuilder.core.adapters import TestAdapter from botbuilder.core.inspection import InspectionMiddleware, InspectionState -from botbuilder.schema import Activity, ActivityTypes, ChannelAccount, Mention +from botbuilder.schema import Activity, ActivityTypes, ChannelAccount, Entity, Mention class TestConversationState(aiounittest.AsyncTestCase): @@ -249,10 +249,12 @@ async def exec_test2(turn_context): text=attach_command, recipient=ChannelAccount(id=recipient_id), entities=[ - Mention( - type="mention", - text=f"{recipient_id}", - mentioned=ChannelAccount(name="Bot", id=recipient_id), + Entity().deserialize( + Mention( + type="mention", + text=f"{recipient_id}", + mentioned=ChannelAccount(name="Bot", id=recipient_id), + ).serialize() ) ], ) diff --git a/libraries/botbuilder-core/tests/test_turn_context.py b/libraries/botbuilder-core/tests/test_turn_context.py index 017b5383e..381287d3d 100644 --- a/libraries/botbuilder-core/tests/test_turn_context.py +++ b/libraries/botbuilder-core/tests/test_turn_context.py @@ -9,6 +9,7 @@ ActivityTypes, ChannelAccount, ConversationAccount, + Entity, Mention, ResourceResponse, ) @@ -309,10 +310,12 @@ def test_should_remove_at_mention_from_activity(self): text="TestOAuth619 test activity", recipient=ChannelAccount(id="TestOAuth619"), entities=[ - Mention( - type="mention", - text="TestOAuth619", - mentioned=ChannelAccount(name="Bot", id="TestOAuth619"), + Entity().deserialize( + Mention( + type="mention", + text="TestOAuth619", + mentioned=ChannelAccount(name="Bot", id="TestOAuth619"), + ).serialize() ) ], )