Commit 6af0edef by Oleksandr Barabash

fix on cards

parent add97a9a
...@@ -4,7 +4,7 @@ import sys ...@@ -4,7 +4,7 @@ import sys
import time import time
import uuid import uuid
from asyncio import Future from asyncio import Future
from typing import Optional, Dict from typing import Optional, Dict, Union, List
from urllib.parse import urlparse, parse_qsl, urlencode, unquote from urllib.parse import urlparse, parse_qsl, urlencode, unquote
import aiohttp import aiohttp
...@@ -85,7 +85,8 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler): ...@@ -85,7 +85,8 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
def send_message(self, def send_message(self,
conversation_id: str, conversation_id: str,
tenant_id: str, text: str = None, tenant_id: str, text: str = None,
card: Dict[any, any] = None) -> Future[ResourceResponse]: card: Optional[Union[List, Dict[any, any]]] = None
) -> Future[ResourceResponse]:
""" Send message as a bot """ """ Send message as a bot """
io_loop = asyncio.get_event_loop() io_loop = asyncio.get_event_loop()
future = Future() future = Future()
...@@ -108,7 +109,12 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler): ...@@ -108,7 +109,12 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
try: try:
attachments = None attachments = None
if card is not None: if card is not None:
attachments = [CardFactory.adaptive_card(card)] if isinstance(card, list):
attachments = [
CardFactory.adaptive_card(x) for x in card
]
else:
attachments = [CardFactory.adaptive_card(card)]
response = await turn_context.send_activity(Activity( response = await turn_context.send_activity(Activity(
type=ActivityTypes.message, type=ActivityTypes.message,
......
""" PA message to send to Teams """ """ PA message to send to Teams """
from dataclasses import dataclass from dataclasses import dataclass
from typing import Optional from typing import Optional, Union, List, Dict
from entities.json.camel_case_mixin import CamelCaseMixin from entities.json.camel_case_mixin import CamelCaseMixin
...@@ -11,4 +11,4 @@ class PAMessage(CamelCaseMixin): ...@@ -11,4 +11,4 @@ class PAMessage(CamelCaseMixin):
conversation_id: str conversation_id: str
tenant_id: str tenant_id: str
text: Optional[str] text: Optional[str]
card: Optional[str] card: Optional[Union[Dict, List]]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment