Bug 1694704 - Stop CFR messages for Proton launch (#200)

* Version guard 89 all cfrs * Keep MILESTONE and DOH_ROLLOUT_CONFIRMATION messages
mozilla · Mar 9, 2021 · 8601dfa · 8601dfa
1 parent 70276dc
commit 8601dfa
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/cfr-fxa.json b/cfr-fxa.json
@@ -32,7 +32,7 @@
     "frequency": {
       "lifetime": 3
     },
-    "targeting": "!usesFirefoxSync && isFxAEnabled == true && totalBookmarksCount >= 10\n&& firefoxVersion >= 70 && userPrefs.cfrFeatures\n",
+    "targeting": "!usesFirefoxSync && isFxAEnabled == true && totalBookmarksCount >= 10\n&& firefoxVersion >= 70 && userPrefs.cfrFeatures && firefoxVersion < 89\n",
     "template": "fxa_bookmark_panel",
     "trigger": {
       "id": "bookmark-panel"

diff --git a/cfr-fxa.yaml b/cfr-fxa.yaml
@@ -22,7 +22,7 @@
     lifetime: 3
   targeting: |
     !usesFirefoxSync && isFxAEnabled == true && totalBookmarksCount >= 10
-    && firefoxVersion >= 70 && userPrefs.cfrFeatures
+    && firefoxVersion >= 70 && userPrefs.cfrFeatures && firefoxVersion < 89
   template: fxa_bookmark_panel
   trigger:
     id: bookmark-panel

diff --git a/cfr.json b/cfr.json
@@ -254,7 +254,7 @@
     "frequency": {
       "lifetime": 3
     },
-    "targeting": "!hasPinnedTabs && recentVisits[.timestamp > (currentDate|date - 3600 * 1000 * 1)]|length >= 3 && firefoxVersion >= 72 && userPrefs.cfrFeatures",
+    "targeting": "!hasPinnedTabs && recentVisits[.timestamp > (currentDate|date - 3600 * 1000 * 1)]|length >= 3 && firefoxVersion >= 72 && userPrefs.cfrFeatures && firefoxVersion < 89",
     "template": "cfr_doorhanger",
     "trigger": {
       "id": "frequentVisits",
@@ -366,7 +366,7 @@
     "frequency": {
       "lifetime": 3
     },
-    "targeting": "(!type || type == 'save') && isFxAEnabled == true && usesFirefoxSync == false && firefoxVersion >= 72 && userPrefs.cfrFeatures",
+    "targeting": "(!type || type == 'save') && isFxAEnabled == true && usesFirefoxSync == false && firefoxVersion >= 72 && userPrefs.cfrFeatures && firefoxVersion < 89",
     "template": "cfr_doorhanger",
     "trigger": {
       "id": "newSavedLogin"
@@ -442,7 +442,7 @@
     "frequency": {
       "lifetime": 3
     },
-    "targeting": "type == 'update' && isFxAEnabled == true && usesFirefoxSync == false && firefoxVersion >= 76 && userPrefs.cfrFeatures",
+    "targeting": "type == 'update' && isFxAEnabled == true && usesFirefoxSync == false && firefoxVersion >= 76 && userPrefs.cfrFeatures && firefoxVersion < 89",
     "template": "cfr_doorhanger",
     "trigger": {
       "id": "newSavedLogin"
@@ -582,7 +582,7 @@
     "frequency": {
       "lifetime": 3
     },
-    "targeting": "\n      localeLanguageCode == \"en\" &&\n      (xpinstallEnabled == true) &&\n      ([\"enhancerforyoutube@maximerf.addons.mozilla.org\",\"{dc8f61ab-5e98-4027-98ef-bb2ff6060d71}\",\"{7b1bf0b6-a1b9-42b0-b75d-252036438bdc}\",\"jid0-UVAeBCfd34Kk5usS8A1CBiobvM8@jetpack\",\"iridium@particlecore.github.io\",\"jid1-ss6kLNCbNz6u0g@jetpack\",\"{1cf918d2-f4ea-4b4f-b34e-455283fef19f}\"] intersect addonsInfo.addons|keys)|length == 0 &&\n      ([\"www.youtube.com\",\"youtube.com\"] intersect topFrecentSites[.frecency >= 10000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons",
+    "targeting": "\n      localeLanguageCode == \"en\" &&\n      (xpinstallEnabled == true) &&\n      ([\"enhancerforyoutube@maximerf.addons.mozilla.org\",\"{dc8f61ab-5e98-4027-98ef-bb2ff6060d71}\",\"{7b1bf0b6-a1b9-42b0-b75d-252036438bdc}\",\"jid0-UVAeBCfd34Kk5usS8A1CBiobvM8@jetpack\",\"iridium@particlecore.github.io\",\"jid1-ss6kLNCbNz6u0g@jetpack\",\"{1cf918d2-f4ea-4b4f-b34e-455283fef19f}\"] intersect addonsInfo.addons|keys)|length == 0 &&\n      ([\"www.youtube.com\",\"youtube.com\"] intersect topFrecentSites[.frecency >= 10000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons && firefoxVersion < 89",
     "template": "cfr_doorhanger",
     "trigger": {
       "id": "openURL",
@@ -666,7 +666,7 @@
     "frequency": {
       "lifetime": 3
     },
-    "targeting": "\n      localeLanguageCode == \"en\" &&\n      (xpinstallEnabled == true) &&\n      ([\"jid1-93WyvpgvxzGATw@jetpack\",\"{087ef4e1-4286-4be6-9aa3-8d6c420ee1db}\",\"{4170faaa-ee87-4a0e-b57a-1aec49282887}\",\"jid1-TMndP6cdKgxLcQ@jetpack\",\"s3google@translator\",\"{9c63d15c-b4d9-43bd-b223-37f0a1f22e2a}\",\"translator@zoli.bod\",\"{8cda9ce6-7893-4f47-ac70-a65215cec288}\",\"simple-translate@sienori\",\"@translatenow\",\"{a79fafce-8da6-4685-923f-7ba1015b8748})\",\"{8a802b5a-eeab-11e2-a41d-b0096288709b}\",\"jid0-fbHwsGfb6kJyq2hj65KnbGte3yT@jetpack\",\"storetranslate.plugin@gmail.com\",\"jid1-r2tWDbSkq8AZK1@jetpack\",\"{b384b75c-c978-4c4d-b3cf-62a82d8f8f12}\",\"jid1-f7dnBeTj8ElpWQ@jetpack\",\"{dac8a935-4775-4918-9205-5c0600087dc4}\",\"gtranslation2@slam.com\",\"{e20e0de5-1667-4df4-bd69-705720e37391}\",\"{09e26ae9-e9c1-477c-80a6-99934212f2fe}\",\"mgxtranslator@magemagix.com\",\"gtranslatewins@mozilla.org\"] intersect addonsInfo.addons|keys)|length == 0 &&\n      ([\"translate.google.com\"] intersect topFrecentSites[.frecency >= 10000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons",
+    "targeting": "\n      localeLanguageCode == \"en\" &&\n      (xpinstallEnabled == true) &&\n      ([\"jid1-93WyvpgvxzGATw@jetpack\",\"{087ef4e1-4286-4be6-9aa3-8d6c420ee1db}\",\"{4170faaa-ee87-4a0e-b57a-1aec49282887}\",\"jid1-TMndP6cdKgxLcQ@jetpack\",\"s3google@translator\",\"{9c63d15c-b4d9-43bd-b223-37f0a1f22e2a}\",\"translator@zoli.bod\",\"{8cda9ce6-7893-4f47-ac70-a65215cec288}\",\"simple-translate@sienori\",\"@translatenow\",\"{a79fafce-8da6-4685-923f-7ba1015b8748})\",\"{8a802b5a-eeab-11e2-a41d-b0096288709b}\",\"jid0-fbHwsGfb6kJyq2hj65KnbGte3yT@jetpack\",\"storetranslate.plugin@gmail.com\",\"jid1-r2tWDbSkq8AZK1@jetpack\",\"{b384b75c-c978-4c4d-b3cf-62a82d8f8f12}\",\"jid1-f7dnBeTj8ElpWQ@jetpack\",\"{dac8a935-4775-4918-9205-5c0600087dc4}\",\"gtranslation2@slam.com\",\"{e20e0de5-1667-4df4-bd69-705720e37391}\",\"{09e26ae9-e9c1-477c-80a6-99934212f2fe}\",\"mgxtranslator@magemagix.com\",\"gtranslatewins@mozilla.org\"] intersect addonsInfo.addons|keys)|length == 0 &&\n      ([\"translate.google.com\"] intersect topFrecentSites[.frecency >= 10000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons && firefoxVersion < 89",
     "template": "cfr_doorhanger",
     "trigger": {
       "id": "openURL",
@@ -749,7 +749,7 @@
     "frequency": {
       "lifetime": 3
     },
-    "targeting": "\n      localeLanguageCode == \"en\" &&\n      (xpinstallEnabled == true) &&\n      ([\"@contain-facebook\",\"{bb1b80be-e6b3-40a1-9b6e-9d4073343f0b}\",\"{a50d61ca-d27b-437a-8b52-5fd801a0a88b}\"] intersect addonsInfo.addons|keys)|length == 0 &&\n      ([\"www.facebook.com\",\"facebook.com\",\"messenger.com\",\"www.messenger.com\",\"instagram.com\",\"www.instagram.com\",\"whatsapp.com\",\"www.whatsapp.com\",\"web.whatsapp.com\"]intersect topFrecentSites[.frecency >= 5000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons",
+    "targeting": "\n      localeLanguageCode == \"en\" &&\n      (xpinstallEnabled == true) &&\n      ([\"@contain-facebook\",\"{bb1b80be-e6b3-40a1-9b6e-9d4073343f0b}\",\"{a50d61ca-d27b-437a-8b52-5fd801a0a88b}\"] intersect addonsInfo.addons|keys)|length == 0 &&\n      ([\"www.facebook.com\",\"facebook.com\",\"messenger.com\",\"www.messenger.com\",\"instagram.com\",\"www.instagram.com\",\"whatsapp.com\",\"www.whatsapp.com\",\"web.whatsapp.com\"]intersect topFrecentSites[.frecency >= 5000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons && firefoxVersion < 89",
     "template": "cfr_doorhanger",
     "trigger": {
       "id": "openURL",

diff --git a/cfr.yaml b/cfr.yaml
@@ -158,7 +158,7 @@
     lifetime: 3
   targeting: '!hasPinnedTabs &&
     recentVisits[.timestamp > (currentDate|date - 3600 * 1000 * 1)]|length >= 3 &&
-    firefoxVersion >= 72 && userPrefs.cfrFeatures'
+    firefoxVersion >= 72 && userPrefs.cfrFeatures && firefoxVersion < 89'
   template: cfr_doorhanger
   trigger:
     id: frequentVisits
@@ -240,7 +240,7 @@
       string_id: cfr-doorhanger-sync-logins-body
   frequency:
     lifetime: 3
-  targeting: (!type || type == 'save') && isFxAEnabled == true && usesFirefoxSync == false && firefoxVersion >= 72 && userPrefs.cfrFeatures
+  targeting: (!type || type == 'save') && isFxAEnabled == true && usesFirefoxSync == false && firefoxVersion >= 72 && userPrefs.cfrFeatures && firefoxVersion < 89
   template: cfr_doorhanger
   trigger:
     id: newSavedLogin
@@ -287,7 +287,7 @@
       string_id: cfr-doorhanger-sync-logins-body
   frequency:
     lifetime: 3
-  targeting: type == 'update' && isFxAEnabled == true && usesFirefoxSync == false && firefoxVersion >= 76 && userPrefs.cfrFeatures
+  targeting: type == 'update' && isFxAEnabled == true && usesFirefoxSync == false && firefoxVersion >= 76 && userPrefs.cfrFeatures && firefoxVersion < 89
   template: cfr_doorhanger
   trigger:
     id: newSavedLogin
@@ -385,7 +385,7 @@
     ,\"iridium@particlecore.github.io\",\"jid1-ss6kLNCbNz6u0g@jetpack\",\"{1cf918d2-f4ea-4b4f-b34e-455283fef19f}\"\
     ] intersect addonsInfo.addons|keys)|length == 0 &&\n      ([\"www.youtube.com\"\
     ,\"youtube.com\"] intersect topFrecentSites[.frecency >= 10000]|mapToProperty('host'))|length\
-    \ > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons"
+    \ > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons && firefoxVersion < 89"
   template: cfr_doorhanger
   trigger:
     id: openURL
@@ -452,7 +452,7 @@
     ,\"{e20e0de5-1667-4df4-bd69-705720e37391}\",\"{09e26ae9-e9c1-477c-80a6-99934212f2fe}\"\
     ,\"mgxtranslator@magemagix.com\",\"gtranslatewins@mozilla.org\"] intersect addonsInfo.addons|keys)|length\
     \ == 0 &&\n      ([\"translate.google.com\"] intersect topFrecentSites[.frecency\
-    \ >= 10000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons"
+    \ >= 10000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons && firefoxVersion < 89"
   template: cfr_doorhanger
   trigger:
     id: openURL
@@ -511,7 +511,7 @@
     ,\"{a50d61ca-d27b-437a-8b52-5fd801a0a88b}\"] intersect addonsInfo.addons|keys)|length\
     \ == 0 &&\n      ([\"www.facebook.com\",\"facebook.com\",\"messenger.com\",\"www.messenger.com\",\
     \"instagram.com\",\"www.instagram.com\",\"whatsapp.com\",\"www.whatsapp.com\",\"web.whatsapp.com\"]\
-    intersect topFrecentSites[.frecency >= 5000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons"
+    intersect topFrecentSites[.frecency >= 5000]|mapToProperty('host'))|length > 0 && firefoxVersion >= 82 && userPrefs.cfrAddons && firefoxVersion < 89"
   template: cfr_doorhanger
   trigger:
     id: openURL

diff --git a/moments.json b/moments.json
@@ -14,7 +14,7 @@
       },
       "bucket_id": "WNP_MOMENTS_2"
     },
-    "targeting": "firefoxVersion >= 69 && localeLanguageCode in [\"en\",\"fr\",\"de\"] && ((currentDate|date - profileAgeCreated) / 86400000) >= 17 && ((currentDate|date - profileAgeCreated) / 86400000) < 30",
+    "targeting": "firefoxVersion >= 69 && localeLanguageCode in [\"en\",\"fr\",\"de\"] && ((currentDate|date - profileAgeCreated) / 86400000) >= 17 && ((currentDate|date - profileAgeCreated) / 86400000) < 30 && firefoxVersion < 89",
     "template": "update_action",
     "trigger": {
       "id": "momentsUpdate"
@@ -35,7 +35,7 @@
       },
       "bucket_id": "WNP_MOMENTS_1"
     },
-    "targeting": "firefoxVersion >= 69 && localeLanguageCode in [\"en\",\"fr\",\"de\"] && ((currentDate|date - profileAgeCreated) / 86400000) >= 4 && ((currentDate|date - profileAgeCreated) / 86400000) < 15",
+    "targeting": "firefoxVersion >= 69 && localeLanguageCode in [\"en\",\"fr\",\"de\"] && ((currentDate|date - profileAgeCreated) / 86400000) >= 4 && ((currentDate|date - profileAgeCreated) / 86400000) < 15 && firefoxVersion < 89",
     "template": "update_action",
     "trigger": {
       "id": "momentsUpdate"
@@ -56,7 +56,7 @@
       },
       "bucket_id": "WNP_MOMENTS_4"
     },
-    "targeting": "firefoxVersion >= 69 && localeLanguageCode in [\"en\", \"fr\", \"de\"] && ((currentDate|date - profileAgeCreated) / 86400000) > 30",
+    "targeting": "firefoxVersion >= 69 && localeLanguageCode in [\"en\", \"fr\", \"de\"] && ((currentDate|date - profileAgeCreated) / 86400000) > 30 && firefoxVersion < 89",
     "template": "update_action",
     "trigger": {
       "id": "momentsUpdate"

diff --git a/moments.yaml b/moments.yaml
@@ -9,7 +9,7 @@
     bucket_id: WNP_MOMENTS_2
   targeting: firefoxVersion >= 69 && localeLanguageCode in ["en","fr","de"] && ((currentDate|date
     - profileAgeCreated) / 86400000) >= 17 && ((currentDate|date - profileAgeCreated)
-    / 86400000) < 30
+    / 86400000) < 30 && firefoxVersion < 89
   template: update_action
   trigger:
     id: momentsUpdate
@@ -24,7 +24,7 @@
     bucket_id: WNP_MOMENTS_1
   targeting: firefoxVersion >= 69 && localeLanguageCode in ["en","fr","de"] && ((currentDate|date
     - profileAgeCreated) / 86400000) >= 4 && ((currentDate|date - profileAgeCreated)
-    / 86400000) < 15
+    / 86400000) < 15 && firefoxVersion < 89
   template: update_action
   trigger:
     id: momentsUpdate
@@ -38,7 +38,7 @@
       id: moments-wnp
     bucket_id: WNP_MOMENTS_4
   targeting: firefoxVersion >= 69 && localeLanguageCode in ["en", "fr", "de"] &&
-    ((currentDate|date - profileAgeCreated) / 86400000) > 30
+    ((currentDate|date - profileAgeCreated) / 86400000) > 30 && firefoxVersion < 89
   template: update_action
   trigger:
     id: momentsUpdate
diff --git a/whats-new-panel.json b/whats-new-panel.json
@@ -20,7 +20,7 @@
         "string_id": "cfr-whatsnew-media-keys-button"
       }
     },
-    "targeting": "firefoxVersion >= 82",
+    "targeting": "firefoxVersion >= 82 && firefoxVersion < 89",
     "trigger": {
       "id": "whatsNewPanelOpened"
     }
@@ -48,7 +48,7 @@
         "string_id": "cfr-whatsnew-pip-cta"
       }
     },
-    "targeting": "firefoxVersion >= 84 && localeLanguageCode != 'ru'",
+    "targeting": "firefoxVersion >= 84 && localeLanguageCode != 'ru' && firefoxVersion < 89",
     "trigger": {
       "id": "whatsNewPanelOpened"
     }
@@ -97,7 +97,7 @@
         "string_id": "cfr-whatsnew-pip-cta"
       }
     },
-    "targeting": "firefoxVersion >= 85",
+    "targeting": "firefoxVersion >= 85 && firefoxVersion < 89",
     "trigger": {
       "id": "whatsNewPanelOpened"
     }
@@ -123,7 +123,7 @@
         "string_id": "cfr-whatsnew-pip-cta"
       }
     },
-    "targeting": "firefoxVersion >= 85",
+    "targeting": "firefoxVersion >= 85 && firefoxVersion < 89",
     "trigger": {
       "id": "whatsNewPanelOpened"
     }
@@ -149,7 +149,7 @@
         "string_id": "cfr-whatsnew-pip-cta"
       }
     },
-    "targeting": "firefoxVersion >= 86",
+    "targeting": "firefoxVersion >= 86 && firefoxVersion < 89",
     "trigger": {
       "id": "whatsNewPanelOpened"
     }

diff --git a/whats-new-panel.yaml b/whats-new-panel.yaml
@@ -14,7 +14,7 @@
     cta_type: OPEN_URL
     link_text:
       string_id: cfr-whatsnew-media-keys-button
-  targeting: firefoxVersion >= 82
+  targeting: firefoxVersion >= 82 && firefoxVersion < 89
   trigger:
     id: whatsNewPanelOpened
 - id: WHATS_NEW_SEARCH_SHORTCUTS_84
@@ -35,7 +35,7 @@
     cta_type: OPEN_URL
     link_text:
       string_id: cfr-whatsnew-pip-cta
-  targeting: firefoxVersion >= 84 && localeLanguageCode != 'ru'
+  targeting: firefoxVersion >= 84 && localeLanguageCode != 'ru' && firefoxVersion < 89
   trigger:
     id: whatsNewPanelOpened
 - id: WHATS_NEW_BADGE_86
@@ -77,7 +77,7 @@
     cta_type: OPEN_URL
     link_text:
       string_id: cfr-whatsnew-pip-cta
-  targeting: firefoxVersion >= 85
+  targeting: firefoxVersion >= 85 && firefoxVersion < 89
   trigger:
     id: whatsNewPanelOpened
 - id: WHATS_NEW_BOOKMARKING_85
@@ -96,7 +96,7 @@
     cta_type: OPEN_URL
     link_text:
       string_id: cfr-whatsnew-pip-cta
-  targeting: firefoxVersion >= 85
+  targeting: firefoxVersion >= 85 && firefoxVersion < 89
   trigger:
     id: whatsNewPanelOpened
 - id: WHATS_NEW_CROSS_SITE_86
@@ -115,6 +115,6 @@
     cta_type: OPEN_URL
     link_text:
       string_id: cfr-whatsnew-pip-cta
-  targeting: firefoxVersion >= 86
+  targeting: firefoxVersion >= 86 && firefoxVersion < 89
   trigger:
     id: whatsNewPanelOpened