clean things up based on feedback

Author: WilliamBergamin

slack_sdk/web/internal_utils.py

@@ -249,9 +249,12 @@ def _to_0_or_1_if_bool(v: Any) -> Union[Any, str]:
 
 def _warn_if_message_text_content_is_missing(endpoint: str, kwargs: Dict[str, Any]) -> None:
     text = kwargs.get("text")
-    markdown_text = kwargs.get("markdown_text")
-    if (text and len(text.strip()) > 0) or (markdown_text and len(markdown_text.strip()) > 0):
+    if text and len(text.strip()) > 0:
         # If a top-level text arg is provided, we are good. This is the recommended accessibility field to always provide.
+        return
+
+    markdown_text = kwargs.get("markdown_text")
+    if markdown_text and len(markdown_text.strip()) > 0:
         # If a top-level markdown_text arg is provided, we are good. It should not be used in conjunction with text.
         return
 

tests/slack_sdk_async/web/test_web_client_msg_text_content_warnings.py

@@ -75,43 +75,43 @@ async def test_missing_fallback_warning_chat_update(self):
         with self.assertWarnsRegex(UserWarning, "`text` argument is missing"):
             resp = await client.chat_update(channel="C111", ts="111.222", blocks=[], attachments=[{"text": "hi"}])
         self.assertIsNone(resp["error"])
-    
+
     @async_test
-    def test_no_warning_when_markdown_text_is_provided_chat_postMessage(self):
-        client = WebClient(base_url="http://localhost:8888", token="xoxb-api_test")
+    async def test_no_warning_when_markdown_text_is_provided_chat_postMessage(self):
+        client = AsyncWebClient(base_url="http://localhost:8888", token="xoxb-api_test")
         with warnings.catch_warnings(record=True) as warning_list:
             warnings.simplefilter("always")
-            resp = client.chat_postMessage(channel="C111", markdown_text="# hello")
+            resp = await client.chat_postMessage(channel="C111", markdown_text="# hello")
 
         self.assertEqual(warning_list, [])
         self.assertIsNone(resp["error"])
 
     @async_test
-    def test_no_warning_when_markdown_text_is_provided_chat_postEphemeral(self):
-        client = WebClient(base_url="http://localhost:8888", token="xoxb-api_test")
+    async def test_no_warning_when_markdown_text_is_provided_chat_postEphemeral(self):
+        client = AsyncWebClient(base_url="http://localhost:8888", token="xoxb-api_test")
         with warnings.catch_warnings(record=True) as warning_list:
             warnings.simplefilter("always")
-            resp = client.chat_postEphemeral(channel="C111", user="U111", markdown_text="# hello")
+            resp = await client.chat_postEphemeral(channel="C111", user="U111", markdown_text="# hello")
 
         self.assertEqual(warning_list, [])
         self.assertIsNone(resp["error"])
 
     @async_test
-    def test_no_warning_when_markdown_text_is_provided_chat_scheduleMessage(self):
-        client = WebClient(base_url="http://localhost:8888", token="xoxb-api_test")
+    async def test_no_warning_when_markdown_text_is_provided_chat_scheduleMessage(self):
+        client = AsyncWebClient(base_url="http://localhost:8888", token="xoxb-api_test")
         with warnings.catch_warnings(record=True) as warning_list:
             warnings.simplefilter("always")
-            resp = client.chat_scheduleMessage(channel="C111", post_at="299876400", markdown_text="# hello")
+            resp = await client.chat_scheduleMessage(channel="C111", post_at="299876400", markdown_text="# hello")
 
         self.assertEqual(warning_list, [])
         self.assertIsNone(resp["error"])
 
     @async_test
-    def test_no_warning_when_markdown_text_is_provided_chat_update(self):
-        client = WebClient(base_url="http://localhost:8888", token="xoxb-api_test")
+    async def test_no_warning_when_markdown_text_is_provided_chat_update(self):
+        client = AsyncWebClient(base_url="http://localhost:8888", token="xoxb-api_test")
         with warnings.catch_warnings(record=True) as warning_list:
             warnings.simplefilter("always")
-            resp = client.chat_update(channel="C111", ts="111.222", markdown_text="# hello")
+            resp = await client.chat_update(channel="C111", ts="111.222", markdown_text="# hello")
 
         self.assertEqual(warning_list, [])
         self.assertIsNone(resp["error"])