Merge pull request #132 from Riott/issue-130

Issue 130 !sch handle all day events

Author: 11k

lib/commands/implementations/schedule.js

@@ -7,15 +7,32 @@ function getNextStreamDate(input, services) {
     .findNextStreamDay()
     .then((nextStreamDay) => {
       if (!nextStreamDay) {
-        return new CommandOutput(null, `Nothing scheduled ${services.schedule.link()}`);
+        return new CommandOutput(null, `Nothing is scheduled. ${services.schedule.link()}`);
       }
 
-      return new CommandOutput(
-        null,
-        `${nextStreamDay.name}${
-          nextStreamDay.allDay ? ', an all-day event,' : ''
-        } scheduled to begin ${moment(nextStreamDay.start).fromNow()} ${services.schedule.link()}`,
-      );
+      const { allDay, name, start, childEvent } = nextStreamDay;
+      const isHappening = start.isBefore(moment());
+      let scheduleOutput = '';
+
+      if (isHappening && allDay) {
+        scheduleOutput = `${name}, an all-day event, is scheduled today.`;
+        if (childEvent) {
+          const childEventIsHappening = moment(childEvent.start).isBefore(moment());
+
+          // prettier-ignore
+          scheduleOutput += childEventIsHappening
+            ? ` ${childEvent.name} is currently happening! It started ${childEvent.start.fromNow()}.`
+            : ` Coming up ${childEvent.start.fromNow()} is ${childEvent.name}.`;
+        }
+      } else if (isHappening) {
+        scheduleOutput = `${name} is currently happening! It started ${start.fromNow()}.`;
+      } else {
+        scheduleOutput = `${name} is the next scheduled event. It starts ${start.fromNow()}.`;
+      }
+
+      scheduleOutput += ` ${services.schedule.link()}`;
+
+      return new CommandOutput(null, scheduleOutput);
     })
     .catch((err) => new CommandOutput(err, "Oops. Something didn't work. Check the logs."));
 }

lib/services/schedule.js

@@ -1,6 +1,29 @@
 const google = require('googleapis').google; // eslint-disable-line prefer-destructuring
 const moment = require('moment-timezone');
 
+/**
+ * @typedef {Object} Event
+ * @property {boolean} allDay
+ * @property {moment.Moment} start
+ * @property {string} name
+ */
+
+/**
+ * @returns {Event}
+ */
+function buildEvent(event) {
+  // All-day events don't have a start time, only a start day.
+  const allDay = !event.start.dateTime;
+
+  const start = allDay ? moment.utc(event.start.date) : moment.utc(event.start.dateTime);
+
+  return {
+    allDay,
+    start,
+    name: event.summary,
+  };
+}
+
 class GoogleCal {
   constructor(configuration) {
     this.configuration = configuration;
@@ -12,29 +35,23 @@ class GoogleCal {
   }
 
   findNextStreamDay() {
-    return this.getListOfUpcomingEvents(this.configuration.GOOGLE_CALENDAR_ID).then((events) => {
-      const now = moment.tz('UTC');
-      const nextEvent = events.find((event) => {
-        if (event.start.date !== undefined) {
-          return true;
+    return this.getListOfUpcomingEvents(this.configuration.GOOGLE_CALENDAR_ID).then(
+      (googleEvents) => {
+        const events = googleEvents.map(buildEvent);
+        if (!events.length) {
+          return null;
         }
 
-        return !(
-          moment.tz(event.end.dateTime, 'YYYY-MM-DDTHH:mm:ss', event.end.timeZone).isAfter(now) &&
-          moment.tz(event.start.dateTime, 'YYYY-MM-DDTHH:mm:ss', event.start.timeZone).isBefore(now)
-        );
-      });
-
-      if (!nextEvent) {
-        return null;
-      }
-
-      return {
-        start: nextEvent.start.dateTime ?? nextEvent.start.date,
-        name: nextEvent.summary,
-        allDay: !nextEvent.start.dateTime, // All-day events don't have a start time, only a start day.
-      };
-    });
+        const nextEvent = events[0];
+        if (nextEvent.allDay) {
+          nextEvent.childEvent = events.find((event) => {
+            return !event.allDay && event.start.isSame(nextEvent.start, 'day');
+          });
+        }
+
+        return nextEvent;
+      },
+    );
   }
 
   link() {
@@ -49,6 +66,7 @@ class GoogleCal {
         singleEvents: true,
         timeMin: new Date().toISOString(),
         maxResults: 5,
+        timeZone: 'UTC',
       })
       .then((response) => response.data.items);
   }

package-lock.json

@@ -20,7 +20,7 @@
     "bunyan": "^1.8.14",
     "fast-levenshtein": "^3.0.0",
     "google-auth-library": "^6.1.1",
-    "googleapis": "^61.0.0",
+    "googleapis": "^118.0.0",
     "inspector-influx": "^2.7.0",
     "inspector-metrics": "^1.21.0",
     "lodash": "^4.17.20",