Adding upstream version 115.8.0esr.upstream/115.8.0esr

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 262 insertions, 228 deletions

diff --git a/services/settings/dumps/main/search-telemetry-v2.json b/services/settings/dumps/main/search-telemetry-v2.json
index 43b22ec101..716a6a9c57 100644
--- a/services/settings/dumps/main/search-telemetry-v2.json
+++ b/services/settings/dumps/main/search-telemetry-v2.json
@@ -1,128 +1,38 @@
 {
   "data": [
     {
-      "schema": 1698656464939,
-      "taggedCodes": [
-        "monline_dg",
-        "monline_3_dg",
-        "monline_4_dg",
-        "monline_7_dg"
-      ],
-      "telemetryId": "baidu",
-      "organicCodes": [],
-      "codeParamName": "tn",
-      "queryParamName": "wd",
-      "queryParamNames": [
-        "wd",
-        "word"
-      ],
-      "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)",
-      "followOnParamNames": [
-        "oq"
-      ],
-      "extraAdServersRegexps": [
-        "^https?://www\\.baidu\\.com/baidu\\.php?"
-      ],
-      "id": "19c434a3-d173-4871-9743-290ac92a3f6a",
-      "last_modified": 1698666532326
-    },
-    {
-      "schema": 1698656463945,
+      "schema": 1705948294201,
       "components": [
         {
           "type": "ad_carousel",
           "included": {
             "parent": {
-              "selector": ".product-ads-carousel"
+              "selector": ".pla-exp-container"
             },
             "related": {
-              "selector": ".snippet__control"
+              "selector": "g-right-button, g-left-button, .exp-button"
             },
             "children": [
               {
-                "selector": ".product-ads-carousel__item",
+                "selector": "[data-dtld]",
                 "countChildren": true
               }
             ]
           }
         },
         {
-          "type": "ad_link",
-          "included": {
-            "parent": {
-              "selector": ".ad-result"
-            },
-            "children": [
-              {
-                "type": "ad_sitelink",
-                "selector": ".result__extra-content .deep-links--descriptions"
-              }
-            ]
-          }
-        },
-        {
-          "type": "incontent_searchbox",
+          "type": "refined_search_buttons",
           "topDown": true,
           "included": {
             "parent": {
-              "selector": "form.search-form"
-            },
-            "related": {
-              "selector": ".search-form__suggestions"
-            },
-            "children": [
-              {
-                "selector": ".search-form__input, .search-form__submit"
-              }
-            ]
-          }
-        },
-        {
-          "type": "ad_link",
-          "default": true
-        }
-      ],
-      "shoppingTab": {
-        "regexp": "/shopping?",
-        "selector": "nav li[data-test-id='search-navigation-item-shopping'] a"
-      },
-      "taggedCodes": [
-        "mzl",
-        "813cf1dd",
-        "16eeffc4"
-      ],
-      "telemetryId": "ecosia",
-      "organicCodes": [],
-      "codeParamName": "tt",
-      "queryParamName": "q",
-      "queryParamNames": [
-        "q"
-      ],
-      "searchPageRegexp": "^https://www\\.ecosia\\.org/",
-      "filter_expression": "env.version|versionCompare(\"110.0a1\")>=0",
-      "expectedOrganicCodes": [],
-      "extraAdServersRegexps": [
-        "^https://www\\.bing\\.com/acli?c?k"
-      ],
-      "id": "9a487171-3a06-4647-8866-36250ec84f3a",
-      "last_modified": 1698666532324
-    },
-    {
-      "schema": 1698656462833,
-      "components": [
-        {
-          "type": "ad_carousel",
-          "included": {
-            "parent": {
-              "selector": ".adsMvCarousel"
+              "selector": "#appbar g-scrolling-carousel"
             },
             "related": {
-              "selector": ".cr"
+              "selector": "g-right-button, g-left-button"
             },
             "children": [
               {
-                "selector": ".pa_item",
-                "countChildren": true
+                "selector": "a"
               }
             ]
           }
@@ -131,17 +41,17 @@
           "type": "ad_link",
           "excluded": {
             "parent": {
-              "selector": "aside"
+              "selector": "#rhs"
             }
           },
           "included": {
             "parent": {
-              "selector": ".sb_adTA"
+              "selector": "[data-text-ad='1']"
             },
             "children": [
               {
                 "type": "ad_sitelink",
-                "selector": ".b_vlist2col"
+                "selector": "[role='list']"
               }
             ]
           }
@@ -150,11 +60,11 @@
           "type": "ad_sidebar",
           "included": {
             "parent": {
-              "selector": "aside"
+              "selector": "#rhs"
             },
             "children": [
               {
-                "selector": ".pa_item, .sb_adTA",
+                "selector": ".pla-unit, .mnr-c",
                 "countChildren": true
               }
             ]
@@ -165,14 +75,36 @@
           "topDown": true,
           "included": {
             "parent": {
-              "selector": "form#sb_form"
+              "selector": "form[role='search']"
             },
             "related": {
-              "selector": "#sw_as"
+              "selector": "div.logo + div + div"
             },
             "children": [
               {
-                "selector": "input[name='q']"
+                "selector": "input[type='text']"
+              },
+              {
+                "selector": "textarea[name='q']"
+              }
+            ]
+          }
+        },
+        {
+          "type": "ad_image_row",
+          "excluded": {
+            "parent": {
+              "selector": ".pla-exp-container"
+            }
+          },
+          "included": {
+            "parent": {
+              "selector": ".top-pla-group-inner"
+            },
+            "children": [
+              {
+                "selector": "[data-dtld]",
+                "countChildren": true
               }
             ]
           }
@@ -183,59 +115,81 @@
         }
       ],
       "shoppingTab": {
-        "regexp": "^/shop?",
-        "selector": "#b-scopeListItem-shop a"
+        "regexp": "&tbm=shop",
+        "selector": "div[role='navigation'] a",
+        "inspectRegexpInSERP": true
       },
       "taggedCodes": [
-        "MOZ2",
-        "MOZ4",
-        "MOZ5",
-        "MOZA",
-        "MOZB",
-        "MOZD",
-        "MOZE",
-        "MOZI",
-        "MOZL",
-        "MOZM",
-        "MOZO",
-        "MOZR",
-        "MOZT",
-        "MOZW",
-        "MOZX",
-        "MZSL01",
-        "MZSL02",
-        "MZSL03"
+        "firefox-a",
+        "firefox-b",
+        "firefox-b-1",
+        "firefox-b-ab",
+        "firefox-b-1-ab",
+        "firefox-b-d",
+        "firefox-b-1-d",
+        "firefox-b-e",
+        "firefox-b-1-e",
+        "firefox-b-m",
+        "firefox-b-1-m",
+        "firefox-b-o",
+        "firefox-b-1-o",
+        "firefox-b-lm",
+        "firefox-b-1-lm",
+        "firefox-b-lg",
+        "firefox-b-huawei-h1611",
+        "firefox-b-is-oem1",
+        "firefox-b-oem1",
+        "firefox-b-oem2",
+        "firefox-b-tinno",
+        "firefox-b-pn-wt",
+        "firefox-b-pn-wt-us",
+        "ubuntu",
+        "ubuntu-sn"
       ],
-      "telemetryId": "bing",
+      "telemetryId": "google",
       "organicCodes": [],
-      "codeParamName": "pc",
+      "codeParamName": "client",
       "queryParamName": "q",
-      "followOnCookies": [
-        {
-          "host": "www.bing.com",
-          "name": "SRCHS",
-          "codeParamName": "PC",
-          "extraCodePrefixes": [
-            "QBRE"
-          ],
-          "extraCodeParamName": "form"
-        }
-      ],
       "queryParamNames": [
         "q"
       ],
-      "searchPageRegexp": "^https://www\\.bing\\.com/search",
+      "domainExtraction": {
+        "ads": [
+          {
+            "method": "data-attribute",
+            "options": {
+              "dataAttributeKey": "dtld"
+            },
+            "selectors": "[data-dtld]"
+          }
+        ],
+        "nonAds": [
+          {
+            "method": "href",
+            "selectors": "#rso div.g[jscontroller] > div > div > div > div a[data-usg]"
+          }
+        ]
+      },
+      "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search",
       "nonAdsLinkRegexps": [
-        "^https://www.bing.com/ck/a"
+        "^https?://www\\.google\\.(?:.+)/url?(?:.+)&url="
+      ],
+      "adServerAttributes": [
+        "rw"
+      ],
+      "followOnParamNames": [
+        "oq",
+        "ved",
+        "ei"
       ],
       "extraAdServersRegexps": [
-        "^https://www\\.bing\\.com/acli?c?k"
+        "^https?://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk"
       ],
-      "id": "e1eec461-f1f3-40de-b94b-3b670b78108c",
-      "last_modified": 1698666532321
+      "id": "635a3325-1995-42d6-be09-dbe4b2a95453",
+      "last_modified": 1706198445460
     },
     {
-      "schema": 1698656461540,
+      "schema": 1705363206938,
       "components": [
         {
           "type": "ad_carousel",
@@ -337,6 +291,23 @@
       "queryParamNames": [
         "q"
       ],
+      "domainExtraction": {
+        "ads": [
+          {
+            "method": "href",
+            "options": {
+              "queryParamKey": "ad_domain"
+            },
+            "selectors": ".products-carousel a.js-carousel-item-title, [data-testid='ad'] a[data-testid='result-title-a']"
+          }
+        ],
+        "nonAds": [
+          {
+            "method": "href",
+            "selectors": "[data-layout='organic'] a[data-testid='result-title-a']"
+          }
+        ]
+      },
       "searchPageRegexp": "^https://duckduckgo\\.com/",
       "expectedOrganicCodes": [
         "h_",
@@ -372,41 +343,131 @@
         "^https://www\\.amazon\\.(?:[a-z.]{2,24}).*(?:tag=duckduckgo-)"
       ],
       "id": "9dfd626b-26f2-4913-9d0a-27db6cb7d8ca",
-      "last_modified": 1698666532318
+      "last_modified": 1706198445456
     },
     {
-      "schema": 1698333339811,
+      "schema": 1698656464939,
+      "taggedCodes": [
+        "monline_dg",
+        "monline_3_dg",
+        "monline_4_dg",
+        "monline_7_dg"
+      ],
+      "telemetryId": "baidu",
+      "organicCodes": [],
+      "codeParamName": "tn",
+      "queryParamName": "wd",
+      "queryParamNames": [
+        "wd",
+        "word"
+      ],
+      "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)",
+      "followOnParamNames": [
+        "oq"
+      ],
+      "extraAdServersRegexps": [
+        "^https?://www\\.baidu\\.com/baidu\\.php?"
+      ],
+      "id": "19c434a3-d173-4871-9743-290ac92a3f6a",
+      "last_modified": 1698666532326
+    },
+    {
+      "schema": 1698656463945,
       "components": [
         {
           "type": "ad_carousel",
           "included": {
             "parent": {
-              "selector": ".pla-exp-container"
+              "selector": ".product-ads-carousel"
             },
             "related": {
-              "selector": "g-right-button, g-left-button, .exp-button"
+              "selector": ".snippet__control"
             },
             "children": [
               {
-                "selector": "[data-dtld]",
+                "selector": ".product-ads-carousel__item",
                 "countChildren": true
               }
             ]
           }
         },
         {
-          "type": "refined_search_buttons",
+          "type": "ad_link",
+          "included": {
+            "parent": {
+              "selector": ".ad-result"
+            },
+            "children": [
+              {
+                "type": "ad_sitelink",
+                "selector": ".result__extra-content .deep-links--descriptions"
+              }
+            ]
+          }
+        },
+        {
+          "type": "incontent_searchbox",
           "topDown": true,
           "included": {
             "parent": {
-              "selector": "#appbar g-scrolling-carousel"
+              "selector": "form.search-form"
             },
             "related": {
-              "selector": "g-right-button, g-left-button"
+              "selector": ".search-form__suggestions"
             },
             "children": [
               {
-                "selector": "a"
+                "selector": ".search-form__input, .search-form__submit"
+              }
+            ]
+          }
+        },
+        {
+          "type": "ad_link",
+          "default": true
+        }
+      ],
+      "shoppingTab": {
+        "regexp": "/shopping?",
+        "selector": "nav li[data-test-id='search-navigation-item-shopping'] a"
+      },
+      "taggedCodes": [
+        "mzl",
+        "813cf1dd",
+        "16eeffc4"
+      ],
+      "telemetryId": "ecosia",
+      "organicCodes": [],
+      "codeParamName": "tt",
+      "queryParamName": "q",
+      "queryParamNames": [
+        "q"
+      ],
+      "searchPageRegexp": "^https://www\\.ecosia\\.org/",
+      "filter_expression": "env.version|versionCompare(\"110.0a1\")>=0",
+      "expectedOrganicCodes": [],
+      "extraAdServersRegexps": [
+        "^https://www\\.bing\\.com/acli?c?k"
+      ],
+      "id": "9a487171-3a06-4647-8866-36250ec84f3a",
+      "last_modified": 1698666532324
+    },
+    {
+      "schema": 1698656462833,
+      "components": [
+        {
+          "type": "ad_carousel",
+          "included": {
+            "parent": {
+              "selector": ".adsMvCarousel"
+            },
+            "related": {
+              "selector": ".cr"
+            },
+            "children": [
+              {
+                "selector": ".pa_item",
+                "countChildren": true
               }
             ]
           }
@@ -415,17 +476,17 @@
           "type": "ad_link",
           "excluded": {
             "parent": {
-              "selector": "#rhs"
+              "selector": "aside"
             }
           },
           "included": {
             "parent": {
-              "selector": "[data-text-ad='1']"
+              "selector": ".sb_adTA"
             },
             "children": [
               {
                 "type": "ad_sitelink",
-                "selector": "[role='list']"
+                "selector": ".b_vlist2col"
               }
             ]
           }
@@ -434,11 +495,11 @@
           "type": "ad_sidebar",
           "included": {
             "parent": {
-              "selector": "#rhs"
+              "selector": "aside"
             },
             "children": [
               {
-                "selector": ".pla-unit, .mnr-c",
+                "selector": ".pa_item, .sb_adTA",
                 "countChildren": true
               }
             ]
@@ -449,36 +510,14 @@
           "topDown": true,
           "included": {
             "parent": {
-              "selector": "form[role='search']"
+              "selector": "form#sb_form"
             },
             "related": {
-              "selector": "div.logo + div + div"
-            },
-            "children": [
-              {
-                "selector": "input[type='text']"
-              },
-              {
-                "selector": "textarea[name='q']"
-              }
-            ]
-          }
-        },
-        {
-          "type": "ad_image_row",
-          "excluded": {
-            "parent": {
-              "selector": ".pla-exp-container"
-            }
-          },
-          "included": {
-            "parent": {
-              "selector": ".top-pla-group-inner"
+              "selector": "#sw_as"
             },
             "children": [
               {
-                "selector": "[data-dtld]",
-                "countChildren": true
+                "selector": "input[name='q']"
               }
             ]
           }
@@ -489,62 +528,57 @@
         }
       ],
       "shoppingTab": {
-        "regexp": "&tbm=shop",
-        "selector": "div[role='navigation'] a",
-        "inspectRegexpInSERP": true
+        "regexp": "^/shop?",
+        "selector": "#b-scopeListItem-shop a"
       },
       "taggedCodes": [
-        "firefox-a",
-        "firefox-b",
-        "firefox-b-1",
-        "firefox-b-ab",
-        "firefox-b-1-ab",
-        "firefox-b-d",
-        "firefox-b-1-d",
-        "firefox-b-e",
-        "firefox-b-1-e",
-        "firefox-b-m",
-        "firefox-b-1-m",
-        "firefox-b-o",
-        "firefox-b-1-o",
-        "firefox-b-lm",
-        "firefox-b-1-lm",
-        "firefox-b-lg",
-        "firefox-b-huawei-h1611",
-        "firefox-b-is-oem1",
-        "firefox-b-oem1",
-        "firefox-b-oem2",
-        "firefox-b-tinno",
-        "firefox-b-pn-wt",
-        "firefox-b-pn-wt-us",
-        "ubuntu",
-        "ubuntu-sn"
+        "MOZ2",
+        "MOZ4",
+        "MOZ5",
+        "MOZA",
+        "MOZB",
+        "MOZD",
+        "MOZE",
+        "MOZI",
+        "MOZL",
+        "MOZM",
+        "MOZO",
+        "MOZR",
+        "MOZT",
+        "MOZW",
+        "MOZX",
+        "MZSL01",
+        "MZSL02",
+        "MZSL03"
       ],
-      "telemetryId": "google",
+      "telemetryId": "bing",
       "organicCodes": [],
-      "codeParamName": "client",
+      "codeParamName": "pc",
       "queryParamName": "q",
+      "followOnCookies": [
+        {
+          "host": "www.bing.com",
+          "name": "SRCHS",
+          "codeParamName": "PC",
+          "extraCodePrefixes": [
+            "QBRE"
+          ],
+          "extraCodeParamName": "form"
+        }
+      ],
       "queryParamNames": [
         "q"
       ],
-      "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search",
+      "searchPageRegexp": "^https://www\\.bing\\.com/search",
       "nonAdsLinkRegexps": [
-        "^https?://www\\.google\\.(?:.+)/url?(?:.+)&url="
-      ],
-      "adServerAttributes": [
-        "rw"
-      ],
-      "followOnParamNames": [
-        "oq",
-        "ved",
-        "ei"
+        "^https://www.bing.com/ck/a"
       ],
       "extraAdServersRegexps": [
-        "^https?://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk"
+        "^https://www\\.bing\\.com/acli?c?k"
       ],
-      "id": "635a3325-1995-42d6-be09-dbe4b2a95453",
-      "last_modified": 1698666532316
+      "id": "e1eec461-f1f3-40de-b94b-3b670b78108c",
+      "last_modified": 1698666532321
     }
   ],
-  "timestamp": 1698666532326
+  "timestamp": 1706198445460
 }