From e7015e8549c372c9ab52dc1f7c26e7b7c7aab1d3 Mon Sep 17 00:00:00 2001 From: Regalijan Date: Mon, 24 Mar 2025 14:18:27 -0400 Subject: [PATCH] Include type of event in event email templates --- functions/api/events-team/events/[id]/decision.ts | 13 ++++++++----- functions/api/events-team/events/new.ts | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/functions/api/events-team/events/[id]/decision.ts b/functions/api/events-team/events/[id]/decision.ts index 6670463..555ef4b 100644 --- a/functions/api/events-team/events/[id]/decision.ts +++ b/functions/api/events-team/events/[id]/decision.ts @@ -14,22 +14,25 @@ export async function onRequestPost(context: RequestContext) { if (!updatedEvent) return jsonError("This event does not exist", 404); - const email = await context.env.DATA.get( - `eventemail_${context.data.event.id}`, - ); + const emailData: { email: string; type: string } | null = + await context.env.DATA.get(`eventemail_${context.data.event.id}`, { + type: "json", + }); + const usernameData: Record | null = await context.env.D1.prepare("SELECT name FROM et_members WHERE id = ?;") .bind(updatedEvent.created_by) .first(); - if (email && usernameData) { + if (emailData && usernameData) { await sendEmail( - email, + emailData.email, context.env.MAILGUN_API_KEY, `Event ${context.data.body.approved ? "Approved" : "Rejected"}`, `event_${context.data.body.approved ? "approved" : "rejected"}`, { date: `${updatedEvent.year}-${updatedEvent.month.toString().padStart(2, "0")}-${updatedEvent.day.toString().padStart(2, "0")}`, + event: emailData.type, username: usernameData.name, }, ); diff --git a/functions/api/events-team/events/new.ts b/functions/api/events-team/events/new.ts index 2c7ff2d..b898c2d 100644 --- a/functions/api/events-team/events/new.ts +++ b/functions/api/events-team/events/new.ts @@ -98,7 +98,7 @@ export async function onRequestPost(context: RequestContext) { if (type !== "gamenight") await context.env.DATA.put( `eventemail_${id}`, - context.data.current_user.email, + JSON.stringify({ email: context.data.current_user.email, type }), { expirationTtl: 2678400 }, );