From e14fd0863d865172687976ecaeec74591e42894b Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Tue, 18 Jan 2022 20:16:52 +0100 Subject: [PATCH] Fix Challenges.fr Plus fix amp: allow amp-consent (part 2) --- changelog.txt | 1 + contentScript.js | 15 ++++++++++----- manifest.json | 2 +- sites.js | 26 +++++++++++++++----------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/changelog.txt b/changelog.txt index 9cef5c40..22510e18 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Changelog Bypass Paywalls Clean - Firefox Post-release +Fix Challenges.fr Fix The New Yorker (update) * v2.5.2.0 (2022-01-16) diff --git a/contentScript.js b/contentScript.js index ed8c0c53..35661f2c 100644 --- a/contentScript.js +++ b/contentScript.js @@ -30,7 +30,7 @@ var usa_mng_domains = ['denverpost.com', 'eastbaytimes.com', 'mercurynews.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) -var arr_localstorage_hold = ['allgaeuer-zeitung.de', 'augsburger-allgemeine.de', 'barrons.com', 'businessoffashion.com', 'charliehebdo.fr', 'cmjornal.pt', 'corriere.it', 'elespanol.com', 'estadao.com.br', 'fortune.com', 'ilfoglio.it', 'inc42.com', 'kurier.at', 'nknews.org', 'ruhrnachrichten.de', 'scmp.com', 'seekingalpha.com', 'telegraph.co.uk', 'thehindu.com', 'thetimes.co.uk', 'wsj.com'].concat(de_funke_media_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, fr_groupe_nice_matin_domains, it_quotidiano_domains, no_nhst_media_domains, usa_hearst_comm_domains); +var arr_localstorage_hold = ['abc.es', 'allgaeuer-zeitung.de', 'augsburger-allgemeine.de', 'barrons.com', 'businessoffashion.com', 'challenges.fr', 'charliehebdo.fr', 'cmjornal.pt', 'corriere.it', 'eldiario.es', 'elespanol.com', 'elle.fr', 'elpais.com', 'elperiodico.com', 'estadao.com.br', 'forbes.com', 'fortune.com', 'freiepresse.de', 'ilfoglio.it', 'inc42.com', 'kurier.at', 'lanouvellerepublique.fr', 'nknews.org', 'ruhrnachrichten.de', 'scmp.com', 'seekingalpha.com', 'telegraph.co.uk', 'thehindu.com', 'thetimes.co.uk', 'wsj.com'].concat(de_funke_media_domains, es_epiberica_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, fr_groupe_nice_matin_domains, it_quotidiano_domains, no_nhst_media_domains, usa_hearst_comm_domains); if (!matchDomain(arr_localstorage_hold)) { window.localStorage.clear(); } @@ -88,8 +88,8 @@ function amp_unhide_access_hide(amp_access = '', amp_access_not = '', amp_ads_se for (elem of access_hide) elem.removeAttribute('amp-access-hide'); if (amp_access_not) { - let amp_access_not_dom = document.querySelector('[amp-access' + amp_access_not + ']'); - removeDOMElement(amp_access_not_dom); + let amp_access_not_dom = document.querySelectorAll('[amp-access' + amp_access_not + ']'); + removeDOMElement(...amp_access_not_dom); } let amp_ads = document.querySelectorAll(amp_ads_sel); removeDOMElement(...amp_ads); @@ -802,6 +802,9 @@ else if (matchDomain('elconfidencial.com')) { else if (matchDomain('eldiario.es')) { if (window.location.pathname.endsWith('.amp.html')) { amp_unhide_access_hide('^="access"'); + } else { + let ads = document.querySelectorAll('.edi-advertising, .header-ad'); + removeDOMElement(...ads); } } @@ -974,8 +977,10 @@ else if (matchDomain('challenges.fr')) { if (amorce) amorce.setAttribute('style', 'display:none !important'); let content = document.querySelectorAll('.user-paying-content'); - for (let elem of content) + for (let elem of content) { elem.classList.remove('user-paying-content'); + elem.removeAttribute('hidden'); + } let paywall = document.querySelector('.temp-paywall'); removeDOMElement(paywall); } @@ -2627,7 +2632,7 @@ else if (matchDomain('newsday.com')) { else if (matchDomain(['newyorker.com', 'vanityfair.com', 'wired.com'])) { if (window.location.pathname.endsWith('/amp')) { - amp_unhide_subscr_section('.ad'); + amp_unhide_subscr_section('amp-ad, amp-embed, .ad'); } else { let paywall_bar = document.querySelector('.paywall-bar'); removeDOMElement(paywall_bar); diff --git a/manifest.json b/manifest.json index 10ca8e76..0036398a 100644 --- a/manifest.json +++ b/manifest.json @@ -602,5 +602,5 @@ "*://*.wsj.net/*", "*://*.zephr.com/*" ], - "version": "2.5.2.1" + "version": "2.5.2.2" } diff --git a/sites.js b/sites.js index 7124a030..d6cbbfea 100644 --- a/sites.js +++ b/sites.js @@ -6,7 +6,7 @@ var defaultSites = { "ABC.es": { domain: "abc.es", allow_cookies: 1, - block_regex: /(\.evolok\.net\/|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js)/, + block_regex: /(\.evolok\.net\/|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad)-.+\.js)/, useragent: "googlebot" }, "Advance Local": { @@ -77,6 +77,7 @@ var defaultSites = { }, "American Banker": { domain: "americanbanker.com", + allow_cookies: 1, block_regex: /\.tinypass\.com\// }, "Apollo Magazine": { @@ -159,7 +160,8 @@ var defaultSites = { }, "BBC History Extra": { domain: "historyextra.com", - block_regex: /\.evolok\.net\// + allow_cookies: 1, + block_regex: /\.tinypass\.com\// }, "Belfast Telegraph (setCookie opt-in)": { domain: "belfasttelegraph.co.uk", @@ -204,7 +206,8 @@ var defaultSites = { }, "Challenges": { domain: "challenges.fr", - block_regex: /(\.poool\.fr\/|cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js)/ + allow_cookies: 1, + block_regex: /(\.poool\.fr\/|cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js)/ }, "Charlie Hebdo": { domain: "charliehebdo.fr", @@ -340,7 +343,7 @@ var defaultSites = { }, "El Diario.es": { domain: "eldiario.es", - block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js/ + block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad)-.+\.js/ }, "El Español": { domain: "elespanol.com", @@ -369,17 +372,17 @@ var defaultSites = { "El País": { domain: "elpais.com", allow_cookies: 1, - block_regex: /(\.epimg\.net\/js\/.+\/(noticia|user)\.min\.js|\/elpais\.com\/arc\/subs\/p\.min\.js|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js)/ + block_regex: /(\.epimg\.net\/js\/.+\/(noticia|user)\.min\.js|\/elpais\.com\/arc\/subs\/p\.min\.js|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad)-.+\.js)/ }, "El Periódico (de Catalunya)": { domain: "elperiodico.com", allow_cookies: 1, - block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/ + block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/ }, "Elle.fr": { domain: "elle.fr", allow_cookies: 1, - block_regex: /(\.poool\.fr\/|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js)/ + block_regex: /(\.poool\.fr\/|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad)-.+\.js)/ }, "Encyclopedia Britannica": { domain: "britannica.com" @@ -456,7 +459,7 @@ var defaultSites = { "Forbes": { domain: "forbes.com", allow_cookies: 1, - block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js)/ + block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js)/ }, "Foreign Affairs": { domain: "foreignaffairs.com", @@ -478,7 +481,7 @@ var defaultSites = { "Freie Presse": { domain: "freiepresse.de", allow_cookies: 1, - block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/ + block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/ }, "Funke Mediengruppe": { domain: "###_de_funke_medien", @@ -624,7 +627,7 @@ var defaultSites = { "lne.es" ], allow_cookies: 1, - block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|analytics|consent)-.+\.js/ + block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|analytics)-.+\.js/ }, "Grupo Vocento (Spain, regional daily)": { domain: "###_es_grupo_vocento", @@ -831,7 +834,7 @@ var defaultSites = { "La Nouvelle République du Centre-Ouest": { domain: "lanouvellerepublique.fr", allow_cookies: 1, - block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/, + block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/, useragent: "googlebot" }, "La Nuova Sardegna": { @@ -1046,6 +1049,7 @@ var defaultSites = { }, "Mexico News Daily": { domain: "mexiconewsdaily.com", + allow_cookies: 1, block_regex: /\.mexiconewsdaily\.com\/c\/assets\/pigeon\.js/ }, "MIT Sloan Management Review": {