Skip to content

use proper messaging - Needs Safari tester #2463

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

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

use proper messaging - Needs Safari tester #2463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e6bcba
Update core.js use proper messaging
raszpl Jun 11, 2024
648b259
Update core.js message instead of dom
raszpl Jun 11, 2024
be200dc
Update init.js proper messages instead of a hack
raszpl Jun 11, 2024
87fadab
Update init.js unneded
raszpl Jun 12, 2024
144b833
Update core.js message passing
raszpl Jun 12, 2024
c0a2b9d
Update core.js ff fix
raszpl Jun 12, 2024
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
44 changes: 3 additions & 41 deletions js&css/extension/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,55 +186,17 @@ extension.inject = function (paths, callback) {
website.
--------------------------------------------------------------*/

/*--------------------------------------------------------------
# CREATE ELEMENT
--------------------------------------------------------------*/

extension.messages.create = function () {
this.element = document.createElement('div');

this.element.id = 'it-messages-from-extension';

this.element.style.display = 'none';

document.documentElement.appendChild(this.element);
};

/*--------------------------------------------------------------
# LISTENER
--------------------------------------------------------------*/

extension.messages.listener = function () {
document.addEventListener('it-message-from-extension--readed', function () {
extension.messages.queue.pop();

if (extension.messages.queue.length > 0) {
extension.messages.element.textContent = message;

document.dispatchEvent(new CustomEvent('it-message-from-extension'));
}
});
};

/*--------------------------------------------------------------
# SEND
--------------------------------------------------------------*/

extension.messages.send = function (message) {
if (typeof message === 'object') {
message = JSON.stringify(message);
}

this.queue.push(message);

if (this.queue.length === 1) {
this.element.textContent = message;

document.dispatchEvent(new CustomEvent('it-message-from-extension'));
if (typeof cloneInto == 'function') {
Copy link

Choose a reason for hiding this comment

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

Where is cloneInto defined?

message = cloneInto(message, window);
}
document.dispatchEvent(new CustomEvent('it-message-from-extension', {'detail': message}));
};


/*--------------------------------------------------------------
# STORAGE
--------------------------------------------------------------*/
Expand Down
205 changes: 92 additions & 113 deletions js&css/extension/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ window.addEventListener('yt-navigate-finish', function () {
extension.features.thumbnailsQuality();
});

extension.messages.create();
extension.messages.listener();

extension.events.on('init', function (resolve) {
extension.storage.listener();
extension.storage.load(function () {
Expand Down Expand Up @@ -115,132 +112,114 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
}
});

document.addEventListener('it-message-from-youtube', function () {
var provider = document.querySelector('#it-messages-from-youtube');
document.addEventListener('it-message-from-youtube', function (message) {
message = message.detail;
Copy link

Choose a reason for hiding this comment

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

Suggested change
message = message.detail;
const detail = message.detail;


if (provider) {
var message = provider.textContent;
if (message.requestOptionsUrl === true) {
extension.messages.send({
responseOptionsUrl: chrome.runtime.getURL('menu/index.html')
});
} else if (message.onlyOnePlayer === true) {
chrome.runtime.sendMessage({
name: 'only-one-player'
});
} else if (message.action === 'fixPopup') {
chrome.runtime.sendMessage({
action: 'fixPopup',
width: message.width,
height: message.height,
title: message.title,
});
} else if (message.action === 'analyzer') {
if (extension.storage.data.analyzer_activation === true) {
var data = message.name,
date = new Date().toDateString(),
hours = new Date().getHours() + ':00';

if (!extension.storage.data.analyzer) {
extension.storage.data.analyzer = {};
}

document.dispatchEvent(new CustomEvent('it-message-from-youtube--readed'));
if (!extension.storage.data.analyzer[date]) {
extension.storage.data.analyzer[date] = {};
}

try {
message = JSON.parse(message);
} catch (error) {
console.log(error);
}
if (!extension.storage.data.analyzer[date][hours]) {
extension.storage.data.analyzer[date][hours] = {};
}

//console.log(message);
if (!extension.storage.data.analyzer[date][hours][data]) {
extension.storage.data.analyzer[date][hours][data] = 0;
}

if (message.requestOptionsUrl === true) {
extension.messages.send({
responseOptionsUrl: chrome.runtime.getURL('menu/index.html')
});
} else if (message.onlyOnePlayer === true) {
chrome.runtime.sendMessage({
name: 'only-one-player'
});
} else if (message.action === 'fixPopup') {
chrome.runtime.sendMessage({
action: 'fixPopup',
width: message.width,
height: message.height,
title: message.title,
extension.storage.data.analyzer[date][hours][data]++;

chrome.storage.local.set({
analyzer: extension.storage.data.analyzer
});
} else if (message.action === 'analyzer') {
if (extension.storage.data.analyzer_activation === true) {
var data = message.name,
date = new Date().toDateString(),
hours = new Date().getHours() + ':00';

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

if (!extension.storage.data.analyzer[date]) {
extension.storage.data.analyzer[date] = {};
switch(message.type) {
case 'channel':
if (!extension.storage.data.blocklist.channels) {
extension.storage.data.blocklist.channels = {};
}

if (!extension.storage.data.analyzer[date][hours]) {
extension.storage.data.analyzer[date][hours] = {};
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

if (!extension.storage.data.analyzer[date][hours][data]) {
extension.storage.data.analyzer[date][hours][data] = 0;
case 'video':
if (!extension.storage.data.blocklist.videos) {
extension.storage.data.blocklist.videos = {};
}

extension.storage.data.analyzer[date][hours][data]++;

chrome.storage.local.set({
analyzer: extension.storage.data.analyzer
});
}
} else if (message.action === 'blocklist') {
if (!extension.storage.data.blocklist || typeof extension.storage.data.blocklist !== 'object') {
extension.storage.data.blocklist = {};
}

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];
if (message.added) {
extension.storage.data.blocklist.videos[message.id] = {
title: message.title
}
break
}
} else {
delete extension.storage.data.blocklist.videos[message.id];
}
break
}

chrome.storage.local.set({
blocklist: extension.storage.data.blocklist
});
} else if (message.action === 'watched') {
if (!extension.storage.data.watched || typeof extension.storage.data.watched !== 'object') {
extension.storage.data.watched = {};
}
chrome.storage.local.set({
blocklist: extension.storage.data.blocklist
});
} else if (message.action === 'watched') {
if (!extension.storage.data.watched || typeof extension.storage.data.watched !== 'object') {
extension.storage.data.watched = {};
}

if (message.type === 'add') {
extension.storage.data.watched[message.id] = {
title: message.title
};
}
if (message.type === 'add') {
extension.storage.data.watched[message.id] = {
title: message.title
};
}

if (message.type === 'remove') {
delete extension.storage.data.watched[message.id];
}
if (message.type === 'remove') {
delete extension.storage.data.watched[message.id];
}

chrome.storage.local.set({
watched: extension.storage.data.watched
});
} else if (message.action === 'set') {
if (message.value) {
chrome.storage.local.set({[message.key]: message.value});
} else {
chrome.storage.local.remove([message.key]);
}
chrome.storage.local.set({
watched: extension.storage.data.watched
});
} else if (message.action === 'set') {
if (message.value) {
chrome.storage.local.set({[message.key]: message.value});
} else {
chrome.storage.local.remove([message.key]);
}
} else if (message.action === 'play') {
chrome.runtime.sendMessage({action: 'play'});
}
});

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) }
});
Loading
Loading