From 14d8006dac742cd91f46f79cbfd0f863ae932725 Mon Sep 17 00:00:00 2001 From: Anton Lilleby Date: Thu, 30 Jan 2025 16:18:10 +0100 Subject: [PATCH 1/3] exp: try changing name --- app/src/lib/email/event/accepted.ts | 2 +- app/src/lib/email/event/canceled.ts | 2 +- app/src/lib/email/event/declined.ts | 2 +- app/src/routes/api/subscribe/+server.ts | 28 +++++++++++++------------ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/src/lib/email/event/accepted.ts b/app/src/lib/email/event/accepted.ts index 6a0bb37..07a35e5 100644 --- a/app/src/lib/email/event/accepted.ts +++ b/app/src/lib/email/event/accepted.ts @@ -31,7 +31,7 @@ const createIcsFile = ({ organiser, }: EmailAcceptedProps) => { const url = `${PUBLIC_APP_BASE_URL}/event/${id}`; - const calendar = ical({ name: "Skjer", method: ICalCalendarMethod.REQUEST }); + const calendar = ical({ name: organiser, method: ICalCalendarMethod.REQUEST }); calendar.createEvent({ id, diff --git a/app/src/lib/email/event/canceled.ts b/app/src/lib/email/event/canceled.ts index 9a0ea87..85cc977 100644 --- a/app/src/lib/email/event/canceled.ts +++ b/app/src/lib/email/event/canceled.ts @@ -31,7 +31,7 @@ const createIcsFile = ({ organiser, }: EmailCanceledProps) => { const url = `${PUBLIC_APP_BASE_URL}/event/${id}`; - const calendar = ical({ name: "Skjer", method: ICalCalendarMethod.CANCEL }); + const calendar = ical({ name: organiser, method: ICalCalendarMethod.CANCEL }); calendar.createEvent({ id, diff --git a/app/src/lib/email/event/declined.ts b/app/src/lib/email/event/declined.ts index b9a2917..db6ce6f 100644 --- a/app/src/lib/email/event/declined.ts +++ b/app/src/lib/email/event/declined.ts @@ -40,7 +40,7 @@ const createIcsFile = ({ organiser, }: EmailDeclinedProps) => { const url = `${PUBLIC_APP_BASE_URL}/event/${id}`; - const calendar = ical({ name: "Skjer", method: ICalCalendarMethod.REQUEST }); + const calendar = ical({ name: organiser, method: ICalCalendarMethod.REQUEST }); calendar.createEvent({ id, diff --git a/app/src/routes/api/subscribe/+server.ts b/app/src/routes/api/subscribe/+server.ts index dadb0ad..7fb6ceb 100644 --- a/app/src/routes/api/subscribe/+server.ts +++ b/app/src/routes/api/subscribe/+server.ts @@ -8,19 +8,21 @@ export const GET: RequestHandler = async () => { const events = await getFutureEvents(); const calendar = ical({ name: "Skjer", method: ICalCalendarMethod.PUBLISH }); - events.forEach(({ _id: id, title: summary, start, end, place: location }) => { - const url = `${PUBLIC_APP_DEFAULT_BASE_URL}/event/${id}`; - const eventData: ICalEventData = { - id, - summary, - description: url, - location, - start, - end, - url, - }; - calendar.createEvent(eventData); - }); + events.forEach( + ({ _id: id, title: summary, summary: description, start, end, place: location }) => { + const url = `${PUBLIC_APP_DEFAULT_BASE_URL}/event/${id}`; + const eventData: ICalEventData = { + id, + summary, + description: `${description ?? ""} ${url}`, + location, + start, + end, + url, + }; + calendar.createEvent(eventData); + } + ); const icalFeed = Buffer.from(calendar.toString()); From d1e717ecb7045ecf427ba897c6a571346bcc8176 Mon Sep 17 00:00:00 2001 From: Anton Lilleby Date: Thu, 30 Jan 2025 16:33:36 +0100 Subject: [PATCH 2/3] chore: try another calendar method --- app/src/routes/api/subscribe/+server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/routes/api/subscribe/+server.ts b/app/src/routes/api/subscribe/+server.ts index 7fb6ceb..74be331 100644 --- a/app/src/routes/api/subscribe/+server.ts +++ b/app/src/routes/api/subscribe/+server.ts @@ -6,7 +6,7 @@ import ical, { ICalCalendarMethod, type ICalEventData } from "ical-generator"; export const GET: RequestHandler = async () => { try { const events = await getFutureEvents(); - const calendar = ical({ name: "Skjer", method: ICalCalendarMethod.PUBLISH }); + const calendar = ical({ name: "Skjer", method: ICalCalendarMethod.REQUEST }); events.forEach( ({ _id: id, title: summary, summary: description, start, end, place: location }) => { From 921a4274f193bb693333070ead2716db20f2710d Mon Sep 17 00:00:00 2001 From: Anton Lilleby Date: Thu, 30 Jan 2025 16:42:02 +0100 Subject: [PATCH 3/3] fix: change method --- app/src/routes/api/subscribe/+server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/routes/api/subscribe/+server.ts b/app/src/routes/api/subscribe/+server.ts index 74be331..f21e733 100644 --- a/app/src/routes/api/subscribe/+server.ts +++ b/app/src/routes/api/subscribe/+server.ts @@ -24,7 +24,7 @@ export const GET: RequestHandler = async () => { } ); - const icalFeed = Buffer.from(calendar.toString()); + const icalFeed = calendar.toString(); return new Response(icalFeed, { headers: {