From c2b9015309f7182f7dfd1017bc91e27afcaa4247 Mon Sep 17 00:00:00 2001
From: aminecmi <aminecmi@gmail.com>
Date: Sat, 16 Jul 2022 21:20:30 +0200
Subject: [PATCH] Page action and quicker.

---
 background.js   |  54 ++++++++++++++++++++++++++++++++----------------
 button/19.png   | Bin 0 -> 1656 bytes
 button/38.png   | Bin 0 -> 3262 bytes
 manifest.json   |  11 +++++++++-
 to-invidious.js |  32 ++++++++++++++--------------
 5 files changed, 62 insertions(+), 35 deletions(-)
 create mode 100644 button/19.png
 create mode 100644 button/38.png

diff --git a/background.js b/background.js
index 7e5d276..4e38493 100644
--- a/background.js
+++ b/background.js
@@ -1,3 +1,5 @@
+let urlFromStorage
+
 // Storage init
 browser.runtime.onInstalled.addListener(function() {
   browser.storage.sync.set({
@@ -5,6 +7,12 @@ browser.runtime.onInstalled.addListener(function() {
   });
 });
 
+browser.storage.sync.onChanged.addListener(function(changes) {
+  if (changes.url && changes.url.newValue) {
+    urlFromStorage = changes.url.newValue
+  }
+})
+
 
 // Url format
 function getVideoToken(url) {
@@ -25,25 +33,35 @@ function cleanToken(token) {
 }
 
 
-// Links click event handling
-browser.runtime.onMessage.addListener(function(message) {
+
+function toInvidious(message) {
   let url = message.url;
   const name = message.targetName;
-  browser.storage.sync.get("url").then(function(item) {
-    const subst = item.url + `/watch?v=`;
-    let token = getVideoToken(url)
-    const cleanedToken = cleanToken(token)
-    url = url.replace(/.*\/watch\?v=/gm, subst);
+  const subst = urlFromStorage + `/watch?v=`;
+  let token = getVideoToken(url)
+  const cleanedToken = cleanToken(token)
+  url = url.replace(/.*\/watch\?v=/gm, subst);
 
-    if (name != "_self") {
-      browser.tabs.create(
-        {active: true, url: url}
-      );
-    } else {
-      browser.tabs.update(
-        {url: url, loadReplace: false}
-      )
-    }
-    console.log('Youtube to invidious is redirecting you to invidious')
-  })
+  if (name != "_self") {
+    browser.tabs.create(
+      {active: true, url: url}
+    );
+  } else {
+    browser.tabs.update(
+      {url: url, loadReplace: false}
+    )
+  }
+  console.log('Youtube to invidious is redirecting you to invidious')
+}
+
+
+// Links click event handling
+browser.runtime.onMessage.addListener(function(message) {
+  toInvidious(message)
+});
+
+
+// Page action
+browser.pageAction.onClicked.addListener(function(page) {
+  toInvidious({url: page.url, targetName: "_self"});
 });
\ No newline at end of file
diff --git a/button/19.png b/button/19.png
new file mode 100644
index 0000000000000000000000000000000000000000..564a7eb375e9c468ed77b8119f9318c3863a29c0
GIT binary patch
literal 1656
zcmY*ZX;4#F6uw~-0+gYMgr$&zgV6#Z0kJ&75(pTUU=q-RvPDQRB8wy;k+Mr+0D)ow
z5pV{TwwOWLsa34F42z*)K{ineC;_9guY%AQq}bj!_nq&4_dDM?=lysYRL{ezNF5{q
zK-HB@qQg-`x)l}RcQn<i0}gVbL<$jrnq1{|hCF;m2b1X(0Ah^+NJ<6Z1571N0>Co|
zKoSH1R0M!lROuZW0lr9O`na+v6mS5>ia;LmC6I*?0)7BO2T0vu1l$n1JD85ZY-?ly
zNM{4NZOw5wN*5X4(wt9GwhZyvu}o%1tx+cX8B5c8j@teV2c;;oF9!f+ct~Xp1Sl>=
z!EU~6Zy&A?#RCeC3^!whM4n`t3BseKS%4sbU>MHiGSGtXGZ7p}U~9OgfM6`8v4-d^
z2{+8v(1$`rJ4Hq_(N<>WX6A-=NHiKvhz?;vbdt+<I()J<JjLZkL0BxG&o|>+m_<g1
zVsX~i)>v~q7LPZD6{ehX5nP7AG=gLF$>d)j5|a}g&5q)-BO}mKU&hHu9@o~;P+Dkb
zed?3TW__*{!Py=Q9uO<N!Q#x!u{+*yDnZIZN21wGxU$sW4oBEh{*T+PL%>Rl|EHNx
zlWwu_sCGyKcIUI%A+-ZWcL5-~>PjMdf2*FIALgNVba!jlJqw#UwE_PDfBh50;`-47
zYIw?z&s=D(M6xPku%+lurg6f8dvLefvz6ZBBB8;|^~XLMUh=!$n^797d)VQsjhK++
zTc(u_Q=KaBnqsCFRa``(Nmt`#94BG^{w9ajma(zXzkY!>@C`=3rw{pVN~<sk5t=NU
z@>O^tF+XWQS1;)M;!}v3`P$N5Zi80(`{YUqk!rn{9Ov6*3;j%Ddu`l8SQu3ooysRM
zSkubjPTMjR%VPz)l3-r>mY7FRUip|GiE6GdaS>CG%)B&eU*V@#9UZ#EI~0@XB%Er~
zSW8@85)Hhb7qNKV_ch748tUVQxo^6ELMwutI*OhHuH2yF%FU&&KQ?O>l6gvkrP<%U
z=rov05VFpSdotU#=zZ}@*cu)IpX4JHGO2VKlahw^H$5_z2N9)^{CfY13(*u6*0F1A
z&jVG$a*PHi86jf@Z&h<#CrZAzaZi-Qt07N46VtSz@y^VwWT04Hd+{PE<sxSSGwzc=
zhXnf_M3uapG@ISn>l>HH<_-nk(|M|C^j*LDa#vghu00EtI{E;GL6&)@S5=zZSw0pV
zQ43D6Ki{EKm|im!akhfgK3$h~Jh2k@vGa9s!D(@y0nfBGQFo<`*x`q}Jz_L=g*qA2
zo2~1>9Fz_1+IXeiK5<Btul&O?i+t!B6LC{OUcx5Salgh#sT>eWn(>8qFPT-H6X}-o
zMB*{s-d=lxu40JMY8-VzASYR*|H2lKk5ip#n|pQqC3wo^m8SLQ>nUEkix{nwH>|@F
zo1WZ_`8XFkIK5c4hqp9yH8x{`(Ub6Qw#cC^Fy2LRSLa`jDtfs?je3Q9M<p*xSG$`X
zoCE*v+2`i=kk;CL8MDUrq~&L1Y1u;@@uDW}acMdG!;7<_x4Av9Mtz<46QUO??DNQ_
z7f6N=&UiLhK*{mWP^!~aDxbg1x#2B&|7T;@^#_vsezjePTUuH=hKGlZwaSG;CmP&l
zB@s8b+LTSuPEMbWSGHk}#)>EbnWI5ocavn&t_j5w$$?8xW&9k?Q6?|v*7fU6PgG#i
z_4uvCgPvhwVY3e(rbI9boGsmZEXVB`X^iU5PS5GKwzk~g{XCZigt3+u1?BWdbdx=G
z>W(~reoJd>m11^wc5Z}vb=VV>tVg+*m)B}-ZS8n*aq;<C0U`CYVotzN<Gf&cePm>W
z(w%#=CaXI5k-UNo0&i;@-q_HvT8(O$q$vsM`;3hf^!4@oAP8#OR2J86DzNH&tsv<1
zNa5PAXn%iy{4rmW!C=7qaq$$gKW-sSOH(s11g{;{Kc!p^Iu?8VH<hdr6W%3xSudsk
OQ&(qC(k;iJlz#v-`Ir0v

literal 0
HcmV?d00001

diff --git a/button/38.png b/button/38.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a5ec4b4448338cd043299116e590cf095b48a15
GIT binary patch
literal 3262
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
V$Sw7_u*1J{L;Z_-Rl3eM{{w;KmdpSE

literal 0
HcmV?d00001

diff --git a/manifest.json b/manifest.json
index 0bf8391..4e20d69 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,13 +2,22 @@
 
   "manifest_version": 2,
   "name": "Youtube to invidious",
-  "version": "0.3",
+  "version": "0.4",
 
   "description": "Change every youtube link to an invidious one",
 
   "icons": {
     "48": "icons/48.png"
   },
+  "page_action": {
+    "show_matches": ["https://*.youtube.com/watch*"],
+    "browser_style": true,
+    "default_icon": {
+      "19": "button/19.png",
+      "38": "button/38.png"
+    }
+  },
+
   "web_accessible_resources": ["icons/48.png"],
   "content_scripts": [
     {
diff --git a/to-invidious.js b/to-invidious.js
index e9edb9c..3a86c86 100644
--- a/to-invidious.js
+++ b/to-invidious.js
@@ -2,14 +2,14 @@ function findATagsAndAddListener(el) {
   let tags = [];
 
   // Google has elements that prevent click on links. May need different handling
-  // if (window.location.href.indexOf("google.") > 0) {
+  // if (window.location.href.indexOf("google.") >= 0) {
   //   const elements = document.getElementsByClassName("NqpkQc");
   //   while(elements.length > 0){
   //       elements[0].parentNode.removeChild(elements[0]);
   //   }
   // }
 
-  if (window.location.href.indexOf('youtube.com') > 0) {
+  if (window.location.href.indexOf('youtube.com') >= 0) {
     tags = el.querySelectorAll('a[href*="/watch"]');
   } else {
     tags = el.querySelectorAll('a[href*="youtube.com/"]');
@@ -22,22 +22,22 @@ function findATagsAndAddListener(el) {
 
 function addListenerToATag(tag) {
   tag.addEventListener('click', function(e) {
-      e.preventDefault();
-      e.stopImmediatePropagation();
+    e.preventDefault();
+    e.stopImmediatePropagation();
 
-      // Find the a tag
-      var target = e.target;
-      while ((target.tagName != "A" || !target.href) && target.parentNode) {
-        target = target.parentNode;
-      }
-      
-      let targetName = (target.attributes.target != null ? target.attributes.target.nodeValue : '_self')
-      if (e.ctrlKey || e.metaKey) {
-        targetName = "_blank";
-      }
+    // Find the a tag
+    var target = e.target;
+    while ((target.tagName != "A" || !target.href) && target.parentNode) {
+      target = target.parentNode;
+    }
+    
+    let targetName = (target.attributes.target != null ? target.attributes.target.nodeValue : '_self')
+    if (e.ctrlKey || e.metaKey) {
+      targetName = "_blank";
+    }
 
-      browser.runtime.sendMessage({"url": target.href, "targetName": targetName});
-    })
+    browser.runtime.sendMessage({"url": target.href, "targetName": targetName});
+  })
 }
 
 // Add the event listeners to the current elements of the body