Commit 405c9b69 by Oleksandr Barabash

bot mention removed

parent ca440e27
......@@ -376,12 +376,14 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
await turn_context.send_activity(i18n.t("tenant_forbidden"))
return
message = turn_context.activity.text.strip().lower()
message = turn_context.remove_recipient_mention(turn_context.activity)\
.strip()
message_lower = message.strip().lower()
cmd_help = i18n.t("cmd_help")
cmd_portal = i18n.t("cmd_portal")
if message == cmd_help.lower():
if message_lower == cmd_help.lower():
tenant_id = turn_context.activity.conversation.tenant_id
conversation_id = turn_context.activity.conversation.id
response = await turn_context.send_activity(
......@@ -394,18 +396,18 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
Log.d(TAG, "on_message_activity::help_resp: {}".format(response))
return
if message == cmd_portal.lower():
if message_lower == cmd_portal.lower():
card = CardHelper.load_assets_card("default_card")
attachments = [CardFactory.adaptive_card(card)]
message = Activity(type=ActivityTypes.message,
attachments=attachments)
await turn_context.send_activity(message)
await turn_context.send_activity(
Activity(type=ActivityTypes.message, attachments=attachments)
)
return
# TODO(s1z): Remove me when it's prod
if message.find("flow") == 0:
if message_lower.find("flow") == 0:
# Strip data again cause 'message' data is lower case
params = turn_context.activity.text.strip().split(' ')
params = message.split(' ')
if len(params) != 3:
response = await turn_context.send_activity(
"Incorrect syntax. Please the syntax below:<br/>"
......@@ -420,7 +422,7 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
_, cmd, url = params
# noinspection PyBroadException
try:
_ = await self.cosmos_client.create_flow(cmd, url)
_ = await self.cosmos_client.create_flow(cmd.lower(), url)
await turn_context.send_activity("Flow cmd saved")
return
except Exception:
......@@ -432,8 +434,9 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
# try get flow link
async def request():
""" request """
# noinspection PyBroadException
try:
flow = await self.cosmos_client.get_flow(message)
flow = await self.cosmos_client.get_flow(message_lower)
Log.e(TAG, f"on_message_activity::flow.url:{flow.url}")
async with aiohttp.ClientSession() as session:
# TODO(s1z): string bot's @mention if needed.
......@@ -446,7 +449,7 @@ class TeamsMessagingExtensionsActionPreviewBot(TeamsActivityHandler):
f"response.text: {rest_text}")
return True
except Exception:
Log.e(TAG, f"on_message_activity::get_flow:error", sys.exc_info())
log.error("Flow exec error", exc_info=sys.exc_info())
return False
response = await request()
if response:
......
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