From e3cb9707d5a825c871111670200af02af1718195 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 23 Apr 2024 06:29:10 +0200 Subject: Merging upstream version 125.0.2. Signed-off-by: Daniel Baumann --- .../dumps/main/cookie-banner-rules-list.json | 255 +++++----- services/settings/dumps/main/search-config-v2.json | 542 ++++++++++----------- .../settings/dumps/main/search-telemetry-v2.json | 149 +++--- 3 files changed, 486 insertions(+), 460 deletions(-) (limited to 'services/settings/dumps/main') diff --git a/services/settings/dumps/main/cookie-banner-rules-list.json b/services/settings/dumps/main/cookie-banner-rules-list.json index 5d1c71818f..1c513579d9 100644 --- a/services/settings/dumps/main/cookie-banner-rules-list.json +++ b/services/settings/dumps/main/cookie-banner-rules-list.json @@ -1,5 +1,147 @@ { "data": [ + { + "click": { + "optIn": "#accept-btn", + "optOut": "#decline-btn", + "presence": "#privacy-manager-popin" + }, + "schema": 1713199742998, + "domains": [ + "canalplus.com" + ], + "id": "7b2e3401-697f-440a-b418-8477fcf2cfeb", + "last_modified": 1713281881442 + }, + { + "click": { + "optIn": "button#didomi-notice-agree-button", + "optOut": "button#didomi-notice-disagree-button", + "presence": "div#didomi-host" + }, + "schema": 1713199742998, + "cookies": {}, + "domains": [ + "doctolib.fr", + "pravda.sk", + "topky.sk", + "zoznam.sk", + "tvnoviny.sk", + "aukro.cz", + "krone.at", + "cas.sk", + "heureka.sk", + "free.fr", + "markiza.sk", + "willhaben.at", + "francetvinfo.fr", + "france.tv", + "france24.com", + "opodo.at", + "opodo.ch", + "opodo.co.uk", + "opodo.de", + "opodo.dk", + "opodo.fi", + "opodo.fr", + "opodo.it", + "opodo.nl", + "opodo.no", + "opodo.pl", + "opodo.pt", + "radiofrance.fr", + "rfi.fr", + "rtl.fr", + "blablacar.fr", + "6play.fr", + "marianne.net" + ], + "id": "690aa076-4a8b-48ec-b52c-1443d44ff008", + "last_modified": 1713281881438 + }, + { + "click": { + "optIn": "button#onetrust-accept-btn-handler", + "optOut": "button.onetrust-close-btn-handler", + "presence": "div#onetrust-consent-sdk" + }, + "schema": 1713199742998, + "cookies": {}, + "domains": [ + "darty.com", + "e.leclerc", + "fnac.be", + "fnac.ch", + "fnac.com", + "fnac.pt", + "leclercdrive.fr", + "mondialrelay.fr", + "pasteur.fr" + ], + "id": "2d821158-5945-4134-a078-56c6da4f678d", + "last_modified": 1713281881435 + }, + { + "click": { + "optIn": "#popin_tc_privacy_button_3", + "optOut": "#popin_tc_privacy_button_2", + "presence": "#tc-privacy-wrapper" + }, + "schema": 1713199742998, + "domains": [ + "bouyguestelecom.fr", + "enedis.fr", + "fortuneo.fr", + "lcl.fr", + "tf1.fr", + "tf1info.fr" + ], + "id": "98D89E26-F4B6-4C2D-BABF-4295B922E433", + "last_modified": 1713281881431 + }, + { + "click": { + "optIn": ".btn-ok", + "optOut": ".btn-reject", + "presence": "#cookie-policy-info" + }, + "schema": 1713199742998, + "cookies": { + "optOut": [ + { + "name": "isReadCookiePolicyDNT", + "value": "No" + }, + { + "name": "isReadCookiePolicyDNTAa", + "value": "false" + } + ] + }, + "domains": [ + "asus.com" + ], + "id": "8c949b75-4c7b-4559-8ade-780064af370a", + "last_modified": 1713281881428 + }, + { + "click": { + "optOut": ".sp_choice_type_13", + "presence": ".message-container > #notice", + "runContext": "child" + }, + "schema": 1713199742998, + "cookies": {}, + "domains": [ + "aktuality.sk", + "sky.it", + "azet.sk", + "bloomberg.com", + "formula1.com" + ], + "id": "ae8f7761-35ff-45b2-92df-7868ca288ad2", + "last_modified": 1713281881424 + }, { "click": { "optIn": "#c-bns #c-p-bn", @@ -418,70 +560,6 @@ "id": "1006f951-cd51-47cc-9527-5036cef4b85a", "last_modified": 1711550955080 }, - { - "click": { - "optIn": "button#didomi-notice-agree-button", - "optOut": "button#didomi-notice-disagree-button", - "presence": "div#didomi-host" - }, - "schema": 1711039008141, - "cookies": {}, - "domains": [ - "doctolib.fr", - "pravda.sk", - "topky.sk", - "zoznam.sk", - "tvnoviny.sk", - "aukro.cz", - "krone.at", - "cas.sk", - "heureka.sk", - "free.fr", - "markiza.sk", - "willhaben.at", - "francetvinfo.fr", - "france.tv", - "france24.com", - "opodo.at", - "opodo.ch", - "opodo.co.uk", - "opodo.de", - "opodo.dk", - "opodo.fi", - "opodo.fr", - "opodo.it", - "opodo.nl", - "opodo.no", - "opodo.pl", - "opodo.pt", - "radiofrance.fr", - "rfi.fr", - "blablacar.fr", - "6play.fr" - ], - "id": "690aa076-4a8b-48ec-b52c-1443d44ff008", - "last_modified": 1711550955075 - }, - { - "click": { - "optIn": "button#onetrust-accept-btn-handler", - "optOut": "button.onetrust-close-btn-handler", - "presence": "div#onetrust-consent-sdk" - }, - "schema": 1711039008141, - "cookies": {}, - "domains": [ - "e.leclerc", - "fnac.be", - "fnac.ch", - "fnac.com", - "fnac.pt", - "leclercdrive.fr", - "mondialrelay.fr" - ], - "id": "2d821158-5945-4134-a078-56c6da4f678d", - "last_modified": 1711550955071 - }, { "click": { "optIn": "#popin_tc_privacy_button", @@ -498,23 +576,6 @@ "id": "43ad2b6b-a57b-4f7a-9d76-e32e696ddc10", "last_modified": 1711550955067 }, - { - "click": { - "optIn": "#popin_tc_privacy_button_3", - "optOut": "#popin_tc_privacy_button_2", - "presence": "#tc-privacy-wrapper" - }, - "schema": 1711039008141, - "domains": [ - "bouyguestelecom.fr", - "enedis.fr", - "fortuneo.fr", - "lcl.fr", - "tf1.fr" - ], - "id": "98D89E26-F4B6-4C2D-BABF-4295B922E433", - "last_modified": 1711550955063 - }, { "click": { "optIn": ".moove-gdpr-infobar-allow-all", @@ -784,23 +845,6 @@ "id": "d42bbaee-f96e-47e7-8e81-efc642518e97", "last_modified": 1710331175368 }, - { - "click": { - "optOut": ".sp_choice_type_13", - "presence": ".message-container > #notice", - "runContext": "child" - }, - "schema": 1710174339269, - "cookies": {}, - "domains": [ - "aktuality.sk", - "sky.it", - "azet.sk", - "bloomberg.com" - ], - "id": "ae8f7761-35ff-45b2-92df-7868ca288ad2", - "last_modified": 1710331175359 - }, { "click": { "optIn": "button#didomi-notice-agree-button", @@ -1249,19 +1293,6 @@ "id": "a2404864-0163-4f71-ab4c-915713f8f349", "last_modified": 1708772697167 }, - { - "click": { - "optIn": ".btn-ok", - "optOut": ".btn-reject", - "presence": "#cookie-policy-info" - }, - "schema": 1708699541450, - "domains": [ - "asus.com" - ], - "id": "8c949b75-4c7b-4559-8ade-780064af370a", - "last_modified": 1708772697161 - }, { "click": { "optIn": "[data-cookieman-accept-all]", @@ -9366,5 +9397,5 @@ "last_modified": 1670498155641 } ], - "timestamp": 1711550955136 + "timestamp": 1713281881442 } diff --git a/services/settings/dumps/main/search-config-v2.json b/services/settings/dumps/main/search-config-v2.json index e360ad9ee3..5a8be8dfeb 100644 --- a/services/settings/dumps/main/search-config-v2.json +++ b/services/settings/dumps/main/search-config-v2.json @@ -2,254 +2,68 @@ "data": [ { "base": { - "name": "Qwant", + "name": "DuckDuckGo", "urls": { "search": { - "base": "https://www.qwant.com/", + "base": "https://duckduckgo.com/", "params": [ { - "name": "client", + "name": "t", "value": "{partnerCode}" } ], "searchTermParamName": "q" }, "suggestions": { - "base": "https://api.qwant.com/api/suggest/", + "base": "https://ac.duckduckgo.com/ac/", "params": [ { - "name": "client", - "value": "opensearch" + "name": "type", + "value": "list" } ], "searchTermParamName": "q" } }, "aliases": [ - "qwant" + "duckduckgo", + "ddg" ], - "partnerCode": "brz-moz", + "partnerCode": "ffab", "classification": "general" }, - "schema": 1710460806956, + "schema": 1713282081098, "variants": [ { "environment": { - "locales": [ - "fr" - ] - } - }, - { - "environment": { - "regions": [ - "be", - "ch", - "es", - "fr", - "it", - "nl" - ] - } - }, - { - "environment": { - "distributions": [ - "qwant-001", - "qwant-002" - ] + "allRegionsAndLocales": true }, - "partnerCode": "firefoxqwant", - "telemetrySuffix": "qwant" - } - ], - "identifier": "qwant", - "recordType": "engine", - "id": "2e62746e-b90a-42ee-b0f2-9ed0e1e2eaf0", - "last_modified": 1710766863306 - }, - { - "orders": [ - { - "order": [ - "baidu", - "bing", - "google", - "wikipedia*" - ], - "environment": { - "distributions": [ - "MozillaOnline" - ] - } - }, - { - "order": [ - "qwant", - "qwantjr" - ], - "environment": { - "distributions": [ - "qwant-001", - "qwant-002" - ] - } - } - ], - "schema": 1707824831520, - "recordType": "engineOrders", - "id": "3e1fed64-5ec7-4b1c-bedc-741fe3c59bc3", - "last_modified": 1707833224345 - }, - { - "base": { - "name": "Bing", - "urls": { - "search": { - "base": "https://www.bing.com/search", - "params": [ - { - "name": "pc", - "value": "{partnerCode}" + "subVariants": [ + { + "environment": { + "channels": [ + "esr" + ] }, - { - "name": "form", - "searchAccessPoint": { - "newtab": "MOZTSB", - "homepage": "MOZSPG", - "searchbar": "MOZSBR", - "addressbar": "MOZLBR", - "contextmenu": "MOZCON" - } - } - ], - "searchTermParamName": "q" - }, - "trending": { - "base": "https://www.bing.com/osjson.aspx" - }, - "suggestions": { - "base": "https://www.bing.com/osjson.aspx", - "params": [ - { - "name": "form", - "value": "OSDJAS" - } - ], - "searchTermParamName": "query" - } - }, - "aliases": [ - "bing" - ], - "partnerCode": "MOZI", - "classification": "general" - }, - "schema": 1706918405822, - "variants": [ - { - "environment": { - "locales": [ - "ach", - "af", - "an", - "ar", - "ast", - "az", - "bn", - "bs", - "ca", - "ca-valencia", - "cak", - "cs", - "cy", - "da", - "de", - "dsb", - "el", - "en-CA", - "en-GB", - "en-US", - "eo", - "es-CL", - "es-ES", - "es-MX", - "eu", - "fa", - "ff", - "fi", - "fr", - "fur", - "fy-NL", - "gd", - "gl", - "gn", - "gu-IN", - "he", - "hi-IN", - "hr", - "hsb", - "hy-AM", - "ia", - "id", - "is", - "it", - "ja", - "ja-JP-macos", - "ka", - "kab", - "km", - "kn", - "lij", - "lo", - "lt", - "meh", - "mk", - "ms", - "my", - "nb-NO", - "ne-NP", - "nl", - "nn-NO", - "oc", - "pa-IN", - "pt-BR", - "rm", - "ro", - "sc", - "sco", - "son", - "sq", - "sr", - "sv-SE", - "te", - "th", - "tl", - "tr", - "trs", - "uk", - "ur", - "uz", - "wo", - "xh", - "zh-CN" - ] - } + "partnerCode": "ftsa", + "telemetrySuffix": "esr" + } + ] }, { "environment": { - "channels": [ - "esr" + "distributions": [ + "mint-001" ] }, - "partnerCode": "MOZR", - "telemetrySuffix": "esr" + "partnerCode": "lm", + "telemetrySuffix": "lm" } ], - "identifier": "bing", + "identifier": "ddg", "recordType": "engine", - "id": "05645095-d26e-4f20-9137-f24a14a23f28", - "last_modified": 1707833224310 + "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", + "last_modified": 1713282817053 }, { "base": { @@ -305,23 +119,25 @@ "partnerCode": "firefox-b-d", "classification": "general" }, - "schema": 1702901739026, + "schema": 1713282083062, "variants": [ { "environment": { "allRegionsAndLocales": true }, + "subVariants": [ + { + "environment": { + "channels": [ + "esr" + ] + }, + "partnerCode": "firefox-b-e", + "telemetrySuffix": "b-e" + } + ], "telemetrySuffix": "b-d" }, - { - "environment": { - "channels": [ - "esr" - ] - }, - "partnerCode": "firefox-b-e", - "telemetrySuffix": "b-e" - }, { "urls": { "search": { @@ -359,33 +175,21 @@ ] }, "partnerCode": "firefox-b-1-d", - "telemetrySuffix": "b-1-d" - }, - { - "urls": { - "search": { - "params": [ - { - "name": "client", - "value": "{partnerCode}" - }, - { - "name": "channel", - "experimentConfig": "google_channel_us" - } - ] + "subVariants": [ + { + "environment": { + "regions": [ + "us" + ], + "channels": [ + "esr" + ] + }, + "partnerCode": "firefox-b-1-e", + "telemetrySuffix": "b-1-e" } - }, - "environment": { - "regions": [ - "us" - ], - "channels": [ - "esr" - ] - }, - "partnerCode": "firefox-b-1-e", - "telemetrySuffix": "b-1-e" + ], + "telemetrySuffix": "b-1-d" }, { "urls": { @@ -459,70 +263,260 @@ "identifier": "google", "recordType": "engine", "id": "7ace4aa1-e762-4f4b-87b9-b23b3c3a930b", - "last_modified": 1702906502757 + "last_modified": 1713282817051 }, { "base": { - "name": "DuckDuckGo", + "name": "Bing", "urls": { "search": { - "base": "https://duckduckgo.com/", + "base": "https://www.bing.com/search", "params": [ { - "name": "t", + "name": "pc", "value": "{partnerCode}" + }, + { + "name": "form", + "searchAccessPoint": { + "newtab": "MOZTSB", + "homepage": "MOZSPG", + "searchbar": "MOZSBR", + "addressbar": "MOZLBR", + "contextmenu": "MOZCON" + } } ], "searchTermParamName": "q" }, + "trending": { + "base": "https://www.bing.com/osjson.aspx" + }, "suggestions": { - "base": "https://ac.duckduckgo.com/ac/", + "base": "https://www.bing.com/osjson.aspx", "params": [ { - "name": "type", - "value": "list" + "name": "form", + "value": "OSDJAS" + } + ], + "searchTermParamName": "query" + } + }, + "aliases": [ + "bing" + ], + "partnerCode": "MOZI", + "classification": "general" + }, + "schema": 1713199744323, + "variants": [ + { + "environment": { + "locales": [ + "ach", + "af", + "an", + "ar", + "ast", + "az", + "bn", + "bs", + "ca", + "ca-valencia", + "cak", + "cs", + "cy", + "da", + "de", + "dsb", + "el", + "en-CA", + "en-GB", + "en-US", + "eo", + "es-CL", + "es-ES", + "es-MX", + "eu", + "fa", + "ff", + "fi", + "fr", + "fur", + "fy-NL", + "gd", + "gl", + "gn", + "gu-IN", + "he", + "hi-IN", + "hr", + "hsb", + "hy-AM", + "ia", + "id", + "is", + "it", + "ja", + "ja-JP-macos", + "ka", + "kab", + "km", + "kn", + "lij", + "lo", + "lt", + "meh", + "mk", + "ms", + "my", + "nb-NO", + "ne-NP", + "nl", + "nn-NO", + "oc", + "pa-IN", + "pt-BR", + "rm", + "ro", + "sc", + "sco", + "son", + "sq", + "sr", + "sv-SE", + "te", + "th", + "tl", + "tr", + "trs", + "uk", + "ur", + "uz", + "wo", + "xh", + "zh-CN" + ] + }, + "subVariants": [ + { + "environment": { + "channels": [ + "esr" + ] + }, + "partnerCode": "MOZR", + "telemetrySuffix": "esr" + } + ] + } + ], + "identifier": "bing", + "recordType": "engine", + "id": "05645095-d26e-4f20-9137-f24a14a23f28", + "last_modified": 1713282817048 + }, + { + "base": { + "name": "Qwant", + "urls": { + "search": { + "base": "https://www.qwant.com/", + "params": [ + { + "name": "client", + "value": "{partnerCode}" + } + ], + "searchTermParamName": "q" + }, + "suggestions": { + "base": "https://api.qwant.com/api/suggest/", + "params": [ + { + "name": "client", + "value": "opensearch" } ], "searchTermParamName": "q" } }, "aliases": [ - "duckduckgo", - "ddg" + "qwant" ], - "partnerCode": "ffab", + "partnerCode": "brz-moz", "classification": "general" }, - "schema": 1702901739665, + "schema": 1710460806956, "variants": [ { "environment": { - "allRegionsAndLocales": true + "locales": [ + "fr" + ] } }, { "environment": { - "channels": [ - "esr" + "regions": [ + "be", + "ch", + "es", + "fr", + "it", + "nl" ] - }, - "partnerCode": "ftsa", - "telemetrySuffix": "esr" + } }, { "environment": { "distributions": [ - "mint-001" + "qwant-001", + "qwant-002" ] }, - "partnerCode": "lm", - "telemetrySuffix": "lm" + "partnerCode": "firefoxqwant", + "telemetrySuffix": "qwant" } ], - "identifier": "ddg", + "identifier": "qwant", "recordType": "engine", - "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", - "last_modified": 1702906502754 + "id": "2e62746e-b90a-42ee-b0f2-9ed0e1e2eaf0", + "last_modified": 1710766863306 + }, + { + "orders": [ + { + "order": [ + "baidu", + "bing", + "google", + "wikipedia*" + ], + "environment": { + "distributions": [ + "MozillaOnline" + ] + } + }, + { + "order": [ + "qwant", + "qwantjr" + ], + "environment": { + "distributions": [ + "qwant-001", + "qwant-002" + ] + } + } + ], + "schema": 1707824831520, + "recordType": "engineOrders", + "id": "3e1fed64-5ec7-4b1c-bedc-741fe3c59bc3", + "last_modified": 1707833224345 }, { "base": { @@ -7341,5 +7335,5 @@ "last_modified": 1702906502241 } ], - "timestamp": 1710766863306 + "timestamp": 1713282817053 } diff --git a/services/settings/dumps/main/search-telemetry-v2.json b/services/settings/dumps/main/search-telemetry-v2.json index 9eb4e5d29c..1a1708529c 100644 --- a/services/settings/dumps/main/search-telemetry-v2.json +++ b/services/settings/dumps/main/search-telemetry-v2.json @@ -1,5 +1,79 @@ { "data": [ + { + "isSPA": true, + "schema": 1712762409532, + "components": [ + { + "type": "ad_image_row", + "included": { + "parent": { + "selector": "[data-testid='pam.container']" + }, + "children": [ + { + "selector": "[data-slide-index]", + "countChildren": true + } + ] + } + }, + { + "type": "ad_link", + "included": { + "parent": { + "selector": "[data-testid='adResult']" + } + } + }, + { + "type": "incontent_searchbox", + "topDown": true, + "included": { + "parent": { + "selector": "._1zdrb._1cR1n" + }, + "related": { + "selector": "#search-suggestions" + }, + "children": [ + { + "selector": "input[type='search']" + } + ] + } + }, + { + "type": "ad_link", + "default": true + } + ], + "taggedCodes": [ + "brz-moz", + "firefoxqwant" + ], + "telemetryId": "qwant", + "organicCodes": [], + "codeParamName": "client", + "queryParamName": "q", + "queryParamNames": [ + "q" + ], + "searchPageRegexp": "^https://www\\.qwant\\.com/", + "filter_expression": "env.version|versionCompare(\"124.0a1\")>=0", + "followOnParamNames": [], + "defaultPageQueryParam": { + "key": "t", + "value": "web" + }, + "extraAdServersRegexps": [ + "^https://www\\.bing\\.com/acli?c?k", + "^https://api\\.qwant\\.com/v3/r/", + "^https://fdn\\.qwant\\.com/v3/r/" + ], + "id": "19c434a3-d173-4871-9743-290ac92a3f6b", + "last_modified": 1713187389066 + }, { "schema": 1712582517430, "components": [ @@ -447,79 +521,6 @@ "id": "635a3325-1995-42d6-be09-dbe4b2a95453", "last_modified": 1712582517281 }, - { - "isSPA": true, - "schema": 1707523204491, - "components": [ - { - "type": "ad_image_row", - "included": { - "parent": { - "selector": "[data-testid='pam.container']" - }, - "children": [ - { - "selector": "[data-slide-index]", - "countChildren": true - } - ] - } - }, - { - "type": "ad_link", - "included": { - "parent": { - "selector": "[data-testid='adResult']" - } - } - }, - { - "type": "incontent_searchbox", - "topDown": true, - "included": { - "parent": { - "selector": "._1zdrb._1cR1n" - }, - "related": { - "selector": "#search-suggestions" - }, - "children": [ - { - "selector": "input[type='search']" - } - ] - } - }, - { - "type": "ad_link", - "default": true - } - ], - "taggedCodes": [ - "brz-moz", - "firefoxqwant" - ], - "telemetryId": "qwant", - "organicCodes": [], - "codeParamName": "client", - "queryParamName": "q", - "queryParamNames": [ - "q" - ], - "searchPageRegexp": "^https://www\\.qwant\\.com/", - "filter_expression": "env.version|versionCompare(\"124.0a1\")>=0", - "followOnParamNames": [], - "defaultPageQueryParam": { - "key": "t", - "value": "web" - }, - "extraAdServersRegexps": [ - "^https://www\\.bing\\.com/acli?c?k", - "^https://api\\.qwant\\.com/v3/r/" - ], - "id": "19c434a3-d173-4871-9743-290ac92a3f6b", - "last_modified": 1707833261849 - }, { "schema": 1705363206938, "components": [ @@ -785,5 +786,5 @@ "last_modified": 1698666532324 } ], - "timestamp": 1712762409389 + "timestamp": 1713187389066 } -- cgit v1.2.3