Fix skip break

czlucius · Jan 15, 2023 · e2e8672 · e2e8672
1 parent 7aba7f1
commit e2e8672
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/background/alarms.js b/src/background/alarms.js
@@ -17,7 +17,7 @@ browser.alarms.onAlarm.addListener(async (alarm) => {
   }
 });
 
-browser.runtime.onMessage.addListener(data => {
+browser.runtime.onMessage.addListener(async (data) => {
   try {
     const { trigger } = JSON.parse(data);
 
@@ -32,6 +32,25 @@ browser.runtime.onMessage.addListener(data => {
         });
       });
     }
+    else if (trigger === "endbreakearly") {
+      browser.alarms.clear("breakAlarm");
+      const periodInSecs = (await browser.storage.sync.get("interval")).interval || 60 * 10
+
+      browser.alarms.create(
+          "Breaks",
+          {
+              periodInMinutes: periodInSecs / 60
+          }
+      )
+
+      browser.tabs.query({}, function (tabs) {
+        tabs.forEach(tab => {
+          browser.tabs.sendMessage(tab.id, JSON.stringify({
+            trigger: "closeoverlay",
+          }));
+        });
+      });
+    }
 
   } catch {
 

diff --git a/src/content/break-overlay.js b/src/content/break-overlay.js
@@ -21,27 +21,12 @@ let breakTimeout;
 
 // Break Handling
 
-const sendEndBreak = async () => {
-};
-
 const sendSkipBreak = () => {
-  browser.tabs.query({}, function (tabs) {
-    for (const tab of tabs) {
-      const msgPromise = browser.tabs.sendMessage(
-        tab.id,
-        JSON.stringify({trigger: "skipbreak"})
-      )
-    }
-  });
-};
+  browser.runtime.sendMessage(JSON.stringify({ trigger: "endbreakearly" }));
+}
 
 const skipBreak = async () => {
   overlay.remove();
-  await sendEndBreak();
-  const breakAlarm = await browser.alarms.get("breakAlarm");
-  if (breakAlarm) {
-    browser.alarms.clear("breakAlarm");
-  }
 };
 
 const displayBreakOverlay = async (quote) => {
@@ -68,7 +53,6 @@ const displayBreakOverlay = async (quote) => {
     btn.style.position = "relative";
 
     btn.onclick = (event) => {
-      skipBreak();
       sendSkipBreak();
     };
   }
@@ -104,7 +88,6 @@ browser.runtime.onMessage.addListener(async data => {
 
   try {
     const jsondata = JSON.parse(data)
-    console.log(jsondata);
     const { trigger } = jsondata;
 
     if (jsondata.trigger === 'breaks') {
@@ -121,10 +104,8 @@ browser.runtime.onMessage.addListener(async data => {
       skipBreak();
     }
     else if (trigger === "onesecondinterval") {
-      console.log("1s interval");
       const alarm = jsondata.breakAlarm;
       if (alarm) {
-        console.log("hello");
         timeLeft = alarm.scheduledTime - Date.now();
       }