Skip to content

Add option to add and remove blocked hostnames via query string #62

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 1 commit into
base: master
Choose a base branch
from
Open

Add option to add and remove blocked hostnames via query string #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
175 changes: 100 additions & 75 deletions firefox/data/options/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ function add(hostname) {
return rd;
}

function remove(hostname) {
const rulesContainer = document.getElementById('rules-container');
const rules = [...rulesContainer.children];
const matchingRules = rules.filter(e => e.attributes['data-hostname'].value === hostname);
matchingRules.forEach(e=>e.remove());
}

document.getElementById('add').addEventListener('submit', e => {
e.preventDefault();
const hostname = e.target.querySelector('input[type=text]').value;
Expand Down Expand Up @@ -125,6 +132,84 @@ const fs = schedule => {
}
};

const save = () => {
grant(async () => {
let schedule = {
times: days.reduce((p, c) => {
const start = document.querySelector(`input[type=time][name=start][data-id=${c}]`).value;
const end = document.querySelector(`input[type=time][name=end][data-id=${c}]`).value;

if (start && end) {
p[c] = [{start, end}];
}

return p;
}, {})
};
const rule = document.querySelector('#schedule [name="hostname"]');
if (rule.value) {
const e = validateRegex(rule.value);
if (e) {
return toast('Schedule Blocking; ' + e.message, 3000, 'error');
}
else {
if (Object.values(schedule.times).some(times => times.some(({start, end}) => start && end))) {
prefs.schedules[rule.value] = schedule;
}
else {
delete prefs.schedules[rule.value];
console.log('deleting rule for', rule.value);
}
schedule = prefs.schedule;
}
}
localStorage.setItem('mode-top', document.getElementById('mode-top').value);
localStorage.setItem('mode-frame', document.getElementById('mode-frame').value);

const password = document.getElementById('password').value;
const sha256 = password ? await new Promise(resolve => {
chrome.runtime.getBackgroundPage(bg => resolve(bg.sha256(password)));
}) : '';

// clear deprecated password preference
chrome.storage.local.remove('password');
chrome.storage.local.set({
sha256,
'title': document.getElementById('title').checked,
'initialBlock': document.getElementById('initialBlock').checked,
'reverse': document.getElementById('reverse').checked,
'no-password-on-add': document.getElementById('no-password-on-add').checked,
'redirect': document.getElementById('redirect').value,
'message': document.getElementById('message').value,
'css': document.getElementById('css').value,
'timeout': Math.max(Number(document.getElementById('timeout').value), 1),
'close': Math.max(Number(document.getElementById('close').value), 0),
'wrong': Math.max(Number(document.getElementById('wrong').value), 1),
schedule,
'schedules': prefs.schedules,
'blocked': [...document.querySelectorAll('#rules-container > div')]
.map(tr => tr.dataset.hostname)
.filter((s, i, l) => s && l.indexOf(s) === i),
'map': [...document.querySelectorAll('#rules-container > div')].reduce((p, c) => {
const {hostname} = c.dataset;
const mapped = c.querySelector('input[type=text]').value;
if (mapped) {
p[hostname] = mapped;
}
return p;
}, {}),
'contextmenu-resume': document.getElementById('contextmenu-resume').checked,
'contextmenu-pause': document.getElementById('contextmenu-pause').checked,
'contextmenu-frame': document.getElementById('contextmenu-frame').checked,
'contextmenu-top': document.getElementById('contextmenu-top').checked
}, () => {
toast('Options saved');
window.removeEventListener('beforeunload', warning);
init(false);
});
});
}

// double-check password; based on https://github.com/ray-lothian/Block-Site/issues/51
const grant = callback => chrome.storage.local.get({
'sha256': ''
Expand Down Expand Up @@ -182,6 +267,20 @@ const init = (table = true) => chrome.storage.local.get(DEFAULTS, ps => {
}
document.getElementById('mode-top').value = localStorage.getItem('mode-top') || 'complete';
document.getElementById('mode-frame').value = localStorage.getItem('mode-frame') || 'complete'; // 'simple'

const queryString = window.location.search.substr(1);
if (queryString) {
const [key, value] = queryString.split('=');
var newURL = location.href.split("?")[0];
window.history.pushState('object', document.title, newURL);
if (key === 'add') {
add(value);
save();
} else if (key === 'remove') {
remove(value);
save();
}
}
});
init();

Expand Down Expand Up @@ -218,81 +317,7 @@ document.addEventListener('click', async e => {
target.closest('div').remove();
}
else if (cmd === 'save') {
grant(async () => {
let schedule = {
times: days.reduce((p, c) => {
const start = document.querySelector(`input[type=time][name=start][data-id=${c}]`).value;
const end = document.querySelector(`input[type=time][name=end][data-id=${c}]`).value;

if (start && end) {
p[c] = [{start, end}];
}

return p;
}, {})
};
const rule = document.querySelector('#schedule [name="hostname"]');
if (rule.value) {
const e = validateRegex(rule.value);
if (e) {
return toast('Schedule Blocking; ' + e.message, 3000, 'error');
}
else {
if (Object.values(schedule.times).some(times => times.some(({start, end}) => start && end))) {
prefs.schedules[rule.value] = schedule;
}
else {
delete prefs.schedules[rule.value];
console.log('deleting rule for', rule.value);
}
schedule = prefs.schedule;
}
}
localStorage.setItem('mode-top', document.getElementById('mode-top').value);
localStorage.setItem('mode-frame', document.getElementById('mode-frame').value);

const password = document.getElementById('password').value;
const sha256 = password ? await new Promise(resolve => {
chrome.runtime.getBackgroundPage(bg => resolve(bg.sha256(password)));
}) : '';

// clear deprecated password preference
chrome.storage.local.remove('password');
chrome.storage.local.set({
sha256,
'title': document.getElementById('title').checked,
'initialBlock': document.getElementById('initialBlock').checked,
'reverse': document.getElementById('reverse').checked,
'no-password-on-add': document.getElementById('no-password-on-add').checked,
'redirect': document.getElementById('redirect').value,
'message': document.getElementById('message').value,
'css': document.getElementById('css').value,
'timeout': Math.max(Number(document.getElementById('timeout').value), 1),
'close': Math.max(Number(document.getElementById('close').value), 0),
'wrong': Math.max(Number(document.getElementById('wrong').value), 1),
schedule,
'schedules': prefs.schedules,
'blocked': [...document.querySelectorAll('#rules-container > div')]
.map(tr => tr.dataset.hostname)
.filter((s, i, l) => s && l.indexOf(s) === i),
'map': [...document.querySelectorAll('#rules-container > div')].reduce((p, c) => {
const {hostname} = c.dataset;
const mapped = c.querySelector('input[type=text]').value;
if (mapped) {
p[hostname] = mapped;
}
return p;
}, {}),
'contextmenu-resume': document.getElementById('contextmenu-resume').checked,
'contextmenu-pause': document.getElementById('contextmenu-pause').checked,
'contextmenu-frame': document.getElementById('contextmenu-frame').checked,
'contextmenu-top': document.getElementById('contextmenu-top').checked
}, () => {
toast('Options saved');
window.removeEventListener('beforeunload', warning);
init(false);
});
});
save();
}
else if (cmd === 'import-txt') {
const input = document.createElement('input');
Expand Down