From 1a12fc0c99a27194a27ae7838536110f5c9a97de Mon Sep 17 00:00:00 2001
From: Akash Vacher <avacher@linkedin.com>
Date: Sat, 1 Oct 2022 11:03:54 -0700
Subject: [PATCH 1/8] Added customisable click-behavior for left-click to
 extension icon

The behavior can be customised by selecting the appropriate radio button on the extension's options page
---
 src/background.js | 39 ++++++++++++++++++++-------------------
 src/options.html  |  5 ++++-
 src/options.js    | 22 ++++++++++++++--------
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/background.js b/src/background.js
index 3d4a5cf..19f5f60 100644
--- a/src/background.js
+++ b/src/background.js
@@ -29,17 +29,15 @@ function sendVideoUrlToMetubeAndSwitchTab(videoUrl, metubeUrl, tab) {
         if (res.ok === true && res.status === 200) {
             return res.json();
         }
-        // todo fix it
-        alert("error :: code " + res.status);
+        console.log("error :: code " + res.status);
     }).then(function(result) {
         if (result.status === "ok") {
             openTab(metubeUrl, tab);
         } else {
-            // todo fix it
-            alert("error :: " + json);
+            console.log("error :: ", result );
         }
     }).catch(function(res) {
-        alert("error :: " + res);
+        console.log("Final catch - error :: " + res);
     });
 }
 
@@ -54,25 +52,28 @@ chrome.contextMenus.onClicked.addListener(function(item, tab) {
 });
 
 chrome.action.onClicked.addListener(function(tab) {
-    chrome.storage.sync.get(['metube', 'sendOnClick'], function(data) {
+    chrome.storage.sync.get(['metube', 'clickBehavior'], function(data) {
         if (data === undefined || !data.hasOwnProperty('metube') || data.metube === "") {
             openTab(chrome.runtime.getURL('options.html'), tab);
             return
         }
-        chrome.tabs.query({
-            active: true,
-            lastFocusedWindow: true
-        }, function(tabs) {
-            // use this tab to get the youtube video URL
-            let videoUrl = tabs[0].url;
-            if (data.sendOnClick) {
+        if (data.clickBehavior == 'do-nothing') {
+            return
+        } else if (data.clickBehavior == 'go-to-metube') {
+            console.log("Going to Metube URL...");
+            openTab(data.metube, tab);
+        } else if (data.clickBehavior == 'send-current-url-and-switch') {
+            chrome.tabs.query({
+                active: true,
+                lastFocusedWindow: true
+            }, function(tabs) {
+                // use this tab to get the youtube video URL
+                let videoUrl = tabs[0].url;
                 sendVideoUrlToMetubeAndSwitchTab(videoUrl, data.metube, tab);
-            }
-            else {
-                console.log("Going to Metube URL...");
-                openTab(data.metube, tab);
-            }
-        });
+            });
+        } else {
+            console.log("Unknown clickBehavior value: " + data.clickBehavior);
+        }
     });
 });
 
diff --git a/src/options.html b/src/options.html
index 97c2e75..6b4f7d7 100644
--- a/src/options.html
+++ b/src/options.html
@@ -33,7 +33,10 @@
       <h3>Settings</h3>
       <label for="metube">Url of MeTube</label><input type="url" placeholder="http://0.0.0.0:8081/" name="metube" id="metube">
       <br>
-      <label for="send-on-click">Enable left-click on extension icon to send current page URL to Metube</label><input type="checkbox" name="send-on-click" id="send-on-click">
+      <h4>Left-click on extension icon behavior</h4>
+      <input type="radio" name="click-behavior" id="do-nothing" value="do-nothing"><label for="do-nothing">Do Nothing</label><br>
+      <input type="radio" name="click-behavior" id="go-to-metube" value="go-to-metube" checked><label for="go-to-metube">Go to MeTube URL</label><br>
+      <input type="radio" name="click-behavior" id="send-current-url-and-switch" value="send-current-url-and-switch"><label for="send-current-url-and-switch">Send current tab URL to MeTube and switch to MeTube</label><br>
       <h3>Additional sites</h3>
       <p>Youtube-dl support <a href="https://github.com/ytdl-org/youtube-dl/blob/master/docs/supportedsites.md" target="_blank">many another sites</a> except youtube. You can add mask url's of this sites in textfield bellow but it can affect performance and we have not tested them support</p>
       <p><textarea name="additional" id="additional" placeholder="https://vimeo.com/*
diff --git a/src/options.js b/src/options.js
index 04e53ef..f733e54 100644
--- a/src/options.js
+++ b/src/options.js
@@ -7,9 +7,13 @@ async function saveOptions() {
 
     let sites = document.getElementById("additional").value;
 
-    let sendOnClick = document.getElementById("send-on-click").checked;
+    let clickBehavior = document.querySelector('input[name="click-behavior"]:checked').value;
 
-    chrome.storage.sync.set({ "metube": url, "sites": sites, "sendOnClick": sendOnClick}, function () {
+    chrome.storage.sync.set({
+        "metube": url,
+        "sites": sites,
+        "clickBehavior": clickBehavior
+    }, function () {
         document.getElementById("saved").classList.remove('hidden');
 
         setTimeout(function () {
@@ -41,7 +45,11 @@ async function saveOptions() {
 }
 
 async function restoreOptions() {
-    chrome.storage.sync.get(['metube', 'sites', 'sendOnClick'], function (data) {
+    chrome.storage.sync.get([
+        'metube',
+        'sites',
+        'clickBehavior'
+    ], function (data) {
         if (data.metube != undefined) {
             document.getElementById("metube").value = data.metube;
         }
@@ -49,11 +57,9 @@ async function restoreOptions() {
         if (data.sites != undefined) {
             document.getElementById("additional").value = data.sites;
         }
-        // document.getElementById("send-on-click").checked = true;
-        if (data.sendOnClick) {
-            document.getElementById("send-on-click").checked = true;
-        }
-    });
+
+        document.getElementById(data.clickBehavior).checked = true;
+    })
 }
 
 function splitLines(t) { return t.split(/\r\n|\r|\n/); }

From 7a104e2e8cf9b468c0021c4ab8afdc48ef10983a Mon Sep 17 00:00:00 2001
From: Akash Vacher <avacher@linkedin.com>
Date: Sat, 1 Oct 2022 12:41:36 -0700
Subject: [PATCH 2/8] Added option for silently sending current tab URL to
 MeTube via extension icon click (no tab switch)

Added the new option as another radio button that user may select when deciding the extention icon click behavior
---
 src/background.js | 35 ++++++++++++++++++++++++++---------
 src/options.html  |  1 +
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/background.js b/src/background.js
index 19f5f60..ce2c8b8 100644
--- a/src/background.js
+++ b/src/background.js
@@ -13,7 +13,7 @@ chrome.runtime.onInstalled.addListener(function() {
     });
 });
 
-function sendVideoUrlToMetubeAndSwitchTab(videoUrl, metubeUrl, tab) {
+function sendVideoUrlToMetube(videoUrl, metubeUrl, callback) {
     console.log("Sending videoUrl=" + videoUrl + " to metubeUrl=" + metubeUrl);
     fetch(metubeUrl + "/add", {
         method: 'POST',
@@ -29,15 +29,19 @@ function sendVideoUrlToMetubeAndSwitchTab(videoUrl, metubeUrl, tab) {
         if (res.ok === true && res.status === 200) {
             return res.json();
         }
-        console.log("error :: code " + res.status);
+        console.log("error :: code" + res.status);
     }).then(function(result) {
-        if (result.status === "ok") {
-            openTab(metubeUrl, tab);
-        } else {
+        if (result.status !== "ok") {
             console.log("error :: ", result );
+            if (result.msg.includes('URLError')) {
+                // Go straight to catch block and skip the callback
+                throw new Error('Error when adding URL to MyTube');
+            }
         }
-    }).catch(function(res) {
-        console.log("Final catch - error :: " + res);
+    }).then(function() {
+        typeof callback === 'function' && callback();
+    }).catch(function(e) {
+        console.log("Ran into an error :: ", e);
     });
 }
 
@@ -47,7 +51,9 @@ chrome.contextMenus.onClicked.addListener(function(item, tab) {
             openTab(chrome.runtime.getURL('options.html'), tab);
             return
         }
-        sendVideoUrlToMetubeAndSwitchTab(item.linkUrl, data.metube, tab);
+        sendVideoUrlToMetube(item.linkUrl, data.metube, function() {
+            openTab(data.metube, tab);
+        });
     });
 });
 
@@ -62,6 +68,15 @@ chrome.action.onClicked.addListener(function(tab) {
         } else if (data.clickBehavior == 'go-to-metube') {
             console.log("Going to Metube URL...");
             openTab(data.metube, tab);
+        } else if (data.clickBehavior == 'send-current-url') {
+            chrome.tabs.query({
+                active: true,
+                lastFocusedWindow: true
+            }, function(tabs) {
+                // use this tab to get the youtube video URL
+                let videoUrl = tabs[0].url;
+                sendVideoUrlToMetube(videoUrl, data.metube);
+            });
         } else if (data.clickBehavior == 'send-current-url-and-switch') {
             chrome.tabs.query({
                 active: true,
@@ -69,7 +84,9 @@ chrome.action.onClicked.addListener(function(tab) {
             }, function(tabs) {
                 // use this tab to get the youtube video URL
                 let videoUrl = tabs[0].url;
-                sendVideoUrlToMetubeAndSwitchTab(videoUrl, data.metube, tab);
+                sendVideoUrlToMetube(videoUrl, data.metube, function() {
+                    openTab(data.metube, tab);
+                });
             });
         } else {
             console.log("Unknown clickBehavior value: " + data.clickBehavior);
diff --git a/src/options.html b/src/options.html
index 6b4f7d7..3ae68ec 100644
--- a/src/options.html
+++ b/src/options.html
@@ -36,6 +36,7 @@
       <h4>Left-click on extension icon behavior</h4>
       <input type="radio" name="click-behavior" id="do-nothing" value="do-nothing"><label for="do-nothing">Do Nothing</label><br>
       <input type="radio" name="click-behavior" id="go-to-metube" value="go-to-metube" checked><label for="go-to-metube">Go to MeTube URL</label><br>
+      <input type="radio" name="click-behavior" id="send-current-url" value="send-current-url"><label for="send-current-url">Send current tab URL to MeTube (no tab switch)</label><br>
       <input type="radio" name="click-behavior" id="send-current-url-and-switch" value="send-current-url-and-switch"><label for="send-current-url-and-switch">Send current tab URL to MeTube and switch to MeTube</label><br>
       <h3>Additional sites</h3>
       <p>Youtube-dl support <a href="https://github.com/ytdl-org/youtube-dl/blob/master/docs/supportedsites.md" target="_blank">many another sites</a> except youtube. You can add mask url's of this sites in textfield bellow but it can affect performance and we have not tested them support</p>

From 92a7c850ab7db05e8280a6ac52c898d7920b3d92 Mon Sep 17 00:00:00 2001
From: Akash Vacher <avacher@linkedin.com>
Date: Sat, 1 Oct 2022 13:21:13 -0700
Subject: [PATCH 3/8] Added option for silently sending a video to MeTube via
 contextmenu (no tab switch)

The default behavior of sending a video to MeTube and switching to MeTube tab is still the default, but this new behavior is also added now in the extension options.
---
 src/background.js | 14 ++++++++++----
 src/options.html  |  8 +++++++-
 src/options.js    |  9 +++++++--
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/background.js b/src/background.js
index ce2c8b8..02637bb 100644
--- a/src/background.js
+++ b/src/background.js
@@ -46,14 +46,20 @@ function sendVideoUrlToMetube(videoUrl, metubeUrl, callback) {
 }
 
 chrome.contextMenus.onClicked.addListener(function(item, tab) {
-    chrome.storage.sync.get(['metube'], function(data) {
+    chrome.storage.sync.get(['metube', 'contextMenuClickBehavior'], function(data) {
         if (data === undefined || !data.hasOwnProperty('metube') || data.metube === "") {
             openTab(chrome.runtime.getURL('options.html'), tab);
             return
         }
-        sendVideoUrlToMetube(item.linkUrl, data.metube, function() {
-            openTab(data.metube, tab);
-        });
+        if ( data.contextMenuClickBehavior == 'context-menu-send-current-url') {
+            sendVideoUrlToMetube(item.linkUrl, data.metube);
+        } else if (data.contextMenuClickBehavior == 'context-menu-send-current-url-and-switch'){
+            sendVideoUrlToMetube(item.linkUrl, data.metube, function() {
+                openTab(data.metube, tab);
+            });
+        } else {
+            console.log("Unknown contextMenuClickBehavior value: " + data.contextMenuClickBehavior);
+        }
     });
 });
 
diff --git a/src/options.html b/src/options.html
index 3ae68ec..7ccc446 100644
--- a/src/options.html
+++ b/src/options.html
@@ -33,11 +33,17 @@
       <h3>Settings</h3>
       <label for="metube">Url of MeTube</label><input type="url" placeholder="http://0.0.0.0:8081/" name="metube" id="metube">
       <br>
-      <h4>Left-click on extension icon behavior</h4>
+
+      <h4>When you left-click on the extension icon, you'd like it to:</h4>
       <input type="radio" name="click-behavior" id="do-nothing" value="do-nothing"><label for="do-nothing">Do Nothing</label><br>
       <input type="radio" name="click-behavior" id="go-to-metube" value="go-to-metube" checked><label for="go-to-metube">Go to MeTube URL</label><br>
       <input type="radio" name="click-behavior" id="send-current-url" value="send-current-url"><label for="send-current-url">Send current tab URL to MeTube (no tab switch)</label><br>
       <input type="radio" name="click-behavior" id="send-current-url-and-switch" value="send-current-url-and-switch"><label for="send-current-url-and-switch">Send current tab URL to MeTube and switch to MeTube</label><br>
+
+      <h4>When you right-click on video preview, you'd like it to:</h4>
+      <input type="radio" name="context-menu-click-behavior" id="context-menu-send-current-url" value="context-menu-send-current-url"><label for="context-menu-send-current-url">Send the video URL to MeTube (no tab switch)</label><br>
+      <input type="radio" name="context-menu-click-behavior" id="context-menu-send-current-url-and-switch" value="context-menu-send-current-url-and-switch" checked><label for="context-menu-send-current-url-and-switch">Send the video URL to MeTube and switch to MeTube</label><br>
+
       <h3>Additional sites</h3>
       <p>Youtube-dl support <a href="https://github.com/ytdl-org/youtube-dl/blob/master/docs/supportedsites.md" target="_blank">many another sites</a> except youtube. You can add mask url's of this sites in textfield bellow but it can affect performance and we have not tested them support</p>
       <p><textarea name="additional" id="additional" placeholder="https://vimeo.com/*
diff --git a/src/options.js b/src/options.js
index f733e54..07f6b0b 100644
--- a/src/options.js
+++ b/src/options.js
@@ -9,10 +9,13 @@ async function saveOptions() {
 
     let clickBehavior = document.querySelector('input[name="click-behavior"]:checked').value;
 
+    let contextMenuClickBehavior = document.querySelector('input[name="context-menu-click-behavior"]:checked').value;
+
     chrome.storage.sync.set({
         "metube": url,
         "sites": sites,
-        "clickBehavior": clickBehavior
+        "clickBehavior": clickBehavior,
+        "contextMenuClickBehavior": contextMenuClickBehavior
     }, function () {
         document.getElementById("saved").classList.remove('hidden');
 
@@ -48,7 +51,8 @@ async function restoreOptions() {
     chrome.storage.sync.get([
         'metube',
         'sites',
-        'clickBehavior'
+        'clickBehavior',
+        'contextMenuClickBehavior'
     ], function (data) {
         if (data.metube != undefined) {
             document.getElementById("metube").value = data.metube;
@@ -59,6 +63,7 @@ async function restoreOptions() {
         }
 
         document.getElementById(data.clickBehavior).checked = true;
+        document.getElementById(data.contextMenuClickBehavior).checked = true;
     })
 }
 

From 45b3eb289a9af19a953d5f399960f99ada6edf4a Mon Sep 17 00:00:00 2001
From: Akash Vacher <avacher@linkedin.com>
Date: Fri, 7 Oct 2022 09:02:43 -0700
Subject: [PATCH 4/8] Minor code refactor in sendVideoUrlToMetube function as
 per suggestion

---
 src/background.js | 17 ++++++++++++++++-
 x                 |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100755 x

diff --git a/src/background.js b/src/background.js
index 02637bb..0521f03 100644
--- a/src/background.js
+++ b/src/background.js
@@ -39,7 +39,9 @@ function sendVideoUrlToMetube(videoUrl, metubeUrl, callback) {
             }
         }
     }).then(function() {
-        typeof callback === 'function' && callback();
+        if (typeof callback === 'function'){
+            callback();
+        }
     }).catch(function(e) {
         console.log("Ran into an error :: ", e);
     });
@@ -63,6 +65,19 @@ chrome.contextMenus.onClicked.addListener(function(item, tab) {
     });
 });
 
+
+async function getCurrentTabUrl() {
+    chrome.tabs.query({
+        active: true,
+        lastFocusedWindow: true
+    }, function(tabs) {
+        // use this tab to get the youtube video URL
+        let videoUrl = tabs[0].url;
+        console.log("Got current tab URL", videoUrl);
+        return videoUrl;
+    });
+}
+
 chrome.action.onClicked.addListener(function(tab) {
     chrome.storage.sync.get(['metube', 'clickBehavior'], function(data) {
         if (data === undefined || !data.hasOwnProperty('metube') || data.metube === "") {
diff --git a/x b/x
new file mode 100755
index 0000000..818fbab
--- /dev/null
+++ b/x
@@ -0,0 +1,2 @@
+#!/bin/bash
+./build.sh --force && cd /Users/avacher/code/hackday/opensource/metube-browser-extension/builds && unzip -o metube-browser-extension-1.3.zip -d metube-browser-extension-1.3; cd ~/code/hackday/opensource/metube-browser-extension

From 8394f2763f9156e59e7b31da4ed4af8292c9bba6 Mon Sep 17 00:00:00 2001
From: Akash Vacher <avacher@linkedin.com>
Date: Sun, 13 Nov 2022 09:42:43 -0800
Subject: [PATCH 5/8] Removed incorrectly added code

---
 src/background.js | 13 -------------
 x                 |  2 --
 2 files changed, 15 deletions(-)
 delete mode 100755 x

diff --git a/src/background.js b/src/background.js
index 0521f03..80c14ba 100644
--- a/src/background.js
+++ b/src/background.js
@@ -65,19 +65,6 @@ chrome.contextMenus.onClicked.addListener(function(item, tab) {
     });
 });
 
-
-async function getCurrentTabUrl() {
-    chrome.tabs.query({
-        active: true,
-        lastFocusedWindow: true
-    }, function(tabs) {
-        // use this tab to get the youtube video URL
-        let videoUrl = tabs[0].url;
-        console.log("Got current tab URL", videoUrl);
-        return videoUrl;
-    });
-}
-
 chrome.action.onClicked.addListener(function(tab) {
     chrome.storage.sync.get(['metube', 'clickBehavior'], function(data) {
         if (data === undefined || !data.hasOwnProperty('metube') || data.metube === "") {
diff --git a/x b/x
deleted file mode 100755
index 818fbab..0000000
--- a/x
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-./build.sh --force && cd /Users/avacher/code/hackday/opensource/metube-browser-extension/builds && unzip -o metube-browser-extension-1.3.zip -d metube-browser-extension-1.3; cd ~/code/hackday/opensource/metube-browser-extension

From 580714d58c9163e6351425bbb879f7b4d5d3fc4f Mon Sep 17 00:00:00 2001
From: Akash Vacher <avacher@linkedin.com>
Date: Sun, 13 Nov 2022 10:41:54 -0800
Subject: [PATCH 6/8] Added sane defaults for click behaviors at extension
 install time

---
 src/background.js | 6 ++++++
 src/options.html  | 4 ++--
 src/options.js    | 9 +++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/background.js b/src/background.js
index 80c14ba..3c096f0 100644
--- a/src/background.js
+++ b/src/background.js
@@ -11,6 +11,12 @@ chrome.runtime.onInstalled.addListener(function() {
         ],
         contexts: ['link'],
     });
+
+    // Set sane defaults for click behaviors at extension install time
+    chrome.storage.sync.set({
+        "clickBehavior": "go-to-metube",
+        "contextMenuClickBehavior": "context-menu-send-current-url-and-switch"
+    });
 });
 
 function sendVideoUrlToMetube(videoUrl, metubeUrl, callback) {
diff --git a/src/options.html b/src/options.html
index 7ccc446..c9b0bae 100644
--- a/src/options.html
+++ b/src/options.html
@@ -36,13 +36,13 @@
 
       <h4>When you left-click on the extension icon, you'd like it to:</h4>
       <input type="radio" name="click-behavior" id="do-nothing" value="do-nothing"><label for="do-nothing">Do Nothing</label><br>
-      <input type="radio" name="click-behavior" id="go-to-metube" value="go-to-metube" checked><label for="go-to-metube">Go to MeTube URL</label><br>
+      <input type="radio" name="click-behavior" id="go-to-metube" value="go-to-metube"><label for="go-to-metube">Go to MeTube URL</label><br>
       <input type="radio" name="click-behavior" id="send-current-url" value="send-current-url"><label for="send-current-url">Send current tab URL to MeTube (no tab switch)</label><br>
       <input type="radio" name="click-behavior" id="send-current-url-and-switch" value="send-current-url-and-switch"><label for="send-current-url-and-switch">Send current tab URL to MeTube and switch to MeTube</label><br>
 
       <h4>When you right-click on video preview, you'd like it to:</h4>
       <input type="radio" name="context-menu-click-behavior" id="context-menu-send-current-url" value="context-menu-send-current-url"><label for="context-menu-send-current-url">Send the video URL to MeTube (no tab switch)</label><br>
-      <input type="radio" name="context-menu-click-behavior" id="context-menu-send-current-url-and-switch" value="context-menu-send-current-url-and-switch" checked><label for="context-menu-send-current-url-and-switch">Send the video URL to MeTube and switch to MeTube</label><br>
+      <input type="radio" name="context-menu-click-behavior" id="context-menu-send-current-url-and-switch" value="context-menu-send-current-url-and-switch"><label for="context-menu-send-current-url-and-switch">Send the video URL to MeTube and switch to MeTube</label><br>
 
       <h3>Additional sites</h3>
       <p>Youtube-dl support <a href="https://github.com/ytdl-org/youtube-dl/blob/master/docs/supportedsites.md" target="_blank">many another sites</a> except youtube. You can add mask url's of this sites in textfield bellow but it can affect performance and we have not tested them support</p>
diff --git a/src/options.js b/src/options.js
index 07f6b0b..9d4627c 100644
--- a/src/options.js
+++ b/src/options.js
@@ -62,8 +62,13 @@ async function restoreOptions() {
             document.getElementById("additional").value = data.sites;
         }
 
-        document.getElementById(data.clickBehavior).checked = true;
-        document.getElementById(data.contextMenuClickBehavior).checked = true;
+        if (data.clickBehavior != undefined) {
+            document.getElementById(data.clickBehavior).checked = true;
+        }
+
+        if (data.contextMenuClickBehavior != undefined) {
+            document.getElementById(data.contextMenuClickBehavior).checked = true;
+        }
     })
 }
 

From 282a3bf9bcb5c42b80b4fa8a5aefdac0e9062ee1 Mon Sep 17 00:00:00 2001
From: Akash Vacher <avacher@linkedin.com>
Date: Sun, 13 Nov 2022 11:09:36 -0800
Subject: [PATCH 7/8] Simplified some code by using needToSwitch variable

---
 src/background.js | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/background.js b/src/background.js
index 3c096f0..cc67649 100644
--- a/src/background.js
+++ b/src/background.js
@@ -59,15 +59,13 @@ chrome.contextMenus.onClicked.addListener(function(item, tab) {
             openTab(chrome.runtime.getURL('options.html'), tab);
             return
         }
-        if ( data.contextMenuClickBehavior == 'context-menu-send-current-url') {
-            sendVideoUrlToMetube(item.linkUrl, data.metube);
-        } else if (data.contextMenuClickBehavior == 'context-menu-send-current-url-and-switch'){
-            sendVideoUrlToMetube(item.linkUrl, data.metube, function() {
-                openTab(data.metube, tab);
-            });
-        } else {
-            console.log("Unknown contextMenuClickBehavior value: " + data.contextMenuClickBehavior);
-        }
+        let needToSwitch = (data.contextMenuClickBehavior === 'context-menu-send-current-url-and-switch');
+        sendVideoUrlToMetube(item.linkUrl, data.metube, function() {
+            if (!needToSwitch) {
+                return;
+            }
+            openTab(data.metube, tab);
+        });
     });
 });
 
@@ -77,21 +75,13 @@ chrome.action.onClicked.addListener(function(tab) {
             openTab(chrome.runtime.getURL('options.html'), tab);
             return
         }
+        let needToSwitch = (data.clickBehavior === 'send-current-url-and-switch');
         if (data.clickBehavior == 'do-nothing') {
             return
         } else if (data.clickBehavior == 'go-to-metube') {
             console.log("Going to Metube URL...");
             openTab(data.metube, tab);
-        } else if (data.clickBehavior == 'send-current-url') {
-            chrome.tabs.query({
-                active: true,
-                lastFocusedWindow: true
-            }, function(tabs) {
-                // use this tab to get the youtube video URL
-                let videoUrl = tabs[0].url;
-                sendVideoUrlToMetube(videoUrl, data.metube);
-            });
-        } else if (data.clickBehavior == 'send-current-url-and-switch') {
+        } else {
             chrome.tabs.query({
                 active: true,
                 lastFocusedWindow: true
@@ -99,11 +89,12 @@ chrome.action.onClicked.addListener(function(tab) {
                 // use this tab to get the youtube video URL
                 let videoUrl = tabs[0].url;
                 sendVideoUrlToMetube(videoUrl, data.metube, function() {
+                    if (!needToSwitch) {
+                        return;
+                    }
                     openTab(data.metube, tab);
                 });
             });
-        } else {
-            console.log("Unknown clickBehavior value: " + data.clickBehavior);
         }
     });
 });

From b0b2b7c2e1c3bc3ad30d6c9a30c4766169d8235b Mon Sep 17 00:00:00 2001
From: Akash Vacher <avacher@linkedin.com>
Date: Sun, 13 Nov 2022 14:40:50 -0800
Subject: [PATCH 8/8] Simplified the promise chain in sendVideoUrlToMetube

---
 src/background.js | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/background.js b/src/background.js
index cc67649..d913e3d 100644
--- a/src/background.js
+++ b/src/background.js
@@ -21,6 +21,9 @@ chrome.runtime.onInstalled.addListener(function() {
 
 function sendVideoUrlToMetube(videoUrl, metubeUrl, callback) {
     console.log("Sending videoUrl=" + videoUrl + " to metubeUrl=" + metubeUrl);
+    if (typeof callback !== 'function'){
+        callback = function(){};
+    }
     fetch(metubeUrl + "/add", {
         method: 'POST',
         headers: {
@@ -31,26 +34,17 @@ function sendVideoUrlToMetube(videoUrl, metubeUrl, callback) {
             "quality": "best",
             "url": videoUrl
         })
-    }).then(function(res) {
-        if (res.ok === true && res.status === 200) {
-            return res.json();
-        }
-        console.log("error :: code" + res.status);
-    }).then(function(result) {
-        if (result.status !== "ok") {
-            console.log("error :: ", result );
-            if (result.msg.includes('URLError')) {
-                // Go straight to catch block and skip the callback
-                throw new Error('Error when adding URL to MyTube');
-            }
-        }
-    }).then(function() {
-        if (typeof callback === 'function'){
+    })
+    .then(response=>response.json())
+    .then(function (response) {
+        if (response.status === 'ok') {
             callback();
         }
-    }).catch(function(e) {
-        console.log("Ran into an error :: ", e);
-    });
+        else {
+            console.log("Ran into an error when submitting URL to meTube: " + response.msg);
+        }
+    })
+    .catch(e => console.log("Ran into an unexpected error: " + e));
 }
 
 chrome.contextMenus.onClicked.addListener(function(item, tab) {