Allow VALARM with a VALUE=DATE-TIME trigger

hebcal · Apr 26, 2022 · 9304a8a · 9304a8a
1 parent e4642db
commit 9304a8a
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/icalendar",
-  "version": "4.16.0",
+  "version": "4.17.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "ical",
@@ -24,7 +24,7 @@
     "url": "https://github.com/hebcal/hebcal-icalendar/issues"
   },
   "dependencies": {
-    "@hebcal/core": "^3.35.0",
+    "@hebcal/core": "^3.36.0",
     "@hebcal/rest-api": "^3.13.0",
     "murmurhash3": "^0.5.0"
   },

diff --git a/src/icalendar.js b/src/icalendar.js
@@ -1,4 +1,4 @@
-import {flags, Locale} from '@hebcal/core';
+import {flags, Locale, greg} from '@hebcal/core';
 import {murmur32HexSync} from 'murmurhash3';
 import {pad2, pad4, getCalendarTitle, makeAnchor, getEventCategories,
   getHolidayDescription, makeTorahMemoText, appendIsraelAndTracking,
@@ -126,19 +126,30 @@ export class IcalEvent {
       }
     }
     this.subj = subj;
+    this.category = ev.category || CATEGORY[getEventCategories(ev)[0]];
+  }
 
-    const isUserEvent = Boolean(mask & flags.USER_EVENT);
-    if (ev.alarm) {
-      this.alarm = ev.alarm;
+
+  /**
+   * @return {string}
+   */
+  getAlarm() {
+    const ev = this.ev;
+    const mask = ev.getFlags();
+    const evAlarm = ev.alarm;
+    if (typeof evAlarm === 'string') {
+      return 'TRIGGER:' + evAlarm;
+    } else if (greg.isDate(evAlarm)) {
+      evAlarm.setSeconds(0);
+      return 'TRIGGER;VALUE=DATE-TIME:' + IcalEvent.makeDtstamp(evAlarm);
     } else if (mask & flags.OMER_COUNT) {
-      this.alarm = '-P0DT3H30M0S'; // 8:30pm Omer alarm evening before
-    } else if (isUserEvent) {
-      this.alarm = '-P0DT12H0M0S'; // noon the day before
-    } else if (timed && ev.getDesc().startsWith('Candle lighting')) {
-      this.alarm = '-P0DT0H10M0S'; // ten minutes
+      return 'TRIGGER:-P0DT3H30M0S'; // 8:30pm Omer alarm evening before
+    } else if (mask & flags.USER_EVENT) {
+      return 'TRIGGER:-P0DT12H0M0S'; // noon the day before
+    } else if (this.timed && ev.getDesc().startsWith('Candle lighting')) {
+      return 'TRIGGER:-P0DT0H10M0S';
     }
-
-    this.category = ev.category || CATEGORY[getEventCategories(ev)[0]];
+    return null;
   }
 
   /**
@@ -197,12 +208,13 @@ export class IcalEvent {
       arr.push('GEO:' + options.location.latitude + ';' + options.location.longitude);
     }
 
-    if (this.alarm) {
+    const trigger = this.getAlarm();
+    if (trigger) {
       arr.push(
           'BEGIN:VALARM',
           'ACTION:DISPLAY',
-          'DESCRIPTION:This is an event reminder',
-          `TRIGGER:${this.alarm}`,
+          'DESCRIPTION:Event reminder',
+          `${trigger}`,
           'END:VALARM',
       );
     }

diff --git a/src/icalendar.spec.js b/src/icalendar.spec.js
@@ -164,7 +164,7 @@ test('ical-candles', (t) => {
     'GEO:41.85003;-87.65005',
     'BEGIN:VALARM',
     'ACTION:DISPLAY',
-    'DESCRIPTION:This is an event reminder',
+    'DESCRIPTION:Event reminder',
     'TRIGGER:-P0DT0H10M0S',
     'END:VALARM',
     'END:VEVENT',
@@ -404,7 +404,7 @@ test('userEvent', (t) => {
     'X-MICROSOFT-CDO-ALLDAYEVENT:TRUE',
     'BEGIN:VALARM',
     'ACTION:DISPLAY',
-    'DESCRIPTION:This is an event reminder',
+    'DESCRIPTION:Event reminder',
     'TRIGGER:-P0DT12H0M0S',
     'END:VALARM',
     'END:VEVENT',
@@ -509,14 +509,39 @@ test('OmerEvent', (t) => {
     ' rah shebiYesod',
     'BEGIN:VALARM',
     'ACTION:DISPLAY',
-    'DESCRIPTION:This is an event reminder',
+    'DESCRIPTION:Event reminder',
     'TRIGGER:-P0DT3H30M0S',
     'END:VALARM',
     'END:VEVENT',
   ];
   t.deepEqual(lines, expected);
 });
 
+test('omer-alarm', (t) => {
+  const dt = new Date(2022, 3, 26);
+  const options = {
+    start: dt,
+    end: dt,
+    noHolidays: true,
+    omer: true,
+    candlelighting: true,
+    location: Location.lookup('Vancouver'),
+  };
+  const ev = HebrewCalendar.calendar(options)[0];
+  const ical = new IcalEvent(ev, options);
+  const lines = ical.toString().split('\r\n');
+  const alarm = lines.slice(lines.length - 6);
+  const expected = [
+    'BEGIN:VALARM',
+    'ACTION:DISPLAY',
+    'DESCRIPTION:Event reminder',
+    'TRIGGER;VALUE=DATE-TIME:20220426T040300Z',
+    'END:VALARM',
+    'END:VEVENT',
+  ];
+  t.deepEqual(alarm, expected);
+});
+
 /** @private */
 class TestEvent extends Event {
   /** @param {HDate} date */