From 55b4a36a8153d9b66f163dd65b4d01ae9a163f21 Mon Sep 17 00:00:00 2001 From: Ryderjj89 Date: Fri, 16 May 2025 18:46:07 -0400 Subject: [PATCH] Remove EMAIL_RECIPIENTS environment variable and update email notification logic --- backend/src/index.ts | 12 ++++-------- docker-compose-build.yml | 3 +-- docker-compose.yml | 3 +-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/backend/src/index.ts b/backend/src/index.ts index f561b93..242d4c4 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -325,18 +325,14 @@ app.post('/api/events/:slug/rsvp', async (req: Request, res: Response) => { // Get recipients from event settings let recipients: string[] = []; - // First try to use the event's email recipients + // Use the event's email recipients if (eventEmailRecipients) { recipients = eventEmailRecipients.split(',').map(addr => addr.trim()).filter(Boolean); } - // If no event recipients, fall back to environment variables - if (recipients.length === 0) { - if (process.env.EMAIL_RECIPIENTS) { - recipients = process.env.EMAIL_RECIPIENTS.split(',').map(addr => addr.trim()).filter(Boolean); - } else if (process.env.EMAIL_USER) { - recipients = [process.env.EMAIL_USER]; - } + // If no recipients are set for the event, use the sender email as a fallback + if (recipients.length === 0 && process.env.EMAIL_USER) { + recipients = [process.env.EMAIL_USER]; } if (recipients.length > 0) { diff --git a/docker-compose-build.yml b/docker-compose-build.yml index c23e8a7..51626b2 100644 --- a/docker-compose-build.yml +++ b/docker-compose-build.yml @@ -17,11 +17,10 @@ services: - EMAIL_PASS=yourpassword - EMAIL_FROM_NAME=RSVP Manager - EMAIL_FROM_ADDRESS=your@email.com - - EMAIL_RECIPIENTS=admin1@email.com,admin2@email.com - EMAIL_SECURE=false - FRONTEND_BASE_URL=https://your-frontend-domain.com restart: unless-stopped volumes: data: - uploads: + uploads: diff --git a/docker-compose.yml b/docker-compose.yml index 88c3d61..37619ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,10 +16,9 @@ services: - EMAIL_FROM_NAME=RSVP Manager - EMAIL_FROM_ADDRESS=your@email.com - EMAIL_SECURE=false - - EMAIL_RECIPIENTS=admin1@email.com,admin2@email.com - FRONTEND_BASE_URL=https://your-frontend-domain.com restart: unless-stopped volumes: data: - uploads: + uploads: