mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Small adjustments to the From behaviour, send as Calendso or via user depending on who you are sending to.

Browse source
This commit is contained in:
Alex van Andel 2021-05-28 11:16:19 +00:00
parent 89cefa9894
commit 4010fb9075
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.example
View file

@ -15,7 +15,7 @@ MS_GRAPH_CLIENT_SECRET=
# allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/ # allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/
# Configures the global From: header whilst sending emails. # Configures the global From: header whilst sending emails.
EMAIL_FROM='Calendso <notifications@yourselfhostedcalendso.com>' EMAIL_FROM='notifications@yourselfhostedcalendso.com'
# Configure SMTP settings (@see https://nodemailer.com/smtp/). # Configure SMTP settings (@see https://nodemailer.com/smtp/).
# Note: The below configuration for Office 365 has been verified to work. # Note: The below configuration for Office 365 has been verified to work.

6
lib/emails/confirm-booked.ts
View file

@ -31,7 +31,7 @@ const sendEmail = (calEvent: CalendarEvent, {
nodemailer.createTransport(transport).sendMail( nodemailer.createTransport(transport).sendMail(
{ {
to: `${calEvent.attendees[0].name} <${calEvent.attendees[0].email}>`, to: `${calEvent.attendees[0].name} <${calEvent.attendees[0].email}>`,
from, from: `${calEvent.organizer.name} <${from}>`,
subject: `Confirmed: ${calEvent.type} with ${calEvent.organizer.name} on ${inviteeStart.format('dddd, LL')}`, subject: `Confirmed: ${calEvent.type} with ${calEvent.organizer.name} on ${inviteeStart.format('dddd, LL')}`,
html: html(calEvent), html: html(calEvent),
text: text(calEvent), text: text(calEvent),
@ -52,7 +52,7 @@ const html = (calEvent: CalendarEvent) => {
<div> <div>
Hi ${calEvent.attendees[0].name},<br /> Hi ${calEvent.attendees[0].name},<br />
<br /> <br />
Your ${calEvent.type} with ${calEvent.organizer.name} at ${inviteeStart.format('h:mma')} Your ${calEvent.type} with ${calEvent.organizer.name} at ${inviteeStart.format('h:mma')}
(${calEvent.attendees[0].timeZone}) on ${inviteeStart.format('dddd, LL')} is scheduled.<br /> (${calEvent.attendees[0].timeZone}) on ${inviteeStart.format('dddd, LL')} is scheduled.<br />
<br /> <br />
Additional notes:<br /> Additional notes:<br />
@ -61,4 +61,4 @@ const html = (calEvent: CalendarEvent) => {
`; `;
}; };
const text = (evt: CalendarEvent) => html(evt).replace('<br />', "\n").replace(/<[^>]+>/g, ''); const text = (evt: CalendarEvent) => html(evt).replace('<br />', "\n").replace(/<[^>]+>/g, '');

2
lib/emails/new-event.ts
View file

@ -66,7 +66,7 @@ const sendEmail = (calEvent: CalendarEvent, {
filename: 'event.ics', filename: 'event.ics',
content: icalEventAsString(calEvent), content: icalEventAsString(calEvent),
}, },
from, from: `Calendso <${from}>`,
to: calEvent.organizer.email, to: calEvent.organizer.email,
subject: `New event: ${calEvent.attendees[0].name} - ${organizerStart.format('LT dddd, LL')} - ${calEvent.type}`, subject: `New event: ${calEvent.attendees[0].name} - ${organizerStart.format('LT dddd, LL')} - ${calEvent.type}`,
html: html(calEvent), html: html(calEvent),