Remove v1.6.1 from updates.json

This reverts commit e57feb2a3c.

README.md

@@ -1,6 +1,6 @@
 # Bypass Paywalls for Firefox
 
-## [Download and install the latest version](https://github.com/iamadamdev/bypass-paywalls-firefox/releases/download/v1.6.0/bypass_paywalls-1.6.0-an+fx.xpi)
+## [Download and install the latest version](https://github.com/iamadamdev/bypass-paywalls-firefox/releases/download/v1.6.2/bypass_paywalls-1.6.2-an+fx.xpi)
 
 ### Bypass the following sites' paywalls with this extension
 
@@ -73,6 +73,7 @@
 [The Japan Times](https://www.japantimes.co.jp)\
 [TheMarker](https://www.themarker.com)\
 [The Mercury News](https://www.mercurynews.com)\
+[The Mercury Tasmania](https://www.themercury.com.au)\
 [The Morning Call](https://www.mcall.com)\
 [The Nation](https://www.thenation.com)\
 [The New York Times](https://www.nytimes.com)\

background.js

@@ -69,6 +69,7 @@ var defaultSites = {
   'The Hindu': 'thehindu.com',
   'The Japan Times': 'japantimes.co.jp',
   'TheMarker': 'themarker.com',
+  'The Mercury Tasmania': 'themercury.com.au',
   'The Mercury News': 'mercurynews.com',
   'The Morning Call': 'mcall.com',
   'The Nation': 'thenation.com',
@@ -128,6 +129,7 @@ const allow_cookies = [
 'theatlantic.com',
 'theaustralian.com.au',
 'thediplomat.com',
+'themercury.com.au',
 'thestar.com',
 'towardsdatascience.com',
 'trouw.nl',
@@ -198,8 +200,10 @@ const use_google_bot = [
 'quora.com',
 'telegraph.co.uk',
 'theaustralian.com.au',
+'themercury.com.au',
 'thetimes.co.uk',
-'wsj.com',
+'wsj.com',
+'haaretz.co.il',
 ]
 
 function setDefaultOptions() {

contentScript.js

@@ -1,183 +1,188 @@
-window.localStorage.clear()
-if (window.location.href.indexOf('bizjournals.com') !== -1) {
-  const hiddenStory = document.getElementsByClassName(
-    'js-pre-chunks__story-body'
-  )
-  if (hiddenStory && hiddenStory.length > 0) {
-    hiddenStory[0].style.display = 'block'
-  }
+window.localStorage.clear();
+if (window.location.href.indexOf("bizjournals.com") !== -1) {
+    const hiddenStory = document.getElementsByClassName(
+        "js-pre-chunks__story-body"
+    );
+    if (hiddenStory && hiddenStory.length > 0) {
+        hiddenStory[0].style.display = "block";
+    }
 
-  const payWallMessage = document.getElementsByClassName(
-    'chunk chunk--flex@lg chunk--paywall'
-  )
-  if (payWallMessage && payWallMessage.length > 0) {
-    payWallMessage[0].style.display = 'none'
-  }
-} else if (window.location.href.indexOf('businessinsider.com') !== -1) {
-  const paywall = document.getElementsByClassName(
-    'tp-modal'
-  )
-  while (paywall.length > 0) {
-    paywall[0].parentNode.removeChild(paywall[0])
-  }
+    const payWallMessage = document.getElementsByClassName(
+        "chunk chunk--flex@lg chunk--paywall"
+    );
+    if (payWallMessage && payWallMessage.length > 0) {
+        payWallMessage[0].style.display = "none";
+    }
+} else if (window.location.href.indexOf("businessinsider.com") !== -1) {
+    const paywall = document.getElementsByClassName(
+        "tp-modal"
+    );
+    while (paywall.length > 0) {
+        paywall[0].parentNode.removeChild(paywall[0]);
+    }
 } else if (location.hostname.endsWith('haaretz.co.il')) {
-  const html = document.getElementsByTagName('html')
-  if (html && html.length > 0) {
-    html[0].style['overflow-y'] = 'auto'
-  }
-  const msg = document.getElementById('article-wrapper')
-  if (msg) {
-    msg.style.display = 'none'
-  }
-} else if (window.location.href.indexOf('nzherald.co.nz') !== -1) {
-  const paywall = document.getElementById(
-    'article-content'
-  )
-  if (paywall) {
-    paywall.classList.remove('premium-content')
-    paywall.classList.add('full-content')
-    removeClassesByPrefix(paywall, 'QUnW')
-    const paras = paywall.querySelectorAll('p, span, h2, div')
-    for (let i = paras.length - 1; i > -1; i--) {
-      removeClassesByPrefix(paras[i], 'QUnW')
-      paras[i].classList.remove('ellipsis')
-      paras[i].removeAttribute('style')
+    const html = document.getElementsByTagName('html');
+    if (html && html.length > 0) {
+        html[0].style['overflow-y'] = 'auto';
     }
-  }
-} else if (location.hostname.endsWith('rep.repubblica.it')) {
-  if (location.href.includes('/pwa/')) {
-    location.href = location.href.replace('/pwa/', '/ws/detail/')
-  }
-
-  if (location.href.includes('/ws/detail/')) {
-    const paywall = document.querySelector('.paywall[subscriptions-section="content"]')
+    const msg = document.getElementById('article-wrapper');
+    if (msg) {
+        msg.style['display'] = 'none';
+    }
+} else if (window.location.href.indexOf("nzherald.co.nz") !== -1) {
+    const paywall = document.getElementById(
+        "article-content"
+    );
     if (paywall) {
-      paywall.removeAttribute('subscriptions-section')
-      const preview = document.querySelector('div[subscriptions-section="content-not-granted"]')
-      if (preview) {
-        preview.remove()
-      }
+        paywall.classList.remove('premium-content');
+        paywall.classList.add('full-content');
+        removeClassesByPrefix(paywall, 'QUnW');
+        let paras = paywall.querySelectorAll("p, span, h2, div");
+        for (let i = paras.length - 1; i > -1; i--) {
+            removeClassesByPrefix(paras[i], 'QUnW');
+            paras[i].classList.remove("ellipsis");
+            paras[i].removeAttribute('style');
+        }
     }
-  }
-} else if (window.location.href.indexOf('wsj.com') !== -1) {
-  if (location.href.includes('/articles/')) {
-    document.addEventListener('DOMContentLoaded', () => {
-      const paywall = document.getElementById('cx-scrim')
-      const candybar = document.getElementById('cx-candybar')
-      removeDOMElement(paywall, candybar)
-    })
-    /**
+} else if (location.hostname.endsWith('rep.repubblica.it')) {
+    if (location.href.includes("/pwa/")) {
+        location.href = location.href.replace("/pwa/", "/ws/detail/");
+    }
+
+    if (location.href.includes("/ws/detail/")) {
+        const paywall = document.querySelector('.paywall[subscriptions-section="content"]');
+        if (paywall) {
+            paywall.removeAttribute('subscriptions-section');
+            const preview = document.querySelector('div[subscriptions-section="content-not-granted"]');
+            if (preview) {
+                preview.remove();
+            }
+        }
+    }
+} else if (window.location.href.indexOf("wsj.com") !== -1) {
+    if (location.href.includes('/articles/')) {
+        document.addEventListener('DOMContentLoaded', () => {
+            const paywall = document.getElementById('cx-scrim');
+            const candybar = document.getElementById('cx-candybar');
+            removeDOMElement(paywall, candybar);
+        });
+        /**
         setTimeout(function () {
             const close_button = document.querySelector('.close-btn');
             if (close_button)
                 close_button.click();
         }, 2000);
         **/
-  }
-} else if (window.location.href.indexOf('washingtonpost.com') !== -1) {
-  if (location.href.includes('/gdpr-consent/')) {
-    document.querySelector('.gdpr-consent-container .continue-btn.button.free').click()
-
-    setTimeout(function () {
-      const gdprcheckbox = document.querySelector('.gdpr-consent-container .consent-page:not(.hide) #agree')
-      if (gdprcheckbox) {
-        gdprcheckbox.checked = true
-        gdprcheckbox.dispatchEvent(new Event('change'))
-
-        document.querySelector('.gdpr-consent-container .consent-page:not(.hide) .continue-btn.button.accept-consent').click()
-      }
-    }, 300) // Delay (in milliseconds)
-  }
-}
-
-if (window.location.href.indexOf('medium.com') !== -1) {
-  const bottomMessageText = 'Get one more story in your member preview when you sign up. It’s free.'
-  const DOMElementsToTextDiv = pageContains('div', bottomMessageText)
-
-  if (DOMElementsToTextDiv[2]) removeDOMElement(DOMElementsToTextDiv[2])
-}
-
-if (window.location.href.indexOf('bloombergquint.com') !== -1) {
-  const articlesLeftModal = document.getElementsByClassName('paywall-meter-module__story-paywall-container__1UgCE')[0]
-  const paywall = document.getElementById('paywallDmp')
-  removeDOMElement(articlesLeftModal, paywall)
-}
-
-if (window.location.href.indexOf('bloomberg.com') !== -1) {
-  document.addEventListener('DOMContentLoaded', () => {
-    const fence = document.querySelector('.fence-body')
-    if (fence) {
-      fence.classList.remove('fence-body')
     }
-    const paywall = document.getElementById('paywall-banner')
-    removeDOMElement(paywall)
-  })
+} else if (window.location.href.indexOf("washingtonpost.com") !== -1) {
+    if (location.href.includes('/gdpr-consent/')) {
+        document.querySelector('.gdpr-consent-container .continue-btn.button.free').click();
+
+        setTimeout(function () {
+
+            const gdprcheckbox = document.querySelector('.gdpr-consent-container .consent-page:not(.hide) #agree');
+            if (gdprcheckbox) {
+                gdprcheckbox.checked = true;
+                gdprcheckbox.dispatchEvent(new Event('change'));
+
+                document.querySelector('.gdpr-consent-container .consent-page:not(.hide) .continue-btn.button.accept-consent').click();
+            }
+        }, 300); // Delay (in milliseconds)
+    }
+}
+
+if (window.location.href.indexOf("medium.com") !== -1) {
+    const bottomMessageText = 'Get one more story in your member preview when you sign up. It’s free.';
+    const DOMElementsToTextDiv = pageContains('div', bottomMessageText);
+
+    if (DOMElementsToTextDiv[2]) removeDOMElement(DOMElementsToTextDiv[2]);
+}
+
+if (window.location.href.indexOf("bloombergquint.com") !== -1) {
+    const articlesLeftModal = document.getElementsByClassName('paywall-meter-module__story-paywall-container__1UgCE')[0];
+    const paywall = document.getElementById('paywallDmp');
+    removeDOMElement(articlesLeftModal, paywall);
+}
+
+if (window.location.href.indexOf("bloomberg.com") !== -1) {
+    document.addEventListener('DOMContentLoaded', () => {
+        const fence = document.querySelector('.fence-body');
+        if (fence){
+            fence.classList.remove('fence-body');
+        }
+        const paywall = document.getElementById('paywall-banner');
+        removeDOMElement(paywall);
+    });
 }
 
 if (window.location.href.indexOf('telegraaf.nl') !== -1) {
-  setTimeout(function () {
-    const paywall = document.getElementById('TEMPRORARY_METERING_ID')
-    if (paywall) {
-      window.location.reload(true)
-    }
-  }, 1000) // Delay (in milliseconds)
+    setTimeout(function () {
+        const paywall = document.getElementById('TEMPRORARY_METERING_ID');
+        if (paywall) {
+            window.location.reload(true);
+        }
+    }, 1000); // Delay (in milliseconds)
 }
 
 if (window.location.href.indexOf('ad.nl') !== -1 || window.location.href.indexOf('ed.nl') !== -1) {
-  const paywall = document.querySelector('.article__component.article__component--paywall-module-notification')
-  removeDOMElement(paywall)
+    let paywall = document.querySelector('.article__component.article__component--paywall-module-notification');
+    removeDOMElement(paywall);
 }
 
-if (window.location.href.indexOf('parool.nl') !== -1 || window.location.href.indexOf('trouw.nl') !== -1 || window.location.href.indexOf('volkskrant.nl') !== -1) {
-  document.addEventListener('DOMContentLoaded', () => {
-    const paywall = document.querySelector('div[data-temptation-position="ARTICLE_BOTTOM"]')
-    const hidden_section = document.querySelector('div[data-temptation-position="ARTICLE_INLINE"]')
-    removeDOMElement(paywall, hidden_section)
-  })
+if (window.location.href.indexOf("parool.nl") !== -1 || window.location.href.indexOf("trouw.nl") !== -1 ||  window.location.href.indexOf("volkskrant.nl") !== -1) {
+    document.addEventListener('DOMContentLoaded', () => {
+        const paywall = document.querySelector('div[data-temptation-position="ARTICLE_BOTTOM"]');
+        const hidden_section = document.querySelector('div[data-temptation-position="ARTICLE_INLINE"]');
+        removeDOMElement(paywall, hidden_section);
+    });
 }
 
 if (window.location.href.indexOf('lemonde.fr') !== -1) {
-  document.addEventListener('DOMContentLoaded', () => {
-    const hidden_section = document.getElementsByClassName('article__content--restricted-media')[0]
-    if (hidden_section) { hidden_section.classList.remove('article__content--restricted-media') }
-    const longform_article_restricted = document.getElementsByClassName('article__content--restricted')[0]
-    if (longform_article_restricted) { longform_article_restricted.classList.remove('article__content--restricted') }
-    const longform_paywall = document.getElementsByClassName('paywall--longform')[0]
-    if (longform_paywall) { longform_paywall.classList.remove('paywall--longform') }
-    const paywall = document.getElementById('js-paywall-content')
-    const friend_paywall = document.getElementsByClassName('friend--paywall')[0]
-    const cookie_banner = document.getElementById('cookie-banner')
-    removeDOMElement(paywall, friend_paywall, cookie_banner)
-  })
+    document.addEventListener('DOMContentLoaded', () => {
+        const hidden_section = document.getElementsByClassName('article__content--restricted-media')[0];
+        if (hidden_section)
+            hidden_section.classList.remove('article__content--restricted-media');
+        const longform_article_restricted = document.getElementsByClassName('article__content--restricted')[0];     
+        if (longform_article_restricted)
+            longform_article_restricted.classList.remove('article__content--restricted');   
+        const longform_paywall = document.getElementsByClassName('paywall--longform')[0];       
+        if (longform_paywall)
+            longform_paywall.classList.remove('paywall--longform'); 
+        const paywall = document.getElementById('js-paywall-content');
+        const friend_paywall = document.getElementsByClassName('friend--paywall')[0];
+        const cookie_banner = document.getElementById('cookie-banner');
+        removeDOMElement(paywall, friend_paywall, cookie_banner);
+    });
 }
 
-if (window.location.href.indexOf('nytimes.com') !== -1) {
-  const preview_button = document.querySelector('.css-3s1ce0')
-  if (preview_button) { preview_button.click() }
+if (window.location.href.indexOf("nytimes.com") !== -1) {
+    const preview_button = document.querySelector('.css-3s1ce0');
+        if (preview_button)
+            preview_button.click();
 }
 
-if (window.location.href.indexOf('caixinglobal.com') !== -1) {
-  const appContent = document.getElementById('appContent')
-  if (appContent) {
-    const p_hidden = document.querySelectorAll('p:not([style="display:block;"]')
-    for (var i = 0; i < p_hidden.length; i++) {
-      p_hidden[i].setAttribute('style', 'display:block;')
+if (window.location.href.indexOf("caixinglobal.com") !== -1) {
+    const appContent = document.getElementById('appContent');
+    if (appContent) {
+        const p_hidden = document.querySelectorAll('p:not([style="display:block;"]');
+        for (var i = 0; i < p_hidden.length; i++) {
+            p_hidden[i].setAttribute('style', 'display:block;');
+        }
     }
-  }
 }
 
-function removeDOMElement (...elements) {
-  for (const element of elements) {
-    if (element) element.remove()
-  }
-}
-
-function removeClassesByPrefix (el, prefix) {
-  for (let i = el.classList.length - 1; i >= 0; i--) {
-    if (el.classList[i].startsWith(prefix)) {
-      el.classList.remove(el.classList[i])
+function removeDOMElement(...elements) {
+    for (let element of elements) {
+        if (element) element.remove();
+    }
+}
+
+function removeClassesByPrefix(el, prefix) {
+    for (let i = el.classList.length - 1; i >= 0; i--) {
+        if (el.classList[i].startsWith(prefix)) {
+            el.classList.remove(el.classList[i]);
+        }
     }
-  }
 }
 
 function pageContains (selector, text) {

manifest.json

@@ -5,22 +5,22 @@
   "content_scripts": [
     {
       "matches": [
-		"*://*.bizjournals.com/*",
-		"*://*.bloomberg.com/*",
-		"*://*.businessinsider.com/*",
-		"*://*.caixinglobal.com/*",
-		"*://*.ad.nl/*",
-		"*://*.ed.nl/*",
-		"*://*.haaretz.co.il/*",
-		"*://*.lemonde.fr/*",		
-		"*://*.nytimes.com/*",		
-		"*://*.nzherald.co.nz/*",
-		"*://*.parool.nl/*",
-		"*://*.repubblica.it/*",
-		"*://*.telegraaf.nl/*",
-		"*://*.trouw.nl/*",
-		"*://*.volkskrant.nl/*",
-		"*://*.washingtonpost.com/*"
+    "*://*.bizjournals.com/*",
+    "*://*.bloomberg.com/*",
+    "*://*.businessinsider.com/*",
+    "*://*.caixinglobal.com/*",
+    "*://*.ad.nl/*",
+    "*://*.ed.nl/*",
+    "*://*.haaretz.co.il/*",
+    "*://*.lemonde.fr/*",   
+    "*://*.nytimes.com/*",    
+    "*://*.nzherald.co.nz/*",
+    "*://*.parool.nl/*",
+    "*://*.repubblica.it/*",
+    "*://*.telegraaf.nl/*",
+    "*://*.trouw.nl/*",
+    "*://*.volkskrant.nl/*",
+    "*://*.washingtonpost.com/*"
       ],
       "js": ["contentScript.js"]
     }
@@ -106,6 +106,7 @@
     "*://*.theadvocate.com.au/*",
     "*://*.theage.com.au/*",
     "*://*.theaustralian.com.au/*",
+    "*://*.themercury.com.au/*",
     "*://*.afr.com/*",
     "*://*.bostonglobe.com/*",
     "*://*.bizjournals.com/*",
@@ -142,9 +143,9 @@
     "*://*.trouw.nl/*",
     "*://*.vn.nl/*",
     "*://*.lemonde.fr/*",
-	"*://*.scientificamerican.com/*",
-	"*://*.thehindu.com/*",
-	"*://*.demorgen.be/*"
+    "*://*.scientificamerican.com/*",
+    "*://*.thehindu.com/*",
+    "*://*.demorgen.be/*"
   ],
-  "version": "1.6.0"
+  "version": "1.6.2"
 }

options.js

@@ -68,6 +68,7 @@ var defaultSites = {
   'The Japan Times': 'japantimes.co.jp',
   'TheMarker': 'themarker.com',
   'The Mercury News': 'mercurynews.com',
+  'The Mercury Tasmania': 'themercury.com.au',
   'The Morning Call': 'mcall.com',
   'The Nation': 'thenation.com',
   'The New York Times': 'nytimes.com',

updates.json

@@ -32,8 +32,10 @@
         { "version": "1.5.9",
             "update_link": "https://github.com/iamadamdev/bypass-paywalls-firefox/releases/download/v1.5.9/bypass_paywalls-1.5.9-an+fx.xpi" },
         { "version": "1.6.0",
-            "update_link": "https://github.com/iamadamdev/bypass-paywalls-firefox/releases/download/v1.6.0/bypass_paywalls-1.6.0-an+fx.xpi" }
+            "update_link": "https://github.com/iamadamdev/bypass-paywalls-firefox/releases/download/v1.6.0/bypass_paywalls-1.6.0-an+fx.xpi" },
+        { "version": "1.6.2",
+            "update_link": "https://github.com/iamadamdev/bypass-paywalls-firefox/releases/download/v1.6.2/bypass_paywalls-1.6.2-an+fx.xpi" }
         ]
     }
   }
-}
+}