From f93317bf5d6549c06c9ce2e4c6c9b4759a6ad872 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 4 Dec 2022 21:00:37 +0100
Subject: [PATCH] fix(caldav): add Z suffix to dates make it clear dates are in
 UTC

---
 pkg/caldav/caldav.go      |  3 +-
 pkg/caldav/caldav_test.go | 66 +++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/pkg/caldav/caldav.go b/pkg/caldav/caldav.go
index 9960b95ee75..7d7b55df81c 100644
--- a/pkg/caldav/caldav.go
+++ b/pkg/caldav/caldav.go
@@ -22,7 +22,6 @@ import (
 	"strings"
 	"time"
 
-	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/utils"
 )
@@ -240,7 +239,7 @@ END:VCALENDAR` // Need a line break
 }
 
 func makeCalDavTimeFromTimeStamp(ts time.Time) (caldavtime string) {
-	return ts.In(config.GetTimeZone()).Format(DateFormat)
+	return ts.In(time.UTC).Format(DateFormat) + "Z"
 }
 
 func calcAlarmDateFromReminder(eventStart, reminder time.Time) (alarmTime string) {
diff --git a/pkg/caldav/caldav_test.go b/pkg/caldav/caldav_test.go
index b78e8bed067..5701d0fd73c 100644
--- a/pkg/caldav/caldav_test.go
+++ b/pkg/caldav/caldav_test.go
@@ -84,25 +84,25 @@ X-APPLE-CALENDAR-COLOR:#affffeFF
 X-OUTLOOK-COLOR:#affffeFF
 X-FUNAMBOL-COLOR:#affffeFF
 DESCRIPTION:Lorem Ipsum
-DTSTAMP:20181201T011204
-DTSTART:20181201T011204
-DTEND:20181201T013024
+DTSTAMP:20181201T011204Z
+DTSTART:20181201T011204Z
+DTEND:20181201T013024Z
 END:VEVENT
 BEGIN:VEVENT
 UID:randommduidd
 SUMMARY:Event #2
 DESCRIPTION:
-DTSTAMP:20181202T045844
-DTSTART:20181202T045844
-DTEND:20181202T081844
+DTSTAMP:20181202T045844Z
+DTSTART:20181202T045844Z
+DTEND:20181202T081844Z
 END:VEVENT
 BEGIN:VEVENT
 UID:20181202T0600242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
 SUMMARY:Event #3 with empty uid
 DESCRIPTION:
-DTSTAMP:20181202T050024
-DTSTART:20181202T050024
-DTEND:20181202T050320
+DTSTAMP:20181202T050024Z
+DTSTART:20181202T050024Z
+DTEND:20181202T050320Z
 END:VEVENT
 END:VCALENDAR`,
 		},
@@ -169,9 +169,9 @@ BEGIN:VEVENT
 UID:randommduid
 SUMMARY:Event #1
 DESCRIPTION:Lorem Ipsum
-DTSTAMP:20181201T011204
-DTSTART:20181201T011204
-DTEND:20181201T013024
+DTSTAMP:20181201T011204Z
+DTSTART:20181201T011204Z
+DTEND:20181201T013024Z
 BEGIN:VALARM
 TRIGGER:-PT3M20S
 ACTION:DISPLAY
@@ -192,9 +192,9 @@ BEGIN:VEVENT
 UID:randommduidd
 SUMMARY:Event #2
 DESCRIPTION:
-DTSTAMP:20181202T045844
-DTSTART:20181202T045844
-DTEND:20181202T081844
+DTSTAMP:20181202T045844Z
+DTSTART:20181202T045844Z
+DTEND:20181202T081844Z
 BEGIN:VALARM
 TRIGGER:-PT27H50M0S
 ACTION:DISPLAY
@@ -212,12 +212,12 @@ DESCRIPTION:Event #2
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-UID:20181202T0500242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
+UID:20181202T050024Z2aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
 SUMMARY:Event #3 with empty uid
 DESCRIPTION:
-DTSTAMP:20181202T050024
-DTSTART:20181202T050024
-DTEND:20181202T050320
+DTSTAMP:20181202T050024Z
+DTSTART:20181202T050024Z
+DTEND:20181202T050320Z
 BEGIN:VALARM
 TRIGGER:-PT27H51M40S
 ACTION:DISPLAY
@@ -240,12 +240,12 @@ DESCRIPTION:Event #3 with empty uid
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-UID:20181202T050024ae7548ce9556df85038abe90dc674d4741a61ce74d1cf
+UID:20181202T050024Zae7548ce9556df85038abe90dc674d4741a61ce74d1cf
 SUMMARY:Event #4 without any
 DESCRIPTION:
-DTSTAMP:20181202T050024
-DTSTART:20181202T050024
-DTEND:20181202T050320
+DTSTAMP:20181202T050024Z
+DTSTART:20181202T050024Z
+DTEND:20181202T050320Z
 END:VEVENT
 END:VCALENDAR`,
 		},
@@ -278,9 +278,9 @@ BEGIN:VEVENT
 UID:randommduid
 SUMMARY:Event #1
 DESCRIPTION:Lorem Ipsum\nDolor sit amet
-DTSTAMP:20181201T011204
-DTSTART:20181201T011204
-DTEND:20181201T013024
+DTSTAMP:20181201T011204Z
+DTSTART:20181201T011204Z
+DTEND:20181201T013024Z
 END:VEVENT
 END:VCALENDAR`,
 		},
@@ -333,13 +333,13 @@ X-OUTLOOK-COLOR:#ffffffFF
 X-FUNAMBOL-COLOR:#ffffffFF
 BEGIN:VTODO
 UID:randommduid
-DTSTAMP:20181201T011204
+DTSTAMP:20181201T011204Z
 SUMMARY:Todo #1
 X-APPLE-CALENDAR-COLOR:#affffeFF
 X-OUTLOOK-COLOR:#affffeFF
 X-FUNAMBOL-COLOR:#affffeFF
 DESCRIPTION:Lorem Ipsum\nDolor sit amet
-LAST-MODIFIED:00010101T000000
+LAST-MODIFIED:00010101T000000Z
 END:VTODO
 END:VCALENDAR`,
 		},
@@ -368,12 +368,12 @@ X-WR-CALNAME:test
 PRODID:-//RandomProdID which is not random//EN
 BEGIN:VTODO
 UID:randommduid
-DTSTAMP:20181201T011204
+DTSTAMP:20181201T011204Z
 SUMMARY:Todo #1
 DESCRIPTION:Lorem Ipsum
-COMPLETED:20181201T013024
+COMPLETED:20181201T013024Z
 STATUS:COMPLETED
-LAST-MODIFIED:00010101T000000
+LAST-MODIFIED:00010101T000000Z
 END:VTODO
 END:VCALENDAR`,
 		},
@@ -402,11 +402,11 @@ X-WR-CALNAME:test
 PRODID:-//RandomProdID which is not random//EN
 BEGIN:VTODO
 UID:randommduid
-DTSTAMP:20181201T011204
+DTSTAMP:20181201T011204Z
 SUMMARY:Todo #1
 DESCRIPTION:Lorem Ipsum
 PRIORITY:9
-LAST-MODIFIED:00010101T000000
+LAST-MODIFIED:00010101T000000Z
 END:VTODO
 END:VCALENDAR`,
 		},