8000 cleaning up PR feedback · rusty0209/botbuilder-python@a5c2ef7 · GitHub
[go: up one dir, main page]
Skip to content

Commit a5c2ef7

Browse files
Virtual-JoshVirtual-Josh
committed
cleaning up PR feedback
1 parent 2b3f2bf commit a5c2ef7

4 files changed

+8
-51
lines changed

‎libraries/botbuilder-core/botbuilder/core/Teams/teams_activity_handler.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ async def on_turn(self, turn_context: TurnContext):
3939
async def on_invoke_activity(self, turn_context: TurnContext):
4040
try:
4141
if (
42-
turn_context.activity.name is None
42+
not turn_context.activity.name
4343
and turn_context.activity.channel_id == Channels.Msteams
4444
):
4545
return # await on_teams_card_action_invoke_activity(turn_context)
@@ -52,20 +52,19 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):
5252
if turn_context.activity.channel_id == Channels.ms_teams:
5353
channel_data = TeamsChannelData(**turn_context.activity.channel_data)
5454

55-
if turn_context.activity.members_added is not None:
55+
if turn_context.activity.members_added:
5656
return await self.on_teams_members_added_dispatch_activity(
5757
turn_context.activity.members_added, channel_data.team, turn_context
5858
)
5959

60-
if turn_context.activity.members_removed is not None:
60+
if turn_context.activity.members_removed:
6161
return await self.on_teams_members_removed_dispatch_activity(
6262
turn_context.activity.members_removed,
6363
channel_data.team,
6464
turn_context,
6565
)
6666

67-
print(turn_context.activity)
68-
if channel_data is not None:
67+
if channel_data:
6968
if channel_data.event_type == "channelCreated":
7069
return await self.on_teams_channel_created_activity(
7170
channel_data.channel, channel_data.team, turn_context

‎libraries/botbuilder-schema/botbuilder/schema/teams/teams_channel_account.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ def __init__(
2727
self.given_name = given_name
2828
self.surname = surname
2929
self.email = email
30+
# This isn't camel_cased because the JSON that makes this object isn't camel_case
3031
self.user_principal_name = userPrincipalName

‎libraries/botbuilder-schema/botbuilder/schema/teams/teams_channel_data.py

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,47 +19,12 @@ def __init__(
1919
tenant: TenantInfo = None,
2020
):
2121
self._channel = ChannelInfo(**channel) if channel is not None else ChannelInfo()
22+
# This is not camel case because the JSON that makes this object isn't
2223
self._event_type = eventType
2324
self._team = TeamInfo(**team) if team is not None else TeamInfo()
2425
self._notification = (
2526
NotificationInfo(**notification)
2627
if notification is not None
2728
else NotificationInfo()
2829
)
29-
self._tenant = TenantInfo(**tenant) if tenant is not None else TenantInfo()
30-
31-
def get_channel(self):
32-
return self._channel
33-
34-
def set_channel(self, channel):
35-
self._channel = channel
36-
37-
def get_event_type(self):
38-
return self._event_type
39-
40-
def set_event_type(event_type):
41-
self._event_type = event_type
42-
43-
def get_team(self):
44-
return self._team
45-
46-
def set_team(self, team):
47-
self._team = team
48-
49-
def get_notification(self):
50-
return self._notification
51-
52-
def set_notification(self, notification):
53-
self._notification = notification
54-
55-
def get_tenant(self):
56-
return self._tenant
57-
58-
def set_tenant(self):
59-
return self._tenant
60-
61-
event_type = property(get_event_type, set_event_type)
62-
channel = property(get_channel, set_channel)
63-
team = property(get_team, set_team)
64-
notification = property(get_notification, set_notification)
65-
tenant = property(get_tenant, set_tenant)
30+
self._tenant = TenantInfo(**tenant) if tenant is not None else TenantInfo()

‎libraries/botbuilder-schema/botbuilder/schema/teams/tenant_info.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,4 @@
99

1010
class TenantInfo:
1111
def __init__(self, id=""):
12-
self._id = id
13-
14-
@property
15 5B50 -
def id():
16-
return self._id
17-
18-
@id.setter
19-
def id(self, id):
20-
self._id = id
12+
self._id = id

0 commit comments

Comments
 (0)
0