Add no dinner/breakfast messages

eusoff-hackers · Sep 28, 2020 · 56c67d1 · 56c67d1
1 parent fe10a98
commit 56c67d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/bot/logic.ts b/src/bot/logic.ts
@@ -51,6 +51,9 @@ const botCommandDictionary: BotCommandDictionary = {
   "Tomorrow's Breakfast": {
     execute: () => {
       const dayTomorrow = (getCurrentDay() % 7) + 1;
+      if (dayTomorrow === 7) {
+        return sendMessage('No breakfast on Sundays!');
+      }
       const breakfast = getBreakfast(
         getCurrentWeek() + (dayTomorrow === 1 ? 1 : 0),
         dayTomorrow
@@ -67,6 +70,9 @@ const botCommandDictionary: BotCommandDictionary = {
   "Today's Dinner": {
     execute: () => {
       const currentDay = getCurrentDay();
+      if (currentDay === 6) {
+        return sendMessage('No dinner on Saturdays!');
+      }
       const dinner = getDinner(getCurrentWeek(), getDinnerColumn(currentDay));
       sendMessage(
         `Dinner on ${generateDateString(new Date())}\n\n${parseMeal(dinner)}`
@@ -76,6 +82,9 @@ const botCommandDictionary: BotCommandDictionary = {
   "Tomorrow's Dinner": {
     execute: () => {
       const dayTomorrow = (getCurrentDay() % 7) + 1;
+      if (dayTomorrow === 6) {
+        return sendMessage('No dinner on Saturdays!');
+      }
       const dinner = getDinner(
         getCurrentWeek() + (dayTomorrow === 1 ? 1 : 0),
         dayTomorrow

diff --git a/src/main.ts b/src/main.ts
@@ -92,6 +92,7 @@ const getDinner = (week: number, day: number) => {
     `Week ${week}`
   );
   if (!sheet) return;
+  day = day === 7 ? 6 : day;
 
   const column = String.fromCharCode('B'.charCodeAt(0) + day);
   const dinnerData = sheet