Merge release/1.98.0 into main

duckduckgo · Jul 22, 2024 · 27267c4 · 27267c4
2 parents a7254a4 + 608be8e
commit 27267c4
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 10 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 229
+CURRENT_PROJECT_VERSION = 230
diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.97.0
+MARKETING_VERSION = 1.98.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 = "\"142adc4a95bca0600dd55ce98ddeec36\""
-        public static let embeddedDataSHA = "439acd6b6ccd93f92ce19c625460090a758c35a5179886fc16dd2f413082cf70"
+        public static let embeddedDataETag = "\"ae2e2a1fde63a243dfcc79151fb9fdf3\""
+        public static let embeddedDataSHA = "0ae27bec4a00b59d5a7bfe548cbe5831fe157cbfb2dde4e06657922cd5de70da"
     }
 
     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": 1720796469387,
+    "version": 1721406809556,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -1039,6 +1039,9 @@
                 },
                 {
                     "domain": "noaprints.com"
+                },
+                {
+                    "domain": "tinder.com"
                 }
             ],
             "settings": {
@@ -1057,7 +1060,7 @@
             },
             "state": "enabled",
             "minSupportedVersion": "1.93.0",
-            "hash": "de5445a7452409483eeef786759d392f"
+            "hash": "08e30d1e6f6105ec1698b55a0aca317a"
         },
         "clickToPlay": {
             "exceptions": [
@@ -1519,6 +1522,10 @@
                         "selector": "#leaderboard",
                         "type": "closest-empty"
                     },
+                    {
+                        "selector": "#leaderboard-container",
+                        "type": "hide-empty"
+                    },
                     {
                         "selector": ".leaderboard_wrapper",
                         "type": "hide-empty"
@@ -1547,6 +1554,10 @@
                         "selector": "#topAd",
                         "type": "hide-empty"
                     },
+                    {
+                        "selector": "#topad",
+                        "type": "hide-empty"
+                    },
                     {
                         "selector": ".ad-banner-container",
                         "type": "hide-empty"
@@ -2846,6 +2857,27 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "gizmodo.com",
+                        "rules": [
+                            {
+                                "selector": ".banner-top",
+                                "type": "closest-empty"
+                            },
+                            {
+                                "selector": ".od-wrapper",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".widget_keleops-ad",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[id^='optidigital-adslot-Billboard']",
+                                "type": "closest-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "google.com",
                         "rules": [
@@ -4577,7 +4609,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "001ab18a7e0381b9824c0e8df68e12e7"
+            "hash": "a27afdd4dfee7a8dcd74a8745d3306ed"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -5285,6 +5317,29 @@
             ],
             "hash": "1a1a4652687f25da9f351df157c5e051"
         },
+        "phishingDetection": {
+            "state": "internal",
+            "exceptions": [
+                {
+                    "domain": "marvel.com"
+                },
+                {
+                    "domain": "sundancecatalog.com"
+                },
+                {
+                    "domain": "noaprints.com"
+                }
+            ],
+            "features": {
+                "allowErrorPage": {
+                    "state": "internal"
+                },
+                "allowPreferencesToggle": {
+                    "state": "internal"
+                }
+            },
+            "hash": "2caa9ff12e48c6e51980b2788b242f88"
+        },
         "pluginPointFocusedViewPlugin": {
             "state": "disabled",
             "exceptions": [],
@@ -5422,9 +5477,9 @@
             "hash": "3c850040d1c9b3e06841b1491c5d2940"
         },
         "remoteMessaging": {
-            "state": "internal",
+            "state": "enabled",
             "exceptions": [],
-            "hash": "f1daaefe788583c2a00d7d19a23864a7"
+            "hash": "697382e31649d84b01166f1dc6f790d6"
         },
         "requestFilterer": {
             "state": "disabled",
@@ -8955,6 +9010,9 @@
         },
         "webCompat": {
             "exceptions": [
+                {
+                    "domain": "crocs.com"
+                },
                 {
                     "domain": "marvel.com"
                 },
@@ -9226,7 +9284,7 @@
                     }
                 ]
             },
-            "hash": "62636b478aa50f4bc1e57e6b73fc1e0e"
+            "hash": "a8ea63aef4af72c462736bf28db907b8"
         },
         "webViewBlobDownload": {
             "exceptions": [],