Merge pull request #35 from andreidimaano/groupBreakPatch

hotfix group Break
andreidimaano · Mar 26, 2021 · ab47abe · ab47abe
2 parents 5244093 + fa51acf
commit ab47abe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/command/group/GroupPomodoro.ts b/src/command/group/GroupPomodoro.ts
@@ -4,7 +4,6 @@ import { deleteGroupCanceledBreak, deleteGroupCanceledPomodoro, isCanceledGroup,
 import { createGroup, deleteGroup } from "../../database/resolvers/GroupPomodoroResolver";
 import { endBreakEmbed, startBreakEmbed } from "../pomodoro/BreakEmbed";
 import { updateDatabase } from "../pomodoro/Pomodoro";
-import { startEmbed } from "../pomodoro/PomodoroEmbed";
 import { endGroupEmbed, startGroupEmbed } from "./GroupPomodoroEmbed";
 
 export let GroupPomodoro = async (message: Message, workTime?: number, breakTime?: number) => {

diff --git a/src/command/pomodoro/Pomodoro.ts b/src/command/pomodoro/Pomodoro.ts
@@ -43,13 +43,13 @@ export let Pomodoro = async ( message: Message, workTime?: number, breakTime?: n
                         await deleteUserCanceledBreak(authorId);
                     }
 
-                }, 60000 /*1000*/ * breakTimer!);
+                }, 60000 * breakTimer!);
             }
         } else {
             console.log('Pomodoro was canceled');
             await deleteUserCanceledPomodoro(authorId);
         }
-    }, 60000 /*1000*/ * workTimer); 
+    }, 60000 * workTimer); 
 }
 
 export let errorCheck = (workTime?: number, breakTime?: number) => {

diff --git a/src/invokers/MessageInvoker.ts b/src/invokers/MessageInvoker.ts
@@ -53,7 +53,7 @@ let executeCommand = async (message: Message, args: Arguments) => {
         case 'group' : {
             let validGroupPomodoro = await canStartGroup(message);
             if(validGroupPomodoro) {
-                await GroupPomodoro(message, args.workTime, args.workTime);
+                await GroupPomodoro(message, args.workTime, args.breakTime);
             }
             break;
         }

diff --git a/src/invokers/messageParser.ts b/src/invokers/messageParser.ts
@@ -30,6 +30,13 @@ export let parseArguments = (messageContent: string) : Arguments => {
         }
     }
 
+    if(args[0].toLowerCase() === "group" && args[1].toLowerCase() === "cancel") {
+        command = "cancel";
+        workTime = 0;
+        breakTime = 0;
+        isGroup = true;
+    }
+
     return {
         command: command,
         workTime: workTime,