From 64b7298334d7e58f5a1086533ef807eec2c25f38 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Fri, 27 Nov 2020 19:34:15 +0100 Subject: [PATCH] Add Alma Talent sites (Finland) --- README.md | 10 ++++++++++ background.js | 34 +++++++++++++++++++++++++++++++++- changelog.txt | 1 + manifest.json | 11 ++++++++++- sites.js | 1 + 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1cf95aa..43f27c0 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,16 @@ Visit the [Chrome repository](https://gitlab.com/magnolia1234/bypass-paywalls-ch [The Times Literary Supplement](https://www.the-tls.co.uk) ##### Finland +Alma Talent sites (grouped in options) like +[Arvopaperi](https://www.arvopaperi.fi) - +[Kauppalehti](https://www.kauppalehti.fi) - +[Markkinointi & Mainonta](https://www.marmai.fi) - +[Mediuutiset](https://www.mediuutiset.fi) - +[Mikrobitti](https://www.mikrobitti.fi) - +[Talouselämä](https://www.talouselama.fi) - +[Tekniikka & Talous](https://www.tekniikkatalous.fi) - +[Tivi](https://www.tivi.fi) - +[Uusi Suomi](https://www.uusisuomi.fi)\ [Helsingin Sanomat](https://www.hs.fi) ##### France/Wallonia diff --git a/background.js b/background.js index 2733b75..75bde24 100644 --- a/background.js +++ b/background.js @@ -113,6 +113,7 @@ var remove_cookies = [ // select specific cookie(s) to hold from remove_cookies domains const remove_cookies_select_hold = { 'barrons.com': ['wsjregion'], + 'groene.nl': ['accept-cookies', 'popunder-hidden'], 'newstatesman.com': ['STYXKEY_nsversion'], 'seattletimes.com': ['st_newsletter_splash_seen'], 'telegraph.co.uk': ['consentUUID'], @@ -284,6 +285,7 @@ const au_comm_media_domains = ['bendigoadvertiser.com.au', 'bordermail.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 au_prov_news_domains = ['news-mail.com.au', 'frasercoastchronicle.com.au', 'gladstoneobserver.com.au', 'dailyexaminer.com.au', 'dailymercury.com.au', 'themorningbulletin.com.au', 'sunshinecoastdaily.com.au', 'gympietimes.com.au', 'northernstar.com.au', 'qt.com.au', 'thechronicle.com.au', 'warwickdailynews.com.au']; const es_grupo_vocento_domains = ['diariosur.es', 'diariovasco.com', 'elcorreo.com', 'eldiariomontanes.es', 'elnortedecastilla.es', 'hoy.es', 'larioja.com', 'laverdad.es']; +const fi_alma_talent_domains = ['arvopaperi.fi', 'kauppalehti.fi', 'marmai.fi', 'mediuutiset.fi', 'mikrobitti.fi', 'talouselama.fi', 'tekniikkatalous.fi', 'tivi.fi', 'uusisuomi.fi']; const ilmessaggero_domains = ['corriereadriatico.it', 'ilgazzettino.it', 'ilmattino.it', 'quotidianodipuglia.it']; const nymag_domains = ['grubstreet.com', 'thecut.com', 'vulture.com']; // pg_domains has only grouped remove_cookies_select_drop rules @@ -298,7 +300,7 @@ const userAgentMobileB = "Chrome/80.0.3987.92 Mobile Safari/537.36 (compatible; var enabledSites = []; var disabledSites = []; var defaultSites_grouped_domains = Object.values(defaultSites); -var defaultSites_domains = defaultSites_grouped_domains.concat(ad_region_domains, au_comm_media_domains, au_news_corp_domains, au_prov_news_domains, es_grupo_vocento_domains, ilmessaggero_domains, nymag_domains); +var defaultSites_domains = defaultSites_grouped_domains.concat(ad_region_domains, au_comm_media_domains, au_news_corp_domains, au_prov_news_domains, es_grupo_vocento_domains, fi_alma_talent_domains, ilmessaggero_domains, nymag_domains); var customSites = {}; var customSites_domains = []; @@ -310,6 +312,29 @@ function setDefaultOptions() { }); } +// copy storage.sync to storage.local (quota exceeded) +ext_api.storage.sync.get({ + sites: {}, + sites_custom: {}, + daily_users: {}, + optIn: {}, + optInShown: {}, + customShown: {} +}, function (items) { + if (Object.keys(items.sites).length > 0) { + ext_api.storage.local.set({ + sites: items.sites, + sites_custom: items.sites_custom, + daily_users: items.daily_users, + optIn: items.optIn, + optInShown: items.optInShown, + customShown: items.customShown + }, function () { + ext_api.storage.sync.remove(['sites', 'sites_custom']); + }); + } +}); + // add grouped sites to en/disabledSites & init rules (optional) function add_grouped_sites(init_rules) { if (init_rules) { @@ -332,6 +357,9 @@ function add_grouped_sites(init_rules) { allow_cookies.push(domain); blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/; } + for (let domain of fi_alma_talent_domains) { + use_google_bot.push(domain); + } for (let domain of ilmessaggero_domains) blockedRegexes[domain] = /utils\.cedsdigital\.it\/js\/PaywallMeter\.js/; for (let domain of pg_domains) @@ -357,6 +385,10 @@ function add_grouped_sites(init_rules) { enabledSites = enabledSites.concat(es_grupo_vocento_domains); else disabledSites = disabledSites.concat(es_grupo_vocento_domains); + if (enabledSites.includes('###_fi_alma_talent')) + enabledSites = enabledSites.concat(fi_alma_talent_domains); + else + disabledSites = disabledSites.concat(fi_alma_talent_domains); if (enabledSites.includes('ilmessaggero.it')) enabledSites = enabledSites.concat(ilmessaggero_domains); else diff --git a/changelog.txt b/changelog.txt index 90d56b9..67a1de9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Changelog Bypass Paywalls Clean - Firefox Post-release +Add Alma Talent sites (Finland) Add El Periodico (Spain) Add Grupo Vocento (Spain, regional daily) Add La Croix (France) diff --git a/manifest.json b/manifest.json index d019b9d..31d8378 100644 --- a/manifest.json +++ b/manifest.json @@ -52,6 +52,7 @@ "*://*.alternatives-economiques.fr/*", "*://*.americanaffairsjournal.org/*", "*://*.americanbanker.com/*", + "*://*.arvopaperi.fi/*", "*://*.asia.nikkei.com/*", "*://*.atavist.com/*", "*://*.baltimoresun.com/*", @@ -174,6 +175,7 @@ "*://*.japantimes.co.jp/*", "*://*.journaldunet.com/*", "*://*.journalnow.com/*", + "*://*.kauppalehti.fi/*", "*://*.knack.be/*", "*://*.kurier.at/*", "*://*.la-croix.com/*", @@ -204,12 +206,15 @@ "*://*.lrb.co.uk/*", "*://*.lvz.de/*", "*://*.marketwatch.com/*", + "*://*.marmai.fi/*", "*://*.mcall.com/*", "*://*.medium.com/*", + "*://*.mediuutiset.fi/*", "*://*.mercuriovalpo.cl/*", "*://*.mercurynews.com/*", "*://*.mexiconewsdaily.com/*", "*://*.miamiherald.com/*", + "*://*.mikrobitti.fi/*", "*://*.modernhealthcare.com/*", "*://*.mv-voice.com/*", "*://*.nationalgeographic.com/*", @@ -276,8 +281,10 @@ "*://*.sueddeutsche.de/*", "*://*.sun-sentinel.com/*", "*://*.sunshinecoastdaily.com.au/*", + "*://*.talouselama.fi/*", "*://*.techinasia.com/*", "*://*.technologyreview.com/*", + "*://*.tekniikkatalous.fi/*", "*://*.telegraaf.nl/*", "*://*.telegraph.co.uk/*", "*://*.the-american-interest.com/*", @@ -305,10 +312,12 @@ "*://*.thewest.com.au/*", "*://*.tijd.be/*", "*://*.timeshighereducation.com/*", + "*://*.tivi.fi/*", "*://*.towardsdatascience.com/*", "*://*.townsvillebulletin.com.au/*", "*://*.trouw.nl/*", "*://*.tubantia.nl/*", + "*://*.uusisuomi.fi/*", "*://*.valeursactuelles.com/*", "*://*.vanityfair.com/*", "*://*.variety.com/*", @@ -358,5 +367,5 @@ "*://*.repstatic.it/*", "*://*.userzoom.com/*" ], - "version": "1.9.6.7" + "version": "1.9.6.8" } \ No newline at end of file diff --git a/sites.js b/sites.js index 747ee27..bee5110 100644 --- a/sites.js +++ b/sites.js @@ -4,6 +4,7 @@ var defaultSites = "Adweek": "adweek.com", "Aftonbladet": "aftonbladet.se", "Algemeen Dagblad (+ regional)": "ad.nl", + "Alma Talent (Finland)": "###_fi_alma_talent", "Alternatives Economiques": "alternatives-economiques.fr", "American Affairs": "americanaffairsjournal.org", "American Banker": "americanbanker.com",