Bugfix

Author: sadiv

whatsapp_api_client_python/greenAPI.py

@@ -48,14 +48,17 @@ def request(self, method: str, url: str,
         text = ''
         try:
             headers = {}
-            payloadJson = None
+            payloadData = None
             if payload != None:
-                headers = {
-                    'Content-Type': 'application/json'
-                }
-                payloadJson = json.dumps(payload)
+                if files == None:
+                    headers = {
+                        'Content-Type': 'application/json'
+                    }
+                    payloadData = json.dumps(payload)
+                else:
+                    payloadData = payload    
             result = requests.request(method, url, headers = headers, 
-                                        data = payloadJson, 
+                                        data = payloadData, 
                                         files = files)
             result.raise_for_status()
             status_code = result.status_code

whatsapp_api_client_python/response.py

@@ -10,5 +10,7 @@ def __init__(self, code: int, text: str) -> None:
         self.code = code
         if code == 200:
             self.data = json.loads(text)
+            self.error = None
         else:
-            self.error = text
+            self.error = text
+            self.data = None

whatsapp_api_client_python/tools/sending.py

@@ -75,7 +75,7 @@ def sendFileByUpload(self, chatId: str, path: str,
 
             pathParts = os.path.split(path)
             if fileName == None:
-                fileName = pathParts[1]
+                fileName = pathParts[pathParts.count - 1]
 
             files = [
                 ('file', open(path,'rb'))
@@ -95,7 +95,7 @@ def sendFileByUpload(self, chatId: str, path: str,
             return self.restApi.request('POST', 
                 '{{host}}/waInstance{{idInstance}}'
                 '/SendFileByUpload/{{apiTokenInstance}}',
-                requestBody, files)
+                requestBody, files = files)
 
     def sendFileByUrl(self, chatId: str, urlFile: str,
                     fileName: str = None,