Fix mute script in a wayyyy

muan · muan · commit c4d6a29f72bd · 2017-02-09T15:17:49.000+08:00
diff --git a/chrome/src/bg/background.js b/chrome/src/bg/background.js
@@ -23,11 +23,25 @@ request.onload = function() {
             }
             request.openerTabId = sender.tab.id
             request.index = position + 1
-            chrome.tabs.create(request)
-          })
+            chrome.tabs.create(request, function(tab) { listenAndCloseTab(tab, request.url, sender.tab.id) })
+          }
+        )
       } else {
         sendMessage(data)
       }
     }
   )
 }
+
+function listenAndCloseTab (tab, url, originalTabId) {
+  var listener = setInterval(function () {
+    chrome.tabs.get(tab.id, function (tab) {
+      if (tab.status === 'complete') {
+        chrome.tabs.remove(tab.id)
+        clearInterval(listener)
+        // Unsubscription finished
+        chrome.tabs.sendMessage(originalTabId, {muteURL: url})
+      }
+    })
+  }, 500)
+}
diff --git a/chrome/src/inject/inject.css b/chrome/src/inject/inject.css
@@ -1,7 +1,9 @@
-.github-link {
+.github-link,
+.github-mute {
   text-decoration: none;
   cursor: pointer;
 }
-.github-link:hover {
+.github-link:hover,
+.github-mute:hover {
   border-color: rgba(0,0,0,0.2) !important;
 }
diff --git a/chrome/src/inject/inject.js b/chrome/src/inject/inject.js
@@ -7,6 +7,14 @@ chrome.extension.sendMessage({}, function (settings) {
   initForInbox()
 })
 
+chrome.runtime.onMessage.addListener(function (req) {
+  var element = req['muteURL'] ? document.querySelector('[href="' + req['muteURL'] + '"]') : null
+
+  if (element) {
+    element.innerText = "Muted!"
+  }
+})
+
 function initForInbox() {
   window.idled = true
 }
@@ -38,7 +46,7 @@ function initOnHashChangeAction(domains) {
         var github_links = reject_unwanted_paths(mail_body.querySelectorAll(selectors))
 
         // Avoid multple buttons
-        Array.prototype.forEach.call(document.querySelectorAll('.github-link, .github-mute-button'), function (ele) {
+        Array.prototype.forEach.call(document.querySelectorAll('.github-link, .github-mute'), function (ele) {
           ele.remove()
         })
 
@@ -50,16 +58,15 @@ function initOnHashChangeAction(domains) {
           if (url.match('notifications/unsubscribe')) {
             var muteURL = url
             url = github_links[github_links.length-2].href
-            muteLink = document.createElement('button')
-            muteLink.type = 'button'
-            muteLink.className = 'github-mute-button T-I J-J5-Ji lS T-I-ax7 ar7'
+            muteLink = document.createElement('a')
+            muteLink.className = 'github-mute T-I J-J5-Ji lS T-I-ax7 ar7'
             muteLink.innerText = 'Mute thread'
-            muteLink.addEventListener('click', function () {
+            muteLink.href = muteURL
+
+            muteLink.addEventListener('click', function (evt) {
+              evt.preventDefault()
+              chrome.extension.sendMessage({url: muteURL, active: false})
               muteLink.innerHTML = '&ctdot;'
-              fetch(muteURL, {mode: 'no-cors'}).then(function () {
-                muteLink.innerText = 'Muted!'
-                muteLink.disabled = 'disabled'
-              })
             })
           }
 
@@ -116,8 +123,8 @@ function initShortcuts(shortcut, backgroundShortcut, muteShortcut) {
     }
 
     // Mute Shortcut: bind user's combination, if a button exist and event not in a textarea
-    if (processRightCombinationBasedOnShortcut(muteShortcut, event) && window.idled && getVisible(document.getElementsByClassName('github-mute-button')) && notAnInput(event.target)) {
-      getVisible(document.getElementsByClassName('github-mute-button')).click()
+    if (processRightCombinationBasedOnShortcut(muteShortcut, event) && window.idled && getVisible(document.getElementsByClassName('github-mute')) && notAnInput(event.target)) {
+      getVisible(document.getElementsByClassName('github-mute')).click()
     }
   })
 }

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,25 @@ request.onload = function() {`
`23`	`23`	`}`
`24`	`24`	`request.openerTabId = sender.tab.id`
`25`	`25`	`request.index = position + 1`
`26`		`- chrome.tabs.create(request)`
`27`		`- })`
	`26`	`+ chrome.tabs.create(request, function(tab) { listenAndCloseTab(tab, request.url, sender.tab.id) })`
	`27`	`+ }`
	`28`	`+ )`
`28`	`29`	`} else {`
`29`	`30`	`sendMessage(data)`
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`	`)`
`33`	`34`	`}`
	`35`	`+`
	`36`	`+function listenAndCloseTab (tab, url, originalTabId) {`
	`37`	`+ var listener = setInterval(function () {`
	`38`	`+ chrome.tabs.get(tab.id, function (tab) {`
	`39`	`+ if (tab.status === 'complete') {`
	`40`	`+ chrome.tabs.remove(tab.id)`
	`41`	`+ clearInterval(listener)`
	`42`	`+ // Unsubscription finished`
	`43`	`+ chrome.tabs.sendMessage(originalTabId, {muteURL: url})`
	`44`	`+ }`
	`45`	`+ })`
	`46`	`+ }, 500)`
	`47`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`		`-.github-link {`
	`1`	`+.github-link,`
	`2`	`+.github-mute {`
`2`	`3`	`text-decoration: none;`
`3`	`4`	`cursor: pointer;`
`4`	`5`	`}`
`5`		`-.github-link:hover {`
	`6`	`+.github-link:hover,`
	`7`	`+.github-mute:hover {`
`6`	`8`	`border-color: rgba(0,0,0,0.2) !important;`
`7`	`9`	`}`