Merge branch 'main' into v-gandiddi/teams-batch-operations

Author: gandiddi

libraries/botbuilder-core/botbuilder/core/activity_handler.py

@@ -68,6 +68,10 @@ async def on_turn(
 
         if turn_context.activity.type == ActivityTypes.message:
             await self.on_message_activity(turn_context)
+        elif turn_context.activity.type == ActivityTypes.message_update:
+            await self.on_message_update_activity(turn_context)
+        elif turn_context.activity.type == ActivityTypes.message_delete:
+            await self.on_message_delete_activity(turn_context)
         elif turn_context.activity.type == ActivityTypes.conversation_update:
             await self.on_conversation_update_activity(turn_context)
         elif turn_context.activity.type == ActivityTypes.message_reaction:
@@ -107,6 +111,34 @@ async def on_message_activity(  # pylint: disable=unused-argument
         """
         return
 
+    async def on_message_update_activity(  # pylint: disable=unused-argument
+        self, turn_context: TurnContext
+    ):
+        """
+        Override this method in a derived class to provide logic specific to activities,
+        such as the conversational logic.
+
+        :param turn_context: The context object for this turn
+        :type turn_context: :class:`botbuilder.core.TurnContext`
+
+        :returns: A task that represents the work queued to execute
+        """
+        return
+
+    async def on_message_delete_activity(  # pylint: disable=unused-argument
+        self, turn_context: TurnContext
+    ):
+        """
+        Override this method in a derived class to provide logic specific to activities,
+        such as the conversational logic.
+
+        :param turn_context: The context object for this turn
+        :type turn_context: :class:`botbuilder.core.TurnContext`
+
+        :returns: A task that represents the work queued to execute
+        """
+        return
+
     async def on_conversation_update_activity(self, turn_context: TurnContext):
         """
         Invoked when a conversation update activity is received from the channel when the base behavior of

libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py

@@ -90,6 +90,16 @@ async def on_invoke_activity(self, turn_context: TurnContext) -> InvokeResponse:
                     )
                 )
 
+            if turn_context.activity.name == "composeExtension/anonymousQueryLink":
+                return self._create_invoke_response(
+                    await self.on_teams_anonymous_app_based_link_query(
+                        turn_context,
+                        deserializer_helper(
+                            AppBasedLinkQuery, turn_context.activity.value
+                        ),
+                    )
+                )
+
             if turn_context.activity.name == "composeExtension/query":
                 return self._create_invoke_response(
                     await self.on_teams_messaging_extension_query(
@@ -331,6 +341,19 @@ async def on_teams_app_based_link_query(  # pylint: disable=unused-argument
         """
         raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
 
+    async def on_teams_anonymous_app_based_link_query(  # pylint: disable=unused-argument
+        self, turn_context: TurnContext, query: AppBasedLinkQuery
+    ) -> MessagingExtensionResponse:
+        """
+        Invoked when an anonymous app based link query activity is received from the connector.
+
+        :param turn_context: A context object for this turn.
+        :param query: The invoke request body type for app-based link query.
+
+        :returns: The Messaging Extension Response for the query.
+        """
+        raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
+
     async def on_teams_messaging_extension_query(  # pylint: disable=unused-argument
         self, turn_context: TurnContext, query: MessagingExtensionQuery
     ) -> MessagingExtensionResponse:
@@ -1042,3 +1065,73 @@ async def on_teams_meeting_participants_leave_event(
         :returns: A task that represents the work queued to execute.
         """
         return
+
+    async def on_message_update_activity(self, turn_context: TurnContext):
+        """
+        Invoked when a message update activity is received, such as a message edit or undelete.
+
+        :param turn_context: A context object for this turn.
+
+        :returns: A task that represents the work queued to execute.
+        """
+        if turn_context.activity.channel_id == Channels.ms_teams:
+            channel_data = TeamsChannelData().deserialize(
+                turn_context.activity.channel_data
+            )
+
+            if channel_data:
+                if channel_data.event_type == "editMessage":
+                    return await self.on_teams_message_edit(turn_context)
+                if channel_data.event_type == "undeleteMessage":
+                    return await self.on_teams_message_undelete(turn_context)
+
+        return await super().on_message_update_activity(turn_context)
+
+    async def on_message_delete_activity(self, turn_context: TurnContext):
+        """
+        Invoked when a message delete activity is received, such as a soft delete message.
+
+        :param turn_context: A context object for this turn.
+
+        :returns: A task that represents the work queued to execute.
+        """
+        if turn_context.activity.channel_id == Channels.ms_teams:
+            channel_data = TeamsChannelData().deserialize(
+                turn_context.activity.channel_data
+            )
+
+            if channel_data:
+                if channel_data.event_type == "softDeleteMessage":
+                    return await self.on_teams_message_soft_delete(turn_context)
+
+        return await super().on_message_delete_activity(turn_context)
+
+    async def on_teams_message_edit(self, turn_context: TurnContext):
+        """
+        Invoked when a Teams edit message event activity is received.
+
+        :param turn_context: A context object for this turn.
+
+        :returns: A task that represents the work queued to execute.
+        """
+        return
+
+    async def on_teams_message_undelete(self, turn_context: TurnContext):
+        """
+        Invoked when a Teams undo soft delete message event activity is received.
+
+        :param turn_context: A context object for this turn.
+
+        :returns: A task that represents the work queued to execute.
+        """
+        return
+
+    async def on_teams_message_soft_delete(self, turn_context: TurnContext):
+        """
+        Invoked when a Teams soft delete message event activity is received.
+
+        :param turn_context: A context object for this turn.
+
+        :returns: A task that represents the work queued to execute.
+        """
+        return

libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py

@@ -34,6 +34,7 @@
     TabContext,
     MeetingParticipantsEventDetails,
     ReadReceiptInfo,
+    TeamsChannelData,
 )
 from botframework.connector import Channels
 from simple_adapter import SimpleAdapter
@@ -219,6 +220,14 @@ async def on_teams_messaging_extension_query(
         self.record.append("on_teams_messaging_extension_query")
         return await super().on_teams_messaging_extension_query(turn_context, query)
 
+    async def on_teams_anonymous_app_based_link_query(
+        self, turn_context: TurnContext, query: AppBasedLinkQuery
+    ):
+        self.record.append("on_teams_anonymous_app_based_link_query")
+        return await super().on_teams_anonymous_app_based_link_query(
+            turn_context, query
+        )
+
     async def on_teams_messaging_extension_submit_action_dispatch(
         self, turn_context: TurnContext, action: MessagingExtensionAction
     ):
@@ -351,6 +360,26 @@ async def on_teams_meeting_end_event(
             turn_context.activity.value, turn_context
         )
 
+    async def on_message_update_activity(self, turn_context: TurnContext):
+        self.record.append("on_message_update_activity")
+        return await super().on_message_update_activity(turn_context)
+
+    async def on_teams_message_edit(self, turn_context: TurnContext):
+        self.record.append("on_teams_message_edit")
+        return await super().on_teams_message_edit(turn_context)
+
+    async def on_teams_message_undelete(self, turn_context: TurnContext):
+        self.record.append("on_teams_message_undelete")
+        return await super().on_teams_message_undelete(turn_context)
+
+    async def on_message_delete_activity(self, turn_context: TurnContext):
+        self.record.append("on_message_delete_activity")
+        return await super().on_message_delete_activity(turn_context)
+
+    async def on_teams_message_soft_delete(self, turn_context: TurnContext):
+        self.record.append("on_teams_message_soft_delete")
+        return await super().on_teams_message_soft_delete(turn_context)
+
     async def on_teams_meeting_participants_join_event(
         self, meeting: MeetingParticipantsEventDetails, turn_context: TurnContext
     ):
@@ -816,6 +845,25 @@ async def test_on_app_based_link_query(self):
         assert bot.record[0] == "on_invoke_activity"
         assert bot.record[1] == "on_teams_messaging_extension_query"
 
+    async def test_compose_extension_anonymous_query_link(self):
+        # arrange
+        activity = Activity(
+            type=ActivityTypes.invoke,
+            name="composeExtension/anonymousQueryLink",
+            value={"url": "http://www.test.com"},
+        )
+
+        turn_context = TurnContext(SimpleAdapter(), activity)
+
+        # Act
+        bot = TestingTeamsActivityHandler()
+        await bot.on_turn(turn_context)
+
+        # Assert
+        assert len(bot.record) == 2
+        assert bot.record[0] == "on_invoke_activity"
+        assert bot.record[1] == "on_teams_anonymous_app_based_link_query"
+
     async def test_on_teams_messaging_extension_bot_message_preview_edit_activity(self):
         # Arrange
 
@@ -1254,6 +1302,124 @@ async def test_on_teams_meeting_end_event(self):
         assert bot.record[0] == "on_event_activity"
         assert bot.record[1] == "on_teams_meeting_end_event"
 
+    async def test_message_update_activity_teams_message_edit(self):
+        # Arrange
+        activity = Activity(
+            type=ActivityTypes.message_update,
+            channel_data=TeamsChannelData(event_type="editMessage"),
+            channel_id=Channels.ms_teams,
+        )
+        turn_context = TurnContext(SimpleAdapter(), activity)
+
+        # Act
+        bot = TestingTeamsActivityHandler()
+        await bot.on_turn(turn_context)
+
+        # Assert
+        self.assertEqual(2, len(bot.record))
+        self.assertEqual("on_message_update_activity", bot.record[0])
+        self.assertEqual("on_teams_message_edit", bot.record[1])
+
+    async def test_message_update_activity_teams_message_undelete(self):
+        # Arrange
+        activity = Activity(
+            type=ActivityTypes.message_update,
+            channel_data=TeamsChannelData(event_type="undeleteMessage"),
+            channel_id=Channels.ms_teams,
+        )
+        turn_context = TurnContext(SimpleAdapter(), activity)
+
+        # Act
+        bot = TestingTeamsActivityHandler()
+        await bot.on_turn(turn_context)
+
+        # Assert
+        self.assertEqual(2, len(bot.record))
+        self.assertEqual("on_message_update_activity", bot.record[0])
+        self.assertEqual("on_teams_message_undelete", bot.record[1])
+
+    async def test_message_update_activity_teams_message_undelete_no_msteams(self):
+        # Arrange
+        activity = Activity(
+            type=ActivityTypes.message_update,
+            channel_data=TeamsChannelData(event_type="undeleteMessage"),
+        )
+        turn_context = TurnContext(SimpleAdapter(), activity)
+
+        # Act
+        bot = TestingTeamsActivityHandler()
+        await bot.on_turn(turn_context)
+
+        # Assert
+        self.assertEqual(1, len(bot.record))
+        self.assertEqual("on_message_update_activity", bot.record[0])
+
+    async def test_message_update_activity_teams_no_channel_data(self):
+        # Arrange
+        activity = Activity(
+            type=ActivityTypes.message_update,
+            channel_id=Channels.ms_teams,
+        )
+        turn_context = TurnContext(SimpleAdapter(), activity)
+
+        # Act
+        bot = TestingTeamsActivityHandler()
+        await bot.on_turn(turn_context)
+
+        # Assert
+        self.assertEqual(1, len(bot.record))
+        self.assertEqual("on_message_update_activity", bot.record[0])
+
+    async def test_message_delete_activity_teams_message_soft_delete(self):
+        # Arrange
+        activity = Activity(
+            type=ActivityTypes.message_delete,
+            channel_data=TeamsChannelData(event_type="softDeleteMessage"),
+            channel_id=Channels.ms_teams,
+        )
+        turn_context = TurnContext(SimpleAdapter(), activity)
+
+        # Act
+        bot = TestingTeamsActivityHandler()
+        await bot.on_turn(turn_context)
+
+        # Assert
+        self.assertEqual(2, len(bot.record))
+        self.assertEqual("on_message_delete_activity", bot.record[0])
+        self.assertEqual("on_teams_message_soft_delete", bot.record[1])
+
+    async def test_message_delete_activity_teams_message_soft_delete_no_msteams(self):
+        # Arrange
+        activity = Activity(
+            type=ActivityTypes.message_delete,
+            channel_data=TeamsChannelData(event_type="softDeleteMessage"),
+        )
+        turn_context = TurnContext(SimpleAdapter(), activity)
+
+        # Act
+        bot = TestingTeamsActivityHandler()
+        await bot.on_turn(turn_context)
+
+        # Assert
+        self.assertEqual(1, len(bot.record))
+        self.assertEqual("on_message_delete_activity", bot.record[0])
+
+    async def test_message_delete_activity_teams_no_channel_data(self):
+        # Arrange
+        activity = Activity(
+            type=ActivityTypes.message_delete,
+            channel_id=Channels.ms_teams,
+        )
+        turn_context = TurnContext(SimpleAdapter(), activity)
+
+        # Act
+        bot = TestingTeamsActivityHandler()
+        await bot.on_turn(turn_context)
+
+        # Assert
+        self.assertEqual(1, len(bot.record))
+        self.assertEqual("on_message_delete_activity", bot.record[0])
+
     async def test_on_teams_meeting_participants_join_event(self):
         # arrange
         activity = Activity(