Skip to content

Commit

Permalink
Merge pull request #2244 from raszpl/master
Browse files Browse the repository at this point in the history 
Blocklist overhaul
  • Loading branch information
@ImprovedTube
ImprovedTube authored May 5, 2024
2 parents 1cf7905 + 6bf2c09 commit 2c1ff0e
Show file tree
Hide file tree
Showing 6 changed files with 343 additions and 217 deletions.
52 changes: 28 additions & 24 deletions js&css/extension/init.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,33 +183,37 @@ document.addEventListener('it-message-from-youtube', function () {
});
}
} else if (message.action === 'blocklist') {
var type = message.type,
id = message.id,
title = message.title;

if (!extension.storage.data.blocklist || typeof extension.storage.data.blocklist !== 'object') {
extension.storage.data.blocklist = {};
}

if (type === 'channel') {
if (!extension.storage.data.blocklist.channels) {
extension.storage.data.blocklist.channels = {};
}

extension.storage.data.blocklist.channels[id] = {
title: title,
preview: message.preview
};
}

if (type === 'video') {
if (!extension.storage.data.blocklist.videos) {
extension.storage.data.blocklist.videos = {};
}

extension.storage.data.blocklist.videos[id] = {
title: title
};
switch(message.type) {
case 'channel':
if (!extension.storage.data.blocklist.channels) {
extension.storage.data.blocklist.channels = {};
}
if (message.added) {
extension.storage.data.blocklist.channels[message.id] = {
title: message.title,
preview: message.preview
}
} else {
delete extension.storage.data.blocklist.channels[message.id];
}
break

case 'video':
if (!extension.storage.data.blocklist.videos) {
extension.storage.data.blocklist.videos = {};
}
if (message.added) {
extension.storage.data.blocklist.videos[message.id] = {
title: message.title
}
} else {
delete extension.storage.data.blocklist.videos[message.id];
}
break
}

chrome.storage.local.set({
Expand Down Expand Up @@ -241,4 +245,4 @@ document.addEventListener('it-play', function (event) {
var videos = document.querySelectorAll('video');
try {chrome.runtime.sendMessage({action: 'play'})}
catch(error){console.log(error); setTimeout(function () { try { chrome.runtime.sendMessage({action: 'play'}, function (response) { console.log(response) } ); } catch { } }, 321) }
});
});
92 changes: 59 additions & 33 deletions js&css/extension/www.youtube.com/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* fix for youtube's player moving in from the right side */
html {overflow-x: hidden !important}
/* html {overflow-x: hidden !important}
/* Fix to tame Youtube's page-load / make it more calm - the player wont annoyingly slide in from the right anymore */
/* Fix to tame Youtube's page-load / make it more calm - the player wont annoyingly slide in from the right anymore */
/* previously also: html[it-transcript='true'] {overflow-x: hidden !important}*/
@-moz-document url-prefix() {overflow-x: visible !important} /* REMOVE ME SOON https://github.com/code-charity/youtube/issues/1649 */

Expand All @@ -11,7 +11,7 @@ html {overflow-x: hidden !important}
html[it-pathname*="/shorts/"] #content.style-scope ytd-engagement-panel-title-header-renderer {
max-width: 42vw !important;
}
/* or maybe something like : html[it-pathname*="/shorts/"] #header.style-scope ytd-engagement-panel-title-header-renderer "visibility-button" */
/* or maybe something like : html[it-pathname*="/shorts/"] #header.style-scope ytd-engagement-panel-title-header-renderer "visibility-button" */
}

/*------------------------------------------------------------------------------
Expand Down Expand Up @@ -57,27 +57,27 @@ html[it-ads=subscribed_channels] #related #player-ads,
html[it-ads=subscribed_channels] #masthead-ad,
html[it-ads=subscribed_channels] *[target-id*='engagement-panel-ads'],
html[it-ads=subscribed_channels] .ytd-ad-slot-renderer,
html[it-ads=subscribed_channels] yt-mealbar-promo-renderer,
html[it-ads=subscribed_channels] #player .ytp-ad-image-overlay,
html[it-ads=subscribed_channels] yt-mealbar-promo-renderer,
html[it-ads=subscribed_channels] #player .ytp-ad-image-overlay,
html[it-ads=subscribed_channels] #player .video-ads .ytp-ad-player-overlay-flyout-cta,
html[it-ads=subscribed_channels] #player .ytp-ad-module .ytp-ad-player-overlay-flyout-cta,
html[it-ads=block_all] #related #player-ads,
html[it-ads=block_all] #masthead-ad,
html[it-ads=block_all] *[target-id*='engagement-panel-ads'],
html[it-ads=block_all] .ytd-ad-slot-renderer,
html[it-ads=block_all] .ytd-ad-slot-renderer,
html[it-ads=block_all] yt-mealbar-promo-renderer,
html[it-ads=block_all] #player .ytp-ad-image-overlay,
html[it-ads=block_all] #player .video-ads .ytp-ad-player-overlay-flyout-cta,
html[it-ads=block_all] #player .video-ads .ytp-ad-player-overlay-flyout-cta,
html[it-ads=block_all] #player .ytp-ad-module .ytp-ad-player-overlay-flyout-cta{
display: none !important;
}

/*
html[it-ads=subscribed_channels] #player .video-ads,
html[it-ads=subscribed_channels] #player .ytp-ad-module,
html[it-ads=block_all] #player .video-ads,
html[it-ads=subscribed_channels] #player .video-ads,
html[it-ads=subscribed_channels] #player .ytp-ad-module,
html[it-ads=block_all] #player .video-ads,
html[it-ads=block_all] #player .ytp-ad-module {
opacity: 0.0001 !important;
opacity: 0.0001 !important;
}
html[it-ads=subscribed_channels] #player .ytp-ad-preview-image,
Expand Down Expand Up @@ -194,20 +194,20 @@ html[it-mini-player-cursor='nw-resize']::after {


/*------------------------------------------------------------------------------
#
#
------------------------------------------------------------------------------*/
html[data-page-type='video'][it-player-fit-to-win-button='true'] .ytp-right-controls {
html[it-player-fit-to-win-button=true][data-page-type=video] .ytp-right-controls {
display: flex;
}

html[data-page-type='video'][it-player-fit-to-win-button='true'] #it-fit-to-win-player-button {
html[it-player-fit-to-win-button=true][data-page-type=video] #it-fit-to-win-player-button {
order: 1;
}
html[data-page-type='video'][it-player-fit-to-win-button='true'] .ytp-fullscreen-button {
html[it-player-fit-to-win-button=true][data-page-type=video] .ytp-fullscreen-button {
order: 2;
}

html[data-page-type='video'][it-player-fit-to-win-button='true'] #ftw-icon path {
html[it-player-fit-to-win-button=true][data-page-type=video] #ftw-icon path {
fill: none;
}
.it-player-button {
Expand Down Expand Up @@ -454,7 +454,7 @@ ytd-guide-section-renderer .it-button::after {


/*------------------------------------------------------------------------------
9.0 BLACKLIST
9.0 BLOCKLIST
------------------------------------------------------------------------------*/
.it-add-to-blocklist {
position: absolute;
Expand All @@ -479,7 +479,7 @@ ytd-guide-section-renderer .it-button::after {
align-items: center;
content: 'Blocklist';
text-transform: uppercase;
color: white; /*quick-fix for: var(--yt-spec-icon-active-other, #fff);*/
color: white; /*quick-fix for: var(--yt-spec-icon-active-other, #fff);*/
position: absolute;
left: 100%;
top: 0;
Expand Down Expand Up @@ -530,35 +530,61 @@ ytd-guide-section-renderer .it-button::after {
*:hover>.it-add-to-blocklist {
visibility: visible;
}
.it-blocklisted-video {

.it-blocklisted-video .it-add-to-blocklist svg,
.it-blocklisted-channel .it-add-to-blocklist svg {
fill: green;
}

.it-blocklisted-video .it-add-to-blocklist::after,
.it-blocklisted-channel .it-add-to-blocklist::after {
color: green;
}

.it-blocklisted-video .it-add-to-blocklist::after {
content: "Unblock Video";
}

.it-blocklisted-channel .it-add-to-blocklist::after {
content: "Unblock Channel"!important;
}

.it-blocklisted-video,
.it-blocklisted-channel {
opacity: .15;
max-height: 19px;
max-height: 4rem;
overflow: hidden;
margin-top: -5px !important;
transition: max-height 0.4s ease 0.1s;
}
.it-blocklisted-video ytd-thumbnail {

ytd-grid-video-renderer .it-blocklisted-video,
ytd-grid-video-renderer .it-blocklisted-channel,
ytd-rich-grid-media .it-blocklisted-video,
ytd-rich-grid-media .it-blocklisted-channel {
overflow: visible;
}

.it-blocklisted-video ytd-thumbnail,
.it-blocklisted-channel ytd-thumbnail {
visibility: hidden;
max-width: 0;
transition: max-width 0.4s ease 0.1s;
}
.it-blocklisted-video:hover {

.it-blocklisted-video:hover,
.it-blocklisted-channel:hover {
opacity: 1;
overflow: visible;
max-height: 120px;
transition: max-height 0.4s ease 1.1s;
}
.it-blocklisted-video:hover ytd-thumbnail {

.it-blocklisted-video:hover ytd-thumbnail,
.it-blocklisted-channel:hover ytd-thumbnail {
visibility: visible;
max-width: 220px;
transition: max-width 0.4s ease 1.1s;
margin-top: -7px !important;
margin-bottom: 4px !important;
margin-left: 5px !important;
}
/* .it-blocklisted-video #metadata-line {display:none !important}
.it-blocklisted-video div {display: inline-block !important} */

/*------------NEW---------------*/

.improvedtube-sidebar-a {
Expand Down Expand Up @@ -633,7 +659,7 @@ ytd-guide-section-renderer .it-button::after {
3.0 THEMES
------------------------------------------------------------------------------*/
/*update: cinematics */
html[it-theme=black] #cinematics,
html[it-theme=black] #cinematics,
html[it-theme=desert] #cinematics {
display:none !important
}
Expand Down Expand Up @@ -889,7 +915,7 @@ html[it-theme=black][data-system-color-scheme=light][it-schedule=system_peferenc
}

/*DAWN*/

html[it-theme=dawn] [dark],
html[it-theme=dawn]:not([it-schedule=system_peference_dark]):not([it-schedule=system_peference_light]),
html[it-theme=dawn][data-system-color-scheme=dark][it-schedule=system_peference_dark],
Expand Down Expand Up @@ -1124,7 +1150,7 @@ html[it-theme=dawn][data-system-color-scheme=light][it-schedule=system_peference
--yt-lightsource-secondary-title-color: var(--yt-spec-text-secondary) !important;
}

/*DESERT*/
/*DESERT*/

html[it-theme=desert]:not([it-schedule=system_peference_dark]):not([it-schedule=system_peference_light]),
html[it-theme=desert][data-system-color-scheme=dark][it-schedule=system_peference_dark],
Expand Down Expand Up @@ -1808,7 +1834,7 @@ html[it-theme=plain][data-system-color-scheme=light][it-schedule=system_peferenc


/*SUNSET*/

html[it-theme=sunset] [dark],
html[it-theme=sunset]:not([it-schedule=system_peference_dark]):not([it-schedule=system_peference_light]),
html[it-theme=sunset][data-system-color-scheme=dark][it-schedule=system_peference_dark],
Expand Down
10 changes: 5 additions & 5 deletions js&css/web-accessible/core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ var ImprovedTube = {
comments: {},
collapse_of_subscription_sections: [],
mark_watched_videos: [],
blocklist_buttons: []
blocklist_buttons: [],
observerList: []
},
regex: {
channel: /\/(@|c\/@?|channel\/|user\/)(?<name>[^/]+)/,
Expand Down Expand Up @@ -173,6 +174,9 @@ document.addEventListener('it-message-from-extension', function () {
}

ImprovedTube.init();
// need to run blocklist once just after page load to catch initial nodes
ImprovedTube.blocklist();

// REACTION OR VISUAL FEEDBACK WHEN THE USER CHANGES A SETTING (already automated for our CSS features):
} else if (message.action === 'storage-changed') {
var camelized_key = message.camelizedKey;
Expand Down Expand Up @@ -354,10 +358,6 @@ document.addEventListener('it-message-from-extension', function () {
ImprovedTube.playerRemainingDuration();
}
break

case 'blocklistActivate':
if (ImprovedTube.storage.blocklist_activate === true) {document.querySelectorAll('.it-add-to-blocklist').forEach(e => e.remove());}
break
}

if (ImprovedTube[camelized_key]) {
Expand Down
13 changes: 6 additions & 7 deletions js&css/web-accessible/functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@ ImprovedTube.ytElementsHandler = function (node) {
if (node.href) {
this.channelDefaultTab(node);

if (node.className.indexOf('ytd-thumbnail') !== -1) {
this.blocklist('video', node);
}
if (node.href.match(/@|((channel|user|c)\/)([^/]+)/)) {
this.blocklist('channel', node);
if (this.storage.blocklist_activate && node.classList.contains('ytd-thumbnail')) {
this.blocklist('video', node);
}
}
} /* else if (name === 'META') { //<META> infos are not updated when clicking related videos...
Expand Down Expand Up @@ -139,8 +136,8 @@ ImprovedTube.ytElementsHandler = function (node) {
// }
else if (name === 'YTD-PLAYLIST-HEADER-RENDERER' || (name === 'YTD-MENU-RENDERER' && node.classList.contains('ytd-playlist-panel-renderer'))) {
this.playlistPopupUpdate();
} else if (name === 'YTD-SUBSCRIBE-BUTTON-RENDERER') {
if (node.className.indexOf('ytd-c4-tabbed-header-renderer') !== -1) {
} else if (name === 'YTD-SUBSCRIBE-BUTTON-RENDERER' || name === 'YT-SUBSCRIBE-BUTTON-VIEW-MODEL') {
if (this.storage.blocklist_activate) {
ImprovedTube.blocklist('channel', node);
}

Expand Down Expand Up @@ -458,6 +455,7 @@ ImprovedTube.onkeydown = function () {
};

ImprovedTube.onmousedown = function (event) {

window.addEventListener('mousedown', function (event) {
if (ImprovedTube.elements.player && ImprovedTube.elements.player.classList.contains('ad-showing') === false) {
var path = event.composedPath();
Expand All @@ -470,6 +468,7 @@ ImprovedTube.onmousedown = function (event) {
ImprovedTube.user_interacted = true;
}
}

}
}, true);
};
Expand Down
Loading

0 comments on commit 2c1ff0e

Please sign in to comment.