Success webhook abstraction (#1)

* success webhook abstraction * more flexibility in formatting of field names in webhooks --------- Co-authored-by: Josh Smith <[email protected]>
osuAkatsuki · Dec 18, 2023 · 1d2823f · 1d2823f
1 parent cb2179d
commit 1d2823f
Showing 1 changed file with 27 additions and 25 deletions.
diff --git a/app/api/webhooks/paypal.py b/app/api/webhooks/paypal.py
@@ -98,6 +98,20 @@ def schedule_failure_webhook(fields: dict[str, Any]) -> None:
     asyncio.create_task(send_discord_webhook(webhook))
 
 
+def schedule_success_webhook(fields: dict[str, Any]) -> None:
+    webhook = AsyncDiscordWebhook(
+        url=settings.DISCORD_WEBHOOK_URL,
+        embeds=[
+            DiscordEmbed(
+                title="Successfully granted donation perks to user",
+                fields=[{"name": k, "value": str(v)} for k, v in fields.items()],
+                color=0x00FF00,
+            ),
+        ],
+    )
+    asyncio.create_task(send_discord_webhook(webhook))
+
+
 @router.post("/webhooks/paypal_ipn")
 async def process_notification(
     request: Request,
@@ -384,33 +398,21 @@ async def process_notification(
             "request_id": x_request_id,
         },
     )
-
-    fields: list[dict[str, Any]] = [
-        {"name": "User ID", "value": f"{user_id}"},
-        {"name": "Username", "value": username},
-        {"name": "Donation Tier", "value": donation_tier},
-        {"name": "Donation Months", "value": f"{donation_months}"},
-        {"name": "Donation Amount", "value": f"{donation_amount:.2f}"},
-        {"name": "Donation Currency", "value": donation_currency},
-        {"name": "New Privileges", "value": f"{privileges}"},
-        {
-            "name": "New Donor Expire",
-            "value": datetime.fromtimestamp(donor_expire).isoformat(),
+    schedule_success_webhook(
+        fields={
+            "User ID": user_id,
+            "Username": username,
+            "Donation Tier": donation_tier,
+            "Donation Months": donation_months,
+            "Donation Amount": round(donation_amount, 2),
+            "Donation Currency": donation_currency,
+            "New Privileges": privileges,
+            "New Donor Expire": datetime.fromtimestamp(donor_expire),
+            "New User Badges": user_badge_ids,
+            "Transaction ID": transaction_id,
+            "Request ID": x_request_id,
         },
-        {"name": "New User Badges", "value": f"{user_badge_ids}"},
-        {"name": "Transaction ID", "value": transaction_id},
-    ]
-    webhook = AsyncDiscordWebhook(
-        url=settings.DISCORD_WEBHOOK_URL,
-        content="** **",
-        embeds=[
-            DiscordEmbed(
-                title="Granting donation perks to user",
-                fields=[f | {"inline": True} for f in fields],
-            ),
-        ],
     )
-    await webhook.execute()
 
     # make writes to the database
     if settings.SHOULD_WRITE_TO_USERS_DB: