From 25f1895c2e7b8e8d36ac9622f4208420c2f9f0b6 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Tue, 17 Dec 2019 10:08:17 -0800 Subject: [PATCH 1/5] adding teams to connector From d246bc4bac7a8b4aaaa5ecc2e25ebbe7aeb95a17 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Tue, 17 Dec 2019 11:24:33 -0800 Subject: [PATCH 2/5] makign helpers private --- libraries/botbuilder-core/botbuilder/core/teams/__init__.py | 3 --- .../botbuilder/core/teams/teams_activity_handler.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/__init__.py b/libraries/botbuilder-core/botbuilder/core/teams/__init__.py index 9acc2a250..d9d4847e8 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/__init__.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/__init__.py @@ -7,7 +7,6 @@ from .teams_activity_handler import TeamsActivityHandler from .teams_info import TeamsInfo -from .teams_helper import deserializer_helper, serializer_helper from .teams_activity_extensions import ( teams_get_channel_id, teams_get_team_info, @@ -15,11 +14,9 @@ ) __all__ = [ - "deserializer_helper", "TeamsActivityHandler", "TeamsInfo", "teams_get_channel_id", "teams_get_team_info", "teams_notify_user", - "serializer_helper", ] diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index 04725db13..00c722cfe 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -5,7 +5,7 @@ from botbuilder.schema import Activity, ActivityTypes, ChannelAccount from botbuilder.core import ActivityHandler, InvokeResponse, BotFrameworkAdapter from botbuilder.core.turn_context import TurnContext -from botbuilder.core.teams.teams_helper import deserializer_helper, serializer_helper +from .teams_helper import deserializer_helper, serializer_helper from botbuilder.core.teams.teams_info import TeamsInfo from botbuilder.schema.teams import ( AppBasedLinkQuery, From b693f573f6e8b3fdc3cb51bb4ca97c29002790d0 Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Tue, 17 Dec 2019 11:37:44 -0800 Subject: [PATCH 3/5] removing unneeded comments --- .../botbuilder/core/teams/teams_activity_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index 00c722cfe..62f11767b 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -433,12 +433,12 @@ async def on_teams_members_removed( async def on_teams_channel_deleted( # pylint: disable=unused-argument self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext ): - return # Task.CompleteTask + return async def on_teams_channel_renamed( # pylint: disable=unused-argument self, channel_info: ChannelInfo, team_info: TeamInfo, turn_context: TurnContext ): - return # Task.CompleteTask + return @staticmethod def _create_invoke_response(body: object = None) -> InvokeResponse: From 701be9e81464824883e4586eb7f0984ea9bfd56a Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Tue, 17 Dec 2019 12:38:34 -0800 Subject: [PATCH 4/5] fixing linting --- .../botbuilder/core/teams/teams_activity_handler.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index 62f11767b..c749f6fe8 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -5,7 +5,6 @@ from botbuilder.schema import Activity, ActivityTypes, ChannelAccount from botbuilder.core import ActivityHandler, InvokeResponse, BotFrameworkAdapter from botbuilder.core.turn_context import TurnContext -from .teams_helper import deserializer_helper, serializer_helper from botbuilder.core.teams.teams_info import TeamsInfo from botbuilder.schema.teams import ( AppBasedLinkQuery, @@ -23,7 +22,7 @@ TaskModuleResponse, ) from botframework.connector import Channels - +from .teams_helper import deserializer_helper, serializer_helper class TeamsActivityHandler(ActivityHandler): async def on_turn(self, turn_context: TurnContext): From 12f574b63aca4eb5614e763a161b09983dc1a11f Mon Sep 17 00:00:00 2001 From: virtual-josh Date: Tue, 17 Dec 2019 13:18:48 -0800 Subject: [PATCH 5/5] black updates --- .../botbuilder/core/teams/teams_activity_handler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index c749f6fe8..6b541d7ff 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -24,6 +24,7 @@ from botframework.connector import Channels from .teams_helper import deserializer_helper, serializer_helper + class TeamsActivityHandler(ActivityHandler): async def on_turn(self, turn_context: TurnContext): if turn_context is None: