mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1755011 - Adding Pocket newtab interest profile prefs to Nimbus manifest. r=gvn 

Differential Revision: https://phabricator.services.mozilla.com/D138552
This commit is contained in:
Scott 2022-02-14 18:59:51 +00:00
Родитель 2654fbb629
Коммит 4bc0d28bac
5 изменённых файлов: 71 добавлений и 13223 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
browser/components/newtab/lib/DiscoveryStreamFeed.jsm
Просмотреть файл

@ -66,8 +66,6 @@ const PREF_REC_IMPRESSIONS = "discoverystream.rec.impressions";
const PREF_COLLECTIONS_ENABLED =
"discoverystream.sponsored-collections.enabled";
const PREF_COLLECTION_DISMISSIBLE = "discoverystream.isCollectionDismissible";
const PREF_RECS_PERSONALIZED = "discoverystream.recs.personalized";
const PREF_SPOCS_PERSONALIZED = "discoverystream.spocs.personalized";
const PREF_PERSONALIZATION = "discoverystream.personalization.enabled";
const PREF_PERSONALIZATION_OVERRIDE =
"discoverystream.personalization.override";
@ -169,12 +167,10 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed {
get personalized() {
// If both spocs and recs are not personalized, we might as well return false here.
const spocsPersonalized = this.store.getState().Prefs.values[
PREF_SPOCS_PERSONALIZED
];
const recsPersonalized = this.store.getState().Prefs.values[
PREF_RECS_PERSONALIZED
];
const spocsPersonalized = this.store.getState().Prefs.values?.pocketConfig
?.spocsPersonalized;
const recsPersonalized = this.store.getState().Prefs.values?.pocketConfig
?.recsPersonalized;
const personalization = this.store.getState().Prefs.values[
PREF_PERSONALIZATION
];
@ -1040,12 +1036,10 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed {
}
async scoreItems(items, type) {
const spocsPersonalized = this.store.getState().Prefs.values[
PREF_SPOCS_PERSONALIZED
];
const recsPersonalized = this.store.getState().Prefs.values[
PREF_RECS_PERSONALIZED
];
const spocsPersonalized = this.store.getState().Prefs.values?.pocketConfig
?.spocsPersonalized;
const recsPersonalized = this.store.getState().Prefs.values?.pocketConfig
?.recsPersonalized;
const personalizedByType =
type === "feed" ? recsPersonalized : spocsPersonalized;
@ -1270,12 +1264,10 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed {
options.isStartup
);
const spocsPersonalized = this.store.getState().Prefs.values[
PREF_SPOCS_PERSONALIZED
];
const recsPersonalized = this.store.getState().Prefs.values[
PREF_RECS_PERSONALIZED
];
const spocsPersonalized = this.store.getState().Prefs.values?.pocketConfig
?.spocsPersonalized;
const recsPersonalized = this.store.getState().Prefs.values?.pocketConfig
?.recsPersonalized;
let expirationPerComponent = {};
if (this.personalized) {

2
browser/components/newtab/lib/PrefsFeed.jsm
Просмотреть файл

@ -194,8 +194,6 @@ this.PrefsFeed = class PrefsFeed {
);
this._setBoolPref(values, "discoverystream.isCollectionDismissible", false);
this._setBoolPref(values, "discoverystream.hardcoded-basic-layout", false);
this._setBoolPref(values, "discoverystream.recs.personalized", false);
this._setBoolPref(values, "discoverystream.spocs.personalized", false);
this._setBoolPref(values, "discoverystream.personalization.enabled", false);
this._setBoolPref(values, "discoverystream.personalization.override");
this._setStringPref(

13223
browser/components/newtab/package-lock.json сгенерированный
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

25
browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js
Просмотреть файл

@ -2781,8 +2781,10 @@ describe("DiscoveryStreamFeed", () => {
const fakeDiscoveryStream = {
Prefs: {
values: {
"discoverystream.spocs.personalized": true,
"discoverystream.recs.personalized": true,
pocketConfig: {
recsPersonalized: true,
spocsPersonalized: true,
},
"discoverystream.personalization.enabled": true,
},
},
@ -2791,6 +2793,7 @@ describe("DiscoveryStreamFeed", () => {
spocs: { loaded: false },
},
};
sandbox.stub(feed, "scoreFeeds").resolves();
sandbox.stub(feed, "scoreSpocs").resolves();
sandbox.stub(feed, "refreshContent").resolves();
@ -2821,8 +2824,10 @@ describe("DiscoveryStreamFeed", () => {
feed.store.getState = () => ({
Prefs: {
values: {
"discoverystream.spocs.personalized": true,
"discoverystream.recs.personalized": true,
pocketConfig: {
recsPersonalized: true,
spocsPersonalized: true,
},
"discoverystream.personalization.enabled": true,
},
},
@ -2851,8 +2856,10 @@ describe("DiscoveryStreamFeed", () => {
feed.store.getState = () => ({
Prefs: {
values: {
"discoverystream.spocs.personalized": true,
"discoverystream.recs.personalized": true,
pocketConfig: {
recsPersonalized: true,
spocsPersonalized: true,
},
"discoverystream.personalization.enabled": true,
},
},
@ -2889,8 +2896,10 @@ describe("DiscoveryStreamFeed", () => {
feed.store.getState = () => ({
Prefs: {
values: {
"discoverystream.spocs.personalized": true,
"discoverystream.recs.personalized": true,
pocketConfig: {
recsPersonalized: true,
spocsPersonalized: true,
},
"discoverystream.personalization.enabled": true,
},
},

12
toolkit/components/nimbus/FeatureManifest.yaml
Просмотреть файл

@ -293,6 +293,18 @@ pocketNewtab:
browser.newtabpage.activity-stream.discoverystream.newSponsoredLabel.enabled
description: >-
Updates the sponsored label position to below the image for Pocket cards on newtab.
recsPersonalized:
type: boolean
fallbackPref: >-
browser.newtabpage.activity-stream.discoverystream.recs.personalized
description: >-
Enables Pocket stories personalization.
spocsPersonalized:
type: boolean
fallbackPref: >-
browser.newtabpage.activity-stream.discoverystream.spocs.personalized
description: >-
Enables Pocket sponsored content personalization.
saveToPocket:
description: The save to Pocket feature
hasExposure: false