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
@ayoy
ayoy committed Dec 15, 2023
2 parents db4a58d + 544e514 commit f7d5b9c
Show file tree
Hide file tree
Showing 4 changed files with 167 additions and 13 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 = 93
CURRENT_PROJECT_VERSION = 95
2 changes: 1 addition & 1 deletion Configuration/Version.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 1.68.0
MARKETING_VERSION = 1.69.0
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 = "\"119cd38f776d198d0ecd736015643c24\""
public static let embeddedDataSHA = "cc7c0549233b74a5afa469a358baecc9f56693d3684186ad6856fc4890c5cf96"
public static let embeddedDataETag = "\"ca66d409eb00e5c19f3a0abae449dd1a\""
public static let embeddedDataSHA = "42f9d3064372bc85ac8ee37afe883ed4741d6a3cfcb9ce927c2f732c3f694140"
}

var embeddedDataEtag: String {
Expand Down
172 changes: 163 additions & 9 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": 1702415315898,
"version": 1702579565498,
"features": {
"adClickAttribution": {
"readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
Expand Down Expand Up @@ -1038,25 +1038,25 @@
"hash": "d757f6509e9a9a20140c755ed0f21ea2"
},
"dbp": {
"state": "disabled",
"state": "enabled",
"features": {
"waitlistBetaActive": {
"state": "disabled"
"state": "enabled"
},
"waitlist": {
"state": "disabled",
"state": "enabled",
"rollout": {
"steps": [
{
"percent": 1
"percent": 3
}
]
}
}
},
"exceptions": [],
"minSupportedVersion": "1.66.0",
"hash": "325d5463fd2f2b6c8b9ad9288ae6ceed"
"minSupportedVersion": "1.68.0",
"hash": "784ab72b62adf8b5c07f656f167a28d2"
},
"duckPlayer": {
"exceptions": [],
Expand Down Expand Up @@ -1216,6 +1216,10 @@
"selector": ".ad-unit",
"type": "hide-empty"
},
{
"selector": ".ad-unit-wrapper",
"type": "hide-empty"
},
{
"selector": ".column-ad",
"type": "hide-empty"
Expand Down Expand Up @@ -1304,6 +1308,10 @@
"selector": ".ad-banner-container",
"type": "hide-empty"
},
{
"selector": "#banner_ad",
"type": "hide-empty"
},
{
"selector": "[class*='bannerAd']",
"type": "hide-empty"
Expand Down Expand Up @@ -1392,6 +1400,10 @@
"selector": "[id*='advert-']",
"type": "hide-empty"
},
{
"selector": "[aria-label='advertisement']",
"type": "hide-empty"
},
{
"selector": ".ads__inline",
"type": "closest-empty"
Expand Down Expand Up @@ -1640,6 +1652,19 @@
"upgrade to flickr pro to hide these ads"
],
"domains": [
{
"domain": "10minutemail.com",
"rules": [
{
"selector": "#secondary_ads",
"type": "hide-empty"
},
{
"selector": "#vi-smartbanner",
"type": "hide"
}
]
},
{
"domain": "3bmeteo.com",
"rules": [
Expand All @@ -1656,6 +1681,27 @@
}
]
},
{
"domain": "9gag.com",
"rules": [
{
"selector": ".billboard",
"type": "hide-empty"
},
{
"selector": ".inline-ad-container",
"type": "hide-empty"
},
{
"selector": ".salt-section",
"type": "hide-empty"
},
{
"selector": "#top-adhesion",
"type": "hide-empty"
}
]
},
{
"domain": "abc.es",
"rules": [
Expand Down Expand Up @@ -1825,6 +1871,19 @@
}
]
},
{
"domain": "businessinsider.com",
"rules": [
{
"selector": ".in-post-sticky",
"type": "hide-empty"
},
{
"selector": ".subnav-ad-layout",
"type": "hide-empty"
}
]
},
{
"domain": "carandclassic.com",
"rules": [
Expand Down Expand Up @@ -1964,6 +2023,23 @@
}
]
},
{
"domain": "drugs.com",
"rules": [
{
"selector": ".topbanner-wrap",
"type": "hide"
},
{
"selector": ".display-ad-wrapper",
"type": "hide-empty"
},
{
"selector": "[id*='ddc-sidebox-ad-stacked-wrap']",
"type": "hide-empty"
}
]
},
{
"domain": "ebay.com",
"rules": [
Expand Down Expand Up @@ -2210,6 +2286,35 @@
}
]
},
{
"domain": "gbnews.com",
"rules": [
{
"selector": ".video-inbody",
"type": "hide-empty"
},
{
"selector": ".ad--billboard",
"type": "hide"
},
{
"selector": ".ad--placeholder",
"type": "hide"
},
{
"selector": ".stiky_sky",
"type": "hide"
},
{
"selector": "[position='sticky_banner']",
"type": "hide"
},
{
"selector": ".ad-inbody",
"type": "hide"
}
]
},
{
"domain": "getpocket.com",
"rules": [
Expand Down Expand Up @@ -2426,6 +2531,10 @@
{
"selector": ".in-post-sticky",
"type": "hide-empty"
},
{
"selector": ".subnav-ad-layout",
"type": "hide-empty"
}
]
},
Expand Down Expand Up @@ -2780,6 +2889,35 @@
}
]
},
{
"domain": "pcgamesn.com",
"rules": [
{
"selector": ".static_mpu_wrap",
"type": "hide-empty"
},
{
"selector": "#nn_astro_wrapper",
"type": "hide-empty"
},
{
"selector": ".ad-nextpage",
"type": "hide"
},
{
"selector": ".legion_primiswrapper",
"type": "hide-empty"
},
{
"selector": ".nn_mobile_mpu_wrapper",
"type": "hide-empty"
},
{
"selector": ".nn-sticky",
"type": "hide-empty"
}
]
},
{
"domain": "petapixel.com",
"rules": [
Expand Down Expand Up @@ -3419,6 +3557,10 @@
{
"selector": "[data-content='Advertisement']",
"type": "hide-empty"
},
{
"selector": "#YDC-Lead-Stack",
"type": "hide-empty"
}
]
},
Expand Down Expand Up @@ -3536,7 +3678,7 @@
]
},
"state": "enabled",
"hash": "b82b3912ad9e3fea5b8754fdec02bc86"
"hash": "c34713afaf78e090b587a923f132ed56"
},
"exceptionHandler": {
"exceptions": [
Expand Down Expand Up @@ -4614,6 +4756,16 @@
}
]
},
"appboycdn.com": {
"rules": [
{
"rule": "js.appboycdn.com/web-sdk/3.1/appboy.min.js",
"domains": [
"edx.org"
]
}
]
},
"aticdn.net": {
"rules": [
{
Expand Down Expand Up @@ -5491,6 +5643,7 @@
"domains": [
"doterra.com",
"easyjet.com",
"edx.org",
"worlddutyfree.com"
]
},
Expand Down Expand Up @@ -5615,6 +5768,7 @@
{
"rule": "pagead2.googlesyndication.com/pagead/js/adsbygoogle.js",
"domains": [
"air-journal.fr",
"arcadepunks.com",
"daotranslate.com",
"drakescans.com",
Expand Down Expand Up @@ -7355,7 +7509,7 @@
"domain": "sundancecatalog.com"
}
],
"hash": "6d895ce49e17ece65475082c7e376325"
"hash": "5cecb6d28193f468b28b9afdaca04da1"
},
"trackingCookies1p": {
"settings": {
Expand Down

0 comments on commit f7d5b9c

Please sign in to comment.