Skip to content

Fix multi-valued RDATE expansion in VTIMEZONE #1049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mschroeder wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix multi-valued RDATE expansion in VTIMEZONE #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions lib/ical/timezone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,32 +450,34 @@ class Timezone {
} else {
let props = aComponent.getAllProperties("rdate");
for (let rdate of props) {
let time = rdate.getFirstValue();
change = init_changes();

change.year = time.year;
change.month = time.month;
change.day = time.day;

if (time.isDate) {
change.hour = dtstart.hour;
change.minute = dtstart.minute;
change.second = dtstart.second;
for (let value of rdate.getValues()) {
let time = value instanceof Time ? value : value.start;
change = init_changes();

if (dtstart.zone != Timezone.utcTimezone) {
Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
change.year = time.year;
change.month = time.month;
change.day = time.day;

if (time.isDate) {
change.hour = dtstart.hour;
change.minute = dtstart.minute;
change.second = dtstart.second;

if (dtstart.zone != Timezone.utcTimezone) {
Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
}
} else {
change.hour = time.hour;
change.minute = time.minute;
change.second = time.second;

if (time.zone != Timezone.utcTimezone) {
Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
}
}
} else {
change.hour = time.hour;
change.minute = time.minute;
change.second = time.second;

if (time.zone != Timezone.utcTimezone) {
Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
}
changes.push(change);
}

changes.push(change);
}

let rrule = aComponent.getFirstProperty("rrule");
Expand Down
49 changes: 49 additions & 0 deletions test/timezone_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,55 @@ suite('timezone', function() {
});
});

suite('#_expandComponent', function() {
function timezoneWithRdates(daylightRdate, standardRdate) {
let component = new ICAL.Component(ICAL.parse(`BEGIN:VTIMEZONE
TZID:Makebelieve/MultiRdate
BEGIN:DAYLIGHT
DTSTART:19800406T030000
${daylightRdate}
TZOFFSETFROM:+0100
TZOFFSETTO:+0200
END:DAYLIGHT
BEGIN:STANDARD
DTSTART:19800928T030000
${standardRdate}
TZOFFSETFROM:+0200
TZOFFSETTO:+0100
END:STANDARD
END:VTIMEZONE`));

return new ICAL.Timezone(component);
}

function assertSummerUtcTime(zone) {
let time = ICAL.Time.fromDateTimeString('2026-07-01T12:00:00');
time.zone = zone;
assert.equal(
time.convertToZone(ICAL.Timezone.utcTimezone).toString(),
'2026-07-01T10:00:00Z'
);
}

test('uses every value in multi-valued RDATE properties', function() {
let zone = timezoneWithRdates(
'RDATE:20250330T030000,20260329T030000,20270328T030000',
'RDATE:20251026T030000,20261025T030000,20271031T030000'
);

assertSummerUtcTime(zone);
});

test('uses the start of every PERIOD-valued RDATE', function() {
let zone = timezoneWithRdates(
'RDATE;VALUE=PERIOD:20250330T030000/PT1H,20260329T030000/PT1H,20270328T030000/PT1H',
'RDATE;VALUE=PERIOD:20251026T030000/PT1H,20261025T030000/PT1H,20271031T030000/PT1H'
);

assertSummerUtcTime(zone);
});
});

suite('#utcOffset', function() {
test('empty vtimezone', function() {
let subject = new ICAL.Timezone({
Expand Down
Loading