From 103a71a15cec260f3d3109a4b457669a35661736 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Mon, 30 Nov 2020 20:38:50 +0100 Subject: [PATCH] Fix-update Telegraph.co.uk (amp pages) --- background.js | 7 ++++--- changelog.txt | 1 + contentScript.js | 14 ++++++++++++++ manifest.json | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/background.js b/background.js index 00d9e1d..3b55804 100755 --- a/background.js +++ b/background.js @@ -187,7 +187,7 @@ var blockedRegexes = { 'chicagotribune.com': /.+:\/\/.+\.tribdss\.com\/.+/, 'chronicle.com': /(.+\.blueconic\.net\/.+|assets\.login\.chronicle\.com\/common\/che-auth0-user\.js)/, 'clarin.com': /js\.matheranalytics\.com\/.+/, - 'corriere.it': /(cdn\.tinypass\.com\/.+|\.rcsobjects\.it\/(rcs_cpmt|rcs_tracking-service)\/|\.corriereobjects\.it\/.+\/js\/(_paywall\.sjs|tracking\/)|\.userzoom\.com\/files\/js\/)/, + 'corriere.it': /(cdn\.tinypass\.com\/|\.rcsobjects\.it\/rcs_(cpmt|tracking-service)\/|\.corriereobjects\.it\/.+\/js\/(_paywall\.sjs|tracking\/)|\.userzoom\.com\/files\/js\/)/, 'digiday.com': /cdn\.tinypass\.com\/.+/, 'dvhn.nl': /.+\.evolok\.net\/.+\/authorize\/.+/, 'economist.com': /cdn\.tinypass\.com\/.+/, @@ -264,7 +264,7 @@ var blockedRegexes = { 'spectator.com.au': /cdn\.tinypass\.com\/.+/, 'spectator.us': /(cdn\.cxense\.com\/.+|cdn\.tinypass\.com\/.+)/, 'technologyreview.com': /.+\.blueconic\.net\/.+/, - 'telegraph.co.uk': /(cdn\.tinypass\.com\/.+|.+\.telegraph\.co\.uk\/.+\/piano.+\.js|assets\.adobedtm\.com\/.+\.js)/, + 'telegraph.co.uk': /(cdn\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|consent)-.+\.js|\.telegraph\.co\.uk\/.+\/piano.+\.js|assets\.adobedtm\.com\/.+\.js)/, 'theage.com.au': /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/, 'thedailybeast.com': /cdn\.tinypass\.com\/.+/, 'thehindu.com': /(cdn\.cxense\.com\/.+|cdn\.tinypass\.com\/.+)/, @@ -724,8 +724,9 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) { let es_grupo_vocento_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain(es_grupo_vocento_domains, header_referer) && isSiteEnabled({url: header_referer})); let fr_lacroix_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain('la-croix.com', header_referer) && isSiteEnabled({url: header_referer})); let sz_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain('sueddeutsche.de', header_referer) && isSiteEnabled({url: header_referer})); + let uk_telegraph_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain('telegraph.co.uk', header_referer) && isSiteEnabled({url: header_referer})); - if (!isSiteEnabled(details) && !inkl_site && !bloomberg_site && !au_nc_amp_site && !au_apn_site && !au_swm_site && !es_grupo_vocento_site && !fr_lacroix_amp_site && !sz_amp_site) { + if (!isSiteEnabled(details) && !inkl_site && !bloomberg_site && !au_nc_amp_site && !au_apn_site && !au_swm_site && !es_grupo_vocento_site && !fr_lacroix_amp_site && !sz_amp_site && !uk_telegraph_amp_site) { return; } diff --git a/changelog.txt b/changelog.txt index 113ebeb..13f3324 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ Post-release Add El Comercio, Ideal & La Voz de Cadiz (Spain) Add The Spectator USA Fix-update El Mercurio & La Segunda (mobile) +Fix-update Telegraph.co.uk (amp pages) * v1.9.7.0 (2020-11-27) Add Alma Talent sites (Finland) diff --git a/contentScript.js b/contentScript.js index 6d3f1f9..af704a6 100755 --- a/contentScript.js +++ b/contentScript.js @@ -1732,6 +1732,20 @@ else if (matchDomain('lasegunda.com')) { } } +else if (matchDomain("telegraph.co.uk")) { + let url = window.location.href; + if (new URL(url).pathname.endsWith('/amp/')) { + let paywall = document.querySelector('.premium-paywall'); + if (paywall) { + let truncated_content = document.querySelector('.truncated-content'); + removeDOMElement(paywall, truncated_content); + let subscr_section = document.querySelector('.notAccessibleForFree'); + if (subscr_section) + subscr_section.removeAttribute('amp-access-hide'); + } + } +} + // General Functions function removeDOMElement(...elements) { for (let element of elements) { diff --git a/manifest.json b/manifest.json index 65af0cf..2460e4b 100644 --- a/manifest.json +++ b/manifest.json @@ -358,5 +358,5 @@ "*://*.repstatic.it/*", "*://*.userzoom.com/*" ], - "version": "1.9.7.2" + "version": "1.9.7.3" } \ No newline at end of file