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

Jump to bottom

Only replace widgets that were actually blocked #2484

Merged
merged 2 commits into from
Apr 23, 2020
Merged

Only replace widgets that were actually blocked #2484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd0215
Only replace widgets that were actually blocked.
ghostwords Oct 21, 2019
1df8ee2
Store widget domains to unblock, not URLs.
ghostwords Jan 10, 2019
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
30 changes: 14 additions & 16 deletions src/data/socialwidgets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"replacementButton": {
"details": "<!-- AddThis Button BEGIN --> <div class='addthis_toolbox addthis_default_style addthis_32x32_style'> <a class='addthis_button_preferred_1'></a> <a class='addthis_button_preferred_2'></a> <a class='addthis_button_preferred_3'></a> <a class='addthis_button_preferred_4'></a> <a class='addthis_button_compact'></a> <a class='addthis_counter addthis_bubble_style'></a> </div> <script type='text/javascript'>var addthis_config = {'data_track_addressbar':true};</script> <script type='text/javascript' src='//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-522d600d3b535ebf'></script> <!-- AddThis Button END -->",
"unblockDomains": [
"http://s7.addthis.com/",
"http://ct1.addthis.com/",
"http://api-public.addthis.com/"
"s7.addthis.com",
"ct1.addthis.com",
"api-public.addthis.com"
],
"imagePath": "AddThis.svg",
"type": 2
Expand All @@ -23,7 +23,7 @@
"replacementButton": {
"details": "http://www.digg.com/submit?url=",
"unblockDomains": [
"http://www.digg.com/submit?url="
"www.digg.com"
],
"imagePath": "Digg.svg",
"type": 0
Expand All @@ -40,8 +40,7 @@
"replacementButton": {
"details": "https://www.facebook.com/plugins/like.php?href=",
"unblockDomains": [
"https://www.facebook.com/plugins/like.php?href=",
"https://www.facebook.com/v2.0/plugins/like.php?href="
"www.facebook.com"
],
"imagePath": "FacebookLike.svg",
"type": 1
Expand All @@ -58,8 +57,7 @@
"replacementButton": {
"details": "https://www.facebook.com/plugins/share_button.php?href=",
"unblockDomains": [
"https://www.facebook.com/plugins/share_button.php?href=",
"https://www.facebook.com/v2.0/plugins/share_button.php?href="
"www.facebook.com"
],
"imagePath": "FacebookShare.svg",
"type": 1
Expand All @@ -73,7 +71,7 @@
"replacementButton": {
"details": "http://www.linkedin.com/shareArticle?mini=true&url=",
"unblockDomains": [
"http://www.linkedin.com/shareArticle?mini=true&url="
"www.linkedin.com"
],
"imagePath": "LinkedIn.svg",
"type": 0
Expand All @@ -88,7 +86,7 @@
"replacementButton": {
"details": "http://pinterest.com/pin/create/button/?url=",
"unblockDomains": [
"http://pinterest.com/pin/create/button/?url="
"pinterest.com"
],
"imagePath": "Pinterest.svg",
"type": 0
Expand All @@ -102,7 +100,7 @@
"replacementButton": {
"details": "",
"unblockDomains": [
"https://w.soundcloud.com/"
"w.soundcloud.com"
],
"imagePath": "badger-play.png",
"type": 3
Expand All @@ -116,7 +114,7 @@
"replacementButton": {
"details": "",
"unblockDomains": [
"https://open.spotify.com/"
"open.spotify.com"
],
"imagePath": "badger-play.png",
"type": 3
Expand All @@ -130,7 +128,7 @@
"replacementButton": {
"details": "",
"unblockDomains": [
"https://streamable.com/"
"streamable.com"
],
"imagePath": "badger-play.png",
"type": 3
Expand All @@ -145,7 +143,7 @@
"replacementButton": {
"details": "http://www.stumbleupon.com/badge/?url=",
"unblockDomains": [
"http://www.stumbleupon.com/badge/?url="
"www.stumbleupon.com"
],
"imagePath": "StumbleUpon.svg",
"type": 0
Expand All @@ -159,7 +157,7 @@
"replacementButton": {
"details": "https://twitter.com/intent/tweet?url=",
"unblockDomains": [
"https://twitter.com/intent/tweet?url="
"twitter.com"
],
"imagePath": "Twitter.svg",
"type": 0
Expand All @@ -174,7 +172,7 @@
"replacementButton": {
"details": "",
"unblockDomains": [
"https://player.vimeo.com/"
"player.vimeo.com"
],
"imagePath": "badger-play.png",
"type": 3
Expand Down
43 changes: 25 additions & 18 deletions src/js/webrequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,8 @@ function _isTabAnExtension(tabId) {
/**
* Provides the widget replacing content script with list of widgets to replace.
*
* @param {Integer} tab_id the ID of the tab we're replacing widgets in
*
* @returns {Object} dict containing the complete list of widgets
* as well as a mapping to indicate which ones should be replaced
*/
Expand All @@ -544,7 +546,7 @@ let getWidgetBlockList = (function () {
{ key: "allow_once" },
];

return function () {
return function (tab_id) {
// A mapping of individual SocialWidget objects to boolean values that determine
// whether the content script should replace that tracker's button/widget
var widgetsToReplace = {};
Expand All @@ -559,15 +561,23 @@ let getWidgetBlockList = (function () {
}

badger.widgetList.forEach(function (widget) {
// replace blocked widgets only
// and only if the widget is not on the 'do not replace' list
const replace = !badger.getSettings().getItem('widgetReplacementExceptions').includes(widget.name);
const action = badger.storage.getBestAction(widget.domain);

widgetsToReplace[widget.name] = replace && (
action == constants.BLOCK ||
action == constants.USER_BLOCK
);
let replace = false;

// replace only if the widget is not on the 'do not replace' list
if (!badger.getSettings().getItem('widgetReplacementExceptions').includes(widget.name) &&
badger.tabData.hasOwnProperty(tab_id) &&
badger.tabData[tab_id].origins.hasOwnProperty(widget.domain)) {

const action = badger.tabData[tab_id].origins[widget.domain];

// and only if it was blocked
replace = (
action == constants.BLOCK ||
action == constants.USER_BLOCK
);
}

widgetsToReplace[widget.name] = replace;
});

return {
Expand Down Expand Up @@ -605,17 +615,14 @@ function isWidgetTemporaryUnblock(tabId, requestHost, frameId) {
* corresponding replacement widget.
*
* @param {Integer} tabId The id of the tab
* @param {Array} widgetUrls an array of widget urls
* @param {Array} domains widget domains
*/
function unblockWidgetOnTab(tabId, widgetUrls) {
function unblockWidgetOnTab(tabId, domains) {
if (temporaryWidgetUnblock[tabId] === undefined) {
temporaryWidgetUnblock[tabId] = [];
}
for (let i in widgetUrls) {
let url = widgetUrls[i];
// TODO just store actual domains in the JSON in the first place
let host = window.extractHostFromURL(url);
temporaryWidgetUnblock[tabId].push(host);
for (let i = 0; i < domains.length; i++) {
temporaryWidgetUnblock[tabId].push(domains[i]);
}
}

Expand Down Expand Up @@ -679,7 +686,7 @@ function dispatcher(request, sender, sendResponse) {

case "checkReplaceButton": {
if (badger.isPrivacyBadgerEnabled(window.extractHostFromURL(sender.tab.url)) && badger.isWidgetReplacementEnabled()) {
let widgetBlockList = getWidgetBlockList();
let widgetBlockList = getWidgetBlockList(sender.tab.id);
sendResponse(widgetBlockList);
}

Expand Down