From c6ddf5292827f3b3aad91a13128d2e15b6a02d08 Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.altner11@gmail.com>
Date: Mon, 21 Mar 2022 13:34:22 +0100
Subject: [PATCH 1/6] added comments

---
 src/background.js |  6 ++++++
 src/content.js    | 15 ++++++++++++---
 src/popup.js      | 13 +++++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/background.js b/src/background.js
index 1380551..a965285 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,8 +1,11 @@
+// Query a WaniKani API endpoint with the given token
 const query = (token, url) => 
     new Promise(async (resolve, reject) => { 
+        // Create header with the authorization token
         const requestHeaders = new Headers()
         requestHeaders.append("Authorization", "Bearer " + token)
 
+        // Construct request
         const endpoint = new Request(
             url, 
             { 
@@ -11,6 +14,8 @@ const query = (token, url) =>
             }
         )
 
+        // Fetch the response. If it returns HTTP 200, resolve the promise,
+        // otherwise reject it
         var result = await fetch(endpoint)
         if(!result.ok)
         {
@@ -21,6 +26,7 @@ const query = (token, url) =>
         return resolve(result.json())
     })
 
+// Update the local cache with new data
 const updateCache = async (token, oldLevel, newLevel) => {
     // If oldLevel is undefined, then a sync has never been performed (first time user)
     if(oldLevel === undefined)
diff --git a/src/content.js b/src/content.js
index 7af3d0a..6121b16 100644
--- a/src/content.js
+++ b/src/content.js
@@ -1,15 +1,18 @@
+// Vocab Furigana CSS
 var vocabStyle = `
     .furikani-vocabulary {
         display: none;
     }
 `
 
+// Kanji Furigana CSS
 var kanjiStyle  = `
     .furikani-kanji {
         display: none;
     }
 `
 
+// Create stylesheet elements on the website for the classes
 var vocabStyleSheet = document.createElement("style")
 var kanjiStyleSheet = document.createElement("style")
 
@@ -23,6 +26,7 @@ chrome.storage.local.get(["vocabulary", "kanji", "validUserLevel", "enabled", "e
     if(!data.validUserLevel)
         return
 
+    // If global setting is enabled, set the stylesheets depending on the other settings
     if(data.enabled)
     {
         if(data.enabledVocab)
@@ -45,7 +49,7 @@ chrome.storage.local.get(["vocabulary", "kanji", "validUserLevel", "enabled", "e
         var ruby = document.createElement("ruby")
         ruby.innerHTML = rubyTags.item(tag).innerHTML
 
-        // Remove all tags (except for <rb>)
+        // Remove all tags (except for <rb>, <span>)
         while(ruby.lastElementChild)
         {
             if(ruby.lastElementChild.tagName.toLowerCase() === "rb" ||
@@ -58,7 +62,8 @@ chrome.storage.local.get(["vocabulary", "kanji", "validUserLevel", "enabled", "e
             ruby.removeChild(ruby.lastElementChild)
         }
 
-        // If the contents of the <ruby> tag are in the word list, remove the <rt> tag
+        // If the contents of the <ruby> tag are in the word list, tag the <rt> tag
+        // with the correct class
         var rtTag = rubyTags.item(tag).getElementsByTagName("rt").item(0)
         if(vocabulary.includes(ruby.innerText))
             rtTag.classList.add("furikani-vocabulary")
@@ -68,11 +73,14 @@ chrome.storage.local.get(["vocabulary", "kanji", "validUserLevel", "enabled", "e
 })
 
 chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
+    // One of the switches was checked/unchecked
     if(msg.action === "settingsUpdated")
     {
+        // Retrieve current switch states
         chrome.storage.local.get(["enabled", "enabledVocab", "enabledKanji"], (data) => {  
             console.log(data)
-
+            
+            // If everything is disabled, disable all stylsheets
             if(!data.enabled)
             {
                 vocabStyleSheet.innerHTML = ""
@@ -81,6 +89,7 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
                 return
             }
 
+            // Otherwise set the kanji and vocab stylesheets depending on their settings
             vocabStyleSheet.innerHTML = data.enabledVocab ? vocabStyle : ""
             kanjiStyleSheet.innerHTML = data.enabledKanji ? kanjiStyle : ""
 
diff --git a/src/popup.js b/src/popup.js
index e7b98b0..ad04d2b 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -9,21 +9,25 @@ const kanjiSetting = document.getElementById("setting-kanji")
 
 // Set popup content
 chrome.storage.local.get(["level", "token", "enabled", "enabledVocab", "enabledKanji"], (data) => {
+    // If no token is set, display exlamation mark and checkmark button
     if(data.token === undefined)
     {
         statusField.innerHTML = String.fromCodePoint(0x2757)
         submitButton.innerHTML = String.fromCodePoint(0x2705)
         submitButton.classList.add("no-token")
     }
-    else
+    else    // else display checkmark and reload button
     {
         statusField.innerHTML = String.fromCodePoint(0x2705)
         submitButton.innerHTML = String.fromCodePoint(0x1F501)
     }
 
+    // Display the users current WaniKani level
     const levelSpan = document.getElementById("level")
     levelSpan.innerHTML = data.level
 
+    // If the input field contains text that is not the current token, turn the
+    // button into a checkmark (else turn it into a repeat button)
     inputField.addEventListener("input", () => {
         if(inputField.value !== "" && inputField.value !== data.token)
         {
@@ -37,6 +41,7 @@ chrome.storage.local.get(["level", "token", "enabled", "enabledVocab", "enabledK
         }
     })
 
+    // Set the switches to thecached values
     globalSetting.checked = data.enabled
     vocabSetting.checked = data.enabledVocab
     kanjiSetting.checked = data.enabledKanji
@@ -74,6 +79,8 @@ submitButton.addEventListener( "click", () => {
 globalSetting.addEventListener("change", () => {
     chrome.storage.local.set({"enabled": globalSetting.checked})
 
+    // If the global settings are unchecked, uncheck the other options as well   
+    // and disable them
     if(!globalSetting.checked)
     {
         vocabSetting.checked = false
@@ -82,7 +89,8 @@ globalSetting.addEventListener("change", () => {
         vocabSetting.setAttribute("disabled", true)
         kanjiSetting.setAttribute("disabled", true)
     }
-    else
+    // Else restore the values of the switches and activate them agin
+    else   
     {
         chrome.storage.local.get(["enabledVocab", "enabledKanji"], (data) => {
             vocabSetting.checked = data.enabledVocab
@@ -93,6 +101,7 @@ globalSetting.addEventListener("change", () => {
         kanjiSetting.removeAttribute("disabled")
     }
 
+    // Send a message to content script that the switches were updated
     chrome.tabs.query({active: true, currentWindow: true}, (tabs) => {
         chrome.tabs.sendMessage(tabs[0].id, {action: "settingsUpdated"}, (r) => {})
     })

From eb71b380451912efb5a1117c1d69cf0154e382b7 Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.altner11@gmail.com>
Date: Mon, 21 Mar 2022 13:35:53 +0100
Subject: [PATCH 2/6] remove console.log

---
 src/content.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/content.js b/src/content.js
index 6121b16..e100d03 100644
--- a/src/content.js
+++ b/src/content.js
@@ -78,8 +78,6 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
     {
         // Retrieve current switch states
         chrome.storage.local.get(["enabled", "enabledVocab", "enabledKanji"], (data) => {  
-            console.log(data)
-            
             // If everything is disabled, disable all stylsheets
             if(!data.enabled)
             {

From 77fb392e8093c08ec96552565294c4d8d14fe4e7 Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.altner11@gmail.com>
Date: Mon, 21 Mar 2022 13:53:22 +0100
Subject: [PATCH 3/6] use set instead of arrays

---
 src/background.js | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/background.js b/src/background.js
index a965285..617b278 100644
--- a/src/background.js
+++ b/src/background.js
@@ -45,9 +45,24 @@ const updateCache = async (token, oldLevel, newLevel) => {
     // Turn the array of levels into a comma separated list
     var levelURLString = levelArray.join(",")
 
-    // API endpoint + response data buffers
+    // Data buffers
+    var vocabulary = new Set();
+    var kanji = new Set();
+
+    // If the old level is less than the new level add the old data to the new data
+    if(oldLevel < newLevel)
+    {
+        await chrome.storage.local.get(["vocabulary", "kanji"], (data) => {
+            if(data.vocabulary !== undefined && data.kanji !== undefined)
+            {
+                data.vocabulary.forEach(vocabulary.add, vocabulary)
+                data.kanji.forEach(kanji.add, kanji)
+            }
+        })
+    }
+
+    // API endpoint
     var url = "https://api.wanikani.com/v2/subjects?types=vocabulary&levels=" + levelURLString
-    var vocabulary = []
     
     // WaniKani only sends 1000 elements in one response and then provides us with a link to the
     // next "page" of the data. We need to loop until the next page is null
@@ -59,14 +74,14 @@ const updateCache = async (token, oldLevel, newLevel) => {
             break
             
         for(let i in response.data)
-            vocabulary.push(response.data[i].data.characters)
+            vocabulary.add(response.data[i].data.characters)
 
         url = response.pages.next_url
     } while(url !== null)
 
     // Extract Kanji as well
     var url = "https://api.wanikani.com/v2/subjects?types=kanji&levels=" + levelURLString
-    var kanji = []
+    var kanji = new Set()
     
     do
     {
@@ -75,24 +90,15 @@ const updateCache = async (token, oldLevel, newLevel) => {
             break
             
         for(let i in response.data)
-            kanji.push(response.data[i].data.characters)
+            kanji.add(response.data[i].data.characters)
 
         url = response.pages.next_url
     } while(url !== null)
-
-    // If the old level is less than the new level add the old data to the new data
-    if(oldLevel < newLevel)
-    {
-        await chrome.storage.local.get(["vocabulary", "kanji"], (data) => {
-            vocabulary.concat(data.vocabulary)
-            kanji.concat(data.kanji)
-        })
-    }
     
     // Cache the data
     chrome.storage.local.set({
-        "vocabulary": vocabulary,
-        "kanji": kanji,
+        "vocabulary": [...vocabulary],
+        "kanji": [...kanji],
         "level": newLevel
     })
 }

From 335d611e577c2e7f895125012574bdc52bc110f0 Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.altner11@gmail.com>
Date: Mon, 21 Mar 2022 13:57:05 +0100
Subject: [PATCH 4/6] remove error log from first time sync

---
 src/background.js | 2 +-
 src/popup.js      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/background.js b/src/background.js
index 617b278..571edd5 100644
--- a/src/background.js
+++ b/src/background.js
@@ -154,4 +154,4 @@ chrome.runtime.onMessage.addListener((data, sender, sendResponse) => {
 })
 
 // At browser start, sync with wanikani
-sync().then(value => console.log(value)).catch(reason => console.error(reason))
\ No newline at end of file
+sync().then(value => console.log(value)).catch(reason => {})
\ No newline at end of file
diff --git a/src/popup.js b/src/popup.js
index ad04d2b..965ccb1 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -47,8 +47,9 @@ chrome.storage.local.get(["level", "token", "enabled", "enabledVocab", "enabledK
     kanjiSetting.checked = data.enabledKanji
 })
 
-// Set the wanikani token
+// Submit button pressed
 submitButton.addEventListener( "click", () => {
+    // If the submit field has a new token, replace the current one with it
     if(submitButton.classList.contains("new-token"))
     {
         chrome.storage.local.set({"token": inputField.value})
@@ -61,6 +62,7 @@ submitButton.addEventListener( "click", () => {
 
     statusField.innerHTML = String.fromCodePoint(0x23F1)
 
+    // Sync with wanikani
     chrome.runtime.sendMessage("", {type: "sync"}, response => {
             if(response.success)
             {

From fc6122c99cf44b4f088de2b47111d6fba668b56b Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.altner11@gmail.com>
Date: Mon, 21 Mar 2022 14:03:34 +0100
Subject: [PATCH 5/6] perform startup initialization

---
 src/background.js | 11 +++++++++++
 src/popup.js      | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/background.js b/src/background.js
index 571edd5..8def5a0 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,3 +1,14 @@
+chrome.storage.local.get("token", (data) => {
+    if(data.token !== undefined)
+        return
+
+    chrome.storage.local.set({
+        "enabled": true,
+        "enabledVocab": true,
+        "enabledKanji": true
+    })
+})
+
 // Query a WaniKani API endpoint with the given token
 const query = (token, url) => 
     new Promise(async (resolve, reject) => { 
diff --git a/src/popup.js b/src/popup.js
index 965ccb1..5fa342f 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -64,17 +64,17 @@ submitButton.addEventListener( "click", () => {
 
     // Sync with wanikani
     chrome.runtime.sendMessage("", {type: "sync"}, response => {
-            if(response.success)
-            {
-                statusField.innerHTML = String.fromCodePoint(0x2705)
-                errorField.innerHTML = ""
-            }
-            else
-            {
-                statusField.innerHTML = String.fromCodePoint(0x2757)
-                errorField.innerHTML = response.error
-            }
-        })
+        if(response.success)
+        {
+            statusField.innerHTML = String.fromCodePoint(0x2705)
+            errorField.innerHTML = ""
+        }
+        else
+        {
+            statusField.innerHTML = String.fromCodePoint(0x2757)
+            errorField.innerHTML = response.error
+        }
+    })
 })
 
 // Set settings event listeners

From 569e9e02fefc458b75e77e808f74023597923af4 Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.altner11@gmail.com>
Date: Mon, 21 Mar 2022 14:06:56 +0100
Subject: [PATCH 6/6] v6.0.1

---
 VERSIONS.md   | 5 +++++
 manifest.json | 2 +-
 popup.html    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 VERSIONS.md

diff --git a/VERSIONS.md b/VERSIONS.md
new file mode 100644
index 0000000..adac9b1
--- /dev/null
+++ b/VERSIONS.md
@@ -0,0 +1,5 @@
+# v0.6
+## v0.6.1
+ * Replaced internal arrays with sets to prevent accidentally doubly caching values
+ * Perform startup initialization for switches (should now default to ON)
+ * Fixed error appearing right after installing extension
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index fbf31ca..eaf5cc6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "FuriKani",
     "description": "Removes furigana on websites based on your WaniKani level",
-    "version": "0.6",
+    "version": "0.6.1",
     "icons": {
         "16": "res/icon16.png",
         "48": "res/icon48.png",
diff --git a/popup.html b/popup.html
index 2917dd3..51e0662 100644
--- a/popup.html
+++ b/popup.html
@@ -6,7 +6,7 @@
 <body>
     <header>
         <h1>FuriKani</h1>
-        <h2>v0.6</h2>
+        <h2>v0.6.1</h2>
     </header>
 
     <div id="token-area">