Skip to content
This repository was archived by the owner on Jan 5, 2026. It is now read-only.

Do NOT call TeamsInfo.get_member for the bot: cherry pick 4.9 fix (#1066) #1067

Merged
tracyboehrer merged 1 commit into from
May 15, 2020
Merged

Do NOT call TeamsInfo.get_member for the bot: cherry pick 4.9 fix (#1066) #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion 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 @@ -350,7 +350,11 @@ async def on_teams_members_added_dispatch( # pylint: disable=unused-argument

team_members_added = []
for member in members_added:
if member.additional_properties != {}:
is_bot = (
turn_context.activity.recipient is not None
and member.id == turn_context.activity.recipient.id
)
if member.additional_properties != {} or is_bot:
team_members_added.append(
deserializer_helper(TeamsChannelAccount, member)
)
Expand Down
32 changes: 32 additions & 0 deletions libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,38 @@ async def test_on_teams_members_added_activity(self):
assert bot.record[0] == "on_conversation_update_activity"
assert bot.record[1] == "on_teams_members_added"

async def test_bot_on_teams_members_added_activity(self):
# arrange
activity = Activity(
recipient=ChannelAccount(id="botid"),
type=ActivityTypes.conversation_update,
channel_data={
"eventType": "teamMemberAdded",
"team": {"id": "team_id_1", "name": "new_team_name"},
},
members_added=[
ChannelAccount(
id="botid",
name="test_user",
aad_object_id="asdfqwerty",
role="tester",
)
],
channel_id=Channels.ms_teams,
conversation=ConversationAccount(id="456"),
)

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_conversation_update_activity"
assert bot.record[1] == "on_teams_members_added"

async def test_on_teams_members_removed_activity(self):
# arrange
activity = Activity(
Expand Down