From 635d7c07a5427e42188f47f7487d1567d175126a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Tue, 25 Aug 2020 17:08:06 +0000 Subject: [PATCH] Bug 1661009 - Implement basic locale filtering for remote top site defaults. r=mikedeboer Differential Revision: https://phabricator.services.mozilla.com/D88147 --- .../components/newtab/lib/TopSitesFeed.jsm | 19 +++++++++++++++++++ services/settings/dumps/main/top-sites.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/browser/components/newtab/lib/TopSitesFeed.jsm b/browser/components/newtab/lib/TopSitesFeed.jsm index 4853f100a166..4f89608bd517 100644 --- a/browser/components/newtab/lib/TopSitesFeed.jsm +++ b/browser/components/newtab/lib/TopSitesFeed.jsm @@ -299,6 +299,7 @@ this.TopSitesFeed = class TopSitesFeed { } if ( topsite.include_regions && + topsite.include_regions.length && !topsite.include_regions.includes(Region.home) ) { return false; @@ -306,6 +307,24 @@ this.TopSitesFeed = class TopSitesFeed { return true; }); + // Filter by locale. + result = result.filter(topsite => { + if ( + topsite.exclude_locales && + topsite.exclude_locales.includes(Services.locale.appLocaleAsBCP47) + ) { + return false; + } + if ( + topsite.include_locales && + topsite.include_locales.length && + !topsite.include_locales.includes(Services.locale.appLocaleAsBCP47) + ) { + return false; + } + return true; + }); + return result; } diff --git a/services/settings/dumps/main/top-sites.json b/services/settings/dumps/main/top-sites.json index 8b61bf5dac85..3bda2fd210ea 100644 --- a/services/settings/dumps/main/top-sites.json +++ b/services/settings/dumps/main/top-sites.json @@ -1 +1 @@ -{"data":[{"url":"https://www.wikipedia.org/","order":5,"title":"Wikipedia","schema":1598345694864,"exclude_regions":["DE"],"send_attribution_request":false,"id":"7105fa42-4066-41df-9af3-885a7b2e9682","last_modified":1598345800680},{"url":"https://de.wikipedia.org/wiki/","order":5,"title":"Wikipedia (DE)","schema":1598345679108,"include_regions":["DE"],"id":"f5419213-0611-40f5-aa12-ddc79d096657","last_modified":1598345800678},{"url":"https://google.com/","order":0,"title":"Google","schema":1598343701162,"keyword":"@google","search_shortcut":true,"send_attribution_request":false,"id":"cb6417cc-21d1-4a4d-9103-5094a5277342","last_modified":1598344419277},{"url":"https://www.facebook.com/","order":1,"title":"Facebook","schema":1598289454075,"send_attribution_request":false,"id":"b64b8279-6996-4e35-9176-c5ae5964c422","last_modified":1598290394840},{"url":"https://www.youtube.com/","order":3,"title":"Youtube","schema":1598289470275,"send_attribution_request":false,"id":"fc5d5d35-5637-4268-bb5f-f262818fa7e9","last_modified":1598290394838},{"url":"https://twitter.com/","order":2,"title":"Twitter","schema":1598289462557,"send_attribution_request":false,"id":"6bb2647b-31d6-4185-9052-6d680bf2d777","last_modified":1598290394833},{"url":"https://www.amazon.com/","order":4,"title":"Amazon","schema":1598289482863,"send_attribution_request":true,"id":"08f43769-116f-4450-b57d-5108042b5fe5","last_modified":1598290394831}]} +{"data":[{"url":"https://www.amazon.de/","order":25,"title":"Amazon","schema":1598361363725,"exclude_locales":[],"exclude_regions":[],"include_locales":[],"include_regions":["DE"],"id":"8c461703-9c24-469f-9122-d3b32c19c5a0","last_modified":1598361546472},{"url":"https://www.reddit.com","order":40,"title":"Reddit","schema":1598350581697,"exclude_regions":["PL","RU","FR","CN"],"id":"239c42d5-02ee-48a0-9e5e-5af092393d14","last_modified":1598355863489},{"url":"https://www.baidu.com/","order":10,"schema":1598350621228,"include_regions":["CN"],"id":"7967ba44-3df1-48ef-9d7e-21a3b9563813","last_modified":1598355863487},{"url":"https://www.zhihu.com/","order":20,"schema":1598350796571,"include_regions":["CN"],"id":"9c618b24-f504-4b8a-a104-70b19912be45","last_modified":1598355863484},{"url":"https://www.ifeng.com/","order":30,"schema":1598350796930,"include_regions":["CN"],"id":"3aef9b94-5732-4772-8bee-d44e4a30303e","last_modified":1598355863481},{"url":"https://weibo.com/","order":40,"schema":1598350797287,"include_regions":["CN"],"id":"605f35a7-de84-4658-9b0f-d7caa5e4a0e4","last_modified":1598355863478},{"url":"https://www.ctrip.com/","order":50,"schema":1598350797644,"include_regions":["CN"],"id":"f0c0d5f2-9363-4bed-ada4-17a1a5437c6e","last_modified":1598355863475},{"url":"https://www.iqiyi.com/","order":60,"schema":1598350798118,"include_regions":["CN"],"id":"9352539a-e65a-4b57-9e45-e076f36a19a3","last_modified":1598355863472},{"url":"https://allegro.pl/","order":25,"schema":1598350907046,"include_regions":["PL"],"id":"fcb00e5e-2fbf-4a22-ba3d-83142f045138","last_modified":1598355863469},{"url":"https://www.olx.pl/","order":40,"schema":1598351124892,"include_regions":["PL"],"id":"128e23fd-ed2a-48a7-9002-5d222d72841f","last_modified":1598355863467},{"url":"https://www.wykop.pl/","order":50,"schema":1598351125252,"include_regions":["PL"],"id":"4769a5c8-a12e-43ab-bc07-4ecaa33a5fd0","last_modified":1598355863464},{"url":"https://vk.com/","order":5,"schema":1598351125602,"include_regions":["RU"],"id":"7e9e91e6-d426-46c8-973c-9e7e2150e5fb","last_modified":1598355863461},{"url":"https://ok.ru/","order":11,"schema":1598351170374,"include_regions":["RU"],"id":"153770f5-d63d-4eb2-b78b-8afd7600031d","last_modified":1598355863458},{"url":"https://www.avito.ru/","order":12,"schema":1598351263499,"include_regions":["RU"],"id":"feb98cba-415d-48bf-bc24-bb56970b1c21","last_modified":1598355863456},{"url":"https://www.aliexpress.com/","order":13,"schema":1598351263838,"include_regions":["RU"],"id":"edf337dc-141f-4427-bc58-cee5a7806b39","last_modified":1598355863452},{"url":"https://www.bbc.co.uk/","order":60,"schema":1598351385868,"include_regions":["GB"],"id":"222ca9d8-03db-4afe-9bed-56ee30a98c6f","last_modified":1598355863450},{"url":"https://www.ebay.co.uk/","order":70,"schema":1598351386239,"include_regions":["GB"],"id":"e4be9812-2d4e-47ed-9e61-a6af6f2c63bc","last_modified":1598355863447},{"url":"https://www.leboncoin.fr/","order":50,"schema":1598351459741,"include_regions":["FR"],"id":"0ebb289d-0788-44a3-963e-1738716efc99","last_modified":1598355863444},{"url":"https://www.amazon.fr/","order":40,"title":"Amazon","schema":1598351460089,"include_regions":["FR"],"id":"2f19d6a4-f8d4-471c-92dd-9235cfbaaa96","last_modified":1598355863441},{"url":"https://www.amazon.co.uk/","order":50,"title":"Amazon","schema":1598355543331,"include_regions":["GB"],"id":"40f9fe72-0f07-42bc-bbe1-331e43cc9ec3","last_modified":1598355863438},{"url":"https://www.amazon.com/","order":25,"title":"Amazon","schema":1598355563018,"include_regions":["US"],"id":"0571379b-d6ee-4f11-83ca-ac4e105a71f6","last_modified":1598355863436},{"url":"https://www.amazon.ca/","order":50,"title":"Amazon","schema":1598355654628,"include_regions":["CA"],"id":"4d12798c-ef7f-49c6-b388-a3903c7f3124","last_modified":1598355863433},{"url":"https://twitter.com/","order":60,"title":"Twitter","schema":1598350613071,"exclude_regions":["PL","RU","DE","GB","CN"],"send_attribution_request":false,"id":"6bb2647b-31d6-4185-9052-6d680bf2d777","last_modified":1598355863427},{"url":"https://www.youtube.com/","order":10,"title":"YouTube","schema":1598350520213,"exclude_regions":["CN"],"send_attribution_request":false,"id":"fc5d5d35-5637-4268-bb5f-f262818fa7e9","last_modified":1598355863425},{"url":"https://www.facebook.com/","order":20,"title":"Facebook","schema":1598350560829,"exclude_regions":["RU","CN"],"send_attribution_request":false,"id":"b64b8279-6996-4e35-9176-c5ae5964c422","last_modified":1598355863423},{"url":"https://www.amazon.com/","order":50,"title":"Amazon","schema":1598355474198,"exclude_regions":["PL","RU","CN","GB","FR","US","CA","DE"],"send_attribution_request":false,"id":"08f43769-116f-4450-b57d-5108042b5fe5","last_modified":1598355863421},{"url":"https://www.wikipedia.org/","order":30,"title":"Wikipedia","schema":1598350571923,"exclude_regions":["GB","CN"],"send_attribution_request":false,"id":"7105fa42-4066-41df-9af3-885a7b2e9682","last_modified":1598355863414}]}