Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add queryprune filters to deal with SSAI #8131

Merged
merged 5 commits into from Nov 1, 2020
Merged

Add queryprune filters to deal with SSAI #8131

merged 5 commits into from Nov 1, 2020

Conversation

liamengland1
Copy link
Contributor

uBlockOrigin/uBlock-issues#760
#1905 (comment)

Some or all of the below content may be geolocked to North America and/or only accessible with a TV provider login.

Test URLs for ABC-owned TV stations:

https://abc7ny.com/7542126/
https://abc7.com/7545037/
https://abc7chicago.com/7508388/
https://6abc.com/7459982/
https://abc7news.com/7522726/
https://abc13.com/7549511/
https://abc11.com/7543719/
https://abc30.com/7529590/

Test URLs for Discovery sites:

https://www.ahctv.com/tv-shows/hunting-nazi-treasure/full-episodes/nazi-gold
https://www.animalplanet.com/tv-shows/mega-zoo/full-episodes/malus-way-or-the-highway
https://watch.cookingchanneltv.com/tv-shows/good-eats-reloaded/full-episodes/a-chuck-for-chuck-the-reload
https://www.destinationamerica.com/tv-shows/railroad-alaska/full-episodes/ice-hell
https://go.discovery.com/tv-shows/homestead-rescue-raney-ranch/full-episodes/raney-days-are-a-comin
https://www.discoverylife.com/tv-shows/life-or-death/full-episodes/brain-attack
https://watch.diynetwork.com/tv-shows/restored/full-episodes/1910-arts-and-crafts-family-farmhouse
https://watch.foodnetwork.com/tv-shows/halloween-wars/full-episodes/monster-road-trip
https://watch.hgtv.com/tv-shows/fixer-to-fabulous/full-episodes/dave-jennys-pick-dreary-home-gets-bright-update
https://www.investigationdiscovery.com/tv-shows/killer-carnies/full-episodes/the-sideshow-murders
https://watch.motortrend.com/tv-shows/restoration-garage/videos/all-seven-colors
https://www.sciencechannel.com/tv-shows/unearthed/full-episodes/secrets-of-the-seven-wonders
https://www.tlc.com/tv-shows/little-people-big-world/full-episodes/farmhouse-farewell
https://watch.travelchannel.com/tv-shows/this-is-halloween/full-episodes/this-is-halloween

Test URLs for NBC:

https://www.nbc.com/manifest/video/icing-conditions/4143892
https://www.nbc.com/this-is-us/video/william-and-jack-cross-paths-in-hospital-chapel-this-is-us/4256160
https://www.nbc.com/syfy-movies/video/a-nightmare-on-elm-street-2-freddys-revenge/3049082
https://www.nbc.com/saturday-night-live/video/john-mulaney-standup-monologue/4258765
http://video.nbc.com/jerseylicious/video/jersey-girl-brawl/3551922

@liamengland1 liamengland1 marked this pull request as draft November 1, 2020 22:05
@liamengland1
Copy link
Contributor Author

liamengland1 commented Nov 1, 2020

NBC filter breaks videos that require an auth token, removing for now until better solution can be found/implemented.

image

@liamengland1 liamengland1 marked this pull request as ready for review November 1, 2020 22:17
@okiehsch okiehsch merged commit 3df9d3d into uBlockOrigin:master Nov 1, 2020
@okiehsch
Copy link
Contributor

okiehsch commented Nov 1, 2020

Thx.

||content.uplynk.com/api/*&ad=$xhr,queryprune=|ad,domain=abc7ny.com|abc7.com|abc7chicago.com|6abc.com|abc7news.com|abc13.com|abc11.com|abc30.com

! SSAI Video ads on Discovery TV sites https://github.com/uBlockOrigin/uBlock-issues/issues/760#issuecomment-715926907
||api.discovery.com/v1/streaming/video/*&adNetworkId=$xhr,queryprune=|ad,domain=ahctv.com|animalplanet.com|cookingchanneltv.com|destinationamerica.com|discovery.com|discoverylife.com|diynetwork.com|foodnetwork.com|hgtv.com|investigationdiscovery.com|motortrend.com|sciencechannel.com|tlc.com|travelchannel.com
Copy link

@majonezzz majonezzz Nov 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@llacb47, in this commit @AdamWr has replaced a proposed solution:
@@||geolocation.onetrust.com/cookieconsentpub/v1/geo/location$script,domain=tvn24.pl to
@@||geolocation.onetrust.com/cookieconsentpub/*/geo/location$domain=tvn24.pl

notice: v1 ==> *, the same has not happened in the case of the current commit:
||api.discovery.com/v1/streaming/video/ is still v1

Now I wonder whether v1 or * is the proper / safer / better solution.
Do you guys have just a different filters approach?
It would be nice to see a confrontation between both of you.
However anybody else can take a voice as well.
Also @krystian3w

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants