Update notifier.py

notifier.py

@@ -8,43 +8,66 @@ from email.mime.multipart import MIMEMultipart
 EMAIL_USER = os.getenv("EMAIL_USER")
 EMAIL_PASS = os.getenv("EMAIL_PASS")
 
-def get_user_ip():
-    try:
-        return requests.get("https://api.ipify.org", timeout=2).text
-    except requests.RequestException:
-        return "Unavailable"
+# def get_user_ip():
+#     try:
+#         return requests.get("https://api.ipify.org", timeout=2).text
+#     except requests.RequestException:
+#         return "Unavailable"
+
+# def get_geo_from_ip(ip):
+#     try:
+#         response = requests.get(f"http://ip-api.com/json/{ip}", timeout=5)
+#         data = response.json()
+#         if data["status"] == "success":
+#             return {
+#                 "city": data.get("city", "Unknown"),
+#                 "region": data.get("regionName", "Unknown"),
+#                 "country": data.get("country", "Unknown"),
+#                 "error": ""
+#             }
+#         else:
+#             return {"error": "Lookup failed"}
+#     except Exception as e:
+#         return {"error": str(e)}
+
+# def send_email_notification(user_message):
+#     if not EMAIL_USER or not EMAIL_PASS:
+#         print("[Notifier] Missing EMAIL_USER or EMAIL_PASS.")
+#         return
+
+#     ip_address = get_user_ip()
+#     location = get_geo_from_ip(ip_address)
+
+#     if location["error"]:
+#         location_info = f"IP: {ip_address} (location lookup failed)"
+#     else:
+#         location_info = f"{location['city']}, {location['region']}, {location['country']} (IP: {ip_address})"
+
+#     subject = "RezAI Used"
+#     body = f"A new user interacted with RezAi.\n\nLocation: {location_info}\nMessage: {user_message}"
+
+#     msg = MIMEMultipart()
+#     msg["From"] = EMAIL_USER
+#     msg["To"] = EMAIL_USER
+#     msg["Subject"] = subject
+#     msg.attach(MIMEText(body, "plain"))
+
+#     try:
+#         with smtplib.SMTP("smtp.gmail.com", 587) as server:
+#             server.starttls()
+#             server.login(EMAIL_USER, EMAIL_PASS)
+#             server.sendmail(EMAIL_USER, EMAIL_USER, msg.as_string())
+#     except Exception as e:
+#         print(f"[Notifier] Email sending error: {e}")
 
-def get_geo_from_ip(ip):
-    try:
-        response = requests.get(f"http://ip-api.com/json/{ip}", timeout=5)
-        data = response.json()
-        if data["status"] == "success":
-            return {
-                "city": data.get("city", "Unknown"),
-                "region": data.get("regionName", "Unknown"),
-                "country": data.get("country", "Unknown"),
-                "error": ""
-            }
-        else:
-            return {"error": "Lookup failed"}
-    except Exception as e:
-        return {"error": str(e)}
 
 def send_email_notification(user_message):
     if not EMAIL_USER or not EMAIL_PASS:
-        print("[Notifier] Missing EMAIL_USER or EMAIL_PASS.")
+        print("[Notifier] Missing email credentials.")
         return
 
-    ip_address = get_user_ip()
-    location = get_geo_from_ip(ip_address)
-
-    if location["error"]:
-        location_info = f"IP: {ip_address} (location lookup failed)"
-    else:
-        location_info = f"{location['city']}, {location['region']}, {location['country']} (IP: {ip_address})"
-
-    subject = "RezAI Used"
-    body = f"A new user interacted with RezAi.\n\nLocation: {location_info}\nMessage: {user_message}"
+    subject = "RezAi Interaction"
+    body = f"Someone just sent a message to RezAi:\n\n{user_message}"
 
     msg = MIMEMultipart()
     msg["From"] = EMAIL_USER
@@ -59,4 +82,3 @@ def send_email_notification(user_message):
             server.sendmail(EMAIL_USER, EMAIL_USER, msg.as_string())
     except Exception as e:
         print(f"[Notifier] Email sending error: {e}")
-