Fix WebClient#files_upload does not send channels since v3.10.0 (#1106)

Author: seratch

slack_sdk/web/async_client.py

@@ -2848,29 +2848,30 @@ async def files_upload(
                 "You cannot specify both the file and the content argument."
             )
 
-        if file:
-            if "filename" not in kwargs and isinstance(file, str):
-                # use the local filename if filename is missing
-                kwargs["filename"] = file.split(os.path.sep)[-1]
-            return await self.api_call(
-                "files.upload", files={"file": file}, data=kwargs
-            )
-        data = kwargs.copy()
-        data.update(
+        if isinstance(channels, (list, Tuple)):
+            kwargs.update({"channels": ",".join(channels)})
+        else:
+            kwargs.update({"channels": channels})
+        kwargs.update(
             {
-                "content": content,
                 "filename": filename,
                 "filetype": filetype,
                 "initial_comment": initial_comment,
                 "thread_ts": thread_ts,
                 "title": title,
             }
         )
-        if isinstance(channels, (list, Tuple)):
-            kwargs.update({"channels": ",".join(channels)})
+        if file:
+            if "filename" not in kwargs and isinstance(file, str):
+                # use the local filename if filename is missing
+                if kwargs.get("filename") is None:
+                    kwargs["filename"] = file.split(os.path.sep)[-1]
+            return await self.api_call(
+                "files.upload", files={"file": file}, data=kwargs
+            )
         else:
-            kwargs.update({"channels": channels})
-        return await self.api_call("files.upload", data=data)
+            kwargs["content"] = content
+            return await self.api_call("files.upload", data=kwargs)
 
     # --------------------------
     # Deprecated: groups.*

slack_sdk/web/client.py

@@ -2797,27 +2797,28 @@ def files_upload(
                 "You cannot specify both the file and the content argument."
             )
 
-        if file:
-            if "filename" not in kwargs and isinstance(file, str):
-                # use the local filename if filename is missing
-                kwargs["filename"] = file.split(os.path.sep)[-1]
-            return self.api_call("files.upload", files={"file": file}, data=kwargs)
-        data = kwargs.copy()
-        data.update(
+        if isinstance(channels, (list, Tuple)):
+            kwargs.update({"channels": ",".join(channels)})
+        else:
+            kwargs.update({"channels": channels})
+        kwargs.update(
             {
-                "content": content,
                 "filename": filename,
                 "filetype": filetype,
                 "initial_comment": initial_comment,
                 "thread_ts": thread_ts,
                 "title": title,
             }
         )
-        if isinstance(channels, (list, Tuple)):
-            kwargs.update({"channels": ",".join(channels)})
+        if file:
+            if "filename" not in kwargs and isinstance(file, str):
+                # use the local filename if filename is missing
+                if kwargs.get("filename") is None:
+                    kwargs["filename"] = file.split(os.path.sep)[-1]
+            return self.api_call("files.upload", files={"file": file}, data=kwargs)
         else:
-            kwargs.update({"channels": channels})
-        return self.api_call("files.upload", data=data)
+            kwargs["content"] = content
+            return self.api_call("files.upload", data=kwargs)
 
     # --------------------------
     # Deprecated: groups.*

slack_sdk/web/legacy_client.py

@@ -2808,27 +2808,28 @@ def files_upload(
                 "You cannot specify both the file and the content argument."
             )
 
-        if file:
-            if "filename" not in kwargs and isinstance(file, str):
-                # use the local filename if filename is missing
-                kwargs["filename"] = file.split(os.path.sep)[-1]
-            return self.api_call("files.upload", files={"file": file}, data=kwargs)
-        data = kwargs.copy()
-        data.update(
+        if isinstance(channels, (list, Tuple)):
+            kwargs.update({"channels": ",".join(channels)})
+        else:
+            kwargs.update({"channels": channels})
+        kwargs.update(
             {
-                "content": content,
                 "filename": filename,
                 "filetype": filetype,
                 "initial_comment": initial_comment,
                 "thread_ts": thread_ts,
                 "title": title,
             }
         )
-        if isinstance(channels, (list, Tuple)):
-            kwargs.update({"channels": ",".join(channels)})
+        if file:
+            if "filename" not in kwargs and isinstance(file, str):
+                # use the local filename if filename is missing
+                if kwargs.get("filename") is None:
+                    kwargs["filename"] = file.split(os.path.sep)[-1]
+            return self.api_call("files.upload", files={"file": file}, data=kwargs)
         else:
-            kwargs.update({"channels": channels})
-        return self.api_call("files.upload", data=data)
+            kwargs["content"] = content
+            return self.api_call("files.upload", data=kwargs)
 
     # --------------------------
     # Deprecated: groups.*