Bug 1456236 - Updates codes in followonsearch. r=standard8
authorMichael Kaply <mozilla@kaply.com>
Mon, 23 Apr 2018 13:54:19 -0500
changeset 415545 de6af6a44e14ba6426717c39ce3e52ee9e4c4a70
parent 415544 b7a347f011cb8c1eb15e8357f2dae0f97eef9bd8
child 415546 fb836a045f2024b51bdd9899fe2e8db19bd96f8a
push id33900
push userdluca@mozilla.com
push dateThu, 26 Apr 2018 04:51:04 +0000
treeherdermozilla-central@76f35d0ecaa6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8
bugs1456236
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1456236 - Updates codes in followonsearch. r=standard8 MozReview-Commit-ID: IyoGMSJ6JGq
browser/extensions/followonsearch/content/followonsearch-fs.js
browser/extensions/followonsearch/install.rdf
--- a/browser/extensions/followonsearch/content/followonsearch-fs.js
+++ b/browser/extensions/followonsearch/content/followonsearch-fs.js
@@ -27,34 +27,16 @@ let searchDomains = [{
 }, {
   "domains": [ "www.bing.com" ],
   "search": "q",
   "prefix": ["pc"],
   "reportPrefix": "form",
   "codes": ["MOZI", "MOZD", "MZSL01", "MZSL02", "MZSL03", "MOZ2"],
   "sap": "bing",
 }, {
-  // The Yahoo domains to watch for.
-  "domains": [
-    "search.yahoo.com", "ca.search.yahoo.com", "hk.search.yahoo.com",
-    "tw.search.yahoo.com", "mozilla.search.yahoo.com", "us.search.yahoo.com",
-    "no.search.yahoo.com", "ar.search.yahoo.com", "br.search.yahoo.com",
-    "ch.search.yahoo.com", "cl.search.yahoo.com", "de.search.yahoo.com",
-    "uk.search.yahoo.com", "es.search.yahoo.com", "espanol.search.yahoo.com",
-    "fi.search.yahoo.com", "fr.search.yahoo.com", "nl.search.yahoo.com",
-    "id.search.yahoo.com", "in.search.yahoo.com", "it.search.yahoo.com",
-    "mx.search.yahoo.com", "se.search.yahoo.com", "sg.search.yahoo.com",
-  ],
-  "search": "p",
-  "followOnSearch": "fr2",
-  "prefix": ["hspart", "fr"],
-  "reportPrefix": "hsimp",
-  "codes": ["mozilla", "moz35"],
-  "sap": "yahoo",
-}, {
   // The Google domains.
   "domains": [
     "www.google.com", "www.google.ac", "www.google.ad", "www.google.ae",
     "www.google.com.af", "www.google.com.ag", "www.google.com.ai",
     "www.google.al", "www.google.am", "www.google.co.ao", "www.google.com.ar",
     "www.google.as", "www.google.at", "www.google.com.au", "www.google.az",
     "www.google.ba", "www.google.com.bd", "www.google.be", "www.google.bf",
     "www.google.bg", "www.google.com.bh", "www.google.bi", "www.google.bj",
@@ -103,17 +85,17 @@ let searchDomains = [{
     "www.google.co.uk", "www.google.us", "www.google.com.uy", "www.google.co.uz",
     "www.google.com.vc", "www.google.co.ve", "www.google.vg", "www.google.co.vi",
     "www.google.com.vn", "www.google.vu", "www.google.ws", "www.google.co.za",
     "www.google.co.zm", "www.google.co.zw",
   ],
   "search": "q",
   "prefix": ["client"],
   "followOnSearch": "oq",
-  "codes": ["firefox-b-ab", "firefox-b"],
+  "codes": ["firefox-b-ab", "firefox-b", "firefox-b-1-ab", "firefox-b-1"],
   "sap": "google",
 }];
 
 function getSearchDomainCodes(host) {
   for (let domainInfo of searchDomains) {
     if (domainInfo.domains.includes(host)) {
       return domainInfo;
     }
@@ -187,24 +169,24 @@ var webProgressListener = {
       }
       // Special case Google so we can track searches
       // without codes from the browser.
       if (domainInfo.sap == "google") {
         if (aLocation.filePath == "/search") {
           gLastSearchQueue.push(aLocation.spec);
           // Our engine currently sends oe and ie - no one else does
           if (queries.get("oe") && queries.get("ie")) {
-            sendSaveTelemetryMsg(code ? code : "none", code ? domainInfo.sap : "google-nocodes", "sap");
+            sendSaveTelemetryMsg(code ? code : "none", code, "sap");
             searchingGoogle = true;
           } else {
             // The tbm value is the specific type of search (Books, Images, News, etc).
             // These are referred to as vertical searches.
             let tbm = queries.get("tbm");
             if (searchingGoogle) {
-              sendSaveTelemetryMsg(code ? code : "none", code ? domainInfo.sap : "google-nocodes", "follow-on", tbm ? `vertical-${tbm}` : null);
+              sendSaveTelemetryMsg(code ? code : "none", code, "follow-on", tbm ? `vertical-${tbm}` : null);
             } else if (code) {
               // Trying to do the right thing for back button to existing entries
               sendSaveTelemetryMsg(code, domainInfo.sap, "follow-on", tbm ? `vertical-${tbm}` : null);
             }
           }
         }
         // Special case all Google. Otherwise our code can
         // show up in maps
--- a/browser/extensions/followonsearch/install.rdf
+++ b/browser/extensions/followonsearch/install.rdf
@@ -2,17 +2,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>followonsearch@mozilla.com</em:id>
     <em:name>Follow-on Search Telemetry</em:name>
-    <em:version>0.9.6</em:version>
+    <em:version>0.9.7</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>52.0</em:minVersion>
         <em:maxVersion>66.*</em:maxVersion>