sirtimbly/bewcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support automatically creating recurring events

Browse Source 
Also implement locks for tasks that can have unintended side-effects if ran simultaneously.

Other minor UI tweaks.
This commit is contained in:
Bruno Bernardino
2024-03-31 13:19:13 +01:00
parent d3a6f60d81
commit 321341a2fb
10 changed files with 312 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
routes/api/calendar/import.tsx
View File

@@ -61,6 +61,13 @@ export const handler: Handlers<Data, FreshContextState> = {
if (parsedExtra !== '{}') {
calendarEvent.extra = partialCalendarEvent.extra!;
if (
calendarEvent.extra.is_recurring && calendarEvent.extra.recurring_sequence === 0 &&
!calendarEvent.extra.recurring_id
) {
calendarEvent.extra.recurring_id = calendarEvent.id;
}
await updateCalendarEvent(calendarEvent);
}
}

2
routes/calendar.tsx
View File

@@ -38,7 +38,7 @@ export const handler: Handlers<Data, FreshContextState> = {
dateRange.end.setDate(dateRange.end.getDate() + 31);
}
const userCalendarEvents = await getCalendarEvents(context.state.user.id, visibleCalendarIds);
const userCalendarEvents = await getCalendarEvents(context.state.user.id, visibleCalendarIds, dateRange);
return await context.render({ userCalendars, userCalendarEvents, view, startDate });
},

53
routes/dav/calendars/[calendarId].tsx
View File

@@ -3,7 +3,13 @@ import { Handler } from 'fresh/server.ts';
import { Calendar, FreshContextState } from '/lib/types.ts';
import { buildRFC822Date, convertObjectToDavXml, DAV_RESPONSE_HEADER, escapeHtml, escapeXml } from '/lib/utils/misc.ts';
import { formatCalendarEventsToVCalendar, parseVCalendarFromTextContents } from '/lib/utils/calendar.ts';
import { getCalendar, getCalendarEvents } from '/lib/data/calendar.ts';
import {
createCalendarEvent,
getCalendar,
getCalendarEvent,
getCalendarEvents,
updateCalendarEvent,
} from '/lib/data/calendar.ts';
import { createSessionCookie } from '/lib/auth.ts';
interface Data {}
@@ -80,32 +86,37 @@ export const handler: Handler<Data, FreshContextState> = async (request, context
const [partialCalendarEvent] = parseVCalendarFromTextContents(requestBody);
if (partialCalendarEvent.title) {
// TODO: Build this
// const newCalendarEvent = await createCalendarEvent(
// context.state.user.id,
// partialCalendarEvent.title,
// partialCalendarEvent.start_date,
// partialCalendarEvent.end_date,
// );
if (partialCalendarEvent.title && partialCalendarEvent.start_date && partialCalendarEvent.end_date) {
const newCalendarEvent = await createCalendarEvent(
context.state.user.id,
calendarId,
partialCalendarEvent.title,
new Date(partialCalendarEvent.start_date),
new Date(partialCalendarEvent.end_date),
partialCalendarEvent.is_all_day,
);
// // Use the sent id for the UID
// if (!partialCalendarEvent.extra?.uid) {
// partialCalendarEvent.extra = {
// ...(partialCalendarEvent.extra! || {}),
// uid: calendarId,
// };
// }
const parsedExtra = JSON.stringify(partialCalendarEvent.extra || {});
// newCalendarEvent.extra = partialCalendarEvent.extra!;
if (parsedExtra !== '{}') {
newCalendarEvent.extra = partialCalendarEvent.extra!;
// await updateCalendarEvent(newCalendarEvent);
if (
newCalendarEvent.extra.is_recurring && newCalendarEvent.extra.recurring_sequence === 0 &&
!newCalendarEvent.extra.recurring_id
) {
newCalendarEvent.extra.recurring_id = newCalendarEvent.id;
}
// const calendarEvent = await getCalendarEvent(newCalendarEvent.id, context.state.user.id);
await updateCalendarEvent(newCalendarEvent);
}
// return new Response('Created', { status: 201, headers: { 'etag': `"${calendarEvent.revision}"` } });
return new Response('Not found', { status: 404 });
const calendarEvent = await getCalendarEvent(newCalendarEvent.id, context.state.user.id);
return new Response('Created', { status: 201, headers: { 'etag': `"${calendarEvent.revision}"` } });
}
return new Response('Not found', { status: 404 });
}
const calendarEvents = await getCalendarEvents(context.state.user.id, [calendar.id]);