Fix BusinessPost.ie (json)

Fix The Spectator World (new domain)
1 year ago · 655caa2707
parent a1aee1d648
commit 655caa2707
7 changed files with 72 additions and 20 deletions
--- a/README.md
+++ b/README.md
@ -207,7 +207,7 @@ Grouped in options:\
 [The New Republic](https://newrepublic.com) -
 [The New York Review of Books](https://www.nybooks.com) -
 [The Point Magazine](https://thepointmag.com) -
-[The Spectator World](https://spectatorworld.com) -
+[The Spectator World](https://thespectator.com) -
 [The Wrap](https://www.thewrap.com)

 Grouped in options:\
--- a/changelog.txt
+++ b/changelog.txt
@ -3,6 +3,8 @@ Changelog Bypass Paywalls Clean - Firefox
 Updates: https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases

 Post-release
+Fix BusinessPost.ie (json)
+Fix The Spectator World (new domain)
 Fix TownNews sites (js)

 * v3.1.1.0 (2023-03-26)
--- a/contentScript.js
+++ b/contentScript.js
@ -2052,7 +2052,7 @@ else if (matchDomain(['lc.nl', 'dvhn.nl'])) {
                        elem.appendChild(span);
                      }
                    } else if (child.children && child.children.length && child.children[0].text && child.children[0].text.length > 2) {
-                      if (child.href || (child.relation && child.relation.follow && child.relation.follow.url)) {
+                      if ((child.href  && child.href.length > 2) || (child.relation && child.relation.follow && child.relation.follow.url)) {
                        let par_link = document.createElement('a');
                        par_link.href = child.href || child.relation.follow.url;
                        par_link.innerText = child.children[0].text;
@ -2388,6 +2388,50 @@ if (matchDomain(['belfasttelegraph.co.uk', 'independent.ie'])) {
  hideDOMElement(...ads);
 }

+else if (matchDomain('businesspost.ie')) {
+  function bpie_main() {
+    if ($) {
+      let article_id_dom = document.querySelector('article[id]');
+      let article_id;
+      if (article_id_dom)
+        article_id = article_id_dom.id;
+      if (article_id) {
+        let bp_ajaxurl = 'https://www.businesspost.ie/wp-admin/admin-ajax.php';
+        let data_ajax = {
+          action: 'fetch_article_content',
+          type: 'POST',
+          data: {
+            id: article_id
+          },
+          dataType: 'json',
+          contentType: 'application/json'
+        };
+        $.ajax({
+          type: 'POST',
+          url: bp_ajaxurl,
+          data: data_ajax,
+          success: function (data) {
+            $('main article .article-body-section').html(data);
+          }
+        });
+      }
+    } else
+      window.location.reload(true);
+  }
+  csDoneOnce = true;
+  window.setTimeout(function () {
+    let paywall = document.querySelector('div#bp_paywall_content');
+    let article_id_dom = document.querySelector('article[id]');
+    let article_id;
+    if (article_id_dom)
+      article_id = article_id_dom.id;
+    if (paywall || article_id) {
+      removeDOMElement(paywall);
+      insert_script(bpie_main);
+    }
+  }, 500);
+}
+
 else if (matchDomain('citywire.com')) {
  removeClassesList(['article-locked', 'm-article--locked', 'm-media-container--locked', 'm-article__body--locked']);
  let banners = document.querySelectorAll('registration-widget, div.alert--locked');
--- a/custom/manifest.json
+++ b/custom/manifest.json
@ -51,5 +51,5 @@
    "webRequestBlocking",
    "*://*/*"
  ],
-  "version": "3.1.1.1"
+  "version": "3.1.1.2"
 }
--- a/manifest.json
+++ b/manifest.json
@ -562,7 +562,6 @@
    "*://*.sofrep.com/*",
    "*://*.spectator.co.uk/*",
    "*://*.spectator.com.au/*",
-    "*://*.spectatorworld.com/*",
    "*://*.spglobal.com/*",
    "*://*.spiegel.de/*",
    "*://*.sportico.com/*",
@ -631,6 +630,7 @@
    "*://*.therecord.com/*",
    "*://*.thesaturdaypaper.com.au/*",
    "*://*.thespec.com/*",
+    "*://*.thespectator.com/*",
    "*://*.thestar.com.my/*",
    "*://*.thestar.com/*",
    "*://*.thestate.com/*",
@ -744,5 +744,5 @@
    "*://*.wallkit.net/*",
    "*://webcache.googleusercontent.com/*"
  ],
-  "version": "3.1.1.1"
+  "version": "3.1.1.2"
 }
--- a/sites.js
+++ b/sites.js
@ -163,7 +163,7 @@ var defaultSites = {
      "westernadvocate.com.au"
    ],
    allow_cookies: 1,
-    block_regex: /(\.piano\.io\/|cdn\.cxense\.com\/)/
+    block_regex: /\.piano\.io\//
  },
  "Australia Nine Entertainment": {
    domain: "###_au_nine_ent",
@ -242,7 +242,7 @@ var defaultSites = {
    domain: "bqprime.com",
    allow_cookies: 1,
    block_js_inline: /\.bqprime\.com\/.+\/.+\?rel=geo_block/,
-    block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/
+    block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/
  },
  "Bulletin of the Atomic Scientists": {
    domain: "thebulletin.org",
@ -253,10 +253,10 @@ var defaultSites = {
    domain: "businessinsider.com",
    block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
  },
-  "Business Post.ie (do not block Piano.io-script and cookie-banner externally)": {
+  "Business Post.ie": {
    domain: "businesspost.ie",
-    block_regex: /cdn\.cxense\.com\//,
-    remove_cookies_select_drop: ["xbc"]
+    allow_cookies: 1,
+    block_regex: /\.piano\.io\//
  },
  "Business Standard": {
    domain: "business-standard.com",
@ -584,7 +584,7 @@ var defaultSites = {
  "Foreign Policy": {
    domain: "foreignpolicy.com",
    allow_cookies: 1,
-    block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/)/
+    block_regex: /\.tinypass\.com\//
  },
  "Fortune": {
    domain: "fortune.com",
@ -806,7 +806,7 @@ var defaultSites = {
      "mallorcazeitung.es"
    ],
    allow_cookies: 1,
-    block_regex: /(\.piano\.io\/|cdn\.cxense\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
+    block_regex: /(\.piano\.io\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
  },
  "Grupo Unidad Editorial": {
    domain: "###_es_unidad",
@ -1474,12 +1474,12 @@ var defaultSites = {
  },
  "O Globo (& Valor Econômico)": {
    domain: "globo.com",
-    block_regex: /(\.tinypass\.com\/|cdn\.cxense\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/
+    block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/
  },
  "Observador.pt": {
    domain: "observador.pt",
    allow_cookies: 1,
-    block_regex: /(\.tinypass\.com\/|cdn\.cxense\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/
+    block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/
  },
  "Outdoor Life": {
    domain: "outdoorlife.com",
@ -1544,7 +1544,7 @@ var defaultSites = {
      "variety.com",
      "wwd.com"
    ],
-    block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|subscriptions)-.+\.js)/
+    block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|subscriptions)-.+\.js)/
  },
  "PhiloMag.com": {
    domain: "philomag.com",
@ -1565,7 +1565,7 @@ var defaultSites = {
  },
  "Pittsburgh Post Gazette": {
    domain: "post-gazette.com",
-    block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/)/
+    block_regex: /\.tinypass\.com\//
  },
  "Política Exterior": {
    domain: "politicaexterior.com",
@ -1713,7 +1713,7 @@ var defaultSites = {
  },
  "Slate": {
    domain: "slate.com",
-    block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
+    block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
  },
  "SlideShare": {
    domain: "slideshare.net",
@ -2065,8 +2065,9 @@ var defaultSites = {
    block_regex: /\.tinypass\.com\//
  },
  "The Spectator World": {
-    domain: "spectatorworld.com",
-    block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/)/
+    domain: "thespectator.com",
+    allow_cookies: 1,
+    block_regex: /\.tinypass\.com\//
  },
  "The Star Malaysia": {
    domain: "thestar.com.my",
@ -2328,7 +2329,7 @@ var defaultSites = {
    domain: "piano.io",
    allow_cookies: 1,
    block_regex_general: /\.piano\.io\/xbuilder\/experience\/execute/,
-    excluded_domains: ["piano.io", "asia.nikkei.com", "businesspost.ie", "japantimes.co.jp", "kurier.at", "onet.pl"]
+    excluded_domains: ["piano.io", "asia.nikkei.com", "japantimes.co.jp", "kurier.at", "onet.pl"]
  },
  "Pico.tools": {
    domain: "pico.tools",
--- a/sites_updated.json
+++ b/sites_updated.json
@ -61,6 +61,11 @@
    "block_regex": "\\/blink\\.net\\/.+\\/blink-sdk\\.js",
    "cs_code": "[{\"cond\":\"div.article-scheduled-modal\",\"rm_elem\":1}]"
  },
+  "The Spectator World - new domain": {
+    "domain": "thespectator.com",
+    "allow_cookies": 1,
+    "block_regex": "\\.tinypass\\.com/"
+  },
  "The Times Literary Supplement": {
    "domain": "the-tls.co.uk",
    "remove_cookies": 1,