kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-22 21:11:17 +00:00
Code Issues Projects Releases Wiki Activity

Fixing double conversion of time between UTC and local timezone

Browse Source
This commit is contained in:
chamakura
2020-07-04 20:12:34 -07:00
parent 73322c96a6
commit 309a18e9c0
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/default/calendar/calendarfetcher.js
View File

@@ -186,10 +186,12 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumNu
// kblankenship1989 - to fix issue #1798, converting all dates to locale time first, then converting back to UTC time
const pastLocal = pastMoment.subtract(past.getTimezoneOffset(), "minutes").toDate();
const futureLocal = futureMoment.subtract(future.getTimezoneOffset(), "minutes").toDate();
const datesLocal = rule.between(pastLocal, futureLocal, true, limitFunction);
const dates = datesLocal.map(function (dateLocal) {
return moment(dateLocal).add(dateLocal.getTimezoneOffset(), "minutes").toDate();
});
const dates = rule.between(pastLocal, futureLocal, true, limitFunction);
if (getTitleFromEvent(event).search("Manageando") > -1) {
console.log(startDate);
console.log(event);
console.log(rule);
}
// The "dates" array contains the set of dates within our desired date range range that are valid
// for the recurrence rule. *However*, it's possible for us to have a specific recurrence that