corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland

Browse Source
This commit is contained in:
Lando
2025-05-13 00:56:56 +00:00
committed by ctuns@mozilla.com
parent f2b97e2ffe afb5c49bd4
commit a6bb0ba8b5
1 changed files with 9 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
browser/extensions/newtab/lib/DiscoveryStreamFeed.sys.mjs
View File

@@ -6,7 +6,6 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
ClientEnvironmentBase:
"resource://gre/modules/components-utils/ClientEnvironment.sys.mjs",
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
ObliviousHTTP: "resource://gre/modules/ObliviousHTTP.sys.mjs",
@@ -308,35 +307,12 @@ export class DiscoveryStreamFeed {
}
setupPrefs(isStartup = false) {
const experimentMetadata =
lazy.NimbusFeatures.pocketNewtab.getEnrollmentMetadata();
let utmSource = "pocket-newtab";
let utmCampaign;
let utmContent;
// getEnrollmentMetadata was introduced in 140, so if it's available,
// we use that here.
if (lazy.NimbusFeatures.pocketNewtab.getEnrollmentMetadata) {
const experimentMetadata =
lazy.NimbusFeatures.pocketNewtab.getEnrollmentMetadata();
utmCampaign = experimentMetadata?.slug;
utmContent = experimentMetadata?.branch;
} else {
// Otherwise, we fallback to the old mechanism which is available in
// 139.
const pocketNewtabExperiment = lazy.ExperimentAPI.getExperimentMetaData({
featureId: "pocketNewtab",
});
const pocketNewtabRollout = lazy.ExperimentAPI.getRolloutMetaData({
featureId: "pocketNewtab",
});
// We want to know if the user is in an experiment or rollout,
// but we prioritize experiments over rollouts.
const experimentMetaData = pocketNewtabExperiment || pocketNewtabRollout;
utmCampaign = experimentMetaData?.slug;
utmContent = experimentMetaData?.branch?.slug;
}
let utmCampaign = experimentMetadata?.slug;
let utmContent = experimentMetadata?.branch;
this.store.dispatch(
ac.BroadcastToContent({
@@ -1704,31 +1680,11 @@ export class DiscoveryStreamFeed {
getExperimentInfo() {
// We want to know if the user is in an experiment or rollout,
// but we prioritize experiments over rollouts.
let experimentName;
let experimentBranch;
// getEnrollmentMetadata was introduced in 140, so if it's available,
// we use that here.
if (lazy.NimbusFeatures.pocketNewtab.getEnrollmentMetadata) {
const experimentMetadata =
lazy.NimbusFeatures.pocketNewtab.getEnrollmentMetadata();
const experimentMetadata =
lazy.NimbusFeatures.pocketNewtab.getEnrollmentMetadata();
experimentName = experimentMetadata?.slug ?? "";
experimentBranch = experimentMetadata?.branch ?? "";
} else {
// Otherwise, we fallback to the old mechanism which is available in
// 139.
const pocketNewtabExperiment = lazy.ExperimentAPI.getExperimentMetaData({
featureId: "pocketNewtab",
});
const pocketNewtabRollout = lazy.ExperimentAPI.getRolloutMetaData({
featureId: "pocketNewtab",
});
const experimentMetaData = pocketNewtabExperiment || pocketNewtabRollout;
experimentName = experimentMetaData?.slug || "";
experimentBranch = experimentMetaData?.branch?.slug || "";
}
let experimentName = experimentMetadata?.slug ?? "";
let experimentBranch = experimentMetadata?.branch ?? "";
return {
experimentName,