Skip to content

Commit

Permalink
Merge branch 'release/1.69.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bunn
Bunn committed Dec 22, 2023
2 parents 983f6ea + ee29d1a commit 951238b
Show file tree
Hide file tree
Showing 5 changed files with 1,024 additions and 666 deletions.
2 changes: 1 addition & 1 deletion Configuration/BuildNumber.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 95
CURRENT_PROJECT_VERSION = 96
4 changes: 2 additions & 2 deletions DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import BrowserServicesKit
final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"8e38db3f042f4a2a5c9f7ca8d33f17c9\""
public static let embeddedDataSHA = "a9fc8ee927a37d1b5545377ff29de798f3ec3b8a757430c3af72d13a3844c258"
public static let embeddedDataETag = "\"754731c1057e982a1f8af4b2923fb28b\""
public static let embeddedDataSHA = "9d16dce193df62e6f0742733ddd071747065834942dee0461dd3c450cfb9b56a"
}

var embeddedDataEtag: String {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/ContentBlocker/AppTrackerDataSetProvider.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import BrowserServicesKit
final class AppTrackerDataSetProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"b879198dd7dcd9e5f1e5ce0a5d4ba782\""
public static let embeddedDataSHA = "0006b1b27b94f5006ba2576f96dd8c7ab0e66943b5556458ea99002aeb80ac1a"
public static let embeddedDataETag = "\"c9e76dac56186b93f609cc9f1e8c2c0a\""
public static let embeddedDataSHA = "5735d4459ecdec68b70d75a3effb5c1f8f8bc18af2d05c7fd2ecae4e1d530627"
}

var embeddedDataEtag: String {
Expand Down
156 changes: 140 additions & 16 deletions DuckDuckGo/ContentBlocker/macos-config.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"readme": "https://github.com/duckduckgo/privacy-configuration",
"version": 1703003631137,
"version": 1703251114570,
"features": {
"adClickAttribution": {
"readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
Expand Down Expand Up @@ -62,6 +62,9 @@
},
"ampLinks": {
"exceptions": [
{
"domain": "asana.com"
},
{
"domain": "freecodecamp.org"
},
Expand Down Expand Up @@ -110,7 +113,7 @@
]
},
"state": "enabled",
"hash": "5bfae22c5e0cb13c0a25ce80531827ff"
"hash": "369b8aac2cb358e0df3a828c1e3b9a29"
},
"androidBrowserConfig": {
"exceptions": [],
Expand All @@ -125,6 +128,9 @@
{
"domain": "bild.de"
},
{
"domain": "breitbart.com"
},
{
"domain": "derstandard.de"
},
Expand Down Expand Up @@ -267,7 +273,7 @@
]
},
"state": "enabled",
"hash": "a1060783f1bf56f5cc661b994c9c9e56"
"hash": "2c63be0009057e4511dc6f6726251a47"
},
"autofill": {
"exceptions": [
Expand Down Expand Up @@ -955,6 +961,9 @@
{
"domain": "ads.google.com"
},
{
"domain": "soranews24.com"
},
{
"domain": "earth.google.com"
},
Expand All @@ -968,7 +977,7 @@
"domain": "sundancecatalog.com"
}
],
"hash": "71ad0f38f9ce2bbacae5ff7db05511ec"
"hash": "e37447d42ee8194f185e35e40f577f41"
},
"cookie": {
"settings": {
Expand Down Expand Up @@ -1055,15 +1064,15 @@
"rollout": {
"steps": [
{
"percent": 3
"percent": 10
}
]
}
}
},
"exceptions": [],
"minSupportedVersion": "1.68.0",
"hash": "784ab72b62adf8b5c07f656f167a28d2"
"hash": "04f130fe1e3e088c7859ef6aa4a64e5c"
},
"duckPlayer": {
"exceptions": [],
Expand Down Expand Up @@ -1800,6 +1809,18 @@
}
]
},
{
"domain": "beverfood.com",
"rules": [
{
"type": "disable-default"
},
{
"selector": ".adsbygoogle",
"type": "override"
}
]
},
{
"domain": "bild.de",
"rules": [
Expand Down Expand Up @@ -2502,6 +2523,32 @@
{
"selector": ".connatix-player",
"type": "closest-empty"
},
{
"selector": ".ad-container",
"type": "hide"
},
{
"selector": ".bottom-right-sticky-container",
"type": "hide"
},
{
"selector": ".video-container",
"type": "hide"
},
{
"selector": ".top-ad-recirc",
"type": "modify-style",
"values": [
{
"property": "height",
"value": "auto"
},
{
"property": "min-height",
"value": "auto"
}
]
}
]
},
Expand Down Expand Up @@ -2870,11 +2917,14 @@
]
},
{
"domain": "orange.fr",
"domain": "oceanofcompressed.xyz",
"rules": [
{
"selector": ".tag-rm",
"type": "hide-empty"
"type": "disable-default"
},
{
"selector": "#sticky-ads",
"type": "hide"
}
]
},
Expand All @@ -2891,6 +2941,15 @@
}
]
},
{
"domain": "orange.fr",
"rules": [
{
"selector": ".tag-rm",
"type": "hide-empty"
}
]
},
{
"domain": "ouest-france.fr",
"rules": [
Expand Down Expand Up @@ -3201,6 +3260,14 @@
}
]
},
{
"domain": "soranews24.com",
"rules": [
{
"type": "disable-default"
}
]
},
{
"domain": "spanishdict.com",
"rules": [
Expand Down Expand Up @@ -3319,6 +3386,15 @@
}
]
},
{
"domain": "thewindowsclub.com",
"rules": [
{
"selector": ".adtester-container",
"type": "hide"
}
]
},
{
"domain": "thewordfinder.com",
"rules": [
Expand Down Expand Up @@ -3702,7 +3778,7 @@
]
},
"state": "enabled",
"hash": "8551081ffe228a4bef49deba3fe37b19"
"hash": "815cda75f82d989dd56864bc43f76574"
},
"exceptionHandler": {
"exceptions": [
Expand Down Expand Up @@ -4393,6 +4469,11 @@
"state": "disabled",
"hash": "dede7e70939822f5ecb9eb5fae577fa3"
},
"privacyProtectionsPopup": {
"state": "disabled",
"exceptions": [],
"hash": "c292bb627849854515cebbded288ef5a"
},
"referrer": {
"exceptions": [
{
Expand Down Expand Up @@ -4488,9 +4569,23 @@
"hash": "5e792dd491428702bc0104240fbce0ce"
},
"sync": {
"state": "internal",
"features": {
"level0ShowSync": {
"state": "enabled"
},
"level1AllowDataSyncing": {
"state": "enabled"
},
"level2AllowSetupFlows": {
"state": "enabled"
},
"level3AllowCreateAccount": {
"state": "enabled"
}
},
"exceptions": [],
"state": "disabled",
"hash": "728493ef7a1488e4781656d3f9db84aa"
"hash": "4e4382e6a69f7cc99222fd924168e80f"
},
"trackerAllowlist": {
"state": "enabled",
Expand Down Expand Up @@ -4754,6 +4849,12 @@
"wxii12.com",
"wyff4.com"
]
},
{
"rule": "z-na.amazon-adsystem.com/widgets/onejs",
"domains": [
"oceanofcompressed.xyz"
]
}
]
},
Expand Down Expand Up @@ -5008,6 +5109,12 @@
"domains": [
"<all>"
]
},
{
"rule": "cdnjs.cloudflare.com/ajax/libs/fingerprintjs2/",
"domains": [
"<all>"
]
}
]
},
Expand Down Expand Up @@ -6098,7 +6205,13 @@
{
"rule": "api.hubspot.com/livechat-public/v1/message/public",
"domains": [
"pippintitle.com"
"<all>"
]
},
{
"rule": "js.hubspot.com/web-interactives-embed.js",
"domains": [
"<all>"
]
},
{
Expand Down Expand Up @@ -6145,7 +6258,7 @@
{
"rule": "cmp.inmobi.com",
"domains": [
"express.co.uk"
"<all>"
]
}
]
Expand Down Expand Up @@ -6407,6 +6520,16 @@
}
]
},
"media.net": {
"rules": [
{
"rule": "contextual.media.net/dmedianet.js",
"domains": [
"oceanofcompressed.xyz"
]
}
]
},
"mediavine.com": {
"rules": [
{
Expand Down Expand Up @@ -6865,7 +6988,8 @@
{
"rule": "secure.quantserve.com/quant.js",
"domains": [
"aternos.org"
"aternos.org",
"oceanofcompressed.xyz"
]
}
]
Expand Down Expand Up @@ -7550,7 +7674,7 @@
"domain": "sundancecatalog.com"
}
],
"hash": "b6996e16fe1785f6d75cd6302da1f48e"
"hash": "aef10e6a36c19d0d87312466ee852936"
},
"trackingCookies1p": {
"settings": {
Expand Down
Loading

0 comments on commit 951238b

Please sign in to comment.