Update get_email_webhook.py

Author: sudosha

get_email_webhook.py

@@ -95,56 +95,17 @@ def format_repo_event(repo, action):
     updated_at = convert_to_utc4(repo.get("updated_at"))
     url = repo.get("html_url", "")
 
-    # Special cases for visibility changes
-    if action == "publicized":
-        subject = f"[GitHub Alert] Repository changed from PRIVATE → PUBLIC: {repo_name}"
-        body = (
-            f"The repository visibility has been changed.\n\n"
-            f"➡️ Now PUBLIC\n\n"
-            f"📌 Repository Name: {repo_name}\n"
-            f"{visibility_icon}\n"
-            f"👤 Owner: {owner}\n"
-            f"🌿 Default branch: {default_branch}\n"
-            f"🕒 Created at: {created_at}\n"
-            f"🕒 Last updated: {updated_at}\n"
-            f"🌍 URL: {url}\n"
-        )
-    elif action == "privatized":
-        subject = f"[GitHub Alert] Repository changed from PUBLIC → PRIVATE: {repo_name}"
-        body = (
-            f"The repository visibility has been changed.\n\n"
-            f"➡️ Now PRIVATE\n\n"
-            f"📌 Repository Name: {repo_name}\n"
-            f" Visibility: {visibility_icon}\n"
-            f"👤 Owner: {owner}\n"
-            f"🌿 Default branch: {default_branch}\n"
-            f"🕒 Created at: {created_at}\n"
-            f"🕒 Last updated: {updated_at}\n"
-            f"🌍 URL: {url}\n"
-        )
-    else:
-        # Generic events
-        action_labels = {
-            "created": "Repository created",
-            "deleted": "Repository deleted",
-            "archived": "Repository archived",
-            "unarchived": "Repository unarchived",
-            "edited": "Repository edited",
-            "renamed": "Repository renamed",
-            "transferred": "Repository transferred"
-        }
-        subject = f"[GitHub Alert] {action_labels.get(action, action)}: {repo_name}"
-        body = (
-            f"A repository event occurred: {action_labels.get(action, action)}\n\n"
-            f"📌 Repository Name: {repo_name}\n"
-            f"{visibility_icon}\n"
-            f"👤 Owner: {owner}\n"
-            f"🌿 Default branch: {default_branch}\n"
-            f"🕒 Created at: {created_at}\n"
-            f"🕒 Last updated: {updated_at}\n"
-            f"🌍 URL: {url}\n"
-        )
-
+    subject = f"[GitHub Alert] Repository {action}: {repo_name}"
+    body = (
+        f"A repository was {action} in your GitHub organization.\n\n"
+        f"📌 Repository Name: {repo_name}\n"
+        f"{visibility_icon}\n"
+        f"👤 Owner: {owner}\n"
+        f"🌿 Default branch: {default_branch}\n"
+        f"🕒 Created at: {created_at}\n"
+        f"🕒 Last updated: {updated_at}\n"
+        f"🌍 URL: {url}\n"
+    )
     return subject, body
 
 # --- GitHub Webhook + Health Handlers ---
@@ -170,19 +131,13 @@ def github_webhook():
             return "❌ Bad payload", 400
 
         event = request.headers.get("X-GitHub-Event", "")
-        action = data.get("action")
-
-        repo_actions = [
-            "created", "deleted", "archived", "unarchived",
-            "publicized", "privatized", "edited", "renamed", "transferred"
-        ]
 
-        if event == "repository" and action in repo_actions:
-            subject, body = format_repo_event(data["repository"], action)
+        if event == "repository" and data.get("action") in ["created", "deleted"]:
+            subject, body = format_repo_event(data["repository"], data["action"])
             print(f"📩 Sending email alert: {subject}")
             send_email_via_graph(subject, body)
         else:
-            print(f"ℹ️ Ignored event: {event}, action: {action}")
+            print(f"ℹ️ Ignored event: {event}, action: {data.get('action')}")
 
         return "OK", 200
 
@@ -195,17 +150,16 @@ def health_check():
     if TEST_MODE:
         print("🔹 TEST_MODE: sending test email")
         test_repo = {
-            "full_name": "quantori/test-repo",
-            "private": False,
+            "full_name": "quantori/sadsrepo",
+            "private": True,
             "owner": {"login": "quantori"},
             "default_branch": "main",
             "created_at": "2025-09-09T13:06:02Z",
             "updated_at": "2025-09-09T13:09:20Z",
-            "html_url": "https://github.com/quantori/test-repo"
+            "html_url": "https://github.com/quantori/sadsrepo"
         }
-        subject, body = format_repo_event(test_repo, "publicized")
+        subject, body = format_repo_event(test_repo, "created")
         send_email_via_graph(subject, body)
     else:
         print("✅ Flask is up and listening on /webhook and /health")
-        port = int(os.environ.get("PORT", 8000))
-        app.run(host="0.0.0.0", port=port)
+        app.run(host="0.0.0.0", port=8000)