From 982221d7b7b0e985b9caf5a9b8da3187011a44b5 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Tue, 7 Jul 2020 19:35:28 +0200 Subject: [PATCH] Group Australia News Corp (more) --- README.md | 8 ++++---- background.js | 19 +++++++------------ sites.js | 5 +---- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 6291af3..3bb58ca 100644 --- a/README.md +++ b/README.md @@ -109,24 +109,24 @@ Install add-on by downloading xpi-file. [New Zealand Herald](https://www.nzherald.co.nz) - [The Age](https://www.theage.com.au) - -[The Australian](https://www.theaustralian.com.au) - [The Australian Financial Review](https://www.afr.com) - -[The Mercury Tasmania](https://www.themercury.com.au) - [The Saturday Paper](https://www.thesaturdaypaper.com.au) - [The Spectator Australia](https://www.spectator.com.au) - [The Sydney Morning Herald](https://www.smh.com.au) – -[The Weekly Times](https://www.weeklytimesnow.com.au) – [WAtoday](https://www.watoday.com.au) -##### > News Corps Australia +##### > News Corp Australia [Cairns Post](https://www.cairnspost.com.au) – [Geelong Advertiser](https://www.geelongadvertiser.com.au) - [Gold Coast Bulletin](https://www.goldcoastbulletin.com.au) – [Herald Sun](https://www.heraldsun.com.au) – [Northern Territory News](https://www.ntnews.com.au) – [The Advertiser/AdelaideNow](https://www.adelaidenow.com.au) – +[The Australian](https://www.theaustralian.com.au) - [The Courier-Mail](https://www.couriermail.com.au) – [The Daily Telegraph](https://www.dailytelegraph.com.au) – +[The Mercury Tasmania](https://www.themercury.com.au) - +[The Weekly Times](https://www.weeklytimesnow.com.au) – [Townsville Bulletin](https://www.townsvillebulletin.com.au) ##### > Financial diff --git a/background.js b/background.js index 2dd5306..19f1452 100644 --- a/background.js +++ b/background.js @@ -61,12 +61,9 @@ var allow_cookies = [ 'the-american-interest.com', 'theathletic.co.uk', 'theathletic.com', -'theaustralian.com.au', 'themarker.com', -'themercury.com.au', 'trouw.nl', 'volkskrant.nl', -'weeklytimesnow.com.au', 'worldpoliticsreview.com', ] @@ -121,11 +118,8 @@ var use_google_bot_default = [ 'switzersuperreport.com.au', 'theathletic.co.uk', 'theathletic.com', -'theaustralian.com.au', 'themarker.com', -'themercury.com.au', 'thetimes.co.uk', -'weeklytimesnow.com.au', 'worldpoliticsreview.com', 'wsj.com', ]; @@ -199,7 +193,7 @@ var blockedRegexes = { }; const au_comm_media_domains = ['bendigoadvertiser.com.au', 'bordermail.com.au', 'canberratimes.com.au', 'centralwesterndaily.com.au', 'dailyadvertiser.com.au', 'dailyliberal.com.au', 'examiner.com.au', 'illawarramercury.com.au', 'newcastleherald.com.au', 'northerndailyleader.com.au', 'portnews.com.au', 'standard.net.au', 'theadvocate.com.au', 'thecourier.com.au', 'westernadvocate.com.au']; -const au_news_corps_domains = ['adelaidenow.com.au', 'cairnspost.com.au', 'couriermail.com.au', 'dailytelegraph.com.au', 'geelongadvertiser.com.au', 'goldcoastbulletin.com.au', 'heraldsun.com.au', 'ntnews.com.au', 'townsvillebulletin.com.au']; +const au_news_corp_domains = ['adelaidenow.com.au', 'cairnspost.com.au', 'couriermail.com.au', 'dailytelegraph.com.au', 'geelongadvertiser.com.au', 'goldcoastbulletin.com.au', 'heraldsun.com.au', 'ntnews.com.au', 'theaustralian.com.au', 'themercury.com.au', 'townsvillebulletin.com.au', 'weeklytimesnow.com.au']; const userAgentDesktop = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" const userAgentMobile = "Chrome/41.0.2272.96 Mobile Safari/537.36 (compatible ; Googlebot/2.1 ; +http://www.google.com/bot.html)" @@ -246,12 +240,13 @@ ext_api.storage.sync.get({ if (enabledSites.includes('###_au_comm_media')) { enabledSites = enabledSites.concat(au_comm_media_domains); for (let domain of au_comm_media_domains) { + allow_cookies.push(domain); blockedRegexes[domain] = /.+cdn-au\.piano\.io\/api\/tinypass.+\.js/; } } - if (enabledSites.includes('###_au_news_corps')) { - enabledSites = enabledSites.concat(au_news_corps_domains); - for (let domain of au_news_corps_domains) { + if (enabledSites.includes('###_au_news_corp')) { + enabledSites = enabledSites.concat(au_news_corp_domains); + for (let domain of au_news_corp_domains) { allow_cookies.push(domain); use_google_bot_default.push(domain); } @@ -282,8 +277,8 @@ ext_api.storage.onChanged.addListener(function (changes, namespace) { enabledSites = enabledSites.concat(ad_region_domains); if (enabledSites.includes('###_au_comm_media')) enabledSites = enabledSites.concat(au_comm_media_domains); - if (enabledSites.includes('###_au_news_corps')) - enabledSites = enabledSites.concat(au_news_corps_domains); + if (enabledSites.includes('###_au_news_corp')) + enabledSites = enabledSites.concat(au_news_corp_domains); // reset disableJavascriptOnListedSites eventListener ext_api.webRequest.onBeforeRequest.removeListener(disableJavascriptOnListedSites); ext_api.webRequest.handlerBehaviorChanged(); diff --git a/sites.js b/sites.js index 13e10d7..8c0f252 100644 --- a/sites.js +++ b/sites.js @@ -7,7 +7,7 @@ var defaultSites = "American Affairs": "americanaffairsjournal.org", "American Banker": "americanbanker.com", "Atavist Magazine": "atavist.com", - "Australia News Corps": "###_au_news_corps", + "Australia News Corp": "###_au_news_corp", "Australian Community Media (daily)": "###_au_comm_media", "Baltimore Sun": "baltimoresun.com", "Barron's": "barrons.com", @@ -137,7 +137,6 @@ var defaultSites = "The Athletic UK": "theathletic.co.uk", "The Atlantic": "theatlantic.com", "The Australian Financial Review": "afr.com", - "The Australian": "theaustralian.com.au", "The Boston Globe": "bostonglobe.com", "The Business Journals": "bizjournals.com", "The Christian Science Monitor": "csmonitor.com", @@ -151,7 +150,6 @@ var defaultSites = "The Japan Times": "japantimes.co.jp", "The Marker": "themarker.com", "The Mercury News": "mercurynews.com", - "The Mercury Tasmania": "themercury.com.au", "The Morning Call": "mcall.com", "The Nation": "thenation.com", "The New Republic": "newrepublic.com", @@ -172,7 +170,6 @@ var defaultSites = "The Toronto Star": "thestar.com", "The Wall Street Journal": "wsj.com", "The Washington Post": "washingtonpost.com", - "The Weekly Times": "weeklytimesnow.com.au", "Towards Data Science": "towardsdatascience.com", "Trouw": "trouw.nl", "Valeurs Actuelles": "valeursactuelles.com",