Get VTIMEZONE data from a time zone database lib

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

.gitattributes

@@ -7,6 +7,8 @@
 /apps/comments/js/*.js.map binary
 /apps/dashboard/js/*.js binary
 /apps/dashboard/js/*.js.map binary
+/apps/dav/js/*.js binary
+/apps/dav/js/*.js.map binary
 /apps/files/js/dist/*.js binary
 /apps/files/js/dist/*.js.map binary
 /apps/files_sharing/js/dist/*.js binary

apps/dav/js/settings-admin-caldav.js

@@ -22,6 +22,7 @@ import { getClient } from '../dav/client'
 import ICAL from 'ical.js'
 import logger from './logger'
 import { parseXML } from 'webdav/dist/node/tools/dav'
+import { getZoneString } from 'icalzone'
 import { v4 as uuidv4 } from 'uuid'
 
 export function getEmptySlots() {
@@ -107,11 +108,21 @@ export async function saveScheduleInboxAvailability(slots, timezoneId) {
 	})))]
 
 	const vcalendarComp = new ICAL.Component('vcalendar')
+	vcalendarComp.addPropertyWithValue('prodid', 'Nextcloud DAV app')
 
 	// Store time zone info
-	const timezoneComp = new ICAL.Component('vtimezone')
-	timezoneComp.addPropertyWithValue('tzid', timezoneId)
-	vcalendarComp.addSubcomponent(timezoneComp)
+	// If possible we use the info from a time zone database
+	const predefinedTimezoneIcal = getZoneString(timezoneId)
+	if (predefinedTimezoneIcal) {
+		const timezoneComp = new ICAL.Component(ICAL.parse(predefinedTimezoneIcal))
+		console.info('tz comp', timezoneComp, predefinedTimezoneIcal)
+		vcalendarComp.addSubcomponent(timezoneComp)
+	} else {
+		// Fall back to a simple markup
+		const timezoneComp = new ICAL.Component('vtimezone')
+		timezoneComp.addPropertyWithValue('tzid', timezoneId)
+		vcalendarComp.addSubcomponent(timezoneComp)
+	}
 
 	// Store availability info
 	const vavailabilityComp = new ICAL.Component('vavailability')

apps/dav/js/settings-admin-caldav.js.map

@@ -56,6 +56,7 @@
     "escape-html": "^1.0.3",
     "handlebars": "^4.7.7",
     "ical.js": "^1.4.0",
+    "icalzone": "^0.0.1",
     "jquery": "~3.3",
     "jquery-migrate": "~3.3",
     "jquery-ui": "^1.13.0",