From a3bad8aec41e4d7f09588b1bf5fcea39f8b92359 Mon Sep 17 00:00:00 2001
From: Sam Detweiler <sdetweil@gmail.com>
Date: Sun, 11 Oct 2020 22:39:42 -0500
Subject: [PATCH] fix subsequent calendar fetcher timing

---
 modules/default/calendar/calendar.js    | 15 +++++++++++----
 modules/default/calendar/node_helper.js |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index af804139..5a8c2628 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -29,7 +29,7 @@ Module.register("calendar", {
 		timeFormat: "relative",
 		dateFormat: "MMM Do",
 		dateEndFormat: "LT",
-		fullDayEventDateFormat: "MMM Do",
+		fullDayEventDateFormat: "MMM Do HH:mm",
 		showEnd: false,
 		getRelative: 6,
 		fadePoint: 0.25, // Start on 1/4th of the list.
@@ -41,7 +41,7 @@ Module.register("calendar", {
 		calendars: [
 			{
 				symbol: "calendar",
-				url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics"
+				url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics1"
 			}
 		],
 		titleReplace: {
@@ -58,6 +58,8 @@ Module.register("calendar", {
 		nextDaysRelative: false
 	},
 
+	requiresVersion: "2.1.0",
+
 	// Define required scripts.
 	getStyles: function () {
 		return ["calendar.css", "font-awesome.css"];
@@ -114,12 +116,12 @@ Module.register("calendar", {
 
 			this.addCalendar(calendar.url, calendar.auth, calendarConfig);
 
-			// Trigger ADD_CALENDAR every fetchInterval to make sure there is always a calendar
+			/*			// Trigger ADD_CALENDAR every fetchInterval to make sure there is always a calendar
 			// fetcher running on the server side.
 			var self = this;
 			setInterval(function () {
 				self.addCalendar(calendar.url, calendar.auth, calendarConfig);
-			}, self.config.fetchInterval);
+			}, self.config.fetchInterval); */
 		}
 
 		this.calendarData = {};
@@ -541,6 +543,8 @@ Module.register("calendar", {
 	 * @param {object} calendarConfig The config of the specific calendar
 	 */
 	addCalendar: function (url, auth, calendarConfig) {
+		var self = this;
+
 		this.sendSocketNotification("ADD_CALENDAR", {
 			id: this.identifier,
 			url: url,
@@ -554,6 +558,9 @@ Module.register("calendar", {
 			auth: auth,
 			broadcastPastEvents: calendarConfig.broadcastPastEvents || this.config.broadcastPastEvents
 		});
+		setTimeout(() => {
+			self.addCalendar(url, auth, calendarConfig);
+		}, self.config.fetchInterval);
 	},
 
 	/**
diff --git a/modules/default/calendar/node_helper.js b/modules/default/calendar/node_helper.js
index 862755a0..1c88b9af 100644
--- a/modules/default/calendar/node_helper.js
+++ b/modules/default/calendar/node_helper.js
@@ -70,7 +70,7 @@ module.exports = NodeHelper.create({
 		} else {
 			Log.log("Use existing calendar fetcher for url: " + url);
 			fetcher = self.fetchers[identifier + url];
-			fetcher.broadcastEvents();
+			//fetcher.broadcastEvents();
 		}
 
 		fetcher.startFetch();