fix mimetypes

Author: sadiv

examples/receiveNotification.py

@@ -2,7 +2,6 @@
 from datetime import datetime
 import json
 from whatsapp_api_client_python import greenAPI as greenAPI
-from whatsapp_api_client_python.tools.webhooks import TypeWebhook as TypeWebhook
 
 
 ID_INSTANCE = environ['ID_INSTANCE']
@@ -14,23 +13,21 @@ def main():
    restApi.webhooks.startReceivingNotifications(onEvent)
 
 def onEvent(typeWebhook, body):
-   if typeWebhook == TypeWebhook.INCOMING_MESSAGE_RECEIVED.value:
+   if typeWebhook == 'incomingMessageReceived':
       onIncomingMessageReceived(body)      
-   elif typeWebhook == TypeWebhook.DEVICE_INFO.value:   
+   elif typeWebhook == 'deviceInfo':   
       onDeviceInfo(body)              
-   elif typeWebhook == TypeWebhook.INCOMING_CALL.value:
+   elif typeWebhook == 'incomingCall':
       onIncomingCall(body)
-   elif typeWebhook == TypeWebhook.INCOMING_MESSAGE_RECEIVED.value:
-      onIncomingMessageReceived(body)
-   elif typeWebhook == TypeWebhook.OUTGOING_API_MESSAGE_RECEIVED.value:
+   elif typeWebhook == 'outgoingAPIMessageReceived':
       onOutgoingAPIMessageReceived(body)
-   elif typeWebhook == TypeWebhook.OUTGOING_MESSAGE_RECEIVED.value:
+   elif typeWebhook == 'outgoingMessageReceived':
       onOutgoingMessageReceived(body)
-   elif typeWebhook == TypeWebhook.OUTGOING_MESSAGE_STATUS.value:
+   elif typeWebhook == 'outgoingMessageStatus':
       onOutgoingMessageStatus(body)
-   elif typeWebhook == TypeWebhook.STATE_INSTANCE_CHANGED.value:
+   elif typeWebhook == 'stateInstanceChanged':
       onStateInstanceChanged(body)
-   elif typeWebhook == TypeWebhook.STATUS_INSTANCE_CHANGED.value:
+   elif typeWebhook == 'statusInstanceChanged':
       onStatusInstanceChanged(body)
 
 def onIncomingMessageReceived(body):

examples/sendPictureByUpload.py

@@ -8,7 +8,7 @@
 restApi = greenAPI.RestApi(ID_INSTANCE, API_TOKEN_INSTANCE)
 
 def main():
-    result = restApi.sending.sendFileByUpload('79001234567@c.us', 
+    result = restApi.sending.sendFileByUpload('77073450985@c.us', 
         'C:\Games\PicFromDisk.png', 
         'PicFromDisk.png', 'Picture from disk')
     print(result.data)

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="whatsapp-api-client-python",
-    version="0.0.20",
+    version="0.0.21",
     install_requires=['requests'],
     author="Ivan Sadovy",
     author_email="sadiv@bk.ru",

whatsapp_api_client_python/greenAPI.py

@@ -1,4 +1,5 @@
 from array import array
+import mimetypes
 import requests
 import json
 from whatsapp_api_client_python.response import Response
@@ -14,6 +15,7 @@
 from whatsapp_api_client_python.tools.serviceMethods import ServiceMethods
 from whatsapp_api_client_python.tools.webhooks import Webhooks
 
+
 class RestApi:
     'REST API class'
 
@@ -57,7 +59,7 @@ def request(self, method: str, url: str,
                     }
                     payloadData = json.dumps(payload)
                 else:
-                    payloadData = payload    
+                    payloadData = payload   
             result = requests.request(method, url, headers = headers, 
                                         data = payloadData, 
                                         files = files)

whatsapp_api_client_python/tools/sending.py

@@ -1,5 +1,6 @@
 from array import array
 import os.path
+import mimetypes
 from whatsapp_api_client_python.response import Response
 
 
@@ -77,8 +78,10 @@ def sendFileByUpload(self, chatId: str, path: str,
             if fileName == None:
                 fileName = pathParts[pathParts.count - 1]
 
+            mimeType = mimetypes.guess_type(path)[0]
+
             files = [
-                ('file', open(path,'rb'))
+                ('file', (fileName, open(path,'rb'), mimeType))
             ]
 
             requestBody = {

whatsapp_api_client_python/tools/webhooks.py

@@ -1,28 +1,3 @@
-from whatsapp_api_client_python.response import Response
-from enum import Enum
-
-
-class TypeWebhook(Enum):
-    INCOMING_MESSAGE_RECEIVED = 'incomingMessageReceived'
-    OUTGOING_MESSAGE_RECEIVED = 'outgoingMessageReceived'
-    OUTGOING_API_MESSAGE_RECEIVED = 'outgoingAPIMessageReceived'
-    OUTGOING_MESSAGE_STATUS  = 'outgoingMessageStatus'
-    STATE_INSTANCE_CHANGED  = 'stateInstanceChanged'
-    STATUS_INSTANCE_CHANGED  = 'statusInstanceChanged'
-    DEVICE_INFO  = 'deviceInfo'
-    INCOMING_CALL  = 'incomingCall'
-
-class TypeMessage(Enum):
-    TEXT_MESSAGE = 'textMessage'
-    IMAGE_MESSAGE = 'imageMessage'
-    VIDEO_MESSAGE = 'videoMessage'
-    DOCUMENT_MESSAGE  = 'documentMessage'
-    AUDIO_MESSAGE  = 'audioMessage'
-    LOCATION_MESSAGE  = 'locationMessage'
-    CONTACT_MESSAGE  = 'contactMessage'
-    EXTENDED_TEXT_MESSAGE  = 'extendedTextMessage'
-    QUOTED_MESSAGE = 'quotedMessage'
-
 class Webhooks:
     def __init__(self, restApi) -> None:
         self.restApi = restApi