--- a/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-03-15 21:41:38.000000000 -0400 +++ b/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-03-17 01:26:49.040525184 -0400 @@ -26,14 +26,7 @@ const DEFAULT_SITES = new Map([ // This first item is the global list fallback for any unexpected geos - ["", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.reddit.com/,https://www.amazon.com/,https://twitter.com/"], - ["US", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://twitter.com/"], - ["CA", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://www.amazon.ca/,https://twitter.com/"], - ["DE", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.de/,https://www.ebay.de/,https://www.wikipedia.org/,https://www.reddit.com/"], - ["PL", "https://www.youtube.com/,https://www.facebook.com/,https://allegro.pl/,https://www.wikipedia.org/,https://www.olx.pl/,https://www.wykop.pl/"], - ["RU", "https://vk.com/,https://www.youtube.com/,https://ok.ru/,https://www.avito.ru/,https://www.aliexpress.com/,https://www.wikipedia.org/"], - ["GB", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.amazon.co.uk/,https://www.bbc.co.uk/,https://www.ebay.co.uk/"], - ["FR", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.amazon.fr/,https://www.leboncoin.fr/,https://twitter.com/"] + [""], ]); const GEO_PREF = "browser.search.region"; const REASON_ADDON_UNINSTALL = 6; @@ -56,19 +49,19 @@ provider_description: "pocket_description", provider_icon: "pocket", provider_name: "Pocket", - read_more_endpoint: "https://getpocket.com/explore/trending?src=fx_new_tab", - stories_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`, - stories_referrer: "http://getpocket.com/recommendations", - info_link: "https://www.mozilla.org/privacy/firefox/#pocketstories", - disclaimer_link: "https://getpocket.com/firefox/new_tab_learn_more.php", - topics_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/trending-topics?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`, + read_more_endpoint: "http://127.0.0.1/", + stories_endpoint: `http://127.0.0.1/`, + stories_referrer: "http://127.0.0.1/", + info_link: "http://127.0.0.1/", + disclaimer_link: "http://127.0.0.1/", + topics_endpoint: `http://127.0.0.1}`, show_spocs: false, personalized: true }) }], ["showSponsored", { title: "Show sponsored cards in spoc experiment (show_spocs in topstories.options has to be set to true as well)", - value: true + value: false }], ["filterAdult", { title: "Remove adult pages from sites, highlights, etc.", @@ -96,7 +89,7 @@ }], ["disableSnippets", { title: "Disable snippets on activity stream", - value: false + value: true }], ["showTopSites", { title: "Show the Top Sites section", @@ -112,12 +105,12 @@ }], ["telemetry", { title: "Enable system error and usage data collection", - value: true, + value: false, value_local_dev: false }], ["telemetry.ping.endpoint", { title: "Telemetry server endpoint", - value: "https://tiles.services.mozilla.com/v4/links/activity-stream" + value: "https://127.0.0.1/" }], ["section.highlights.collapsed", { title: "Collapse the Highlights section", @@ -133,7 +126,7 @@ }], ["tippyTop.service.endpoint", { title: "Tippy Top service manifest url", - value: "https://activity-stream-icons.services.mozilla.com/v1/icons.json.br" + value: "" }] ]); @@ -186,14 +179,14 @@ "CA": ["en-US", "en-GB", "en-ZA"], "DE": ["de", "de-DE", "de-AT", "de-CH"] })[geo]; - return !!locales && locales.includes(locale); + return false; } }, { name: "snippets", factory: () => new SnippetsFeed(), title: "Gets snippets data", - value: true + value: false }, { name: "systemtick", @@ -205,7 +198,7 @@ name: "telemetry", factory: () => new TelemetryFeed(), title: "Relays telemetry-related actions to PingCentre", - value: true + value: false }, { name: "favicon",