Add Rock and Ice

2 years ago · c09ec0e711
parent 0096c662c1
commit c09ec0e711
7 changed files with 29 additions and 10 deletions
--- a/README.md
+++ b/README.md
@ -205,6 +205,7 @@ Grouped in options:\
 [Cycling Tips](https://cyclingtips.com) -
 [Outside](https://www.outsideonline.com) -
 [Oxygen](https://www.oxygenmag.com) -
+[Rock and Ice](https://www.rockandice.com) -
 [SKI](https://www.skimag.com) -
 [Trail Runner](https://www.trailrunnermag.com) -
 [Triathlete](https://www.triathlete.com) -
--- a/background.js
+++ b/background.js
@ -149,7 +149,7 @@ function set_rules(sites, sites_updated, sites_custom) {
      let site_default = defaultSites.hasOwnProperty(site) ? site : Object.keys(defaultSites).find(default_key => compareKey(default_key, site));
      if (site_default) {
        rule = defaultSites[site_default];
-        if (sites_updated.hasOwnProperty(site_default)  && !sites_updated[site_default].new_site)
+        if (sites_updated.hasOwnProperty(site_default) && !sites_updated[site_default].new_site)
          rule = sites_updated[site_default];
      } else if (sites_updated.hasOwnProperty(site)) { // updated (new) sites
        rule = sites_updated[site];
--- a/changelog.txt
+++ b/changelog.txt
@ -3,6 +3,7 @@ Changelog Bypass Paywalls Clean - Firefox

 Post-release
 Add Automobilwoche
+Add Rock and Ice

 * v2.6.5.0 (2022-04-18)
 Add Aftonbladet.se
--- a/contentScript.js
+++ b/contentScript.js
@ -30,7 +30,7 @@ var usa_hearst_comm_domains = ['expressnews.com', 'houstonchronicle.com', 'sfchr
 var usa_lee_ent_domains = ['buffalonews.com', 'richmond.com', 'tucson.com', 'tulsaworld.com'];
 var usa_mcc_domains = ['bnd.com', 'charlotteobserver.com', 'fresnobee.com', 'kansas.com', 'kansascity.com', 'kentucky.com', 'miamiherald.com', 'newsobserver.com', 'sacbee.com', 'star-telegram.com', 'thestate.com', 'tri-cityherald.com'];
 var usa_mng_domains =   ['denverpost.com', 'eastbaytimes.com', 'mercurynews.com', 'ocregister.com', 'pe.com', 'twincities.com'];
-var usa_outside_mag_domains = ["backpacker.com", "betamtb.com", "cleaneatingmag.com", "climbing.com", "cyclingtips.com", "outsideonline.com", "oxygenmag.com", "skimag.com", "trailrunnermag.com", "triathlete.com", "vegetariantimes.com", "velonews.com", "womensrunning.com", "yogajournal.com"];
+var usa_outside_mag_domains = ["backpacker.com", "betamtb.com", "cleaneatingmag.com", "climbing.com", "cyclingtips.com", "outsideonline.com", "oxygenmag.com", "rockandice.com", "skimag.com", "trailrunnermag.com", "triathlete.com", "vegetariantimes.com", "velonews.com", "womensrunning.com", "yogajournal.com"];
 var usa_tribune_domains = ['baltimoresun.com', 'chicagotribune.com', 'courant.com', 'dailypress.com', 'mcall.com', 'nydailynews.com', 'orlandosentinel.com', 'pilotonline.com', 'sun-sentinel.com'];

 // clean local storage of sites (with an exemption for hold-list)
@ -313,7 +313,7 @@ else {
      if (window.location.hostname.startsWith('amp.')) {
        amp_unhide_subscr_section(amp_ads_sel, true, true, 'resourcesssl.newscdn.com.au');
        comments = document.querySelector('#story-comments, .comments-wrapper');
-      } else if (window.location.href.includes('?amp')) {
+      } else if (window.location.search.match(/(\?|&)amp/)) {
        amp_unhide_subscr_section(amp_ads_sel, true, true, 'resourcesssl.newscdn.com.au');
        comments = document.querySelector('#comments-load');
        let amp_iframe_sizers = document.querySelectorAll('amp-iframe > i-amphtml-sizer');
@ -490,7 +490,7 @@ else if (matchDomain('berliner-zeitung.de')) {

 else if (matchDomain('cicero.de')) {
  let url = window.location.href;
-  if (!url.includes('?amp')) {
+  if (!window.location.search.match(/(\?|&)amp/)) {
    let paywall = document.querySelector('.plenigo-paywall');
    if (paywall) {
      removeDOMElement(paywall);
@ -693,7 +693,7 @@ else if (matchDomain('nn.de')) {

 else if (matchDomain(['noz.de', 'nwzonline.de', 'shz.de', 'svz.de'])) {
  if (window.location.pathname.match(/(-amp\.html|\/amp)$/)) {
-    amp_unhide_access_hide('="NOT data.reduced"', '="data.reduced"', 'amp-ad, amp-embed, #flying-carpet-wrapper');
+    amp_unhide_access_hide('="NOT data.reduced"', '="data.reduced"', 'amp-ad, amp-embed, .ads-wrapper, #flying-carpet-wrapper');
  } else {
    let paywall = document.querySelector('.paywall, .story--premium__container');
    let amphtml = document.querySelector('link[rel="amphtml"]');
@ -1520,7 +1520,7 @@ else if (matchDomain('lesechos.fr') && window.location.href.match(/\d{6,}/)) {
 }

 else if (matchDomain('lesinrocks.com')) {
-  if (window.location.search.startsWith('?amp')) {
+  if (window.location.search.match(/(\?|&)amp/)) {
    let size_defined = document.querySelector('amp-script.i-amphtml-layout-size-defined');
    if (size_defined)
      size_defined.style = 'overflow:visible !important;';
@ -2010,7 +2010,7 @@ else

 if (matchDomain('independent.co.uk')) {
  let url = window.location.href;
-  if (url.includes('?amp')) {
+  if (window.location.search.match(/(\?|&)amp/)) {
    let ads = document.querySelectorAll('amp-ad, amp-embed, [id^="ad-"]');
    removeDOMElement(...ads);
  } else {
@ -2076,7 +2076,7 @@ else if (matchDomain('the-tls.co.uk')) {
 }

 else if (matchDomain(['theathletic.com', 'theathletic.co.uk'])) {
-  if (!window.location.href.includes('?amp')) {
+  if (!window.location.search.match(/(\?|&)amp/)) {
    let paywall = document.querySelectorAll('div#paywall-container, div[subscriptions-action="subscribe"], a.headline-paywall, div#slideup-paywall');
    let amphtml = document.querySelector('link[rel="amphtml"]');
    if (paywall.length && amphtml) {
@ -2339,7 +2339,7 @@ else if (matchDomain('asia.nikkei.com')) {
 }

 else if (matchDomain('asiatimes.com')) {
-  if (!window.location.search.includes('?amp_markup=1')) {
+  if (!window.location.search.match(/(\?|&)amp_markup=1/)) {
    let paywall = document.querySelector('div.woocommerce');
    if (paywall) {
      removeDOMElement(paywall);
--- a/manifest.json
+++ b/manifest.json
@ -479,6 +479,7 @@
        "*://*.richmond.com/*",
        "*://*.rnd.de/*",
        "*://*.roadandtrack.com/*",
+        "*://*.rockandice.com/*",
        "*://*.rollingstone.com/*",
        "*://*.rugbypass.com/*",
        "*://*.rundschau-online.de/*",
@ -668,5 +669,5 @@
        "*://*.wsj.net/*",
        "*://webcache.googleusercontent.com/*"
    ],
-    "version": "2.6.5.1"
+    "version": "2.6.5.2"
 }
--- a/sites.js
+++ b/sites.js
@ -1296,6 +1296,7 @@ var defaultSites = {
      "cyclingtips.com",
      "outsideonline.com",
      "oxygenmag.com",
+      "rockandice.com",
      "skimag.com",
      "trailrunnermag.com",
      "triathlete.com",
--- a/sites_updated.json
+++ b/sites_updated.json
@ -36,6 +36,21 @@
    "ld_json": "div.paywall|div#articleBody",
    "new_site": 1
  },
+  "Rock and Ice": {
+    "domain": "rockandice.com",
+    "allow_cookies": 1,
+    "block_regex": "\\.rockandice\\.com\\/.+\\/scripts\\/contentGate.+\\.js",
+    "cs_code": [{
+        "cond": "div.o-membership-overlay",
+        "rm_elem": 1,
+        "elems": [{
+            "cond": "[class*=\"is-gated\"]",
+            "rm_class": "is-gated,is-gated--flexible-layout"
+          }
+        ]
+      }
+    ]
+  },
  "Vogue Business": {
    "allow_cookies": 1,
    "domain": "voguebusiness.com",