Merge branch 'master' into master

Author: aaryanrr

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug Report
 about: Create a Report to help us Improve
 title: ''
-labels: ''
+labels: 'bug'
 assignees: ''
 
 ---
@@ -23,8 +23,8 @@ If applicable, add Screenshots to help explain your Problem
 
 - OS: [e.g. Windows 10]
 - Browser: [e.g. Microsoft Edge, Google Chrome]
-- Python: [e.g. 3.10.0]
-- PyWhatKit: [e.g. 5.2]
+- Python: [e.g. 3.10.1]
+- PyWhatKit: [e.g. 5.3]
 
 You can Check the PyWhatKit Version using
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature Request
 about: Suggest an Idea for this Project
 title: ''
-labels: ''
+labels: 'feature-request'
 assignees: ''
 
 ---

pywhatkit/core/exceptions.py

@@ -22,6 +22,14 @@ class InternetException(Exception):
     pass
 
 
+class InvalidPhoneNumber(Exception):
+    """
+    Phone number given is invalid
+    """
+
+    pass
+
+
 class UnsupportedEmailProvider(Exception):
     """
     Email provider used to send the Email is not supported

pywhatkit/whats.py

@@ -1,6 +1,7 @@
 import time
 import webbrowser as web
 from datetime import datetime
+from re import fullmatch
 from urllib.parse import quote
 
 import pyautogui as pg
@@ -24,6 +25,10 @@ def sendwhatmsg_instantly(
     if not core.check_number(number=phone_no):
         raise exceptions.CountryCodeException("Country Code Missing in Phone Number!")
 
+    phone_no = phone_no.replace(" ", "")
+    if not fullmatch(r"^\+?[0-9]{2,4}\s?[0-9]{10}$", phone_no):
+        raise exceptions.InvalidPhoneNumber("Invalid Phone Number.")
+
     web.open(f"https://web.whatsapp.com/send?phone={phone_no}&text={quote(message)}")
     time.sleep(4)
     pg.click(core.WIDTH / 2, core.HEIGHT / 2)
@@ -48,6 +53,10 @@ def sendwhatmsg(
     if not core.check_number(number=phone_no):
         raise exceptions.CountryCodeException("Country Code Missing in Phone Number!")
 
+    phone_no = phone_no.replace(" ", "")
+    if not fullmatch(r"^\+?[0-9]{2,4}[0-9]{10}$", phone_no):
+        raise exceptions.InvalidPhoneNumber("Invalid Phone Number.")
+
     if time_hour not in range(25) or time_min not in range(60):
         raise Warning("Invalid Time Format!")
 
@@ -133,6 +142,8 @@ def sendwhatmsg_to_group_instantly(
 def sendwhats_image(
     receiver: str,
     img_path: str,
+    time_hour: int,
+    time_min: int,
     caption: str = "",
     wait_time: int = 15,
     tab_close: bool = False,
@@ -144,6 +155,23 @@ def sendwhats_image(
         raise exceptions.CountryCodeException("Country Code Missing in Phone Number!")
 
     current_time = time.localtime()
+    left_time = datetime.strptime(
+        f"{time_hour}:{time_min}:0", "%H:%M:%S"
+    ) - datetime.strptime(
+        f"{current_time.tm_hour}:{current_time.tm_min}:{current_time.tm_sec}",
+        "%H:%M:%S",
+    )
+
+    if left_time.seconds < wait_time:
+        raise exceptions.CallTimeException(
+            "Call Time must be Greater than Wait Time as WhatsApp Web takes some Time to Load!"
+        )
+
+    sleep_time = left_time.seconds - wait_time
+    print(
+        f"In {sleep_time} Seconds WhatsApp will open and after {wait_time} Seconds Image will be Delivered!"
+    )
+    time.sleep(sleep_time)
     core.send_image(
         path=img_path, caption=caption, receiver=receiver, wait_time=wait_time
     )