From a4d056ceb507b4488e76dca8bdaa3b06493bfebb Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Mon, 9 Dec 2019 23:23:04 -0800 Subject: [PATCH 1/3] updating turn context mention --- libraries/botbuilder-core/botbuilder/core/turn_context.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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( From 6ae43c3688991ddd7ea29a5365bba540f26b1892 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Mon, 9 Dec 2019 23:23:15 -0800 Subject: [PATCH 2/3] updating tests based on new mention --- .../botbuilder-core/tests/test_inspection_middleware.py | 6 +++--- libraries/botbuilder-core/tests/test_turn_context.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/botbuilder-core/tests/test_inspection_middleware.py b/libraries/botbuilder-core/tests/test_inspection_middleware.py index 30c8ce7bf..b3f0bbd0a 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): @@ -248,12 +248,12 @@ async def exec_test2(turn_context): type=ActivityTypes.message, text=attach_command, recipient=ChannelAccount(id=recipient_id), - entities=[ + entities=[Entity().deserialize( Mention( type="mention", text=f"{recipient_id}", mentioned=ChannelAccount(name="Bot", id=recipient_id), - ) + ).serialize()) ], ) await application_adapter.receive_activity(attach_activity) diff --git a/libraries/botbuilder-core/tests/test_turn_context.py b/libraries/botbuilder-core/tests/test_turn_context.py index 017b5383e..055744b9f 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, ) @@ -308,12 +309,12 @@ def test_should_remove_at_mention_from_activity(self): type="message", text="TestOAuth619 test activity", recipient=ChannelAccount(id="TestOAuth619"), - entities=[ + entities=[Entity().deserialize( Mention( type="mention", text="TestOAuth619", mentioned=ChannelAccount(name="Bot", id="TestOAuth619"), - ) + ).serialize()) ], ) From 3eb7ee4fa1230c50f386a81de74e2e46e16acee6 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Mon, 9 Dec 2019 23:32:59 -0800 Subject: [PATCH 3/3] black updates --- .../tests/test_inspection_middleware.py | 14 ++++++++------ .../botbuilder-core/tests/test_turn_context.py | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libraries/botbuilder-core/tests/test_inspection_middleware.py b/libraries/botbuilder-core/tests/test_inspection_middleware.py index b3f0bbd0a..68259a1b4 100644 --- a/libraries/botbuilder-core/tests/test_inspection_middleware.py +++ b/libraries/botbuilder-core/tests/test_inspection_middleware.py @@ -248,12 +248,14 @@ async def exec_test2(turn_context): type=ActivityTypes.message, text=attach_command, recipient=ChannelAccount(id=recipient_id), - entities=[Entity().deserialize( - Mention( - type="mention", - text=f"{recipient_id}", - mentioned=ChannelAccount(name="Bot", id=recipient_id), - ).serialize()) + entities=[ + Entity().deserialize( + Mention( + type="mention", + text=f"{recipient_id}", + mentioned=ChannelAccount(name="Bot", id=recipient_id), + ).serialize() + ) ], ) await application_adapter.receive_activity(attach_activity) diff --git a/libraries/botbuilder-core/tests/test_turn_context.py b/libraries/botbuilder-core/tests/test_turn_context.py index 055744b9f..381287d3d 100644 --- a/libraries/botbuilder-core/tests/test_turn_context.py +++ b/libraries/botbuilder-core/tests/test_turn_context.py @@ -309,12 +309,14 @@ def test_should_remove_at_mention_from_activity(self): type="message", text="TestOAuth619 test activity", recipient=ChannelAccount(id="TestOAuth619"), - entities=[Entity().deserialize( - Mention( - type="mention", - text="TestOAuth619", - mentioned=ChannelAccount(name="Bot", id="TestOAuth619"), - ).serialize()) + entities=[ + Entity().deserialize( + Mention( + type="mention", + text="TestOAuth619", + mentioned=ChannelAccount(name="Bot", id="TestOAuth619"), + ).serialize() + ) ], )