From e6a636abb579b2ef2b2dea7193a370145c231fd7 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 25 Jun 2020 10:18:43 -0700 Subject: [PATCH 1/3] Adding dependencies to setup.py --- libraries/botbuilder-adapters-slack/setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/botbuilder-adapters-slack/setup.py b/libraries/botbuilder-adapters-slack/setup.py index 666e321f2..42990d15b 100644 --- a/libraries/botbuilder-adapters-slack/setup.py +++ b/libraries/botbuilder-adapters-slack/setup.py @@ -8,6 +8,8 @@ "botbuilder-schema==4.10.0", "botframework-connector==4.10.0", "botbuilder-core==4.10.0", + "pyslack", + "slackclient", ] TEST_REQUIRES = ["aiounittest==1.3.0"] @@ -32,7 +34,7 @@ long_description=long_description, long_description_content_type="text/x-rst", license=package_info["__license__"], - packages=["botbuilder.adapters", "botbuilder.adapters.slack",], + packages=["botbuilder.adapters.slack"], install_requires=REQUIRES + TEST_REQUIRES, tests_require=TEST_REQUIRES, include_package_data=True, From 488ba6cf478cb883afb0aa378471217deddc1dca Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 25 Jun 2020 11:19:11 -0700 Subject: [PATCH 2/3] pylint fixes --- .../botbuilder/adapters/slack/slack_client.py | 6 +++--- .../botbuilder/adapters/slack/slack_helper.py | 8 +++++--- .../botbuilder/adapters/slack/slack_payload.py | 4 +--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_client.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_client.py index 42fb96e81..0911ce965 100644 --- a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_client.py +++ b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_client.py @@ -10,13 +10,13 @@ import aiohttp from aiohttp.web_request import Request +from slack.web.client import WebClient +from slack.web.slack_response import SlackResponse + from botbuilder.schema import Activity from botbuilder.adapters.slack import SlackAdapterOptions from botbuilder.adapters.slack.slack_message import SlackMessage -from slack.web.client import WebClient -from slack.web.slack_response import SlackResponse - POST_MESSAGE_URL = "https://slack.com/api/chat.postMessage" POST_EPHEMERAL_MESSAGE_URL = "https://slack.com/api/chat.postEphemeral" diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py index e15604442..f45710561 100644 --- a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py +++ b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py @@ -7,6 +7,8 @@ from aiohttp.web_request import Request from aiohttp.web_response import Response +from slack.web.classes.attachments import Attachment + from botbuilder.schema import ( Activity, ConversationAccount, @@ -14,8 +16,6 @@ ActivityTypes, ) -from slack.web.classes.attachments import Attachment - from .slack_message import SlackMessage from .slack_client import SlackClient from .slack_event import SlackEvent @@ -53,7 +53,9 @@ def activity_to_slack(activity: Activity) -> SlackMessage: message.blocks = att.content else: new_attachment = Attachment( - author_name=att.name, thumb_url=att.thumbnail_url, + author_name=att.name, + thumb_url=att.thumbnail_url, + text="", ) attachments.append(new_attachment) diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_payload.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_payload.py index 0be8e3666..d5d87a225 100644 --- a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_payload.py +++ b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_payload.py @@ -2,10 +2,8 @@ # Licensed under the MIT License. from typing import Optional, List - -from botbuilder.adapters.slack.slack_message import SlackMessage - from slack.web.classes.actions import Action +from botbuilder.adapters.slack.slack_message import SlackMessage class SlackPayload: From d1edfae7434ad440666c313511f5b8c0bbf904e8 Mon Sep 17 00:00:00 2001 From: Axel Suarez Date: Thu, 25 Jun 2020 11:36:00 -0700 Subject: [PATCH 3/3] Black compliant --- .../botbuilder/adapters/slack/slack_helper.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py index f45710561..de5b7e672 100644 --- a/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py +++ b/libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py @@ -53,9 +53,7 @@ def activity_to_slack(activity: Activity) -> SlackMessage: message.blocks = att.content else: new_attachment = Attachment( - author_name=att.name, - thumb_url=att.thumbnail_url, - text="", + author_name=att.name, thumb_url=att.thumbnail_url, text="", ) attachments.append(new_attachment)