ClearURLs/Addon
1
1
Fork 0
mirror of https://github.com/ClearURLs/Addon.git synced 2024-09-11 11:45:35 +03:00
Code Issues Projects Releases Wiki Activity

Version 1.9.2

Browse Source 
#290
This commit is contained in:
Kevin Röbert 2019-11-09 01:40:17 +01:00
parent 61b911921e
commit 61712e77a2
8 changed files with 874 additions and 817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -4,6 +4,7 @@ before_script:
- export DEBIAN_FRONTEND= noninteractive
- apt-get update -y
- apt-get install -y zip unzip jq
- apt-get install nodejs
stages:
- build
@ -13,9 +14,13 @@ hash rules:
stage: build
script:
- sha256sum data/data.min.json | awk '{print $1}' > rules.min.hash
- node build_tools/minifyDataJSON.js "..\data\data.min.json" "..\data\data.minify.json"
- sha256sum data/data.minify.json | awk '{print $1}' > rules.minify.hash
artifacts:
paths:
- rules.min.hash
- data.minify.json
- rules.minify.hash
build firefox:
stage: build

15
CHANGELOG.md
View File

@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.9.2] - 2019-11-09
### Compatibility note
- Require Firefox >= 55
- Require Chrome >= 22
### Fixed
- Fixed [#290](https://gitlab.com/KevinRoebert/ClearUrls/issues/290)
## Changed
- Updated some strings of Italian translation by [@gioxx](https://gitlab.com/gioxx)
### Added
- Added a minimal version of the data.min.json file where all line breaks and spaces, as well as default values and empty lists are removed.
## [1.9.1] - 2019-10-24
### Compatibility note

87
build_tools/minifyDataJSON.js Normal file
View File

@ -0,0 +1,87 @@
/*
* ClearURLs
* Copyright (c) 2017-2019 Kevin Röbert
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*jshint esversion: 6 */
/*
* This script is responsible for minification of the data.min.json file and deletes also empty entries.
*/
let fs = require('fs');
const inFileLocation = process.argv.slice(2)[0];
const outFileLocation = process.argv.slice(2)[1];
if(inFileLocation === undefined || outFileLocation === undefined) {
throw "in- and output must be set!";
}
const fileContent = fs.readFileSync(inFileLocation).toString();
/**
* Builds a minify version of the data.min.json file.
*/
function build() {
const data = JSON.parse(fileContent);
let minifiedData = {"providers":{}};
for(let provider in data.providers) {
minifiedData.providers[provider] = {};
let self = minifiedData.providers[provider];
if(data.providers[provider].completeProvider === true) {
self.completeProvider = true;
}
if(data.providers[provider].forceRedirection === true) {
self.forceRedirection = true;
}
if(data.providers[provider].urlPattern !== "") {
self.urlPattern = data.providers[provider].urlPattern;
}
if(data.providers[provider].rules.length !== 0) {
self.rules = data.providers[provider].rules;
}
if(data.providers[provider].rawRules.length !== 0) {
self.rawRules = data.providers[provider].rawRules;
}
if(data.providers[provider].referralMarketing.length !== 0) {
self.referralMarketing = data.providers[provider].referralMarketing;
}
if(data.providers[provider].exceptions.length !== 0) {
self.exceptions = data.providers[provider].exceptions;
}
if(data.providers[provider].redirections.length !== 0) {
self.redirections = data.providers[provider].redirections;
}
}
fs.writeFile(outFileLocation, JSON.stringify(minifiedData), function(err) {
if(err) {
return console.log(err);
}
console.log("The file was saved!");
});
}
build();

166
clearurls.js
View File

@ -39,8 +39,7 @@ var currentURL;
* @param {boolean} quiet if the action should be displayed in log and statistics
* @return {Array} Array with changes and url fields
*/
function removeFieldsFormURL(provider, pureUrl, quiet = false)
{
function removeFieldsFormURL(provider, pureUrl, quiet = false) {
let url = pureUrl;
let domain = "";
let fragments = "";
@ -67,8 +66,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false)
if (beforeReplace !== url) {
//Log the action
if(storage.loggingStatus && !quiet)
{
if (storage.loggingStatus && !quiet) {
pushToLog(beforeReplace, url, rawRule);
}
@ -80,9 +78,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false)
if (!res) {
if (storage.badgedStatus && !quiet) {
browser.browserAction.setBadgeText({text: (++badges[tabid]).toString(), tabId: tabid});
}
else
{
} else {
browser.browserAction.setBadgeText({text: "", tabId: tabid});
}
}
@ -104,8 +100,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false)
* url redirections form sites to sites.
*/
let re = provider.getRedirection(url);
if(re !== null)
{
if (re !== null) {
url = decodeURL(re);
//Log the action
@ -128,19 +123,16 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false)
/**
* Only test for matches, if there are fields or fragments that can be cleaned.
*/
if(fields !== "" || fragments !== "")
{
if (fields !== "" || fragments !== "") {
rules.forEach(function (rule) {
let beforeReplace = fields;
let beforeReplaceFragments = fragments;
fields = fields.replace(new RegExp(rule, "gi"), "");
fragments = fragments.replace(new RegExp(rule, "gi"), "");
if(beforeReplace !== fields || beforeReplaceFragments !== fragments)
{
if (beforeReplace !== fields || beforeReplaceFragments !== fragments) {
//Log the action
if(storage.loggingStatus)
{
if (storage.loggingStatus) {
let tempURL = domain;
let tempBeforeURL = domain;
@ -160,9 +152,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false)
if (!res) {
if (storage.badgedStatus && !quiet) {
browser.browserAction.setBadgeText({text: (++badges[tabid]).toString(), tabId: tabid});
}
else
{
} else {
browser.browserAction.setBadgeText({text: "", tabId: tabid});
}
}
@ -182,8 +172,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false)
if (provider.isCaneling()) {
if (!quiet) pushToLog(pureUrl, pureUrl, translate('log_domain_blocked'));
if(badges[tabid] == null)
{
if (badges[tabid] == null) {
badges[tabid] = 0;
}
@ -193,9 +182,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false)
if (!res) {
if (storage.badgedStatus && !quiet) {
browser.browserAction.setBadgeText({text: (++badges[tabid]).toString(), tabId: tabid});
}
else
{
} else {
browser.browserAction.setBadgeText({text: "", tabId: tabid});
}
}
@ -211,12 +198,11 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false)
};
}
function start()
{
function start() {
/**
* Initialize the JSON provider object keys.
*
* @param {JSON Object} obj
* @param {object} obj
*/
function getKeys(obj) {
for (const key in obj) {
@ -228,47 +214,45 @@ function start()
* Initialize the providers form the JSON object.
*
*/
function createProviders()
{
function createProviders() {
let data = storage.ClearURLsData;
for(let p = 0; p < prvKeys.length; p++)
{
for (let p = 0; p < prvKeys.length; p++) {
//Create new provider
providers.push(new Provider(prvKeys[p], data.providers[prvKeys[p]].completeProvider,
data.providers[prvKeys[p]].forceRedirection));
providers.push(new Provider(prvKeys[p], data.providers[prvKeys[p]].getOrDefault('completeProvider', false),
data.providers[prvKeys[p]].getOrDefault('forceRedirection', false)));
//Add URL Pattern
providers[p].setURLPattern(data.providers[prvKeys[p]].urlPattern);
providers[p].setURLPattern(data.providers[prvKeys[p]].getOrDefault('urlPattern', ''));
let rules = data.providers[prvKeys[p]].getOrDefault('rules', []);
//Add rules to provider
for(let r = 0; r < data.providers[prvKeys[p]].rules.length; r++)
{
providers[p].addRule(data.providers[prvKeys[p]].rules[r]);
for (let r = 0; r < rules.length; r++) {
providers[p].addRule(rules[r]);
}
let rawRules = data.providers[prvKeys[p]].getOrDefault('rawRules', []);
//Add raw rules to provider
for(let raw = 0; raw < data.providers[prvKeys[p]].rawRules.length; raw++)
{
providers[p].addRawRule(data.providers[prvKeys[p]].rawRules[raw]);
for (let raw = 0; raw < rawRules.length; raw++) {
providers[p].addRawRule(rawRules[raw]);
}
let referralMarketingRules = data.providers[prvKeys[p]].getOrDefault('referralMarketing', []);
//Add referral marketing rules to provider
for(let referralMarketing = 0; referralMarketing < data.providers[prvKeys[p]].referralMarketing.length; referralMarketing++)
{
providers[p].addReferralMarketing(data.providers[prvKeys[p]].referralMarketing[referralMarketing]);
for (let referralMarketing = 0; referralMarketing < referralMarketingRules.length; referralMarketing++) {
providers[p].addReferralMarketing(referralMarketingRules[referralMarketing]);
}
let exceptions = data.providers[prvKeys[p]].getOrDefault('exceptions', []);
//Add exceptions to provider
for(let e = 0; e < data.providers[prvKeys[p]].exceptions.length; e++)
{
providers[p].addException(data.providers[prvKeys[p]].exceptions[e]);
for (let e = 0; e < exceptions.length; e++) {
providers[p].addException(exceptions[e]);
}
let redirections = data.providers[prvKeys[p]].getOrDefault('redirections', []);
//Add redirections to provider
for(let re = 0; re < data.providers[prvKeys[p]].redirections.length; re++)
{
providers[p].addRedirection(data.providers[prvKeys[p]].redirections[re]);
for (let re = 0; re < redirections.length; re++) {
providers[p].addRedirection(redirections[re]);
}
}
}
@ -290,8 +274,7 @@ function start()
* If the hash has changed, then download the new rule file.
* Else do nothing.
*/
function getHash()
{
function getHash() {
//Get the target hash from github
fetch(storage.hashURL)
.then(function (response) {
@ -318,13 +301,11 @@ function start()
* # Fetch Rules & Exception from URL #
* ##################################################################
*/
function fetchFromURL()
{
function fetchFromURL() {
fetch(storage.ruleURL)
.then(checkResponse);
function checkResponse(response)
{
function checkResponse(response) {
const responseText = response.clone().text().then(function (responseText) {
if (response.ok && $.trim(responseText)) {
const downloadedFileHash = $.sha256(responseText);
@ -429,20 +410,16 @@ function start()
* @param {boolean} isActive Is this rule active?
*/
this.applyRule = (enabledRuleArray, disabledRulesArray, rule, isActive = true) => {
if(isActive)
{
if (isActive) {
enabledRuleArray[rule] = true;
if(disabledRulesArray[rule] !== undefined)
{
if (disabledRulesArray[rule] !== undefined) {
delete disabledRulesArray[rule];
}
}
else {
} else {
disabledRulesArray[rule] = true;
if(enabledRuleArray[rule] !== undefined)
{
if (enabledRuleArray[rule] !== undefined) {
delete enabledRuleArray[rule];
}
}
@ -467,6 +444,10 @@ function start()
* @return Array RegExp strings
*/
this.getRules = function () {
if (!storage.referralMarketing) {
return Object.keys(Object.assign(enabled_rules, enabled_referralMarketing));
}
return Object.keys(enabled_rules);
};
@ -487,10 +468,6 @@ function start()
* @return Array RegExp strings
*/
this.getRawRules = function () {
if(!storage.referralMarketing) {
return Object.keys(Object.assign(enabled_rawRules, enabled_referralMarketing));
}
return Object.keys(enabled_rawRules);
};
@ -502,6 +479,8 @@ function start()
* @param {boolean} isActive Is this rule active?
*/
this.addReferralMarketing = function (rule, isActive = true) {
rule = "([\\/|\\?|#]|(&|&amp;))+(" + rule + "=[^\\/|\\?|&]*)";
this.applyRule(enabled_referralMarketing, disabled_referralMarketing, rule, isActive);
};
@ -513,20 +492,16 @@ function start()
* @param {Boolean} isActive Is this exception acitve?
*/
this.addException = function (exception, isActive = true) {
if(isActive)
{
if (isActive) {
enabled_exceptions[exception] = true;
if(disabled_exceptions[exception] !== undefined)
{
if (disabled_exceptions[exception] !== undefined) {
delete disabled_exceptions[exception];
}
}
else {
} else {
disabled_exceptions[exception] = true;
if(enabled_exceptions[exception] !== undefined)
{
if (enabled_exceptions[exception] !== undefined) {
delete enabled_exceptions[exception];
}
}
@ -563,20 +538,16 @@ function start()
* @param {Boolean} isActive Is this redirection active?
*/
this.addRedirection = function (redirection, isActive = true) {
if(isActive)
{
if (isActive) {
enabled_redirections[redirection] = true;
if(disabled_redirections[redirection] !== undefined)
{
if (disabled_redirections[redirection] !== undefined) {
delete disabled_redirections[redirection];
}
}
else {
} else {
disabled_redirections[redirection] = true;
if(enabled_redirections[redirection] !== undefined)
{
if (enabled_redirections[redirection] !== undefined) {
delete enabled_redirections[redirection];
}
}
@ -593,8 +564,7 @@ function start()
for (const redirection in enabled_redirections) {
let result = (url.match(new RegExp(redirection, "i")));
if (result && result.length > 0 && redirection)
{
if (result && result.length > 0 && redirection) {
re = (new RegExp(redirection, "i")).exec(url)[1];
break;
@ -604,6 +574,7 @@ function start()
return re;
};
}
// ##################################################################
/**
@ -613,8 +584,7 @@ function start()
* @param {webRequest} request webRequest-Object
* @return {Array} redirectUrl or none
*/
function clearUrl(request)
{
function clearUrl(request) {
const URLbeforeReplaceCount = countFields(request.url);
//Add Fields form Request to global url counter
@ -633,8 +603,7 @@ function start()
*/
for (let i = 0; i < providers.length; i++) {
if(providers[i].matchURL(request.url))
{
if (providers[i].matchURL(request.url)) {
result = removeFieldsFormURL(providers[i], request.url);
}
@ -642,8 +611,7 @@ function start()
* Expand urls and bypass tracking.
* Cancel the active request.
*/
if(result.redirect)
{
if (result.redirect) {
if (providers[i].shouldForceRedirect() &&
request.type === 'main_frame') {
browser.tabs.update(request.tabId, {url: result.url});
@ -701,8 +669,7 @@ function start()
* And if url has changed.
*/
function handleUpdated(tabId, changeInfo, tabInfo) {
if(changeInfo.url)
{
if (changeInfo.url) {
delete badges[tabId];
}
currentURL = tabInfo.url;
@ -731,13 +698,10 @@ function start()
/**
* Check the request.
*/
function promise(requestDetails)
{
if(isDataURL(requestDetails))
{
function promise(requestDetails) {
if (isDataURL(requestDetails)) {
return {};
}
else {
} else {
return clearUrl(requestDetails);
}
}
@ -777,11 +741,9 @@ function start()
* @param afterProcessing the url after the clear process
* @param rule the rule that triggered the process
*/
function pushToLog(beforeProcessing, afterProcessing, rule)
{
function pushToLog(beforeProcessing, afterProcessing, rule) {
const limit = storage.logLimit;
if(storage.loggingStatus && limit !== 0)
{
if (storage.loggingStatus && limit !== 0) {
if (limit > 0 && !isNaN(limit)) {
while (storage.log.log.length >= limit) {
storage.log.log.shift();

62
core_js/storage.js
View File

@ -27,8 +27,7 @@ var pendingSaves = new Set();
/**
* Writes the storage variable to the disk.
*/
function saveOnExit()
{
function saveOnExit() {
saveOnDisk(Object.keys(storage));
}
@ -68,8 +67,7 @@ function storageDataAsString(key) {
* Save multiple keys on the disk.
* @param {String[]} keys
*/
function saveOnDisk(keys)
{
function saveOnDisk(keys) {
let json = {};
keys.forEach(function (key) {
@ -84,8 +82,7 @@ function saveOnDisk(keys)
* Schedule to save a key to disk in 30 seconds.
* @param {String} key
*/
function deferSaveOnDisk(key)
{
function deferSaveOnDisk(key) {
if (hasPendingSaves) {
pendingSaves.add(key);
return;
@ -102,8 +99,7 @@ function deferSaveOnDisk(key)
/**
* Start sequence for ClearURLs.
*/
function genesis()
{
function genesis() {
browser.storage.local.get(null).then((items) => {
initStorage(items);
@ -123,8 +119,7 @@ function genesis()
* @param {String} key
* @return {Object}
*/
function getData(key)
{
function getData(key) {
return storage[key];
}
@ -132,8 +127,7 @@ function getData(key)
* Return the entire storage object.
* @return {Object}
*/
function getEntireData()
{
function getEntireData() {
return storage;
}
@ -146,8 +140,7 @@ function getEntireData()
* @param {String} key
* @param {Object} value
*/
function setData(key, value)
{
function setData(key, value) {
switch (key) {
case "ClearURLsData":
case "log":
@ -171,8 +164,7 @@ function setData(key, value)
/**
* Write error on console.
*/
function error(e)
{
function error(e) {
console.log(translate('core_error'));
console.error(e);
}
@ -181,8 +173,7 @@ function error(e)
* Set default values, if the storage is empty.
* @param {Object} items
*/
function initStorage(items)
{
function initStorage(items) {
initSettings();
if (!isEmpty(items)) {
@ -195,8 +186,7 @@ function initStorage(items)
/**
* Set default values for the settings.
*/
function initSettings()
{
function initSettings() {
storage.ClearURLsData = [];
storage.dataHash = "";
storage.badgedStatus = true;
@ -208,8 +198,8 @@ function initSettings()
storage.log = {"log": []};
storage.statisticsStatus = true;
storage.badged_color = "ffa500";
storage.hashURL = "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.min.hash?job=hash%20rules";
storage.ruleURL = "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.min.json";
storage.hashURL = "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.minify.hash?job=hash%20rules";
storage.ruleURL = "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.minify.json";
storage.contextMenuEnabled = true;
storage.historyListenerEnabled = true;
storage.localHostsSkipping = true;
@ -227,8 +217,7 @@ function initSettings()
* Replace the old URLs with the
* new GitLab URLs.
*/
function replaceOldURLs(url)
{
function replaceOldURLs(url) {
switch (url) {
case "https://raw.githubusercontent.com/KevinRoebert/ClearUrls/master/data/rules.hash?flush_cache=true":
return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.min.hash?job=hash%20rules";
@ -238,6 +227,10 @@ function replaceOldURLs(url)
return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.min.hash?job=hash%20rules";
case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.json":
return "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.min.json";
case "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.min.hash?job=hash%20rules":
return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.minify.hash?job=hash%20rules";
case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.min.json":
return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/data.minify.json?job=hash%20rules";
default:
return url;
}
@ -247,8 +240,7 @@ function replaceOldURLs(url)
* Load local saved data, if the browser is offline or
* some other network trouble.
*/
function loadOldDataFromStore()
{
function loadOldDataFromStore() {
localDataHash = storage.dataHash;
}
@ -260,17 +252,19 @@ function loadOldDataFromStore()
* 3 "update available"
* @param status_code the number for the status
*/
function storeHashStatus(status_code)
{
switch(status_code)
{
case 1: status_code = "hash_status_code_1";
function storeHashStatus(status_code) {
switch (status_code) {
case 1:
status_code = "hash_status_code_1";
break;
case 2: status_code = "hash_status_code_2";
case 2:
status_code = "hash_status_code_2";
break;
case 3: status_code = "hash_status_code_3";
case 3:
status_code = "hash_status_code_3";
break;
default: status_code = "hash_status_code_4";
default:
status_code = "hash_status_code_4";
}
storage.hashStatus = status_code;

82
core_js/tools.js
View File

@ -40,8 +40,7 @@ Array.prototype.flatten = function() {
* @param {Object} obj
* @return {Boolean}
*/
function isEmpty(obj)
{
function isEmpty(obj) {
return (Object.getOwnPropertyNames(obj).length === 0);
}
@ -50,16 +49,14 @@ function isEmpty(obj)
*
* @param {string} string Name of the attribute used for localization
*/
function translate(string)
{
function translate(string) {
return browser.i18n.getMessage(string);
}
/**
* Reloads the extension.
*/
function reload()
{
function reload() {
browser.runtime.reload();
}
@ -67,8 +64,7 @@ function reload()
* Check if it is an android device.
* @return bool
*/
async function checkOSAndroid()
{
async function checkOSAndroid() {
if (os === undefined || os === null || os === "") {
await chrome.runtime.getPlatformInfo(function (info) {
os = info.os;
@ -108,8 +104,7 @@ function checkLocalURL(url) {
* @param {String} url URL as String
* @return {int} Number of Parameters
*/
function countFields(url)
{
function countFields(url) {
return extractFileds(url).length;
}
@ -118,8 +113,7 @@ function countFields(url)
* @param {String} url URL as String
* @return {boolean}
*/
function existsFields(url)
{
function existsFields(url) {
let matches = (url.match(/\?.+/i) || []);
let count = matches.length;
@ -131,8 +125,7 @@ function existsFields(url)
* @param {String} url URL as String
* @return {Array} Fields as array
*/
function extractFileds(url)
{
function extractFileds(url) {
if (existsFields(url)) {
let fields = url.replace(new RegExp(".*?\\?", "i"), "");
if (existsFragments(url)) {
@ -150,8 +143,7 @@ function extractFileds(url)
* @param {String} url URL as String
* @return {int} Number of fragments
*/
function countFragments(url)
{
function countFragments(url) {
return extractFragments(url).length;
}
@ -160,8 +152,7 @@ function countFragments(url)
* @param {String} url URL as String
* @return {Array} fragments as array
*/
function extractFragments(url)
{
function extractFragments(url) {
if (existsFragments(url)) {
let fragments = url.replace(new RegExp(".*?#", "i"), "");
return (fragments.match(/[^&]+=?[^&]*/gi) || []);
@ -175,8 +166,7 @@ function extractFragments(url)
* @param {String} url URL as String
* @return {boolean}
*/
function existsFragments(url)
{
function existsFragments(url) {
let matches = (url.match(/\#.+/i) || []);
let count = matches.length;
@ -187,8 +177,7 @@ function existsFragments(url)
* Load local saved data, if the browser is offline or
* some other network trouble.
*/
function loadOldDataFromStore()
{
function loadOldDataFromStore() {
localDataHash = storage.dataHash;
}
@ -200,17 +189,19 @@ function loadOldDataFromStore()
* 3 "update available"
* @param status_code the number for the status
*/
function storeHashStatus(status_code)
{
switch(status_code)
{
case 1: status_code = "hash_status_code_1";
function storeHashStatus(status_code) {
switch (status_code) {
case 1:
status_code = "hash_status_code_1";
break;
case 2: status_code = "hash_status_code_2";
case 2:
status_code = "hash_status_code_2";
break;
case 3: status_code = "hash_status_code_3";
case 3:
status_code = "hash_status_code_3";
break;
default: status_code = "hash_status_code_4";
default:
status_code = "hash_status_code_4";
}
storage.hashStatus = status_code;
@ -220,10 +211,8 @@ function storeHashStatus(status_code)
* Increase by {number} the GlobalURLCounter
* @param {int} number
*/
function increaseGlobalURLCounter(number)
{
if(storage.statisticsStatus)
{
function increaseGlobalURLCounter(number) {
if (storage.statisticsStatus) {
storage.globalurlcounter += number;
deferSaveOnDisk('globalurlcounter');
}
@ -232,10 +221,8 @@ function increaseGlobalURLCounter(number)
/**
* Increase by one the URLCounter
*/
function increaseURLCounter()
{
if(storage.statisticsStatus)
{
function increaseURLCounter() {
if (storage.statisticsStatus) {
storage.globalCounter++;
deferSaveOnDisk('globalCounter');
}
@ -244,8 +231,7 @@ function increaseURLCounter()
/**
* Change the icon.
*/
function changeIcon()
{
function changeIcon() {
checkOSAndroid().then((res) => {
if (!res) {
if (storage.globalStatus) {
@ -262,8 +248,7 @@ function changeIcon()
* into a local variable.
*
*/
function setBadgedStatus()
{
function setBadgedStatus() {
checkOSAndroid().then((res) => {
if (!res && storage.badgedStatus) {
browser.browserAction.setBadgeBackgroundColor({
@ -277,8 +262,7 @@ function setBadgedStatus()
* Returns the current URL.
* @return {String} [description]
*/
function getCurrentURL()
{
function getCurrentURL() {
return currentURL;
}
@ -305,3 +289,13 @@ function decodeURL(url) {
return rtn;
}
/*
* Gets the value of at `key` an object. If the resolved value is `undefined`, the `defaultValue` is returned in its place.
*
* @param {string} key the key of the object
* @param {object} defaultValue the default value
*/
Object.prototype.getOrDefault = function (key, defaultValue) {
return this[key] === undefined ? defaultValue : this[key];
};

2
data/data.min.json
View File

@ -36,7 +36,7 @@
"rnid"
],
"referralMarketing": [
"([\\/|\\?|#]|(&|&amp;))+(tag=[^\\/|\\?|&]*)"
"tag"
],
"exceptions": [
".*(amazon\\.).*(\\/gp).*\\/redirector.html\\/.*",

2
manifest.json
View File

@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "ClearURLs",
"version": "1.9.1",
"version": "1.9.2",
"author": "Kevin Röbert",
"description": "Remove tracking elements from URLs.",
"homepage_url": "https://gitlab.com/KevinRoebert/ClearUrls",