8000 fixing merge conflicts from rebase · ericmicrofocus/botbuilder-python@99ce4ea · GitHub
[go: up one dir, main page]
Skip to content

Commit 99ce4ea

Browse files
Virtual-JoshVirtual-Josh
committed
fixing merge conflicts from rebase
2 parents 5fb0b92 + aca5c97 commit 99ce4ea

File tree

6 files changed

+521
-37
lines changed

6 files changed

+521
-37
lines changed

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

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@
66
from botbuilder.core.turn_context import TurnContext
77
from botbuilder.core import ActivityHandler, InvokeResponse, BotFrameworkAdapter
88
from botbuilder.schema.teams import (
9+
AppBasedLinkQuery,
910
TeamInfo,
1011
ChannelInfo,
12+
FileConsentCardResponse,
1113
TeamsChannelData,
1214
TeamsChannelAccount,
15+
MessageActionsPayload,
16+
MessagingExtensionAction,
17+
MessagingExtensionQuery,
18+
O365ConnectorCardActionQuery,
19+
TaskModuleRequest
1320
)
1421
from botframework.connector import Channels
1522
import json
@@ -56,26 +63,26 @@ async def on_invoke_activity(self, turn_context: TurnContext):
5663

5764
if turn_context.activity.name == "fileConsent/invoke":
5865
return await self.on_teams_file_consent(
59-
turn_context, turn_context.activity.value
66+
turn_context, FileConsentCardResponse(**turn_context.activity.value)
6067
)
6168

6269
if turn_context.activity.name == "actionableMessage/executeAction":
6370
await self.on_teams_o365_connector_card_action(
64-
turn_context, turn_context.activity.value
71+
turn_context, O365ConnectorCardActionQuery(**turn_context.activity.value)
6572
)
6673
return self._create_invoke_response()
6774

6875
if turn_context.activity.name == "composeExtension/queryLink":
6976
return self._create_invoke_response(
7077
await self.on_teams_app_based_link_query(
71-
turn_context, turn_context.activity.value
78+
turn_context, AppBasedLinkQuery(**turn_context.activity.value)
7279
)
7380
)
7481

7582
if turn_context.activity.name == "composeExtension/query":
7683
return self._create_invoke_response(
7784
await self.on_teams_messaging_extension_query(
78-
turn_context, turn_context.activity.value
85+
turn_context, MessagingExtensionQuery(**turn_context.activity.value)
7986
)
8087
)
8188

@@ -89,21 +96,21 @@ async def on_invoke_activity(self, turn_context: TurnContext):
8996
if turn_context.activity.name == "composeExtension/submitAction":
9097
return self._create_invoke_response(
9198
await self.on_teams_messaging_extension_submit_action_dispatch(
92-
turn_context, turn_context.activity.value
99+
turn_context, MessagingExtensionAction(**turn_context.activity.value)
93100
)
94101
)
95102

96103
if turn_context.activity.name == "composeExtension/fetchTask":
97104
return self._create_invoke_response(
98105
await self.on_teams_messaging_extension_fetch_task(
99-
turn_context, turn_context.activity.value
106+
turn_context, Messa 67ED gingExtensionAction(**turn_context.activity.value)
100107
)
101108
)
102109

103110
if turn_context.activity.name == "composeExtension/querySettingUrl":
104111
return self._create_invoke_response(
105112
await self.on_teams_messaging_extension_configuration_query_settings_url(
106-
turn_context, turn_context.activity.value
113+
turn_context, MessagingExtensionQuery(**turn_context.activity.value)
107114
)
108115
)
109116

@@ -122,14 +129,14 @@ async def on_invoke_activity(self, turn_context: TurnContext):
122129
if turn_context.activity.name == "task/fetch":
123130
return self._create_invoke_response(
124131
await self.on_teams_task_module_fetch(
125-
turn_context, turn_context.activity.value
132+
turn_context, TaskModuleRequest(**turn_context.activity.value)
126133
)
127134
)
128135

129136
if turn_context.activity.name == "task/submit":
130137
return self._create_invoke_response(
131138
await self.on_teams_task_module_submit(
132-
turn_context, turn_context.activity.value
139+
turn_context, TaskModuleRequest(**turn_context.activity.value)
133140
)
134141
)
135142

@@ -144,7 +151,7 @@ async def on_teams_signin_verify_state(self, turn_context: TurnContext):
144151
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
145152

146153
async def on_teams_file_consent(
147-
self, turn_context: TurnContext, file_consent_card_response
154+
self, turn_context: TurnContext, file_consent_card_response: FileConsentCardResponse
148155
):
149156
if file_consent_card_response.action == "accept":
150157
await self.on_teams_file_consent_accept_activity(
@@ -164,39 +171,39 @@ async def on_teams_file_consent(
164171
)
165172

166173
async def on_teams_file_consent_accept_activity( # pylint: disable=unused-argument
167-
self, turn_context: TurnContext, file_consent_card_response
174+
self, turn_context: TurnContext, file_consent_card_response: FileConsentCardResponse
168175
):
169176
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
170177

171178
async def on_teams_file_consent_decline_activity( # pylint: disable=unused-argument
172-
self, turn_context: TurnContext, file_consent_card_response
179+
self, turn_context: TurnContext, file_consent_card_response: FileConsentCardResponse
173180
):
174181
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
175182

176183
async def on_teams_o365_connector_card_action( # pylint: disable=unused-argument
177-
self, turn_context: TurnContext, query
184+
self, turn_context: TurnContext, query: O365ConnectorCardActionQuery
178185
):
179186
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
180187

181188
async def on_teams_app_based_link_query( # pylint: disable=unused-argument
182-
self, turn_context: TurnContext, query
189+
self, turn_context: TurnContext, query: AppBasedLinkQuery
183190
):
184191
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
185192

186193
async def on_teams_messaging_extension_query( # pylint: disable=unused-argument
187-
self, turn_context: TurnContext, query
194+
self, turn_context: TurnContext, query: MessagingExtensionQuery
188195
):
189196
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
190197

191198
async def on_teams_messaging_extension_select_item( # pylint: disable=unused-argument
192-
self, turn_context: TurnContext, query
199+
self, turn_context: TurnContext, query
193200
):
194201
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
195202

196203
async def on_teams_messaging_extension_submit_action_dispatch(
197-
self, turn_context: TurnContext, action
204+
self, turn_context: TurnContext, action: MessagingExtensionAction
198205
):
199-
if not action:
206+
if not action.bot_message_preview_action:
200207
return await self.on_teams_messaging_extension_submit_action_activity(
201208
turn_context, action
202209
)
@@ -227,17 +234,17 @@ async def on_teams_messaging_extension_bot_message_send_activity( # pylint: dis
227234
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
228235

229236
async def on_teams_messaging_extension_submit_action_activity( # pylint: disable=unused-argument
230-
self, turn_context: TurnContext, action
237+
self, turn_context: TurnContext, action: MessagingExtensionAction
231238
):
232239
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
233240

234241
async def on_teams_messaging_extension_fetch_task( # pylint: disable=unused-argument
235-
self, turn_context: TurnContext, task_module_request
242+
self, turn_context: TurnContext, action: MessagingExtensionAction
236243
):
237244
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
238245

239246
async def on_teams_messaging_extension_configuration_query_settings_url( # pylint: disable=unused-argument
240-
self, turn_context: TurnContext, query
247+
self, turn_context: TurnContext, query: MessagingExtensionQuery
241248
):
242249
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
243250

@@ -252,12 +259,12 @@ async def on_teams_messaging_extension_card_button_clicked( # pylint: disable=u
252259
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
253260

254261
async def on_teams_task_module_fetch( # pylint: disable=unused-argument
255-
self, turn_context: TurnContext, task_module_request
262+
self, turn_context: TurnContext, task_module_request: TaskModuleRequest
256263
):
257264
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
258265

259266
async def on_teams_task_module_submit( # pylint: disable=unused-argument
260-
self, turn_context: TurnContext, task_module_request
267+
self, turn_context: TurnContext, task_module_request: TaskModuleRequest
261268
):
262269
raise _InvokeResponseException(status_code=HTTPStatus.NOT_IMPLEMENTED)
263270

@@ -290,7 +297,7 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):
290297
return await self.on_teams_channel_renamed_activity(
291298
channel_data.channel, channel_data.team, turn_context
292299
)
293-
if channel_data.eventType == "teamRenamed":
300+
if channel_data.event_type == "teamRenamed":
294301
return await self.on_teams_team_renamed_activity(channel_data.team, turn_context)
295302
return await super().on_conversation_update_activity(turn_context)
296303

0 commit comments

Comments
 (0)
0