Update main.py

main.py

@@ -6,18 +6,6 @@ from datetime import datetime
 from dotenv import load_dotenv
 import threading
 from http.server import BaseHTTPRequestHandler, HTTPServer
-import socket
-
-# --- Hugging Face DNS Workaround ---
-# Hugging Face Spaces often fail to resolve 'api.telegram.org' via DNS. 
-# We monkey-patch socket.getaddrinfo to force it to use Telegram's known IP.
-_old_getaddrinfo = socket.getaddrinfo
-def _new_getaddrinfo(host, port, family=0, type=0, proto=0, flags=0):
-    if host.lower() == 'api.telegram.org':
-        return [(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, '', ('149.154.167.220', port))]
-    return _old_getaddrinfo(host, port, family, type, proto, flags)
-socket.getaddrinfo = _new_getaddrinfo
-# -----------------------------------
 
 # Load optional .env if present in same directory
 load_dotenv()
@@ -28,9 +16,13 @@ load_dotenv()
 # Environment values (Make sure to populate your .env file)
 # We will reload these inside the loop so you can change them on the fly.
 
-# Telegram settings (Optional, loaded from .env or hardcoded here)
-TELEGRAM_BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN", "")
-TELEGRAM_CHAT_ID = os.getenv("TELEGRAM_CHAT_ID", "")
+# Email settings (Loaded from .env)
+# The email you are sending FROM and TO (can be the same)
+EMAIL_ADDRESS = os.getenv("EMAIL_ADDRESS", "")
+# Gmail App Password (NOT your regular password)
+EMAIL_PASSWORD = os.getenv("EMAIL_PASSWORD", "")
+# Notification recipient
+EMAIL_RECIPIENT = os.getenv("EMAIL_RECIPIENT", EMAIL_ADDRESS)
 
 # App check interval in seconds (default 60 secs = 1 min)
 CHECK_INTERVAL_SECONDS = 60 
@@ -50,9 +42,15 @@ EXPIRED_BIP = None
 
 
 # ==============================================================================
-# TELEGRAM NOTIFIER
+# EMAIL NOTIFIER
 # ==============================================================================
-TELEGRAM_OFFSET = None
+import smtplib
+from email.mime.text import MIMEText
+from email.mime.multipart import MIMEMultipart
+import imaplib
+import email
+
+LAST_SEEN_EMAIL_UID = None
 
 def update_env_file(new_xsrf, new_bip):
     env_path = ".env"
@@ -82,31 +80,40 @@ def update_env_file(new_xsrf, new_bip):
         if new_bip is not None and not bip_updated:
             f.write(f'BIP_SESSION="{new_bip}"\n')
 
-def check_telegram_messages():
-    global TELEGRAM_OFFSET, SESSION_EXPIRED, EXPIRED_XSRF, EXPIRED_BIP
-    if not TELEGRAM_BOT_TOKEN: return False
+def check_email_for_cookies():
+    global LAST_SEEN_EMAIL_UID, SESSION_EXPIRED, EXPIRED_XSRF, EXPIRED_BIP
+    if not EMAIL_ADDRESS or not EMAIL_PASSWORD: return False
     
-    url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/getUpdates"
-    params = {"timeout": 5}
-    if TELEGRAM_OFFSET:
-        params["offset"] = TELEGRAM_OFFSET
-        
     try:
-        r = requests.get(url, params=params, timeout=10)
-        data = r.json()
-        cookies_updated = False
-        if data.get("ok"):
-            for result in data.get("result", []):
-                TELEGRAM_OFFSET = result["update_id"] + 1
-                msg = result.get("message", {})
-                text = msg.get("text", "").strip()
-                chat_id = msg.get("chat", {}).get("id")
-                
-                # Only process messages from our authorized user
-                if str(chat_id) == str(TELEGRAM_CHAT_ID):
+        # Connect to Gmail IMAP
+        mail = imaplib.IMAP4_SSL('imap.gmail.com')
+        mail.login(EMAIL_ADDRESS, EMAIL_PASSWORD)
+        mail.select('inbox')
+        
+        # Search for unread emails with our specific subject
+        status, messages = mail.search(None, '(UNSEEN SUBJECT "BIP_COOKIES")')
+        if status != 'OK': return False
+        
+        cookie_updated = False
+        message_ids = messages[0].split()
+        
+        for msg_id in message_ids:
+            status, msg_data = mail.fetch(msg_id, '(RFC822)')
+            for response_part in msg_data:
+                if isinstance(response_part, tuple):
+                    msg = email.message_from_bytes(response_part[1])
+                    if msg.is_multipart():
+                        for part in msg.walk():
+                            if part.get_content_type() == "text/plain":
+                                text = part.get_payload(decode=True).decode()
+                                break
+                    else:
+                        text = msg.get_payload(decode=True).decode()
+                        
+                    # Process text
                     new_xsrf = None
                     new_bip = None
-                    for line in text.replace("\r", "\n").split("\n"):
+                    for line in text.split("\n"):
                         line = line.strip()
                         if line.startswith("XSRF_TOKEN=") or line.startswith("XSRF-TOKEN="):
                             parts = line.split("=", 1)
@@ -116,45 +123,51 @@ def check_telegram_messages():
                             parts = line.split("=", 1)
                             if len(parts) > 1:
                                 new_bip = parts[1].strip(' "\'')
-                            
+                                
                     if new_xsrf or new_bip:
                         update_env_file(new_xsrf, new_bip)
-                        send_telegram_message("✅ <b>Cookies Received!</b>\n\nI have updated the <code>.env</code> file and will now resume checking the BIP portal.")
+                        send_email_message("Cookies Received", "✅ Cookies Received!\n\nI have updated the .env file and will now resume checking the BIP portal.")
                         SESSION_EXPIRED = False
                         EXPIRED_XSRF = None
                         EXPIRED_BIP = None
-                        cookies_updated = True
-                        print(f"[{datetime.now().strftime('%I:%M:%S %p')}] 🔄 Cookies received via Telegram! Resuming checks...")
-        return cookies_updated
+                        cookie_updated = True
+                        print(f"[{datetime.now().strftime('%I:%M:%S %p')}] 🔄 Cookies received via Email! Resuming checks...")
+        return cookie_updated
     except Exception as e:
-        print(f"[DEBUG] Network/Request EXCEPTION in check_telegram_messages: {type(e).__name__} - {e}")
+        print(f"[DEBUG] IMAP EXCEPTION: {e}")
         return False
-
-def send_telegram_message(text: str):
-    print(f"\n[DEBUG] --> send_telegram_message called")
-    if not TELEGRAM_BOT_TOKEN or not TELEGRAM_CHAT_ID:
-        print("\n[!] Telegram not configured. The following alert would have been sent:\n")
-        print(text)
+        
+def send_email_message(subject: str, body: str, is_html=False):
+    print(f"\n[DEBUG] --> send_email_message called")
+    if not EMAIL_ADDRESS or not EMAIL_PASSWORD or not EMAIL_RECIPIENT:
+        print("\n[!] Email credentials not configured. The following alert would have been sent:\n")
+        print(f"Subject: {subject}")
+        print(body)
         print("-" * 50)
         return False
         
-    url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendMessage"
-    payload = {
-        "chat_id": TELEGRAM_CHAT_ID,
-        "text": text,
-        "parse_mode": "HTML",
-        "disable_web_page_preview": True
-    }
-    
     try:
-        print(f"[DEBUG] Sending alert to Telegram API...")
-        r = requests.post(url, json=payload, timeout=10)
-        print(f"[DEBUG] Telegram responded with HTTP {r.status_code}")
-        r.raise_for_status()
+        msg = MIMEMultipart()
+        msg['From'] = EMAIL_ADDRESS
+        msg['To'] = EMAIL_RECIPIENT
+        msg['Subject'] = subject
+        
+        if is_html:
+            msg.attach(MIMEText(body, 'html'))
+        else:
+            msg.attach(MIMEText(body, 'plain'))
+            
+        server = smtplib.SMTP('smtp.gmail.com', 587)
+        server.starttls()
+        server.login(EMAIL_ADDRESS, EMAIL_PASSWORD)
+        text = msg.as_string()
+        server.sendmail(EMAIL_ADDRESS, EMAIL_RECIPIENT, text)
+        server.quit()
+        print(f"[DEBUG] Email sent successfully.")
         return True
     except Exception as e:
-        print(f"[DEBUG] Network/Request EXCEPTION in send_telegram_message: {type(e).__name__} - {e}")
-        print(f"[!] Failed to send telegram message: {e}")
+        print(f"[DEBUG] Network/SMTP EXCEPTION: {e}")
+        print(f"[!] Failed to send email: {e}")
         return False
 
 def send_event_alerts(events):
@@ -176,17 +189,17 @@ def send_event_alerts(events):
 
         msg += (
             f"<b>{ev.get('event_code', '-')} - "
-            f"{ev.get('event_name', 'Unknown')}</b>\n\n"
-            f"{ev.get('event_category', '-')}\n\n"
-            f"{start} to {end}\n\n"
-            f"{ev.get('location', '-')}\n\n"
-            f"{ev.get('status', '-')}\n\n"
+            f"{ev.get('event_name', 'Unknown')}</b><br><br>"
+            f"{ev.get('event_category', '-')}<br><br>"
+            f"{start} to {end}<br><br>"
+            f"{ev.get('location', '-')}<br><br>"
+            f"{ev.get('status', '-')}<br><br>"
             f"Seats: Max {ev.get('maximum_count', '-')} | "
-            f"Applied {ev.get('applied_count', '-')}\n"
-            f"<a href='{ev.get('web_url', '#')}'>View Event Here</a>\n"
-            f"────────────────\n"
+            f"Applied {ev.get('applied_count', '-')}<br>"
+            f"<a href='{ev.get('web_url', '#')}'>View Event Here</a><br>"
+            f"<hr>"
         )
-    send_telegram_message(msg)
+    send_email_message("📢 New BIP Event(s) Found!", msg, is_html=True)
 
 
 # ==============================================================================
@@ -292,12 +305,14 @@ def process_tick():
     
     if err:
         print(f"{time_str.lower()}  - ❌ Error scraping events: {err}")
-        send_telegram_message(
-            "⚠️ <b>Scraper Error!</b>\n\n"
-            f"The notifier encountered an error and has paused checking. Error:\n"
-            f"<code>{err}</code>\n\n"
-            "Please reply directly to this bot with your new cookies in this format to resume:\n\n"
-            "<code>XSRF_TOKEN=your_new_token_here\nBIP_SESSION=your_new_session_here</code>"
+        send_email_message(
+            "⚠️ BIP Scraper Error",
+            "⚠️ <b>Scraper Error!</b><br><br>"
+            f"The notifier encountered an error and has paused checking. Error:<br>"
+            f"<code>{err}</code><br><br>"
+            "Please send an email to this address with the subject <b>BIP_COOKIES</b> and your new cookies in the body like this:<br><br>"
+            "<code>XSRF_TOKEN=your_new_token_here<br>BIP_SESSION=your_new_session_here</code>",
+            is_html=True
         )
         SESSION_EXPIRED = True
         EXPIRED_XSRF = xsrf
@@ -376,10 +391,10 @@ def get_latest_event():
     print(f"Link:     {ev.get('web_url')}")
     print("-" * 60)
 
-def test_telegram_alert():
-    """Sends a dummy test message to the configured Telegram chat."""
-    print("Sending test exact alert to Telegram...")
-    success = send_telegram_message("🤖 <b>Test Alert from BIP CLI Notifier</b>\n\nYour Telegram integration is working perfectly!")
+def test_email_alert():
+    """Sends a dummy test message to the configured Email."""
+    print("Sending test exact alert to Email...")
+    success = send_email_message("🤖 Test Alert", "🤖 <b>Test Alert from BIP CLI Notifier</b><br><br>Your Email integration is working perfectly!", is_html=True)
     if success:
         print("✅ Test message sent successfully!")
     else:
@@ -399,7 +414,7 @@ def start_loop():
             target_time = time.time() + CHECK_INTERVAL_SECONDS
             
             while time.time() < target_time:
-                cookies_updated = check_telegram_messages()
+                cookies_updated = check_email_for_cookies()
                 if cookies_updated:
                     # User sent new cookies, immediately break to run process_tick right now!
                     break
@@ -436,7 +451,7 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="BIP Cloud Notifier CLI")
     parser.add_argument("--list-all", action="store_true", help="List all recent events and exit")
     parser.add_argument("--latest", action="store_true", help="Print details of the latest event and exit")
-    parser.add_argument("--test-alert", action="store_true", help="Send a test message to Telegram and exit")
+    parser.add_argument("--test-alert", action="store_true", help="Send a test message to Email and exit")
     parser.add_argument("--run", action="store_true", help="Start the continuous 1-minute monitoring loop")
     print("Parsed arguments:", parser.parse_args())
     args = parser.parse_args()
@@ -446,7 +461,7 @@ if __name__ == "__main__":
     elif args.latest:
         get_latest_event()
     elif args.test_alert:
-        test_telegram_alert()
+        test_email_alert()
     elif args.run:
         threading.Thread(target=run_dummy_server, daemon=True).start()
         start_loop()