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.

Sign up for GitHub

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 adblock support #68

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add adblock support #68

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c09edd
add adblock support
Aug 9, 2019
0b90a1e
add adblock support
Aug 9, 2019
1bbf777
Merge pull request #1 from steve228uk/master
bro0k Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions YT Music/Controllers/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import WebKit
import MediaKeyTap

class ViewController: NSViewController {

var webView: CustomWebView!
var userContentController: WKUserContentController!
var movableView: WindowMovableView!
Expand All @@ -34,13 +34,32 @@ class ViewController: NSViewController {
addObservers()
}

// implementation reference https://github.com/ShingoFukuyama/AdsBlock_WKWebView_for_iOS11
// abp list to block content list https://github.com/adblockplus/abp2blocklist
// youtube abp rules https://github.com/kbinani/adblock-youtube-ads/
private func loadAdBlockRuleList() {
if let jsonFilePath = Bundle.main.path(forResource: "adblock.json", ofType: nil),
let jsonFileContent = try? String(contentsOfFile: jsonFilePath, encoding: String.Encoding.utf8) {
WKContentRuleListStore.default().compileContentRuleList(forIdentifier: "adblock rules", encodedContentRuleList: jsonFileContent) { (contentRuleList, error) in
if error != nil {
return
}
if let list = contentRuleList {
self.userContentController.add(list)
}
}
}
}

override func loadView() {
let webConfiguration = WKWebViewConfiguration()

userContentController = WKUserContentController()
// load adblock rule list
loadAdBlockRuleList()
userContentController.add(MediaCenter.default, name: "observer")
webConfiguration.userContentController = userContentController

webConfiguration.userContentController = userContentController

webView = CustomWebView(frame: .zero, configuration: webConfiguration)
webView.wantsLayer = true
Expand All @@ -60,7 +79,7 @@ class ViewController: NSViewController {
override func viewDidLayout() {

super.viewDidLayout()

var y = webView.isFlipped ? 22 : webView.frame.height - 39

if let btn = view.window?.standardWindowButton(.closeButton) {
Expand All @@ -80,7 +99,7 @@ class ViewController: NSViewController {
btn.setFrameOrigin(NSPoint(x: 57, y: y))
view.addSubview(btn)
}


movableView.frame = CGRect(x: 0, y: webView.isFlipped ? 0 : webView.frame.height - 20, width: webView.frame.width, height: 20)

Expand All @@ -106,7 +125,7 @@ class ViewController: NSViewController {
self.forwardButton.isEnabled = webView.canGoForward
self.forwardButton.image = webView.canGoForward ? #imageLiteral(resourceName: "Forward Arrow Active") : #imageLiteral(resourceName: "Forward Arrow Inactive")
}

}

func addNavigationButtons() {
Expand Down Expand Up @@ -145,7 +164,7 @@ class ViewController: NSViewController {
@objc func forwardButtonClicked(_ sender: NSButton) {
webView.goForward()
}

func addMovableView() {
movableView = WindowMovableView(frame: .zero)
movableView.frame = CGRect(x: 0, y: 0, width: webView.frame.width, height: 20)
Expand Down Expand Up @@ -176,8 +195,8 @@ extension ViewController: WKNavigationDelegate, WKUIDelegate {

func injectCustomCSS() {
guard let cssURL = Bundle.main.url(forResource: "custom", withExtension: "css"),
let css = try? String(contentsOf: cssURL) else {
return
let css = try? String(contentsOf: cssURL) else {
return
}

var js = "var style = document.createElement('style'); style.innerHTML = '\(css)'; document.head.appendChild(style);"
Expand All @@ -196,8 +215,8 @@ extension ViewController: WKNavigationDelegate, WKUIDelegate {
/// These are used to detect when a track is playing etc.
func injectObservers() {
guard let jsURL = Bundle.main.url(forResource: "observer", withExtension: "js"),
let js = try? String(contentsOf: jsURL) else {
return
let js = try? String(contentsOf: jsURL) else {
return
}

webView.evaluateJavaScript(js) { (_, error) in
Expand All @@ -206,5 +225,5 @@ extension ViewController: WKNavigationDelegate, WKUIDelegate {
}
}
}

}
250 changes: 250 additions & 0 deletions YT Music/Supporting Files/adblock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
[
{
"trigger": {
"url-filter": "^https?://",
"url-filter-is-case-sensitive": true
},
"action": {
"type": "css-display-none",
"selector": ".ad-container, .video-ads, .ytp-ad-progress-list"
}
},
{
"trigger": {
"url-filter": "^https?://([^/:]*\\.)?youtube\\.com[/:]",
"url-filter-is-case-sensitive": true
},
"action": {
"type": "css-display-none",
"selector": "[id=masthead-ad]"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?.*=adunit&",
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw"
]
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?doubleclick\\.net([^-_.%a-z0-9].*)?$",
"url-filter-is-case-sensitive": true,
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
],
"unless-top-url": [
"^[^:]+:(//)?([^/]+\\.)?doubleclick\\.net([^-_.%a-z0-9].*)?$"
],
"top-url-filter-is-case-sensitive": true
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?flashtalking\\.com",
"url-filter-is-case-sensitive": true,
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
]
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?googleadservices\\.com",
"url-filter-is-case-sensitive": true,
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
],
"unless-top-url": [
"^[^:]+:(//)?([^/]+\\.)?googleadservices\\.com"
],
"top-url-filter-is-case-sensitive": true
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?googlesyndication\\.com([^-_.%a-z0-9].*)?$",
"url-filter-is-case-sensitive": true,
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
],
"unless-top-url": [
"^[^:]+:(//)?([^/]+\\.)?googlesyndication\\.com([^-_.%a-z0-9].*)?$"
],
"top-url-filter-is-case-sensitive": true
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?s0\\.2mdn\\.net/ads",
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
],
"unless-top-url": [
"^[^:]+:(//)?([^/]+\\.)?s0\\.2mdn\\.net/ads"
]
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?www\\.google\\..*/pagead",
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
]
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^https?://([^/]+\\.)?www\\.youtube\\.com/\\[\\[computeemptygif_\\(\\)\\]\\]",
"resource-type": [
"image"
]
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?www\\.youtube\\.com/\\[\\[computethumbnailurl_\\(data\\.thumbnail\\)\\]\\]",
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
],
"unless-top-url": [
"^[^:]+:(//)?([^/]+\\.)?www\\.youtube\\.com/\\[\\[computethumbnailurl_\\(data\\.thumbnail\\)\\]\\]"
]
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?www\\.youtube\\.com/api/stats",
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
],
"unless-top-url": [
"^[^:]+:(//)?([^/]+\\.)?www\\.youtube\\.com/api/stats"
]
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?www\\.youtube\\.com/pagead",
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
],
"unless-top-url": [
"^[^:]+:(//)?([^/]+\\.)?www\\.youtube\\.com/pagead"
]
},
"action": {
"type": "block"
}
},
{
"trigger": {
"url-filter": "^[^:]+:(//)?([^/]+\\.)?www\\.youtube\\.com/ptracking",
"resource-type": [
"image",
"style-sheet",
"script",
"font",
"media",
"raw",
"document"
],
"unless-top-url": [
"^[^:]+:(//)?([^/]+\\.)?www\\.youtube\\.com/ptracking"
]
},
"action": {
"type": "block"
}
}
]