whatsapp-python 3.3.5.dev0__py3-none-any.whl → 3.3.9__py3-none-any.whl

whatsapp/ext/_send_others.py

@@ -1,86 +1,118 @@
-from typing import Any, Dict, List
-import requests
-import logging
-
-
-def send_custom_json(self, data: dict, recipient_id: str = ""):
-    """
-    Sends a custom json to a WhatsApp user. This can be used to send custom objects to the message endpoint.
-
-    Args:
-        data[dict]: Dictionary that should be send
-        recipient_id[str]: Phone number of the user with country code wihout +
-    Example:
-        >>> from whatsapp import WhatsApp
-        >>> whatsapp = WhatsApp(token, phone_number_id)
-        >>> whatsapp.send_custom_json({
-                "messaging_product": "whatsapp",
-                "type": "audio",
-                "audio": {"id": audio}}, "5511999999999")
-    """
-
-    if recipient_id:
-        if "to" in data.keys():
-            data_recipient_id = data["to"]
-            logging.info(
-                f"Recipient Id is defined in data ({data_recipient_id}) and recipient_id parameter ({recipient_id})")
-        else:
-            data["to"] = recipient_id
-
-    logging.info(f"Sending custom json to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
-    if r.status_code == 200:
-        logging.info(f"Custom json sent to {recipient_id}")
-        return r.json()
-    logging.info(f"Custom json not sent to {recipient_id}")
-    logging.info(f"Status code: {r.status_code}")
-    logging.error(f"Response: {r.json()}")
-    return r.json()
-
-
-def send_contacts(
-    self, contacts: List[Dict[Any, Any]], recipient_id: str
-) -> Dict[Any, Any]:
-    """send_contacts
-
-    Send a list of contacts to a user
-
-    Args:
-        contacts(List[Dict[Any, Any]]): List of contacts to send
-        recipient_id(str): Phone number of the user with country code wihout +
-
-    Example:
-        >>> from whatsapp import WhatsApp
-        >>> whatsapp = WhatsApp(token, phone_number_id)
-        >>> contacts = [{
-            "addresses": [{
-                "street": "STREET",
-                "city": "CITY",
-                "state": "STATE",
-                "zip": "ZIP",
-                "country": "COUNTRY",
-                "country_code": "COUNTRY_CODE",
-                "type": "HOME"
-                },
-            ....
-            }
-        ]
-
-    REFERENCE: https://developers.facebook.com/docs/whatsapp/cloud-api/reference/messages#contacts-object
-    """
-
-    data = {
-        "messaging_product": "whatsapp",
-        "to": recipient_id,
-        "type": "contacts",
-        "contacts": contacts,
-    }
-    logging.info(f"Sending contacts to {recipient_id}")
-    r = requests.post(self.url, headers=self.headers, json=data)
-    if r.status_code == 200:
-        logging.info(f"Contacts sent to {recipient_id}")
-        return r.json()
-    logging.info(f"Contacts not sent to {recipient_id}")
-    logging.info(f"Status code: {r.status_code}")
-    logging.error(f"Response: {r.json()}")
-    return r.json()
+from typing import Any, Dict, List
+import requests
+import logging
+
+
+def send_custom_json(self, data: dict, recipient_id: str = "", sender= None):
+    """
+    Sends a custom json to a WhatsApp user. This can be used to send custom objects to the message endpoint.
+
+    Args:
+        data[dict]: Dictionary that should be send
+        recipient_id[str]: Phone number of the user with country code wihout +
+    Example:
+        >>> from whatsapp import WhatsApp
+        >>> whatsapp = WhatsApp(token, phone_number_id)
+        >>> whatsapp.send_custom_json({
+                "messaging_product": "whatsapp",
+                "type": "audio",
+                "audio": {"id": audio}}, "5511999999999")
+    """
+    try:
+        sender = dict(self.l)[sender]
+        print(self.l)
+        print(sender)
+        
+        
+        print(12)
+
+    except:
+        print(22)
+        sender = self.phone_number_id
+        
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
+
+    if recipient_id:
+        if "to" in data.keys():
+            data_recipient_id = data["to"]
+            logging.info(
+                f"Recipient Id is defined in data ({data_recipient_id}) and recipient_id parameter ({recipient_id})")
+        else:
+            data["to"] = recipient_id
+
+    logging.info(f"Sending custom json to {recipient_id}")
+    r = requests.post(url, headers=self.headers, json=data)
+    if r.status_code == 200:
+        logging.info(f"Custom json sent to {recipient_id}")
+        return r.json()
+    logging.info(f"Custom json not sent to {recipient_id}")
+    logging.info(f"Status code: {r.status_code}")
+    logging.error(f"Response: {r.json()}")
+    return r.json()
+
+
+def send_contacts(
+    self, contacts: List[Dict[Any, Any]], recipient_id: str, sender=None
+) -> Dict[Any, Any]:
+    """send_contacts
+
+    Send a list of contacts to a user
+
+    Args:
+        contacts(List[Dict[Any, Any]]): List of contacts to send
+        recipient_id(str): Phone number of the user with country code wihout +
+
+    Example:
+        >>> from whatsapp import WhatsApp
+        >>> whatsapp = WhatsApp(token, phone_number_id)
+        >>> contacts = [{
+            "addresses": [{
+                "street": "STREET",
+                "city": "CITY",
+                "state": "STATE",
+                "zip": "ZIP",
+                "country": "COUNTRY",
+                "country_code": "COUNTRY_CODE",
+                "type": "HOME"
+                },
+            ....
+            }
+        ]
+
+    REFERENCE: https://developers.facebook.com/docs/whatsapp/cloud-api/reference/messages#contacts-object
+    """
+    try:
+        sender = dict(self.l)[sender]
+        print(self.l)
+        print(sender)
+        
+        
+        print(12)
+
+    except:
+        print(22)
+        sender = self.phone_number_id
+        
+    if sender == None:
+        sender = self.phone_number_id
+
+    url = f"https://graph.facebook.com/v18.0/{sender}/messages"
+
+    data = {
+        "messaging_product": "whatsapp",
+        "to": recipient_id,
+        "type": "contacts",
+        "contacts": contacts,
+    }
+    logging.info(f"Sending contacts to {recipient_id}")
+    r = requests.post(url, headers=self.headers, json=data)
+    if r.status_code == 200:
+        logging.info(f"Contacts sent to {recipient_id}")
+        return r.json()
+    logging.info(f"Contacts not sent to {recipient_id}")
+    logging.info(f"Status code: {r.status_code}")
+    logging.error(f"Response: {r.json()}")
+    return r.json()