version 1.16.4

jsess79 · Mar 10, 2023 · 20d250f · 20d250f
1 parent 99e77eb
commit 20d250f
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 51 deletions.
diff --git a/docs/api-docs/slack_bolt/app/app.html b/docs/api-docs/slack_bolt/app/app.html
@@ -245,9 +245,16 @@ <h1 class="title">Module <code>slack_bolt.app.app</code></h1>
 
         self._authorize: Optional[Authorize] = None
         if authorize is not None:
-            if oauth_settings is not None or oauth_flow is not None:
-                raise BoltError(error_authorize_conflicts())
-            self._authorize = CallableAuthorize(logger=self._framework_logger, func=authorize)
+            if isinstance(authorize, Authorize):
+                # As long as an advanced developer understands what they&#39;re doing,
+                # bolt-python should not prevent customizing authorize middleware
+                self._authorize = authorize
+            else:
+                if oauth_settings is not None or oauth_flow is not None:
+                    # If the given authorize is a simple function,
+                    # it does not work along with installation_store.
+                    raise BoltError(error_authorize_conflicts())
+                self._authorize = CallableAuthorize(logger=self._framework_logger, func=authorize)
 
         self._installation_store: Optional[InstallationStore] = installation_store
         if self._installation_store is not None and self._authorize is None:
@@ -764,7 +771,7 @@ <h1 class="title">Module <code>slack_bolt.app.app</code></h1>
 
     def message(
         self,
-        keyword: Union[str, Pattern],
+        keyword: Union[str, Pattern] = &#34;&#34;,
         matchers: Optional[Sequence[Callable[..., bool]]] = None,
         middleware: Optional[Sequence[Union[Callable, Middleware]]] = None,
     ) -&gt; Callable[..., Optional[Callable[..., Optional[BoltResponse]]]]:
@@ -1669,9 +1676,16 @@ <h2 id="args">Args</h2>
 
         self._authorize: Optional[Authorize] = None
         if authorize is not None:
-            if oauth_settings is not None or oauth_flow is not None:
-                raise BoltError(error_authorize_conflicts())
-            self._authorize = CallableAuthorize(logger=self._framework_logger, func=authorize)
+            if isinstance(authorize, Authorize):
+                # As long as an advanced developer understands what they&#39;re doing,
+                # bolt-python should not prevent customizing authorize middleware
+                self._authorize = authorize
+            else:
+                if oauth_settings is not None or oauth_flow is not None:
+                    # If the given authorize is a simple function,
+                    # it does not work along with installation_store.
+                    raise BoltError(error_authorize_conflicts())
+                self._authorize = CallableAuthorize(logger=self._framework_logger, func=authorize)
 
         self._installation_store: Optional[InstallationStore] = installation_store
         if self._installation_store is not None and self._authorize is None:
@@ -2188,7 +2202,7 @@ <h2 id="args">Args</h2>
 
     def message(
         self,
-        keyword: Union[str, Pattern],
+        keyword: Union[str, Pattern] = &#34;&#34;,
         matchers: Optional[Sequence[Callable[..., bool]]] = None,
         middleware: Optional[Sequence[Union[Callable, Middleware]]] = None,
     ) -&gt; Callable[..., Optional[Callable[..., Optional[BoltResponse]]]]:
@@ -3455,7 +3469,7 @@ <h2 id="args">Args</h2>
 </details>
 </dd>
 <dt id="slack_bolt.app.app.App.message"><code class="name flex">
-<span>def <span class="ident">message</span></span>(<span>self, keyword: Union[str, Pattern], matchers: Optional[Sequence[Callable[..., bool]]] = None, middleware: Optional[Sequence[Union[Callable, <a title="slack_bolt.middleware.middleware.Middleware" href="../middleware/middleware.html#slack_bolt.middleware.middleware.Middleware">Middleware</a>]]] = None) ‑> Callable[..., Optional[Callable[..., Optional[<a title="slack_bolt.response.response.BoltResponse" href="../response/response.html#slack_bolt.response.response.BoltResponse">BoltResponse</a>]]]]</span>
+<span>def <span class="ident">message</span></span>(<span>self, keyword: Union[str, Pattern] = '', matchers: Optional[Sequence[Callable[..., bool]]] = None, middleware: Optional[Sequence[Union[Callable, <a title="slack_bolt.middleware.middleware.Middleware" href="../middleware/middleware.html#slack_bolt.middleware.middleware.Middleware">Middleware</a>]]] = None) ‑> Callable[..., Optional[Callable[..., Optional[<a title="slack_bolt.response.response.BoltResponse" href="../response/response.html#slack_bolt.response.response.BoltResponse">BoltResponse</a>]]]]</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Registers a new message event listener. This method can be used as either a decorator or a method.
@@ -3488,7 +3502,7 @@ <h2 id="args">Args</h2>
 </summary>
 <pre><code class="python">def message(
     self,
-    keyword: Union[str, Pattern],
+    keyword: Union[str, Pattern] = &#34;&#34;,
     matchers: Optional[Sequence[Callable[..., bool]]] = None,
     middleware: Optional[Sequence[Union[Callable, Middleware]]] = None,
 ) -&gt; Callable[..., Optional[Callable[..., Optional[BoltResponse]]]]:

diff --git a/docs/api-docs/slack_bolt/app/async_app.html b/docs/api-docs/slack_bolt/app/async_app.html
@@ -250,10 +250,16 @@ <h1 class="title">Module <code>slack_bolt.app.async_app</code></h1>
 
         self._async_authorize: Optional[AsyncAuthorize] = None
         if authorize is not None:
-            if oauth_settings is not None or oauth_flow is not None:
-                raise BoltError(error_authorize_conflicts())
-
-            self._async_authorize = AsyncCallableAuthorize(logger=self._framework_logger, func=authorize)
+            if isinstance(authorize, AsyncAuthorize):
+                # As long as an advanced developer understands what they&#39;re doing,
+                # bolt-python should not prevent customizing authorize middleware
+                self._async_authorize = authorize
+            else:
+                if oauth_settings is not None or oauth_flow is not None:
+                    # If the given authorize is a simple function,
+                    # it does not work along with installation_store.
+                    raise BoltError(error_authorize_conflicts())
+                self._async_authorize = AsyncCallableAuthorize(logger=self._framework_logger, func=authorize)
 
         self._async_installation_store: Optional[AsyncInstallationStore] = installation_store
         if self._async_installation_store is not None and self._async_authorize is None:
@@ -795,7 +801,7 @@ <h1 class="title">Module <code>slack_bolt.app.async_app</code></h1>
 
     def message(
         self,
-        keyword: Union[str, Pattern],
+        keyword: Union[str, Pattern] = &#34;&#34;,
         matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None,
         middleware: Optional[Sequence[Union[Callable, AsyncMiddleware]]] = None,
     ) -&gt; Callable[..., Optional[Callable[..., Awaitable[Optional[BoltResponse]]]]]:
@@ -1572,10 +1578,16 @@ <h2 id="args">Args</h2>
 
         self._async_authorize: Optional[AsyncAuthorize] = None
         if authorize is not None:
-            if oauth_settings is not None or oauth_flow is not None:
-                raise BoltError(error_authorize_conflicts())
-
-            self._async_authorize = AsyncCallableAuthorize(logger=self._framework_logger, func=authorize)
+            if isinstance(authorize, AsyncAuthorize):
+                # As long as an advanced developer understands what they&#39;re doing,
+                # bolt-python should not prevent customizing authorize middleware
+                self._async_authorize = authorize
+            else:
+                if oauth_settings is not None or oauth_flow is not None:
+                    # If the given authorize is a simple function,
+                    # it does not work along with installation_store.
+                    raise BoltError(error_authorize_conflicts())
+                self._async_authorize = AsyncCallableAuthorize(logger=self._framework_logger, func=authorize)
 
         self._async_installation_store: Optional[AsyncInstallationStore] = installation_store
         if self._async_installation_store is not None and self._async_authorize is None:
@@ -2117,7 +2129,7 @@ <h2 id="args">Args</h2>
 
     def message(
         self,
-        keyword: Union[str, Pattern],
+        keyword: Union[str, Pattern] = &#34;&#34;,
         matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None,
         middleware: Optional[Sequence[Union[Callable, AsyncMiddleware]]] = None,
     ) -&gt; Callable[..., Optional[Callable[..., Awaitable[Optional[BoltResponse]]]]]:
@@ -3413,7 +3425,7 @@ <h2 id="args">Args</h2>
 </details>
 </dd>
 <dt id="slack_bolt.app.async_app.AsyncApp.message"><code class="name flex">
-<span>def <span class="ident">message</span></span>(<span>self, keyword: Union[str, Pattern], matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None, middleware: Optional[Sequence[Union[Callable, <a title="slack_bolt.middleware.async_middleware.AsyncMiddleware" href="../middleware/async_middleware.html#slack_bolt.middleware.async_middleware.AsyncMiddleware">AsyncMiddleware</a>]]] = None) ‑> Callable[..., Optional[Callable[..., Awaitable[Optional[<a title="slack_bolt.response.response.BoltResponse" href="../response/response.html#slack_bolt.response.response.BoltResponse">BoltResponse</a>]]]]]</span>
+<span>def <span class="ident">message</span></span>(<span>self, keyword: Union[str, Pattern] = '', matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None, middleware: Optional[Sequence[Union[Callable, <a title="slack_bolt.middleware.async_middleware.AsyncMiddleware" href="../middleware/async_middleware.html#slack_bolt.middleware.async_middleware.AsyncMiddleware">AsyncMiddleware</a>]]] = None) ‑> Callable[..., Optional[Callable[..., Awaitable[Optional[<a title="slack_bolt.response.response.BoltResponse" href="../response/response.html#slack_bolt.response.response.BoltResponse">BoltResponse</a>]]]]]</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Registers a new message event listener. This method can be used as either a decorator or a method.
@@ -3446,7 +3458,7 @@ <h2 id="args">Args</h2>
 </summary>
 <pre><code class="python">def message(
     self,
-    keyword: Union[str, Pattern],
+    keyword: Union[str, Pattern] = &#34;&#34;,
     matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None,
     middleware: Optional[Sequence[Union[Callable, AsyncMiddleware]]] = None,
 ) -&gt; Callable[..., Optional[Callable[..., Awaitable[Optional[BoltResponse]]]]]:

diff --git a/docs/api-docs/slack_bolt/app/index.html b/docs/api-docs/slack_bolt/app/index.html
@@ -292,9 +292,16 @@ <h2 id="args">Args</h2>
 
         self._authorize: Optional[Authorize] = None
         if authorize is not None:
-            if oauth_settings is not None or oauth_flow is not None:
-                raise BoltError(error_authorize_conflicts())
-            self._authorize = CallableAuthorize(logger=self._framework_logger, func=authorize)
+            if isinstance(authorize, Authorize):
+                # As long as an advanced developer understands what they&#39;re doing,
+                # bolt-python should not prevent customizing authorize middleware
+                self._authorize = authorize
+            else:
+                if oauth_settings is not None or oauth_flow is not None:
+                    # If the given authorize is a simple function,
+                    # it does not work along with installation_store.
+                    raise BoltError(error_authorize_conflicts())
+                self._authorize = CallableAuthorize(logger=self._framework_logger, func=authorize)
 
         self._installation_store: Optional[InstallationStore] = installation_store
         if self._installation_store is not None and self._authorize is None:
@@ -811,7 +818,7 @@ <h2 id="args">Args</h2>
 
     def message(
         self,
-        keyword: Union[str, Pattern],
+        keyword: Union[str, Pattern] = &#34;&#34;,
         matchers: Optional[Sequence[Callable[..., bool]]] = None,
         middleware: Optional[Sequence[Union[Callable, Middleware]]] = None,
     ) -&gt; Callable[..., Optional[Callable[..., Optional[BoltResponse]]]]:
@@ -2078,7 +2085,7 @@ <h2 id="args">Args</h2>
 </details>
 </dd>
 <dt id="slack_bolt.app.App.message"><code class="name flex">
-<span>def <span class="ident">message</span></span>(<span>self, keyword: Union[str, Pattern], matchers: Optional[Sequence[Callable[..., bool]]] = None, middleware: Optional[Sequence[Union[Callable, <a title="slack_bolt.middleware.middleware.Middleware" href="../middleware/middleware.html#slack_bolt.middleware.middleware.Middleware">Middleware</a>]]] = None) ‑> Callable[..., Optional[Callable[..., Optional[<a title="slack_bolt.response.response.BoltResponse" href="../response/response.html#slack_bolt.response.response.BoltResponse">BoltResponse</a>]]]]</span>
+<span>def <span class="ident">message</span></span>(<span>self, keyword: Union[str, Pattern] = '', matchers: Optional[Sequence[Callable[..., bool]]] = None, middleware: Optional[Sequence[Union[Callable, <a title="slack_bolt.middleware.middleware.Middleware" href="../middleware/middleware.html#slack_bolt.middleware.middleware.Middleware">Middleware</a>]]] = None) ‑> Callable[..., Optional[Callable[..., Optional[<a title="slack_bolt.response.response.BoltResponse" href="../response/response.html#slack_bolt.response.response.BoltResponse">BoltResponse</a>]]]]</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Registers a new message event listener. This method can be used as either a decorator or a method.
@@ -2111,7 +2118,7 @@ <h2 id="args">Args</h2>
 </summary>
 <pre><code class="python">def message(
     self,
-    keyword: Union[str, Pattern],
+    keyword: Union[str, Pattern] = &#34;&#34;,
     matchers: Optional[Sequence[Callable[..., bool]]] = None,
     middleware: Optional[Sequence[Union[Callable, Middleware]]] = None,
 ) -&gt; Callable[..., Optional[Callable[..., Optional[BoltResponse]]]]:

diff --git a/docs/api-docs/slack_bolt/async_app.html b/docs/api-docs/slack_bolt/async_app.html
@@ -403,10 +403,16 @@ <h2 id="args">Args</h2>
 
         self._async_authorize: Optional[AsyncAuthorize] = None
         if authorize is not None:
-            if oauth_settings is not None or oauth_flow is not None:
-                raise BoltError(error_authorize_conflicts())
-
-            self._async_authorize = AsyncCallableAuthorize(logger=self._framework_logger, func=authorize)
+            if isinstance(authorize, AsyncAuthorize):
+                # As long as an advanced developer understands what they&#39;re doing,
+                # bolt-python should not prevent customizing authorize middleware
+                self._async_authorize = authorize
+            else:
+                if oauth_settings is not None or oauth_flow is not None:
+                    # If the given authorize is a simple function,
+                    # it does not work along with installation_store.
+                    raise BoltError(error_authorize_conflicts())
+                self._async_authorize = AsyncCallableAuthorize(logger=self._framework_logger, func=authorize)
 
         self._async_installation_store: Optional[AsyncInstallationStore] = installation_store
         if self._async_installation_store is not None and self._async_authorize is None:
@@ -948,7 +954,7 @@ <h2 id="args">Args</h2>
 
     def message(
         self,
-        keyword: Union[str, Pattern],
+        keyword: Union[str, Pattern] = &#34;&#34;,
         matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None,
         middleware: Optional[Sequence[Union[Callable, AsyncMiddleware]]] = None,
     ) -&gt; Callable[..., Optional[Callable[..., Awaitable[Optional[BoltResponse]]]]]:
@@ -2244,7 +2250,7 @@ <h2 id="args">Args</h2>
 </details>
 </dd>
 <dt id="slack_bolt.async_app.AsyncApp.message"><code class="name flex">
-<span>def <span class="ident">message</span></span>(<span>self, keyword: Union[str, Pattern], matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None, middleware: Optional[Sequence[Union[Callable, <a title="slack_bolt.middleware.async_middleware.AsyncMiddleware" href="middleware/async_middleware.html#slack_bolt.middleware.async_middleware.AsyncMiddleware">AsyncMiddleware</a>]]] = None) ‑> Callable[..., Optional[Callable[..., Awaitable[Optional[<a title="slack_bolt.response.response.BoltResponse" href="response/response.html#slack_bolt.response.response.BoltResponse">BoltResponse</a>]]]]]</span>
+<span>def <span class="ident">message</span></span>(<span>self, keyword: Union[str, Pattern] = '', matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None, middleware: Optional[Sequence[Union[Callable, <a title="slack_bolt.middleware.async_middleware.AsyncMiddleware" href="middleware/async_middleware.html#slack_bolt.middleware.async_middleware.AsyncMiddleware">AsyncMiddleware</a>]]] = None) ‑> Callable[..., Optional[Callable[..., Awaitable[Optional[<a title="slack_bolt.response.response.BoltResponse" href="response/response.html#slack_bolt.response.response.BoltResponse">BoltResponse</a>]]]]]</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Registers a new message event listener. This method can be used as either a decorator or a method.
@@ -2277,7 +2283,7 @@ <h2 id="args">Args</h2>
 </summary>
 <pre><code class="python">def message(
     self,
-    keyword: Union[str, Pattern],
+    keyword: Union[str, Pattern] = &#34;&#34;,
     matchers: Optional[Sequence[Callable[..., Awaitable[bool]]]] = None,
     middleware: Optional[Sequence[Union[Callable, AsyncMiddleware]]] = None,
 ) -&gt; Callable[..., Optional[Callable[..., Awaitable[Optional[BoltResponse]]]]]: