diff --git a/README.md b/README.md index 5b3a40f3..100199c6 100644 --- a/README.md +++ b/README.md @@ -952,7 +952,6 @@ Grouped in options:\ [Tech in Asia](https://www.techinasia.com)\ Grouped in options:\ *SPH Media* sites like\ -[The Business Times](https://www.businesstimes.com.sg) - [The Straits Times](https://www.straitstimes.com) #### Latin America diff --git a/background.js b/background.js index fe2c8349..ac20a6ae 100644 --- a/background.js +++ b/background.js @@ -393,8 +393,13 @@ function set_rules(sites, sites_updated, sites_custom) { if (site_default) { rule = defaultSites[site_default]; let site_updated = Object.keys(sites_updated).find(updated_key => compareKey(updated_key, site)); - if (site_updated) + if (site_updated) { rule = sites_updated[site_updated]; + if (rule.nofix) { + enabledSites.splice(enabledSites.indexOf(site_domain), 1); + nofix_sites.push(site_domain); + } + } } else if (sites_updated.hasOwnProperty(site)) { // updated (new) sites rule = sites_updated[site]; } else if (sites_custom.hasOwnProperty(site)) { // custom (new) sites diff --git a/changelog.txt b/changelog.txt index 3013af33..8560680a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,8 @@ Changelog Bypass Paywalls Clean - Firefox Updates (install signed xpi-file): https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases Post-release +Remove BusinessTimes.com.sg (fix obsolete) +Maintenance updated sites (removed) * v3.5.7.0 (2024-02-25) Add Canarias7.es (Grupo Vocento) diff --git a/contentScript.js b/contentScript.js index 6c245990..f36fd179 100644 --- a/contentScript.js +++ b/contentScript.js @@ -34,6 +34,7 @@ var nl_dpg_adr_domains = ['ad.nl', 'bd.nl', 'bndestem.nl', 'destentor.nl', 'ed.n var nl_dpg_media_domains = ['demorgen.be', 'flair.nl', 'humo.be', 'libelle.nl', 'margriet.nl', 'parool.nl', 'trouw.nl', 'volkskrant.nl']; var no_nhst_media_domains = ['europower.no', 'fiskeribladet.no', 'intrafish.com', 'intrafish.no', 'rechargenews.com', 'tradewindsnews.com', 'upstreamonline.com']; var pe_grupo_elcomercio_domains = ['diariocorreo.pe', 'elcomercio.pe', 'gestion.pe']; +var sg_sph_media_domains = ['straitstimes.com']; var timesofindia_domains = ['epaper.indiatimes.com', 'timesofindia.com', 'timesofindia.indiatimes.com']; var uk_incisive_media_domains = ['businessgreen.com', 'internationalinvestment.net', 'investmentweek.co.uk', 'professionaladviser.com', 'professionalpensions.com']; var uk_nat_world_domains = ['scotsman.com', 'yorkshirepost.co.uk']; @@ -3765,13 +3766,6 @@ else if (matchDomain('businessoffashion.com')) { } } -else if (matchDomain(['businesstimes.com.sg', 'straitstimes.com'])) { - let url = window.location.href; - getArchive(url, 'div[class*=eas-paywall], div#nocx_paywall_area', '', 'main#content'); - let ads = document.querySelectorAll('div.ads, div[id^="dfp-ad-"], div.cx_paywall_placeholder'); - hideDOMElement(...ads); -} - else if (matchDomain(ca_gcm_domains)) { let paywall = document.querySelector('div._block_1dgevo'); if (paywall) { @@ -4832,6 +4826,13 @@ else if (matchDomain('seekingalpha.com')) { } } +else if (matchDomain(sg_sph_media_domains)) { + let url = window.location.href; + getArchive(url, 'div#nocx_paywall_area', '', 'main#content'); + let ads = document.querySelectorAll('div.ads, div[id^="dfp-ad-"], div.cx_paywall_placeholder'); + hideDOMElement(...ads); +} + else if (matchDomain('slate.com')) { let slate_roadblock = document.querySelector('.slate-roadblock'); let ads = document.querySelectorAll('section[class*="-ad"]'); diff --git a/custom/manifest.json b/custom/manifest.json index b69ecaab..f88e1253 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -51,5 +51,5 @@ "webRequestBlocking", "*://*/*" ], - "version": "3.5.7.0" + "version": "3.5.7.1" } diff --git a/manifest.json b/manifest.json index 70881ca5..02166fc1 100644 --- a/manifest.json +++ b/manifest.json @@ -130,7 +130,6 @@ "*://*.businessinsider.nl/*", "*://*.businessoffashion.com/*", "*://*.businesspost.ie/*", - "*://*.businesstimes.com.sg/*", "*://*.cairnspost.com.au/*", "*://*.calgaryherald.com/*", "*://*.cambiocolombia.com/*", @@ -842,5 +841,5 @@ "*://archive.vn/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.5.7.0" + "version": "3.5.7.1" } diff --git a/options/options.js b/options/options.js index 06f6c81a..f6549157 100644 --- a/options/options.js +++ b/options/options.js @@ -38,7 +38,9 @@ function renderOptions() { sites_excluded: [] }, function (items) { var sites = items.sites; - var sites_updated = items.sites_updated; + var sites_updated = filterObject(items.sites_updated, function (val, key) { + return !val.nofix + }); var sites_updated_domains_new = Object.values(sites_updated).filter(x => (x.domain && !defaultSites_domains.includes(x.domain) || x.group)).map(x => x.group ? x.group.filter(y => !defaultSites_domains.includes(y)) : x.domain).flat(); var sites_custom = items.sites_custom; var sites_custom_domains_new = Object.values(sites_custom).filter(x => x.domain && !defaultSites_domains.includes(x.domain)).map(x => x.group ? x.group.split(',').map(x => x.trim()) : x.domain).flat(); @@ -153,6 +155,13 @@ function compareKey(firstStr, secondStr) { return firstStr.toLowerCase().replace(/\s\(.*\)/, '') === secondStr.toLowerCase().replace(/\s\(.*\)/, ''); } +function filterObject(obj, filterFn, mapFn = function (val, key) { + return [key, val]; +}) { + return Object.fromEntries(Object.entries(obj). + filter(([key, val]) => filterFn(val, key)).map(([key, val]) => mapFn(val, key))); +} + document.addEventListener('DOMContentLoaded', renderOptions); document.getElementById('save').addEventListener('click', save_options); document.getElementById('save_top').addEventListener('click', save_options); diff --git a/options/options_custom.js b/options/options_custom.js index 1036410a..81e4f3c8 100644 --- a/options/options_custom.js +++ b/options/options_custom.js @@ -329,7 +329,9 @@ function renderOptions() { }, function (items) { var sites_custom = sortJson(items.sites_custom); var sites_custom_domains_new = Object.values(sites_custom).filter(x => x.domain && !defaultSites_domains.includes(x.domain)).map(x => x.group ? x.group.split(',').filter(x => x).map(x => x.trim()) : x.domain).flat(); - var sites_updated = items.sites_updated; + var sites_updated = filterObject(items.sites_updated, function (val, key) { + return !val.nofix + }); var sites_updated_domains_new = Object.values(sites_updated).filter(x => (x.domain && !defaultSites_domains.includes(x.domain) || x.group)).map(x => x.group ? x.group.filter(y => !defaultSites_domains.includes(y)) : x.domain).flat(); var sitesEl = document.getElementById('bypass_sites'); sitesEl.innerHTML = ''; diff --git a/sites.js b/sites.js index 55cb518e..351685be 100644 --- a/sites.js +++ b/sites.js @@ -2149,7 +2149,6 @@ var defaultSites = { "SPH Media (fetch from archive.is)": { domain: "###_sg_sph_media", group: [ - "businesstimes.com.sg", "straitstimes.com" ], allow_cookies: 1, @@ -3052,4 +3051,4 @@ var fr_groupe_ebra_nofix_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain. var fr_indigo_nofix_domains = ['africaintelligence.com', 'africaintelligence.fr', 'glitz.paris', 'intelligenceonline.com', 'intelligenceonline.fr', 'lalettre.fr']; var it_gedi_nofix_domains = ['gelocal.it', 'limesonline.com']; var nl_mediahuis_region_nofix_domains = ['gooieneemlander.nl', 'haarlemsdagblad.nl', 'ijmuidercourant.nl', 'leidschdagblad.nl', 'noordhollandsdagblad.nl']; -var nofix_sites = ['11freunde.de', 'aamulehti.fi', 'abendblatt.de', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'arkansasonline.com', 'asahi.com', 'asiatimes.com', 'autosport.com', 'aviationweek.com', 'badische-zeitung.de', 'bhaskar.com', 'bloomberglaw.com', 'bloombergtax.com', 'bnef.com', 'bnn.de', 'borsen.dk', 'businessinsider.de', 'businessinsider.jp', 'businesslive.co.za', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'chegg.com', 'codesports.com.au', 'compactmag.com', 'courrierinternational.com', 'coursehero.com', 'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'dn.no', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'ewmagazine.nl', 'falter.at', 'finance.si', 'franc-tireur.fr', 'ftchinese.com', 'ftchineselive.com', 'gamestar.de', 'geo.de', 'golem.de', 'gp.se', 'gva.be', 'handelsblatt.com', 'hbrarabic.com', 'hbrchina.org', 'hbrfrance.fr', 'heise.de', 'hs.fi', 'ilsole24ore.com', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'jungefreiheit.de', 'kleinezeitung.at', 'laverita.info', 'lavie.fr', 'lavozdegalicia.es', 'law360.co.uk', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefilmfrancais.com', 'lemonde.fr', 'lequipe.fr', 'lesjours.fr', 'letemps.ch', 'liberation.fr', 'libertiesjournal.com', 'main-echo.de', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'money.it', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'motorsport.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'newcriterion.com', 'news24.com', 'newslaundry.com', 'nn.de', 'nwzonline.de', 'observador.pt', 'on3.com', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'quillette.com', 'rbc.ru', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'streetinsider.com', 'substack.com', 'suedkurier.de', 'swp.de', 'taxation.co.uk', 'taxjournal.com', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thestar.com.my', 'thewirechina.com', 'timeslive.co.za', 'weltwoche.ch', 'weltwoche.de', 'wissenschaft.de', 'worldpoliticsreview.com', 'wz.de', 'zaobao.com.sg'].concat(de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, de_westfalen_medien_nofix_domains, fr_be_groupe_rossel_nofix_domains, fr_groupe_ebra_nofix_domains, fr_indigo_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains); +var nofix_sites = ['11freunde.de', 'aamulehti.fi', 'abendblatt.de', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'arkansasonline.com', 'asahi.com', 'asiatimes.com', 'autosport.com', 'aviationweek.com', 'badische-zeitung.de', 'bhaskar.com', 'bloomberglaw.com', 'bloombergtax.com', 'bnef.com', 'bnn.de', 'borsen.dk', 'businessinsider.de', 'businessinsider.jp', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'chegg.com', 'codesports.com.au', 'compactmag.com', 'courrierinternational.com', 'coursehero.com', 'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'dn.no', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'ewmagazine.nl', 'falter.at', 'finance.si', 'franc-tireur.fr', 'ftchinese.com', 'ftchineselive.com', 'gamestar.de', 'geo.de', 'golem.de', 'gp.se', 'gva.be', 'handelsblatt.com', 'hbrarabic.com', 'hbrchina.org', 'hbrfrance.fr', 'heise.de', 'hs.fi', 'ilsole24ore.com', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'jungefreiheit.de', 'kleinezeitung.at', 'laverita.info', 'lavie.fr', 'lavozdegalicia.es', 'law360.co.uk', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefilmfrancais.com', 'lemonde.fr', 'lequipe.fr', 'lesjours.fr', 'letemps.ch', 'liberation.fr', 'libertiesjournal.com', 'main-echo.de', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'money.it', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'motorsport.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'newcriterion.com', 'news24.com', 'newslaundry.com', 'nn.de', 'nwzonline.de', 'observador.pt', 'on3.com', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'quillette.com', 'rbc.ru', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'streetinsider.com', 'substack.com', 'suedkurier.de', 'swp.de', 'taxation.co.uk', 'taxjournal.com', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thestar.com.my', 'thewirechina.com', 'timeslive.co.za', 'weltwoche.ch', 'weltwoche.de', 'wissenschaft.de', 'worldpoliticsreview.com', 'wz.de', 'zaobao.com.sg'].concat(de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, de_westfalen_medien_nofix_domains, fr_be_groupe_rossel_nofix_domains, fr_groupe_ebra_nofix_domains, fr_indigo_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains); diff --git a/sites_updated.json b/sites_updated.json index c29d8ef2..9ac3a290 100644 --- a/sites_updated.json +++ b/sites_updated.json @@ -35,51 +35,23 @@ "block_regex": "\\.{domain}\\/journey\\/compiler\\/build-.+\\.js", "upd_version": "3.5.6.1" }, - "Daily Mail UK": { - "domain": "dailymail.co.uk", - "allow_cookies": 1, - "block_regex": "\\/zephr\\/feature", - "upd_version": "3.5.4.6" - }, - "Der Aktionär": { - "domain": "deraktionaer.de", - "allow_cookies": 1, - "add_ext_link": "div#paywall-container|div#article-body", - "add_ext_link_type": "archive.is", - "ld_archive_is": "div#paywall-container|div#article-body", - "upd_version": "3.5.4.8" - }, - "FewCents": { - "domain": "fewcents.co", - "allow_cookies": 1, - "block_regex_general": "\\.fewcents\\.co\\/.+\\/paywall.*\\.js", - "upd_version": "3.5.4.5" - }, "Forbes Australia": { "domain": "forbes.com.au", "remove_cookies_select_drop": ["blaize_session"], "ld_json_url": "div[class*='_gate']|div.article-page__content-body", "upd_version": "3.5.6.3" }, - "Grupo Prensa Ibérica": { - "domain": "###_es_epiberica", - "group": [ - "diariodemallorca.es", - "eldia.es", - "elperiodico.com", - "epe.es", - "farodevigo.es", - "informacion.es", - "laprovincia.es", - "levante-emv.com", - "lne.es", - "mallorcazeitung.es", - "superdeporte.es" - ], + "Funke Mediengruppe (removed)": { + "domain": "###_de_funke_medien", + "group": [], "allow_cookies": 1, - "block_regex": "(\\.piano\\.io\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)", - "cs_code": "[{\"cond\":\"div.ft-helper-closenews\", \"rm_attrib\":\"class\"}]", - "upd_version": "3.5.4.1" + "upd_version": "3.5.6.8" + }, + "Groupe Rossel (removed)": { + "domain": "###_fr_be_groupe_rossel", + "group": [], + "allow_cookies": 1, + "upd_version": "3.5.6.6" }, "Grupo Vocento": { "domain": "###_es_grupo_vocento", @@ -130,12 +102,11 @@ "cs_block": 1, "upd_version": "3.5.5.4" }, - "National Geographic USA": { - "domain": "nationalgeographic.com", + "Mediahuis Nederland Regional (removed)": { + "domain": "###_nl_mediahuis_region", + "group": [], "allow_cookies": 1, - "block_regex": "cdn\\.registerdisney\\.go\\.com\\/", - "random_ip": "eu", - "upd_version": "3.5.4.2" + "upd_version": "3.5.6.8" }, "Polityka.pl": { "domain": "polityka.pl", @@ -151,12 +122,16 @@ "cs_block": 1, "upd_version": "3.5.5.4" }, - "Sophi.io": { - "domain": "sophi.io", + "SPH Media": { + "domain": "###_sg_sph_media", + "group": [ + "straitstimes.com" + ], "allow_cookies": 1, - "block_regex_general": "\\.sophi\\.io\\/", - "excluded_domains": ["sophi.io"], - "upd_version": "3.5.4.6" + "add_ext_link": "div#nocx_paywall_area|main#content", + "add_ext_link_type": "archive.is", + "ld_archive_is": "div#nocx_paywall_area|main#content", + "upd_version": "3.5.7.1" }, "The Epoch Times": { "domain": "###_usa_epochtimes", @@ -176,12 +151,6 @@ ], "upd_version": "3.5.6.5" }, - "The Indian Express": { - "domain": "indianexpress.com", - "allow_cookies": 1, - "block_regex": "(\\/indianexpress\\/js\\/evolok\\/|\\.fewcents\\.co\\/.+\\/paywall.*\\.js|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)", - "upd_version": "3.5.4.5" - }, "The New York Times": { "domain": "nytimes.com", "allow_cookies": 1, @@ -206,18 +175,5 @@ } ], "upd_version": "3.5.6.8" - }, - "Vogue Business (member-text only)": { - "domain": "voguebusiness.com", - "block_regex": "\\.voguebusiness\\.com\\/journey\\/compiler\\/build-.+\\.js", - "ld_json": "aside[class^='PaywallInlineBarrierWrapper']|div.body__inner-container", - "remove_cookies_select_drop": ["userId"], - "upd_version": "3.5.4.4" - }, - "Ynet": { - "domain": "ynet.co.il", - "allow_cookies": 1, - "block_regex": "\\.tinypass\\.com\\/", - "upd_version": "3.5.4.7" } } diff --git a/updates.json b/updates.json index 3d01a09b..8232c763 100644 --- a/updates.json +++ b/updates.json @@ -2,8 +2,8 @@ "addons": { "magnolia@12.34": { "updates": [ - { "version": "3.5.6.4", - "update_link": "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.5.6.4.xpi" } + { "version": "3.5.7.0", + "update_link": "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.5.7.0.xpi" } ] } }