Don't include Torah memo for timed Chanukah events

hebcal · Aug 25, 2022 · 7dc205a · 7dc205a
1 parent e52df76
commit 7dc205a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/icalendar",
-  "version": "4.18.1",
+  "version": "4.18.2",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "ical",
@@ -24,8 +24,8 @@
     "url": "https://github.com/hebcal/hebcal-icalendar/issues"
   },
   "dependencies": {
-    "@hebcal/core": "^3.42.2",
-    "@hebcal/rest-api": "^4.0.0",
+    "@hebcal/core": "^3.42.3",
+    "@hebcal/rest-api": "^4.1.0",
     "murmurhash3": "^0.5.0"
   },
   "scripts": {

diff --git a/src/icalendar.js b/src/icalendar.js
@@ -350,7 +350,7 @@ const HOLIDAY_IGNORE_MASK = flags.DAF_YOMI | flags.OMER_COUNT |
  * @return {string}
  */
 function makeTorahMemo(ev, il) {
-  if (ev.getFlags() & HOLIDAY_IGNORE_MASK) {
+  if ((ev.getFlags() & HOLIDAY_IGNORE_MASK) || ev.eventTime) {
     return '';
   }
   const hd = ev.getDate();

diff --git a/src/icalendar.spec.js b/src/icalendar.spec.js
@@ -320,8 +320,8 @@ test('appendHebrewToSubject', (t) => {
 
 test('chanukah-candles', (t) => {
   const options = {
-    start: new Date(2020, 11, 10),
-    end: new Date(2020, 11, 10),
+    start: new Date(2020, 11, 11),
+    end: new Date(2020, 11, 11),
     location: Location.lookup('Boston'),
     candlelighting: true,
     emoji: true,
@@ -335,9 +335,9 @@ test('chanukah-candles', (t) => {
     'BEGIN:VEVENT',
     'DTSTAMP:X',
     'CATEGORIES:Holiday',
-    'SUMMARY:🕎1️⃣ Chanukah: 1 Candle',
-    'DTSTART;TZID=America/New_York:20201210T164300',
-    'DTEND;TZID=America/New_York:20201210T164300',
+    'SUMMARY:🕎2️⃣ Chanukah: 2 Candles',
+    'DTSTART;TZID=America/New_York:20201211T155300',
+    'DTEND;TZID=America/New_York:20201211T155300',
     'UID:X',
     'TRANSP:TRANSPARENT',
     'X-MICROSOFT-CDO-BUSYSTATUS:FREE',