Skip to content

Commit e70705a

Browse files
committed
version 1.2.0b4
1 parent b183b0c commit e70705a

File tree

5 files changed

+30
-12
lines changed

5 files changed

+30
-12
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
exclude=["examples", "integration_tests", "tests", "tests.*",]
3434
),
3535
include_package_data=True, # MANIFEST.in
36-
install_requires=["slack_sdk>=3.2.0b5,<3.3",],
36+
install_requires=["slack_sdk>=3.2.0b6,<3.3",],
3737
setup_requires=["pytest-runner==5.2"],
3838
tests_require=test_dependencies,
3939
test_suite="tests",

slack_bolt/adapter/socket_mode/aiohttp/__init__.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def __init__( # type: ignore
3636
self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
3737
self.client = SocketModeClient(
3838
app_token=self.app_token,
39-
logger=logger,
40-
web_client=web_client,
39+
logger=logger if logger is not None else app.logger,
40+
web_client=web_client if web_client is not None else app.client,
4141
proxy=proxy,
4242
ping_interval=ping_interval,
4343
)
@@ -58,10 +58,20 @@ def __init__( # type: ignore
5858
self,
5959
app: AsyncApp, # type: ignore
6060
app_token: Optional[str] = None,
61+
logger: Optional[Logger] = None,
62+
web_client: Optional[AsyncWebClient] = None,
63+
proxy: Optional[str] = None,
64+
ping_interval: float = 10,
6165
):
6266
self.app = app
6367
self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
64-
self.client = SocketModeClient(app_token=self.app_token)
68+
self.client = SocketModeClient(
69+
app_token=self.app_token,
70+
logger=logger if logger is not None else app.logger,
71+
web_client=web_client if web_client is not None else app.client,
72+
proxy=proxy,
73+
ping_interval=ping_interval,
74+
)
6575
self.client.socket_mode_request_listeners.append(self.handle)
6676

6777
async def handle(self, client: SocketModeClient, req: SocketModeRequest) -> None:

slack_bolt/adapter/socket_mode/builtin/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ def __init__( # type: ignore
3333
self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
3434
self.client = SocketModeClient(
3535
app_token=self.app_token,
36-
logger=logger,
37-
web_client=web_client,
38-
proxy=proxy,
36+
logger=logger if logger is not None else app.logger,
37+
web_client=web_client if web_client is not None else app.client,
38+
proxy=proxy if proxy is not None else app.client.proxy,
3939
ping_interval=ping_interval,
4040
concurrency=concurrency,
4141
trace_enabled=trace_enabled,

slack_bolt/adapter/socket_mode/websocket_client/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def __init__( # type: ignore
3636
self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
3737
self.client = SocketModeClient(
3838
app_token=self.app_token,
39-
logger=logger,
40-
web_client=web_client,
39+
logger=logger if logger is not None else app.logger,
40+
web_client=web_client if web_client is not None else app.client,
4141
ping_interval=ping_interval,
4242
concurrency=concurrency,
4343
http_proxy_host=http_proxy_host,

slack_bolt/adapter/socket_mode/websockets/__init__.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def __init__( # type: ignore
3535
self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
3636
self.client = SocketModeClient(
3737
app_token=self.app_token,
38-
logger=logger,
39-
web_client=web_client,
38+
logger=logger if logger is not None else app.logger,
39+
web_client=web_client if web_client is not None else app.client,
4040
ping_interval=ping_interval,
4141
)
4242
self.client.socket_mode_request_listeners.append(self.handle)
@@ -56,10 +56,18 @@ def __init__( # type: ignore
5656
self,
5757
app: AsyncApp, # type: ignore
5858
app_token: Optional[str] = None,
59+
logger: Optional[Logger] = None,
60+
web_client: Optional[AsyncWebClient] = None,
61+
ping_interval: float = 10,
5962
):
6063
self.app = app
6164
self.app_token = app_token or os.environ["SLACK_APP_TOKEN"]
62-
self.client = SocketModeClient(app_token=self.app_token)
65+
self.client = SocketModeClient(
66+
app_token=self.app_token,
67+
logger=logger if logger is not None else app.logger,
68+
web_client=web_client if web_client is not None else app.client,
69+
ping_interval=ping_interval,
70+
)
6371
self.client.socket_mode_request_listeners.append(self.handle)
6472

6573
async def handle(self, client: SocketModeClient, req: SocketModeRequest) -> None:

0 commit comments

Comments
 (0)