Merge release/1.90.0 into main

duckduckgo · May 27, 2024 · 653dcb4 · 653dcb4
2 parents 86fd337 + 480df12
commit 653dcb4
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 19 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 191
+CURRENT_PROJECT_VERSION = 192
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.89.0
+MARKETING_VERSION = 1.90.0
diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"f2379428bfb9f97dffb6f9e700c27840\""
-        public static let embeddedDataSHA = "0fb9abce9db169dec195c611c4520a8d643f620c3dc1bf075c73052591f7acf4"
+        public static let embeddedDataETag = "\"1d52c7748b83498990caa1a58407b9e7\""
+        public static let embeddedDataSHA = "be9d07bf6557974c7e267cf82fd07db4ada9caad67e6ae6c78d800b0b8da7e34"
     }
 
     var embeddedDataEtag: String {

diff --git a/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift b/DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppTrackerDataSetProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"004872ea25514c61490f047cd5f088b8\""
-        public static let embeddedDataSHA = "4a06a3df999fad7829baecc9ccfcbc54c20526ba304f6c5f2846899d29b281cc"
+        public static let embeddedDataETag = "\"ea184137cdaa19ca5de76352215a9e0e\""
+        public static let embeddedDataSHA = "faa4dfbef4903710374b153c9a87e09b713fc19d64fa0bcfd1fd392fff93af21"
     }
 
     var embeddedDataEtag: String {

diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1716212212537,
+    "version": 1716586822463,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -303,6 +303,9 @@
                 {
                     "domain": "www.thrifty.com"
                 },
+                {
+                    "domain": "sports.tipico.de"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -318,7 +321,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "6ea22969c48f1cb624808cd49a296f4d"
+            "hash": "0e21f0096d2a135a3c36332ae79b656c"
         },
         "autofill": {
             "exceptions": [
@@ -1228,6 +1231,11 @@
             "state": "enabled",
             "hash": "b685397a8317384bec3b8d7e8b7571bb"
         },
+        "dummyWebMessageListener": {
+            "exceptions": [],
+            "state": "disabled",
+            "hash": "728493ef7a1488e4781656d3f9db84aa"
+        },
         "elementHiding": {
             "exceptions": [
                 {
@@ -3476,6 +3484,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "post-gazette.com",
+                        "rules": [
+                            {
+                                "selector": "[data-dfpads-position]",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "prajwaldesai.com",
                         "rules": [
@@ -3921,6 +3938,15 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "toledoblade.com",
+                        "rules": [
+                            {
+                                "selector": "[data-dfpads-position]",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "tripadvisor.ca",
                         "rules": [
@@ -4193,6 +4219,10 @@
                             {
                                 "selector": ".gam-placeholder",
                                 "type": "closest-empty"
+                            },
+                            {
+                                "selector": "[class*='sdaContainer']",
+                                "type": "hide-empty"
                             }
                         ]
                     },
@@ -4354,7 +4384,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "9a895fea083dabb6e3496242636a8370"
+            "hash": "1c7a079280844400d77a0b0baf89c967"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -4712,6 +4742,12 @@
                 {
                     "domain": "tirerack.com"
                 },
+                {
+                    "domain": "milesplit.live"
+                },
+                {
+                    "domain": "dollargeneral.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -4728,7 +4764,7 @@
                     "privacy-test-pages.site"
                 ]
             },
-            "hash": "05bddff3ae61a9536e38a6ef7d383eb3"
+            "hash": "3803c69233510b43ebaee8368b38a31d"
         },
         "harmfulApis": {
             "settings": {
@@ -6643,6 +6679,7 @@
                                 "domains": [
                                     "abril.com.br",
                                     "algomalegalclinic.com",
+                                    "bodyelectricvitality.com.au",
                                     "cosmicbook.news",
                                     "eatroyo.com",
                                     "thesimsresource.com",
@@ -6772,6 +6809,7 @@
                                     "newschannel20.com",
                                     "newschannel9.com",
                                     "okcfox.com",
+                                    "post-gazette.com",
                                     "raleighcw.com",
                                     "siouxlandnews.com",
                                     "southernoregoncw.com",
@@ -6780,6 +6818,7 @@
                                     "thecw46.com",
                                     "thecwtc.com",
                                     "thenationaldesk.com",
+                                    "toledoblade.com",
                                     "triblive.com",
                                     "turnto10.com",
                                     "univisionseattle.com",
@@ -6834,7 +6873,8 @@
                                 "rule": "grow.me/main.js",
                                 "domains": [
                                     "budgetbytes.com",
-                                    "foodfornet.com"
+                                    "foodfornet.com",
+                                    "homesteadingfamily.com"
                                 ]
                             },
                             {
@@ -7077,11 +7117,7 @@
                             {
                                 "rule": "static.klaviyo.com/onsite/js/klaviyo.js",
                                 "domains": [
-                                    "essentialpraxis.com",
-                                    "kidsguide.com",
-                                    "muc-off.com",
-                                    "paria.cc",
-                                    "urbanebikes.com"
+                                    "<all>"
                                 ]
                             },
                             {
@@ -7932,6 +7968,12 @@
                                 "domains": [
                                     "<all>"
                                 ]
+                            },
+                            {
+                                "rule": "c.slickstream.com/app/",
+                                "domains": [
+                                    "<all>"
+                                ]
                             }
                         ]
                     },
@@ -8458,7 +8500,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "d9db93f32201ee8d2e545eeead7cc66f"
+            "hash": "36ca79804d05bc24247f804f48fda77b"
         },
         "trackingCookies1p": {
             "settings": {

diff --git a/DuckDuckGo/ContentBlocker/trackerData.json b/DuckDuckGo/ContentBlocker/trackerData.json
@@ -1,6 +1,6 @@
 {
     "_builtWith": {
-        "tracker-radar": "a8f276714a31d43fb185a1b233ed92f12680627ca54c6f98da44de9fe27f097e-4013b4e91930c643394cb31c6c745356f133b04f",
+        "tracker-radar": "9c02278e8bfb43db5e6b8756cdedc469924d600b8c4d6c9d7177de01405c8f5c-4013b4e91930c643394cb31c6c745356f133b04f",
         "tracker-surrogates": "0528e3226df15b1a3e319ad68ef76612a8f26623"
     },
     "readme": "https://github.com/duckduckgo/tracker-blocklists",
@@ -41441,7 +41441,8 @@
                 "twittercommunity.com",
                 "twttr.com",
                 "twttr.net",
-                "vine.co"
+                "vine.co",
+                "x.com"
             ],
             "prevalence": 8.79,
             "displayName": "Twitter"
@@ -52872,6 +52873,7 @@
         "twttr.com": "Twitter, Inc.",
         "twttr.net": "Twitter, Inc.",
         "vine.co": "Twitter, Inc.",
+        "x.com": "Twitter, Inc.",
         "ads1-adnow.com": "Mas Capital Group Ltd",
         "ads2-adnow.com": "Mas Capital Group Ltd",
         "ads3-adnow.com": "Mas Capital Group Ltd",