From 9cfab51e1cd5c790752ad1e57e2414146d6434a0 Mon Sep 17 00:00:00 2001
From: laxvy <laxvy@outlook.com>
Date: Sat, 17 May 2025 22:45:00 -0700
Subject: [PATCH 1/6] Needs fixes + Improvements, but Very Basic Timer
 Functionality Added

---
 src/popup.css  |  11 +++++
 src/popup.html |  10 +++-
 src/popup.js   |  52 +++++++++++++++++---
 src/word.js    | 131 ++++++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 190 insertions(+), 14 deletions(-)

diff --git a/src/popup.css b/src/popup.css
index d844708..7a22930 100644
--- a/src/popup.css
+++ b/src/popup.css
@@ -270,6 +270,17 @@ button#document_bg_save_custom:hover {
   background-color: var(--accent-color);
 }
 
+/* Timer CSS */
+button#timer_save_times {
+  background-color: var(--secondary-background-color);
+  border-radius: 4px;
+}
+
+button#timer_save_times:hover {
+  background-color: var(--accent-color);
+}
+/* */
+
 #version {
   color: var(--tertiary-text-color);
   margin: 0;
diff --git a/src/popup.html b/src/popup.html
index 97de894..3c3ac9b 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -42,9 +42,17 @@ <h1>DocsAfterDark Options</h1>
           <div id="modes" class="button_row">
             <button id="mode_dark" value="dark" class="accent_button">Dark</button>
             <button id="mode_light" value="light" class="accent_button">Light</button>
+            <button id="mode_timer" value ="timer" class = "accent_button">Dark on Times</button>
             <button id="mode_off" value="off" class="accent_button">Off</button>
           </div>
+          <div id="timer_for_mode_switch" class="option_row hidden">
+            <input id="startTime" placeholder="8:00 PM/20:00" />
+            <input id="endTime" placeholder="8:00 AM/8:00" />
+            <button id="timer_save_times">Set</button>
+            <!-- TO DO: Add in Checkboxes to Switch from Dark > Light or Dark > Off -->
         </div>
+        </div>
+
 
       <div class="option_section">
         <p class="section_label">Dark Mode Variant</p>
@@ -138,6 +146,7 @@ <h1>DocsAfterDark Options</h1>
         <button id="spectrum_reset" disabled>Reset</button>
       </div>
 
+      
       <!-- <div class="option_section" id="debug_section">
         <p class="section_label">Debug</p>
         <div class="option_container">
@@ -157,7 +166,6 @@ <h1>DocsAfterDark Options</h1>
           <button id="debug_clear">Clear Storage</button>
         </div>
       </div> -->
-
       <hr />
       <footer>
         <p id="version"></p>
diff --git a/src/popup.js b/src/popup.js
index c852a19..3f8a880 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -134,6 +134,7 @@ function clear_storage() {
   browser_namespace.storage.local.clear();
 }
 
+
 ///////////////
 // VARIABLES //
 ///////////////
@@ -141,6 +142,7 @@ function clear_storage() {
 const mode_off            = 0;
 const mode_light          = 1;
 const mode_dark           = 2;
+const mode_timer          = 3; 
 
 const dark_mode_normal    = 0;
 const dark_mode_eclipse   = 1;
@@ -158,6 +160,12 @@ var selected_mode;
 
 var document_inverted_state = false;
 
+//Timing Related Variables for Switching on and Off. 
+const timer_for_mode_switch         = document.querySelector("#timer_for_mode_switch");
+const timer_set_times              = document.querySelector("#timer_save_times"); 
+const timer_start_times             = document.querySelector("#startTime");
+const timer_end_times             = document.querySelector("#endTime"); 
+
 // DARK MODE VARIANTS
 const dark_mode_normal_button   = document.querySelector("#dark_mode_normal");
 const dark_mode_eclipse_button  = document.querySelector("#dark_mode_eclipse");
@@ -223,12 +231,22 @@ document.querySelectorAll("#modes button").forEach(function (e) {
 
     this.classList.add("selected");
     selected_mode = this.value;
-    
+
+    //Making this 
+    if(selected_mode != "timer"){
+      timer_for_mode_switch.classList.add("hidden");
+    }
+    else{
+      timer_for_mode_switch.classList.remove("hidden");
+      set_storage("mode", mode_timer)
+    }
+//
     if (selected_mode == "off") {
       set_storage("mode", mode_off);
-    } else if (selected_mode == "light") {
+    } 
+  
+    else if (selected_mode == "light") {
       set_storage("mode", mode_light);
-
       if (document_bg_option != "black" && document_bg_option != "custom") {
         // UPDATE INVERT CHECKBOXES
         document_inverted_checkbox.checked = false;
@@ -239,7 +257,6 @@ document.querySelectorAll("#modes button").forEach(function (e) {
       }
     } else if (selected_mode == "dark") {
       set_storage("mode", mode_dark);
-
       if (document_bg_option != "default" && document_bg_option != "custom") {
         // UPDATE INVERT CHECKBOXES
         document_inverted_checkbox.checked = true;
@@ -249,6 +266,9 @@ document.querySelectorAll("#modes button").forEach(function (e) {
         update_storage("invert", "invert", true);
       }
     }
+
+
+
   });
 });
 
@@ -352,6 +372,12 @@ document_bg_custom_save.addEventListener("click", function (e) {
     set_storage("custom_bg", document_bg_custom_input.value);
 });
 
+// Add Timer Values to the Storage 
+timer_set_times.addEventListener("click", function (e) {
+  set_storage("startTime", timer_start_times.value);
+  set_storage("endTime", timer_end_times.value);
+});
+
 ////////////////////////////
 // INVERT CLICK LISTENERS //
 ////////////////////////////
@@ -602,6 +628,7 @@ spectrum_bar.addEventListener("mousedown", function (e) {
   });
 });
 
+
 ///////////////////
 // LOAD SETTINGS //
 ///////////////////
@@ -618,6 +645,8 @@ try {
       "temp_accent_color",
       "dark_mode",
       "button_options",
+      "endTime", 
+      "startTime", 
       "raise_button", // DEPRECATED BUT KEEP FOR BACKWARDS COMPATIBILITY
       "on", // DEPRECATED BUT KEEP FOR BACKWARDS COMPATIBILITY
     ],
@@ -627,7 +656,8 @@ try {
       let custom_data   = data.custom_bg;
       let invert_data   = data.invert;
       let border_shown  = data.show_border;
-
+      let setEndTime = data.endTime; 
+      let setStartTime = data.startTime; 
       ////////////////////
       // PARSE SETTINGS //
       ////////////////////
@@ -645,7 +675,15 @@ try {
           selected_mode = "off";
         } else if (data.mode == mode_light) {
           selected_mode = "light";
-        } else {
+        } 
+        else if(data.mode == mode_timer){
+          selected_mode = "timer";
+          timer_for_mode_switch.classList.remove("hidden");
+          timer_start_times.value = setStartTime;
+          timer_end_times.value = setEndTime; 
+
+        }
+        else {
           selected_mode = "dark";
         }
       }
@@ -762,6 +800,7 @@ try {
       initiateKnob(accent_color.hue);
       setPopupAccentColor(accent_color);
 
+
       ///////////////////////
       // DARK MODE VARIANT //
       ///////////////////////
@@ -823,3 +862,4 @@ try {
 // });
 
 
+
diff --git a/src/word.js b/src/word.js
index b235f91..546295a 100644
--- a/src/word.js
+++ b/src/word.js
@@ -132,6 +132,7 @@ function is_newer_or_equal_version(current_version, target_version) {
   return true;
 }
 
+
 ///////////////////////////
 // END UTILITY FUNCTIONS //
 ///////////////////////////
@@ -146,6 +147,7 @@ const version = browser_namespace.runtime.getManifest().version;
 const mode_off              = 0;
 const mode_light            = 1;
 const mode_dark             = 2;
+const mode_timer            = 3;
 
 const dark_mode_normal      = 0;
 const dark_mode_eclipse     = 1;
@@ -195,13 +197,18 @@ const backgrounds = {
   black: "#000000",
 };
 
-// TODO: TOGGLE INVERT IF DARK OR BLACK BACKGROUND IS SELECTED
 
+
+// TODO: TOGGLE INVERT IF DARK OR BLACK BACKGROUND IS SELECTED
 var mode;
 var dark_mode_options;
 var button_options;
 var accent_color;
 var toggle_state = false;
+var notSetToTimer = true; 
+//Defaults for Timer
+var timerStartTime = []; 
+var timerEndTime = [];
 
 // DO NOT ENABLE DARK MODE ON GOOGLE DOCS HOMEPAGE
 if (document.querySelector(".docs-homescreen-gb-container"))
@@ -234,8 +241,10 @@ function remove_css_file(file) {
  * @param {{ variant: number }} dark_mode
  */
 function inject_dark_mode(dark_mode) {  
+  if(notSetToTimer){
   mode = mode_dark;
-  
+  }
+
   remove_css_file("light.css");
   remove_css_file("dark_midnight.css");
   
@@ -252,8 +261,9 @@ function inject_dark_mode(dark_mode) {
  * INJECTS LIGHT MODE CSS
  */
 function inject_light_mode() {
+  if(notSetToTimer){
   mode = mode_light;
-
+  }
   remove_css_file("dark_midnight.css");
   remove_css_file("dark_normal.css");
 
@@ -330,6 +340,8 @@ function remove_accent_color() {
  * HANDLES MODE AND VARIANT CHANGE
  * 
  */
+
+
 function handle_mode() {
   if (mode != mode_off && button_options && button_options.show)
     handle_button();
@@ -339,15 +351,82 @@ function handle_mode() {
     inject_dark_mode(default_dark_mode);
     set_storage("mode", mode_dark);
   } else if (mode == mode_dark) {
+    notSetToTimer = true;
     inject_dark_mode(dark_mode_options);
   } else if (mode == mode_light) {
     inject_light_mode();
-  } else {
+  }  
+  else if(mode == mode_timer){
+    notSetToTimer = false; 
+    const tempTime = new Date(); 
+    const tempStartTime = new Date();
+    const tempEndTime = new Date(); 
+    tempEndTime.setHours(timerEndTime[0], timerEndTime[1], 0)
+    tempStartTime.setHours(timerStartTime[0], timerStartTime[1], 0);
+    if((tempTime >= tempStartTime)){
+      document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
+      inject_dark_mode(default_dark_mode);
+    }
+    else{
+      document.documentElement.style.setProperty("--docsafterdark_document_invert", "none");
+      inject_light_mode();
+    }
+
+    timerFunctionality();  
+  }
+  else {
     // TURN OFF DOCSAFTERDARK
     remove_docsafterdark();
   }
 }
 
+
+///Timer Function. 
+async function timerFunctionality(){
+  //This Should be reduced to a Single thing
+  const timerSTime = new Date();
+  const timerETime = new Date();
+  const curTime = new Date(); 
+  timerSTime.setHours(parseInt(timerStartTime[0]), parseInt(timerStartTime[1]), 0);
+  timerETime.setHours(parseInt(timerEndTime[0]), parseInt(timerEndTime[1]), 0); 
+  
+  if(timerETime <= timerSTime){
+    timerETime.setDate((parseInt(timerETime.getDate())+1)) //To Account for Day Roll Overs
+  }
+  //Add Seconds to this from curTime
+  var checkBackInOn; 
+  if(timerStartTime < curTime){
+  checkBackInOn = Math.abs((((timerEndTime[0]-curTime.getHours())*360)+((timerEndTime[1]-curTime.getMinutes())*60))*1000)
+  }
+  else{
+    checkBackInOn = Math.abs((((timerEndTime[0]-timerStartTime[0])*360)+((timerEndTime[1]-timerStartTime[1])*60))*1000)
+  }
+
+  console.log("Start Time: "+timerSTime.toLocaleTimeString()+", End Time: "+timerETime.toLocaleTimeString()+", Pause Time: "+checkBackInOn);
+  if(mode == mode_timer){
+  if(curTime >= timerSTime){
+document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
+inject_dark_mode(default_dark_mode);
+}
+//
+if(curTime >= timerETime){ 
+document.documentElement.style.setProperty("--docsafterdark_document_invert", "none");
+inject_light_mode();
+}
+//Need to add an AbortSignal to this. 
+await new Promise((resolve, reject) => 
+  
+  setTimeout(resolve, checkBackInOn)
+
+);
+
+}
+timerFunctionality();
+
+}
+
+
+
 /**
  * HANDLES DOCUMENT INVERT
  * 
@@ -388,6 +467,8 @@ browser_namespace.storage.local.get(
     "show_border",
     "accent_color",
     "button_options",
+    "endTime", 
+    "startTime", //Timer Values
     "version",
     "updates", // DEPRECATED BUT KEEP FOR BACKWARDS COMPATIBILITY
     "raise_button", // DEPRECATED BUT KEEP FOR BACKWARDS COMPATIBILITY
@@ -416,7 +497,31 @@ browser_namespace.storage.local.get(
       dark_mode_options = { variant: dark_mode_normal };
       set_storage("dark_mode", dark_mode_options);
     }
+    ///////////
+
+      //Set The Timer Times and Calculate them as needed
+    if((data.startTime != null) && (data.endTime != null)){
+    tempSTime = data.startTime.split(":")
+    tempETime = data.endTime.split(":")
+    //This should just be a function so we can Parse All Of them Equally at the same time
+    if(tempETime[1].includes("PM") && (tempETime[0] != "12")){
+    tempETime[0] = (parseInt(tempETime[0])+12)
+    }
+    if(tempETime[0] == "12" && tempETime[1].includes("AM")){
+      tempETime[0] = 0;
+    }
 
+    //Start Time
+    if(tempSTime[1].includes("PM") && (tempSTime[0] != "12")){
+    tempSTime[0] = (parseInt(tempSTime[0])+12)
+    }
+    if(tempSTime[0] == "12" && tempSTime[1].includes("AM")){
+      tempSTime[0] = 0;
+    }    
+    timerStartTime = [parseInt(tempSTime[0]), parseInt(tempSTime[1])]
+    timerEndTime = [parseInt(tempETime[0]), parseInt(tempETime[1])]
+    }
+ 
     /////////////////////////
     // DOCUMENT BACKGROUND //
     /////////////////////////
@@ -437,6 +542,7 @@ browser_namespace.storage.local.get(
       set_storage("doc_bg", default_background);
     }
 
+
     ////////////
     // INVERT //
     ////////////
@@ -487,7 +593,6 @@ browser_namespace.storage.local.get(
 
     // NOTE: MUST BE CALLED BEFORE HANDLE_MODE
     // TODO: USE BACKGROUND WORKER TO CONSOLIDATE DEFAULT OPTIONS AND OPTION MIGRATION
-
     button_options = data.button_options;
 
     if (button_options == null) {
@@ -501,6 +606,8 @@ browser_namespace.storage.local.get(
       set_storage("button_options", button_options);
     }
 
+
+
     ////////////////////
     // HANDLE VERSION //
     ////////////////////
@@ -574,10 +681,11 @@ browser_namespace.storage.local.get(
   }
 );
 
+
+
 ////////////////////////////
 // HANDLE STORAGE CHANGES //
 ////////////////////////////
-
 browser_namespace.storage.onChanged.addListener(function (changes, area) {
   /////////////////////////
   // DOCUMENT BACKGROUND //
@@ -623,6 +731,14 @@ browser_namespace.storage.onChanged.addListener(function (changes, area) {
     mode = changes.mode.newValue;
   }
 
+  //Timer Values; I think this needs to Be Done on an Event Listener? 
+  if((changes.startTime != null) && (changes.endTime != null)){
+    browser_namespace.storage.local.get(["startTime"], changes.startTime)
+    browser_namespace.storage.local.get(["endTime"], changes.endTime)
+    timerFunctionality()
+}
+  //
+
   ///////////////////////
   // DARK MODE VARIANT //
   ///////////////////////
@@ -645,7 +761,6 @@ browser_namespace.storage.onChanged.addListener(function (changes, area) {
   ////////////
 
   // NOTE: MUST BE CALLED BEFORE HANDLE_MODE
-
   if (changes.button_options != null) {
     button_options = changes.button_options.newValue;
     handle_button();
@@ -673,3 +788,5 @@ browser_namespace.runtime.onMessage.addListener(function (request, sender, sendR
     update_accent_color(request.color);
   }
 });
+
+

From 70d0b2cda1c8c268f11d8c658f8f7d1e3cd1f244 Mon Sep 17 00:00:00 2001
From: laxvy <laxvy@outlook.com>
Date: Sun, 18 May 2025 00:36:22 -0700
Subject: [PATCH 2/6] Fixing setTimeout Calculation

---
 src/popup.js |  2 +-
 src/word.js  | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/popup.js b/src/popup.js
index 3f8a880..7a50945 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -232,7 +232,7 @@ document.querySelectorAll("#modes button").forEach(function (e) {
     this.classList.add("selected");
     selected_mode = this.value;
 
-    //Making this 
+    //
     if(selected_mode != "timer"){
       timer_for_mode_switch.classList.add("hidden");
     }
diff --git a/src/word.js b/src/word.js
index 546295a..5d12130 100644
--- a/src/word.js
+++ b/src/word.js
@@ -365,7 +365,7 @@ function handle_mode() {
     tempStartTime.setHours(timerStartTime[0], timerStartTime[1], 0);
     if((tempTime >= tempStartTime)){
       document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
-      inject_dark_mode(default_dark_mode);
+      inject_dark_mode(dark_mode_options);
     }
     else{
       document.documentElement.style.setProperty("--docsafterdark_document_invert", "none");
@@ -393,20 +393,21 @@ async function timerFunctionality(){
   if(timerETime <= timerSTime){
     timerETime.setDate((parseInt(timerETime.getDate())+1)) //To Account for Day Roll Overs
   }
-  //Add Seconds to this from curTime
+  
   var checkBackInOn; 
-  if(timerStartTime < curTime){
-  checkBackInOn = Math.abs((((timerEndTime[0]-curTime.getHours())*360)+((timerEndTime[1]-curTime.getMinutes())*60))*1000)
+   if(timerSTime <= curTime){
+  checkBackInOn = Math.abs((((timerEndTime[0]-parseInt(curTime.getHours()))*3600000)+((timerEndTime[1]-parseInt(curTime.getMinutes()))*60000)))
   }
   else{
-    checkBackInOn = Math.abs((((timerEndTime[0]-timerStartTime[0])*360)+((timerEndTime[1]-timerStartTime[1])*60))*1000)
+    checkBackInOn = Math.abs((((timerEndTime[0]-timerStartTime[0])*3600000)+((timerEndTime[1]-timerStartTime[1])*60000)))
   }
+  //If we have a faked, we can just check 
 
   console.log("Start Time: "+timerSTime.toLocaleTimeString()+", End Time: "+timerETime.toLocaleTimeString()+", Pause Time: "+checkBackInOn);
-  if(mode == mode_timer){
+  if(mode == mode_timer && checkBackInOn != NaN){
   if(curTime >= timerSTime){
 document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
-inject_dark_mode(default_dark_mode);
+inject_dark_mode(dark_mode_options);
 }
 //
 if(curTime >= timerETime){ 
@@ -417,10 +418,10 @@ inject_light_mode();
 await new Promise((resolve, reject) => 
   
   setTimeout(resolve, checkBackInOn)
-
 );
 
 }
+
 timerFunctionality();
 
 }
@@ -731,7 +732,7 @@ browser_namespace.storage.onChanged.addListener(function (changes, area) {
     mode = changes.mode.newValue;
   }
 
-  //Timer Values; I think this needs to Be Done on an Event Listener? 
+  //Timer Values; Add a Listener so then we send an Abort Signal Function so then we don't need to Click and Such? 
   if((changes.startTime != null) && (changes.endTime != null)){
     browser_namespace.storage.local.get(["startTime"], changes.startTime)
     browser_namespace.storage.local.get(["endTime"], changes.endTime)

From 76b08458dbb75fd8a21300b3fe0fc6511833f515 Mon Sep 17 00:00:00 2001
From: laxvy <laxvy@outlook.com>
Date: Sun, 18 May 2025 20:30:16 -0700
Subject: [PATCH 3/6] Now Dynamically Takes and registers Time; Just Needs a
 few more improvements and tweaks

---
 src/popup.js |  2 ++
 src/word.js  | 91 ++++++++++++++++++++++++++++++++++------------------
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/src/popup.js b/src/popup.js
index 7a50945..b843faa 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -374,8 +374,10 @@ document_bg_custom_save.addEventListener("click", function (e) {
 
 // Add Timer Values to the Storage 
 timer_set_times.addEventListener("click", function (e) {
+  if(timer_start_times.value){
   set_storage("startTime", timer_start_times.value);
   set_storage("endTime", timer_end_times.value);
+  }
 });
 
 ////////////////////////////
diff --git a/src/word.js b/src/word.js
index 5d12130..389876b 100644
--- a/src/word.js
+++ b/src/word.js
@@ -159,6 +159,7 @@ const default_invert        = { invert: true, grayscale: true, black: false };
 
 const switch_on             = "🌚";
 const switch_off            = "🌞";
+//
 
 const replacements_path     = "assets/replacements/";
 const css_path              = "assets/css/";
@@ -205,11 +206,12 @@ var dark_mode_options;
 var button_options;
 var accent_color;
 var toggle_state = false;
+//Timer Variables. 
 var notSetToTimer = true; 
-//Defaults for Timer
+var startTime = ""; //Can we leave this blank RQ? 
+var endTime = "";
 var timerStartTime = []; 
 var timerEndTime = [];
-
 // DO NOT ENABLE DARK MODE ON GOOGLE DOCS HOMEPAGE
 if (document.querySelector(".docs-homescreen-gb-container"))
   throw new Error("NOT ENABLING DOCSAFTERDARK ON GOOGLE DOCS HOMEPAGE");
@@ -336,18 +338,20 @@ function remove_accent_color() {
   document.documentElement.style.removeProperty("--docsafterdark-accent-hue");
 }
 
+//Additional Timer Setting Functions
+
+///
+
 /**
  * HANDLES MODE AND VARIANT CHANGE
  * 
  */
-
-
 function handle_mode() {
   if (mode != mode_off && button_options && button_options.show)
     handle_button();
-
   if (mode == null) {
     // FIRST INVOCATION (SHOULD NOT BE CALLED); ENABLE DEFAULT DARK MODE BY DEFAULT
+    //Should we set our Times on our First invocation too??? 
     inject_dark_mode(default_dark_mode);
     set_storage("mode", mode_dark);
   } else if (mode == mode_dark) {
@@ -357,12 +361,14 @@ function handle_mode() {
     inject_light_mode();
   }  
   else if(mode == mode_timer){
+    
     notSetToTimer = false; 
     const tempTime = new Date(); 
     const tempStartTime = new Date();
     const tempEndTime = new Date(); 
     tempEndTime.setHours(timerEndTime[0], timerEndTime[1], 0)
     tempStartTime.setHours(timerStartTime[0], timerStartTime[1], 0);
+    if(!(isNaN(tempEndTime.getTime())) && !(isNaN(tempStartTime.getTime()))){
     if((tempTime >= tempStartTime)){
       document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
       inject_dark_mode(dark_mode_options);
@@ -371,8 +377,9 @@ function handle_mode() {
       document.documentElement.style.setProperty("--docsafterdark_document_invert", "none");
       inject_light_mode();
     }
-
     timerFunctionality();  
+    }
+    ///
   }
   else {
     // TURN OFF DOCSAFTERDARK
@@ -383,7 +390,7 @@ function handle_mode() {
 
 ///Timer Function. 
 async function timerFunctionality(){
-  //This Should be reduced to a Single thing
+  //This needs to be Manually itterated over. 
   const timerSTime = new Date();
   const timerETime = new Date();
   const curTime = new Date(); 
@@ -401,31 +408,27 @@ async function timerFunctionality(){
   else{
     checkBackInOn = Math.abs((((timerEndTime[0]-timerStartTime[0])*3600000)+((timerEndTime[1]-timerStartTime[1])*60000)))
   }
-  //If we have a faked, we can just check 
-
+  
   console.log("Start Time: "+timerSTime.toLocaleTimeString()+", End Time: "+timerETime.toLocaleTimeString()+", Pause Time: "+checkBackInOn);
+  //Only run if we have Valid Times + Timer is Set. 
   if(mode == mode_timer && checkBackInOn != NaN){
   if(curTime >= timerSTime){
-document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
-inject_dark_mode(dark_mode_options);
+    document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
+    inject_dark_mode(dark_mode_options);
 }
 //
 if(curTime >= timerETime){ 
 document.documentElement.style.setProperty("--docsafterdark_document_invert", "none");
 inject_light_mode();
 }
-//Need to add an AbortSignal to this. 
-await new Promise((resolve, reject) => 
-  
-  setTimeout(resolve, checkBackInOn)
-);
 
+await new Promise((resolve, reject) => 
+  testArray.push(window.setTimeout(function(){}, resolve, checkBackInOn)));
 }
-
 timerFunctionality();
-
 }
 
+var testArray = [];
 
 
 /**
@@ -457,7 +460,6 @@ for (let [key, value] of Object.entries(replacements)) {
 }
 
 let show_border;
-
 browser_namespace.storage.local.get(
   [
     "mode",
@@ -500,10 +502,12 @@ browser_namespace.storage.local.get(
     }
     ///////////
 
-      //Set The Timer Times and Calculate them as needed
+    //Set The Timer Times and Calculate them as needed
     if((data.startTime != null) && (data.endTime != null)){
-    tempSTime = data.startTime.split(":")
-    tempETime = data.endTime.split(":")
+    startTime = data.startTime;
+    endTime = data.endTime; 
+    tempSTime = startTime.split(":")
+    tempETime = endTime.split(":")
     //This should just be a function so we can Parse All Of them Equally at the same time
     if(tempETime[1].includes("PM") && (tempETime[0] != "12")){
     tempETime[0] = (parseInt(tempETime[0])+12)
@@ -511,8 +515,6 @@ browser_namespace.storage.local.get(
     if(tempETime[0] == "12" && tempETime[1].includes("AM")){
       tempETime[0] = 0;
     }
-
-    //Start Time
     if(tempSTime[1].includes("PM") && (tempSTime[0] != "12")){
     tempSTime[0] = (parseInt(tempSTime[0])+12)
     }
@@ -521,7 +523,11 @@ browser_namespace.storage.local.get(
     }    
     timerStartTime = [parseInt(tempSTime[0]), parseInt(tempSTime[1])]
     timerEndTime = [parseInt(tempETime[0]), parseInt(tempETime[1])]
+    set_storage("endTime", endTime)
+    set_storage("startTime", startTime)
+    timerFunctionality();
     }
+
  
     /////////////////////////
     // DOCUMENT BACKGROUND //
@@ -723,7 +729,6 @@ browser_namespace.storage.onChanged.addListener(function (changes, area) {
     log.debug("INVERT CHANGES", changes.invert.newValue);
     handle_document_invert(changes.invert.newValue);
   }
-
   //////////
   // MODE //
   //////////
@@ -732,13 +737,35 @@ browser_namespace.storage.onChanged.addListener(function (changes, area) {
     mode = changes.mode.newValue;
   }
 
-  //Timer Values; Add a Listener so then we send an Abort Signal Function so then we don't need to Click and Such? 
-  if((changes.startTime != null) && (changes.endTime != null)){
-    browser_namespace.storage.local.get(["startTime"], changes.startTime)
-    browser_namespace.storage.local.get(["endTime"], changes.endTime)
-    timerFunctionality()
-}
-  //
+  //Change the Time on Set, Still not Done and Just need to figure this last thing out 
+  if((changes.startTime != null) || (changes.endTime != null)){
+    console.log(startTime)
+    if(changes.startTime != null){
+      startTime = changes.startTime.newValue;
+    }
+    if(changes.endTime != null){
+      endTime = changes.endTime.newValue;
+    }
+    tempSTime = startTime.split(":")
+    tempETime = endTime.split(":")
+    //This should just be a function so we can Parse All Of them Equally at the same time
+    if(tempETime[1].includes("PM") && (tempETime[0] != "12")){
+    tempETime[0] = (parseInt(tempETime[0])+12)
+    }
+    if(tempETime[0] == "12" && tempETime[1].includes("AM")){
+      tempETime[0] = 0;
+    }
+    if(tempSTime[1].includes("PM") && (tempSTime[0] != "12")){
+    tempSTime[0] = (parseInt(tempSTime[0])+12)
+    }
+    if(tempSTime[0] == "12" && tempSTime[1].includes("AM")){
+      tempSTime[0] = 0;
+    }    
+    timerStartTime = [parseInt(tempSTime[0]), parseInt(tempSTime[1])]
+    timerEndTime = [parseInt(tempETime[0]), parseInt(tempETime[1])]
+
+    handle_mode(); //Properly Run again? 
+  }
 
   ///////////////////////
   // DARK MODE VARIANT //

From b57fe53cac2e42c6050e500d77343cffbf4ef7f1 Mon Sep 17 00:00:00 2001
From: laxvy <laxvy@outlook.com>
Date: Mon, 19 May 2025 21:29:10 -0700
Subject: [PATCH 4/6] Needs Clean up but Should be all set.

---
 src/word.js | 102 +++++++++++++++++++++++-----------------------------
 1 file changed, 45 insertions(+), 57 deletions(-)

diff --git a/src/word.js b/src/word.js
index 389876b..42e52db 100644
--- a/src/word.js
+++ b/src/word.js
@@ -208,7 +208,7 @@ var accent_color;
 var toggle_state = false;
 //Timer Variables. 
 var notSetToTimer = true; 
-var startTime = ""; //Can we leave this blank RQ? 
+var startTime = ""; 
 var endTime = "";
 var timerStartTime = []; 
 var timerEndTime = [];
@@ -377,6 +377,7 @@ function handle_mode() {
       document.documentElement.style.setProperty("--docsafterdark_document_invert", "none");
       inject_light_mode();
     }
+    //this is being set 3 Times; which SHouldn't be set
     timerFunctionality();  
     }
     ///
@@ -388,48 +389,67 @@ function handle_mode() {
 }
 
 
+function cleanTimeForTimer(timeRecieved){
+ hourThenMinutes =  timeRecieved.split(":");
+    
+    if(hourThenMinutes[1].includes("PM") && (hourThenMinutes[0] != "12")){
+    hourThenMinutes[0] = (parseInt(hourThenMinutes[0])+12)
+    }
+    if(hourThenMinutes[0] == "12" && hourThenMinutes[1].includes("AM")){
+      hourThenMinutes[0] = 0;
+    }
+    hourThenMinutes[1] = parseInt(hourThenMinutes[1].substring(0,2))
+ return hourThenMinutes; 
+}
+
 ///Timer Function. 
 async function timerFunctionality(){
-  //This needs to be Manually itterated over. 
+  clearTimeout();
   const timerSTime = new Date();
   const timerETime = new Date();
   const curTime = new Date(); 
-  timerSTime.setHours(parseInt(timerStartTime[0]), parseInt(timerStartTime[1]), 0);
-  timerETime.setHours(parseInt(timerEndTime[0]), parseInt(timerEndTime[1]), 0); 
+  timerSTime.setHours(timerStartTime[0], timerStartTime[1], 0);
+  timerETime.setHours(timerEndTime[0], timerEndTime[1], 0); 
   
+  //To Account for Day Roll Overs + Passing it's current time. 
   if(timerETime <= timerSTime){
     timerETime.setDate((parseInt(timerETime.getDate())+1)) //To Account for Day Roll Overs
   }
-  
+  if((timerSTime < curTime) && (timerETime < curTime) ){
+    timerSTime.setDate((parseInt(timerETime.getDate())+1))
+  }
+  //////
   var checkBackInOn; 
-   if(timerSTime <= curTime){
-  checkBackInOn = Math.abs((((timerEndTime[0]-parseInt(curTime.getHours()))*3600000)+((timerEndTime[1]-parseInt(curTime.getMinutes()))*60000)))
+  //Make this a Switch Case Since we need to change what we're doing. 
+  if(curTime < timerSTime){
+  checkBackInOn = (Math.abs((((timerStartTime[0]-parseInt(curTime.getHours()))*3600000)+((timerStartTime[1]-parseInt(curTime.getMinutes()))*60000)))-(parseInt(curTime.getSeconds())*1000))
+  }
+  else if(timerSTime <= curTime){
+  checkBackInOn = (Math.abs((((timerEndTime[0]-parseInt(curTime.getHours()))*3600000)+((timerEndTime[1]-parseInt(curTime.getMinutes()))*60000)))-(parseInt(curTime.getSeconds())*1000))
   }
   else{
-    checkBackInOn = Math.abs((((timerEndTime[0]-timerStartTime[0])*3600000)+((timerEndTime[1]-timerStartTime[1])*60000)))
+    checkBackInOn = (Math.abs((((timerEndTime[0]-timerStartTime[0])*3600000)+((timerEndTime[1]-timerStartTime[1])*60000))))
   }
-  
+  ///
   console.log("Start Time: "+timerSTime.toLocaleTimeString()+", End Time: "+timerETime.toLocaleTimeString()+", Pause Time: "+checkBackInOn);
-  //Only run if we have Valid Times + Timer is Set. 
-  if(mode == mode_timer && checkBackInOn != NaN){
-  if(curTime >= timerSTime){
+  
+  if(mode == mode_timer && checkBackInOn != NaN && checkBackInOn > 0){
+//Only run if we have Valid Times + Timer is Set. 
+ if((curTime >= timerSTime) && (curTime < timerETime)){
     document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
     inject_dark_mode(dark_mode_options);
 }
-//
-if(curTime >= timerETime){ 
+else{ 
 document.documentElement.style.setProperty("--docsafterdark_document_invert", "none");
 inject_light_mode();
 }
-
 await new Promise((resolve, reject) => 
-  testArray.push(window.setTimeout(function(){}, resolve, checkBackInOn)));
+ setTimeout(resolve, checkBackInOn));
 }
+//Running Recursively under the Assumption of "Set it and Forget it"
 timerFunctionality();
 }
 
-var testArray = [];
-
 
 /**
  * HANDLES DOCUMENT INVERT
@@ -506,26 +526,11 @@ browser_namespace.storage.local.get(
     if((data.startTime != null) && (data.endTime != null)){
     startTime = data.startTime;
     endTime = data.endTime; 
-    tempSTime = startTime.split(":")
-    tempETime = endTime.split(":")
-    //This should just be a function so we can Parse All Of them Equally at the same time
-    if(tempETime[1].includes("PM") && (tempETime[0] != "12")){
-    tempETime[0] = (parseInt(tempETime[0])+12)
-    }
-    if(tempETime[0] == "12" && tempETime[1].includes("AM")){
-      tempETime[0] = 0;
-    }
-    if(tempSTime[1].includes("PM") && (tempSTime[0] != "12")){
-    tempSTime[0] = (parseInt(tempSTime[0])+12)
-    }
-    if(tempSTime[0] == "12" && tempSTime[1].includes("AM")){
-      tempSTime[0] = 0;
-    }    
-    timerStartTime = [parseInt(tempSTime[0]), parseInt(tempSTime[1])]
-    timerEndTime = [parseInt(tempETime[0]), parseInt(tempETime[1])]
+    timerStartTime = cleanTimeForTimer(startTime)
+    timerEndTime = cleanTimeForTimer(endTime)
     set_storage("endTime", endTime)
     set_storage("startTime", startTime)
-    timerFunctionality();
+    handle_mode();
     }
 
  
@@ -739,32 +744,15 @@ browser_namespace.storage.onChanged.addListener(function (changes, area) {
 
   //Change the Time on Set, Still not Done and Just need to figure this last thing out 
   if((changes.startTime != null) || (changes.endTime != null)){
-    console.log(startTime)
     if(changes.startTime != null){
       startTime = changes.startTime.newValue;
     }
     if(changes.endTime != null){
       endTime = changes.endTime.newValue;
-    }
-    tempSTime = startTime.split(":")
-    tempETime = endTime.split(":")
-    //This should just be a function so we can Parse All Of them Equally at the same time
-    if(tempETime[1].includes("PM") && (tempETime[0] != "12")){
-    tempETime[0] = (parseInt(tempETime[0])+12)
-    }
-    if(tempETime[0] == "12" && tempETime[1].includes("AM")){
-      tempETime[0] = 0;
-    }
-    if(tempSTime[1].includes("PM") && (tempSTime[0] != "12")){
-    tempSTime[0] = (parseInt(tempSTime[0])+12)
-    }
-    if(tempSTime[0] == "12" && tempSTime[1].includes("AM")){
-      tempSTime[0] = 0;
-    }    
-    timerStartTime = [parseInt(tempSTime[0]), parseInt(tempSTime[1])]
-    timerEndTime = [parseInt(tempETime[0]), parseInt(tempETime[1])]
-
-    handle_mode(); //Properly Run again? 
+    } 
+    timerStartTime = cleanTimeForTimer(startTime)
+    timerEndTime = cleanTimeForTimer(endTime)
+    handle_mode(); //Properly Run again using this. 
   }
 
   ///////////////////////

From 27ac0ad8c027046a0a50fa28b25aecc73845a805 Mon Sep 17 00:00:00 2001
From: laxvy <laxvy@outlook.com>
Date: Tue, 20 May 2025 07:24:54 -0700
Subject: [PATCH 5/6] Date functionality works fine Now, just needs general
 clean up

---
 src/word.js | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/word.js b/src/word.js
index 42e52db..da93441 100644
--- a/src/word.js
+++ b/src/word.js
@@ -361,13 +361,15 @@ function handle_mode() {
     inject_light_mode();
   }  
   else if(mode == mode_timer){
-    
+  
     notSetToTimer = false; 
+    //We Should condense this into a Single time. 
     const tempTime = new Date(); 
     const tempStartTime = new Date();
     const tempEndTime = new Date(); 
     tempEndTime.setHours(timerEndTime[0], timerEndTime[1], 0)
     tempStartTime.setHours(timerStartTime[0], timerStartTime[1], 0);
+    //Setting this Initially to Ensure the change is more Smooth. 
     if(!(isNaN(tempEndTime.getTime())) && !(isNaN(tempStartTime.getTime()))){
     if((tempTime >= tempStartTime)){
       document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
@@ -377,7 +379,6 @@ function handle_mode() {
       document.documentElement.style.setProperty("--docsafterdark_document_invert", "none");
       inject_light_mode();
     }
-    //this is being set 3 Times; which SHouldn't be set
     timerFunctionality();  
     }
     ///
@@ -391,7 +392,6 @@ function handle_mode() {
 
 function cleanTimeForTimer(timeRecieved){
  hourThenMinutes =  timeRecieved.split(":");
-    
     if(hourThenMinutes[1].includes("PM") && (hourThenMinutes[0] != "12")){
     hourThenMinutes[0] = (parseInt(hourThenMinutes[0])+12)
     }
@@ -405,6 +405,7 @@ function cleanTimeForTimer(timeRecieved){
 ///Timer Function. 
 async function timerFunctionality(){
   clearTimeout();
+  //Can't we condense these? We use this on as well. 
   const timerSTime = new Date();
   const timerETime = new Date();
   const curTime = new Date(); 
@@ -412,27 +413,29 @@ async function timerFunctionality(){
   timerETime.setHours(timerEndTime[0], timerEndTime[1], 0); 
   
   //To Account for Day Roll Overs + Passing it's current time. 
-  if(timerETime <= timerSTime){
-    timerETime.setDate((parseInt(timerETime.getDate())+1)) //To Account for Day Roll Overs
-  }
   if((timerSTime < curTime) && (timerETime < curTime) ){
-    timerSTime.setDate((parseInt(timerETime.getDate())+1))
+    timerSTime.setDate((parseInt(timerSTime.getDate())+1))
+  }
+  if(timerETime <= timerSTime){
+    timerETime.setDate((parseInt(timerETime.getDate())+1))
   }
-  //////
   var checkBackInOn; 
-  //Make this a Switch Case Since we need to change what we're doing. 
-  if(curTime < timerSTime){
-  checkBackInOn = (Math.abs((((timerStartTime[0]-parseInt(curTime.getHours()))*3600000)+((timerStartTime[1]-parseInt(curTime.getMinutes()))*60000)))-(parseInt(curTime.getSeconds())*1000))
+
+  //This is Gross. It works but it's gross. 
+  if(curTime.getDate() < timerSTime.getDate()){
+    checkBackInOn = 86400000-(Math.abs((((timerStartTime[0]-parseInt(curTime.getHours()))*3600000)+((timerStartTime[1]-parseInt(curTime.getMinutes()))*60000)))-(parseInt(curTime.getSeconds())*1000))
+  }
+  else if((curTime < timerSTime) && (curTime.getDate() == timerSTime.getDate())){
+    checkBackInOn = (Math.abs((((timerStartTime[0]-parseInt(curTime.getHours()))*3600000)+((timerStartTime[1]-parseInt(curTime.getMinutes()))*60000)))-(parseInt(curTime.getSeconds())*1000))
   }
   else if(timerSTime <= curTime){
-  checkBackInOn = (Math.abs((((timerEndTime[0]-parseInt(curTime.getHours()))*3600000)+((timerEndTime[1]-parseInt(curTime.getMinutes()))*60000)))-(parseInt(curTime.getSeconds())*1000))
+    checkBackInOn = (Math.abs((((timerEndTime[0]-parseInt(curTime.getHours()))*3600000)+((timerEndTime[1]-parseInt(curTime.getMinutes()))*60000)))-(parseInt(curTime.getSeconds())*1000))
   }
   else{
-    checkBackInOn = (Math.abs((((timerEndTime[0]-timerStartTime[0])*3600000)+((timerEndTime[1]-timerStartTime[1])*60000))))
+    checkBackInOn = (Math.abs((((timerEndTime[0]-timerStartTime[0])*3600000)+((timerEndTime[1]-timerStartTime[1])*60000)))) 
   }
-  ///
-  console.log("Start Time: "+timerSTime.toLocaleTimeString()+", End Time: "+timerETime.toLocaleTimeString()+", Pause Time: "+checkBackInOn);
-  
+/* console.log("Start Time: "+timerSTime.toLocaleDateString()+", End Time: "+timerETime.toLocaleDateString()+", Pause Time: "+checkBackInOn);
+  console.log("Start Time: "+timerSTime.toLocaleTimeString()+", End Time: "+timerETime.toLocaleTimeString()+", Pause Time: "+checkBackInOn); */
   if(mode == mode_timer && checkBackInOn != NaN && checkBackInOn > 0){
 //Only run if we have Valid Times + Timer is Set. 
  if((curTime >= timerSTime) && (curTime < timerETime)){
@@ -446,7 +449,6 @@ inject_light_mode();
 await new Promise((resolve, reject) => 
  setTimeout(resolve, checkBackInOn));
 }
-//Running Recursively under the Assumption of "Set it and Forget it"
 timerFunctionality();
 }
 

From 0546b55b43c5cd7a99547fe9b85dfaad023c0550 Mon Sep 17 00:00:00 2001
From: laxvy <laxvy@outlook.com>
Date: Tue, 20 May 2025 19:51:35 -0700
Subject: [PATCH 6/6] Last Fixes for now

---
 src/word.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/word.js b/src/word.js
index da93441..a304767 100644
--- a/src/word.js
+++ b/src/word.js
@@ -361,15 +361,13 @@ function handle_mode() {
     inject_light_mode();
   }  
   else if(mode == mode_timer){
-  
     notSetToTimer = false; 
-    //We Should condense this into a Single time. 
     const tempTime = new Date(); 
     const tempStartTime = new Date();
     const tempEndTime = new Date(); 
     tempEndTime.setHours(timerEndTime[0], timerEndTime[1], 0)
     tempStartTime.setHours(timerStartTime[0], timerStartTime[1], 0);
-    //Setting this Initially to Ensure the change is more Smooth. 
+
     if(!(isNaN(tempEndTime.getTime())) && !(isNaN(tempStartTime.getTime()))){
     if((tempTime >= tempStartTime)){
       document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
@@ -389,7 +387,6 @@ function handle_mode() {
   }
 }
 
-
 function cleanTimeForTimer(timeRecieved){
  hourThenMinutes =  timeRecieved.split(":");
     if(hourThenMinutes[1].includes("PM") && (hourThenMinutes[0] != "12")){
@@ -405,7 +402,6 @@ function cleanTimeForTimer(timeRecieved){
 ///Timer Function. 
 async function timerFunctionality(){
   clearTimeout();
-  //Can't we condense these? We use this on as well. 
   const timerSTime = new Date();
   const timerETime = new Date();
   const curTime = new Date(); 
@@ -420,9 +416,8 @@ async function timerFunctionality(){
     timerETime.setDate((parseInt(timerETime.getDate())+1))
   }
   var checkBackInOn; 
-
-  //This is Gross. It works but it's gross. 
-  if(curTime.getDate() < timerSTime.getDate()){
+  //Decide how we should Calculate the Pause Interval; 
+  if(curTime < timerSTime){
     checkBackInOn = 86400000-(Math.abs((((timerStartTime[0]-parseInt(curTime.getHours()))*3600000)+((timerStartTime[1]-parseInt(curTime.getMinutes()))*60000)))-(parseInt(curTime.getSeconds())*1000))
   }
   else if((curTime < timerSTime) && (curTime.getDate() == timerSTime.getDate())){
@@ -434,10 +429,10 @@ async function timerFunctionality(){
   else{
     checkBackInOn = (Math.abs((((timerEndTime[0]-timerStartTime[0])*3600000)+((timerEndTime[1]-timerStartTime[1])*60000)))) 
   }
-/* console.log("Start Time: "+timerSTime.toLocaleDateString()+", End Time: "+timerETime.toLocaleDateString()+", Pause Time: "+checkBackInOn);
+/* console.log("Start Time: "+timerSTime.toLocaleDateString()+", End Time: "+timerETime.toLocaleDateString()+", Pause Time: "+checkBackInOn); 
   console.log("Start Time: "+timerSTime.toLocaleTimeString()+", End Time: "+timerETime.toLocaleTimeString()+", Pause Time: "+checkBackInOn); */
+
   if(mode == mode_timer && checkBackInOn != NaN && checkBackInOn > 0){
-//Only run if we have Valid Times + Timer is Set. 
  if((curTime >= timerSTime) && (curTime < timerETime)){
     document.documentElement.style.setProperty("--docsafterdark_document_invert", document_inverted_value);
     inject_dark_mode(dark_mode_options);