fixed email verification

app.py

@@ -10,8 +10,8 @@ import pickle
 import base64
 
 from google.auth.transport.requests import Request
-from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import build
+from google.oauth2.credentials import Credentials
 
 from email.mime.text import MIMEText
 from datetime import datetime, date
@@ -39,13 +39,12 @@ def get_db():
     return psycopg2.connect(DB_URL, sslmode="require")
 
 
-# ================= GMAIL AUTH =================
+# ================= GMAIL =================
 
 def get_gmail_service():
 
     creds = None
 
-    # Load token
     if os.path.exists(TOKEN_FILE):
         try:
             with open(TOKEN_FILE, "rb") as f:
@@ -53,7 +52,6 @@ def get_gmail_service():
         except:
             creds = None
 
-    # Refresh token
     if creds and creds.expired and creds.refresh_token:
         try:
             creds.refresh(Request())
@@ -61,54 +59,48 @@ def get_gmail_service():
             with open(TOKEN_FILE, "wb") as f:
                 pickle.dump(creds, f)
 
-        except Exception as e:
-            print("❌ Token refresh failed:", e)
+        except:
             creds = None
 
     if not creds:
-        raise Exception(
-            "❌ Missing token.pkl. Generate locally and upload to HF."
-        )
+        raise Exception("❌ token.pkl missing. Upload valid token.")
 
     return build("gmail", "v1", credentials=creds)
 
 
-# ================= EMAIL =================
-
 def send_email(to, subject, html):
 
     try:
         service = get_gmail_service()
 
-        message = MIMEText(html, "html")
-        message["To"] = to
-        message["From"] = GMAIL_USER
-        message["Subject"] = subject
+        msg = MIMEText(html, "html")
+        msg["To"] = to
+        msg["From"] = GMAIL_USER
+        msg["Subject"] = subject
 
         raw = base64.urlsafe_b64encode(
-            message.as_bytes()
+            msg.as_bytes()
         ).decode()
 
         body = {"raw": raw}
 
-        result = service.users().messages().send(
+        service.users().messages().send(
             userId="me",
             body=body
         ).execute()
 
-        print("✅ Gmail sent:", to, "| ID:", result.get("id"))
-
+        print("✅ Sent:", to)
         return True
 
     except Exception as e:
-        print("❌ Gmail send failed:", e)
+        print("❌ Gmail error:", e)
         return False
 
 
 # ================= VALIDATION =================
 
 EMAIL_REGEX = re.compile(
-    r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"
+    r"^[\w\.-]+@[\w\.-]+\.\w+$"
 )
 
 
@@ -126,7 +118,6 @@ def valid_leetcode(username):
             f"{LEETCODE_API}/{username}",
             timeout=8
         )
-
         return r.status_code == 200
 
     except:
@@ -140,15 +131,15 @@ def get_daily_problem():
     r = requests.get(f"{LEETCODE_API}/daily", timeout=10)
     r.raise_for_status()
 
-    data = r.json()
+    d = r.json()
 
-    if "questionTitle" in data:
-        return data["questionTitle"], data["titleSlug"]
+    if "questionTitle" in d:
+        return d["questionTitle"], d["titleSlug"]
 
-    if "title" in data:
-        return data["title"], data["titleSlug"]
+    if "title" in d:
+        return d["title"], d["titleSlug"]
 
-    raise ValueError("Invalid daily API format")
+    raise Exception("Daily API invalid")
 
 
 def solved_today(username, slug):
@@ -156,29 +147,26 @@ def solved_today(username, slug):
     try:
         r = requests.get(
             f"{LEETCODE_API}/{username}/acSubmission?limit=20",
-            timeout=10,
+            timeout=10
         )
 
         if r.status_code != 200:
             return False
 
-        data = r.json()
-
-        if isinstance(data, dict) and "submission" in data:
-            submissions = data["submission"]
-
-        elif isinstance(data, dict) and "data" in data:
-            submissions = data["data"]
-
-        elif isinstance(data, list):
-            submissions = data
+        d = r.json()
 
+        if "submission" in d:
+            subs = d["submission"]
+        elif "data" in d:
+            subs = d["data"]
+        elif isinstance(d, list):
+            subs = d
         else:
             return False
 
         today = date.today()
 
-        for s in submissions:
+        for s in subs:
 
             if not isinstance(s, dict):
                 continue
@@ -191,18 +179,17 @@ def solved_today(username, slug):
             if not ts:
                 continue
 
-            solved_date = datetime.fromtimestamp(
+            solved = datetime.fromtimestamp(
                 int(ts),
                 tz=pytz.utc
             ).date()
 
-            if solved_date == today:
+            if solved == today:
                 return True
 
         return False
 
-    except Exception as e:
-        print("⚠️ solved_today error:", e)
+    except:
         return False
 
 
@@ -214,30 +201,28 @@ def subscribe(username, email, timezone):
         return "❌ Invalid LeetCode username"
 
     if not valid_email(email):
-        return "❌ Invalid email format"
+        return "❌ Invalid email"
 
     conn = get_db()
     cur = conn.cursor()
 
     cur.execute("""
         SELECT email_verified, verification_token, unsubscribed
-        FROM users
-        WHERE email = %s
+        FROM users WHERE email=%s
     """, (email,))
 
     row = cur.fetchone()
 
+    # Existing
     if row:
 
         verified, token, unsub = row
 
-        # Active
         if verified and not unsub:
             cur.close()
             conn.close()
             return "⚠️ Already subscribed"
 
-        # Resubscribe
         if verified and unsub:
 
             cur.execute("""
@@ -254,14 +239,14 @@ def subscribe(username, email, timezone):
             cur.close()
             conn.close()
 
-            return "✅ Re-subscribed successfully!"
+            return "✅ Re-subscribed"
 
-        # Resend verify
+        # resend verify
         link = f"{HF_URL}?verify={token}"
 
         send_email(
             email,
-            "Verify your subscription",
+            "Verify Subscription",
             f"<a href='{link}'>Verify</a>"
         )
 
@@ -270,19 +255,15 @@ def subscribe(username, email, timezone):
 
         return "📩 Verification re-sent"
 
-    # New user
+    # New
     token = uuid.uuid4().hex
 
     cur.execute("""
-        INSERT INTO users (
-            leetcode_username,
-            email,
-            timezone,
-            email_verified,
-            verification_token,
-            unsubscribed
+        INSERT INTO users(
+            leetcode_username,email,timezone,
+            email_verified,verification_token,unsubscribed
         )
-        VALUES (%s,%s,%s,false,%s,false)
+        VALUES(%s,%s,%s,false,%s,false)
     """, (username, email, timezone, token))
 
     conn.commit()
@@ -293,7 +274,7 @@ def subscribe(username, email, timezone):
 
     send_email(
         email,
-        "Verify your subscription",
+        "Verify Subscription",
         f"<a href='{link}'>Verify</a>"
     )
 
@@ -314,13 +295,13 @@ def verify_user(token):
         AND email_verified=false
     """, (token,))
 
-    updated = cur.rowcount
+    ok = cur.rowcount
 
     conn.commit()
     cur.close()
     conn.close()
 
-    if updated == 0:
+    if ok == 0:
         return "❌ Invalid link"
 
     return "✅ Email verified"
@@ -339,18 +320,38 @@ def unsubscribe_user(token):
         WHERE verification_token=%s
     """, (token,))
 
-    updated = cur.rowcount
+    ok = cur.rowcount
 
     conn.commit()
     cur.close()
     conn.close()
 
-    if updated == 0:
+    if ok == 0:
         return "❌ Invalid link"
 
     return "✅ Unsubscribed"
 
 
+# ================= URL HANDLER =================
+
+def handle_url(request: gr.Request):
+
+    try:
+        params = request.query_params
+
+        if "verify" in params:
+            return verify_user(params["verify"])
+
+        if "unsubscribe" in params:
+            return unsubscribe_user(params["unsubscribe"])
+
+        return ""
+
+    except Exception as e:
+        print("URL error:", e)
+        return ""
+
+
 # ================= SCHEDULER =================
 
 def run_scheduler(secret):
@@ -362,9 +363,8 @@ def run_scheduler(secret):
     cur = conn.cursor()
 
     cur.execute("""
-        SELECT id, leetcode_username, email, timezone,
-               last_sent_date, last_sent_slot,
-               verification_token
+        SELECT id,leetcode_username,email,timezone,
+               last_sent_date,last_sent_slot,verification_token
         FROM users
         WHERE email_verified=true
         AND unsubscribed=false
@@ -381,22 +381,16 @@ def run_scheduler(secret):
     for uid, user, mail, tz, last_d, last_s, token in users:
 
         local = now.astimezone(pytz.timezone(tz))
-        hour = local.hour
+        h = local.hour
 
-        if hour == 9:
-            slot = "morning"
-            sub = "Today's LeetCode"
-            body = f"<b>{title}</b>"
+        if 8 <= h <= 9:
+            slot="morning"; sub="Today's LeetCode"; body=f"<b>{title}</b>"
 
-        elif hour == 15:
-            slot = "afternoon"
-            sub = "Reminder"
-            body = f"Solve <b>{title}</b>"
+        elif 14 <= h <= 15:
+            slot="afternoon"; sub="Reminder"; body=f"Solve <b>{title}</b>"
 
-        elif hour == 20:
-            slot = "night"
-            sub = "Final Reminder"
-            body = f"Last chance: <b>{title}</b>"
+        elif 19 <= h <= 20:
+            slot="night"; sub="Final Reminder"; body=f"Last chance <b>{title}</b>"
 
         else:
             continue
@@ -418,7 +412,6 @@ def run_scheduler(secret):
         )
 
         if not ok:
-            print("❌ Failed:", mail)
             continue
 
         cur.execute("""
@@ -443,13 +436,13 @@ with gr.Blocks(title="LeetCode Notifier") as app:
 
     gr.Markdown("## 📬 LeetCode Daily Email Notifier")
 
-    user = gr.Textbox(label="Username")
-    mail = gr.Textbox(label="Email")
+    u = gr.Textbox(label="Username")
+    m = gr.Textbox(label="Email")
     tz = gr.Dropdown(pytz.all_timezones, value="Asia/Kolkata")
 
-    out = gr.Textbox()
+    out = gr.Textbox(label="Status")
 
-    gr.Button("Subscribe").click(subscribe, [user, mail, tz], out)
+    gr.Button("Subscribe").click(subscribe, [u, m, tz], out)
 
     gr.Markdown("### 🔒 Scheduler")
 
@@ -457,6 +450,9 @@ with gr.Blocks(title="LeetCode Notifier") as app:
 
     gr.Button("Run").click(run_scheduler, sec, out)
 
+    # ✅ URL handler
+    app.load(handle_url, outputs=out)
+
 
 if __name__ == "__main__":
-        app.launch(debug=True)
+    app.launch(debug=True)