Skip to content

Cherry-picking helpers into master #535

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 5 commits into from
Dec 17, 2019
Merged

Cherry-picking helpers into master #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25f1895
adding teams to connector
Virtual-Josh Dec 17, 2019
d246bc4
makign helpers private
Virtual-Josh Dec 17, 2019
b693f57
removing unneeded comments
Virtual-Josh Dec 17, 2019
701be9e
fixing linting
Virtual-Josh Dec 17, 2019
12f574b
black updates
Virtual-Josh Dec 17, 2019
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
3 changes: 0 additions & 3 deletions libraries/botbuilder-core/botbuilder/core/teams/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,16 @@

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,
teams_notify_user,
)

__all__ = [
"deserializer_helper",
"TeamsActivityHandler",
"TeamsInfo",
"teams_get_channel_id",
"teams_get_team_info",
"teams_notify_user",
"serializer_helper",
]
6 changes: 3 additions & 3 deletions libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 botbuilder.core.teams.teams_helper import deserializer_helper, serializer_helper
from botbuilder.core.teams.teams_info import TeamsInfo
from botbuilder.schema.teams import (
AppBasedLinkQuery,
Expand All @@ -23,6 +22,7 @@
TaskModuleResponse,
)
from botframework.connector import Channels
from .teams_helper import deserializer_helper, serializer_helper


class TeamsActivityHandler(ActivityHandler):
Expand Down Expand Up @@ -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:
Expand Down