regalijan/car-crushers-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Regalijan 2025-03-25 14:05:47 -04:00
commit 0b2dd8fb6c
Signed by: regalijan
GPG Key ID: 5D4196DA269EF520
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
functions/api/events-team/events/[id]/decision.ts
View File

@ -14,22 +14,25 @@ export async function onRequestPost(context: RequestContext) {
if (!updatedEvent) return jsonError("This event does not exist", 404); if (!updatedEvent) return jsonError("This event does not exist", 404);
const email = await context.env.DATA.get( const emailData: { email: string; type: string } | null =
`eventemail_${context.data.event.id}`, await context.env.DATA.get(`eventemail_${context.data.event.id}`, {
); type: "json",
});
const usernameData: Record<string, string> | null = const usernameData: Record<string, string> | null =
await context.env.D1.prepare("SELECT name FROM et_members WHERE id = ?;") await context.env.D1.prepare("SELECT name FROM et_members WHERE id = ?;")
.bind(updatedEvent.created_by) .bind(updatedEvent.created_by)
.first(); .first();
if (email && usernameData) { if (emailData && usernameData) {
await sendEmail( await sendEmail(
email, emailData.email,
context.env.MAILGUN_API_KEY, context.env.MAILGUN_API_KEY,
`Event ${context.data.body.approved ? "Approved" : "Rejected"}`, `Event ${context.data.body.approved ? "Approved" : "Rejected"}`,
`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")}`, date: `${updatedEvent.year}-${updatedEvent.month.toString().padStart(2, "0")}-${updatedEvent.day.toString().padStart(2, "0")}`,
event: emailData.type,
username: usernameData.name, username: usernameData.name,
}, },
); );

2
functions/api/events-team/events/new.ts
View File

@ -98,7 +98,7 @@ export async function onRequestPost(context: RequestContext) {
if (type !== "gamenight") if (type !== "gamenight")
await context.env.DATA.put( await context.env.DATA.put(
`eventemail_${id}`, `eventemail_${id}`,
context.data.current_user.email, JSON.stringify({ email: context.data.current_user.email, type }),
{ expirationTtl: 2678400 }, { expirationTtl: 2678400 },
); );