maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds CalDav Edge case (#7187) 

* Adds CalDav Edge case

* Update packages/lib/CalendarService.ts
This commit is contained in:
Omar López 2023-02-17 18:34:37 -07:00 committed by GitHub
parent 6573f75a83
commit af018f0e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/lib/CalendarService.ts
View File

@ -4,7 +4,7 @@ import type { Prisma } from "@prisma/client";
import ICAL from "ical.js";
import type { Attendee, DateArray, DurationObject, Person } from "ics";
import { createEvent } from "ics";
import type { DAVAccount } from "tsdav";
import type { DAVAccount, DAVCalendar } from "tsdav";
import {
createAccount,
createCalendarObject,
@ -421,17 +421,20 @@ export default abstract class BaseCalendarService implements Calendar {
try {
const account = await this.getAccount();
const calendars = await fetchCalendars({
const calendars = (await fetchCalendars({
account,
headers: this.headers,
});
})) /** @url https://github.com/natelindev/tsdav/pull/139 */ as (Omit<DAVCalendar, "displayName"> & {
displayName?: string | Record<string, unknown>;
})[];
return calendars.reduce<IntegrationCalendar[]>((newCalendars, calendar) => {
if (!calendar.components?.includes("VEVENT")) return newCalendars;
newCalendars.push({
externalId: calendar.url,
name: calendar.displayName ?? "",
/** @url https://github.com/calcom/cal.com/issues/7186 */
name: typeof calendar.displayName === "string" ? calendar.displayName : "",
primary: event?.destinationCalendar?.externalId
? event.destinationCalendar.externalId === calendar.url
: false,