Merge pull request #2267.

Stop replacing yellowlisted widgets.
EFForg · Oct 22, 2019 · db0687b · db0687b
2 parents 7dd7b4c + f50d70f
commit db0687b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/data/socialwidgets.json b/src/data/socialwidgets.json
@@ -95,7 +95,7 @@
         }
     },
     "SoundCloud": {
-        "domain": "soundcloud.com",
+        "domain": "w.soundcloud.com",
         "buttonSelectors": [
             "iframe[src^='https://w.soundcloud.com/player']"
         ],

diff --git a/src/js/webrequest.js b/src/js/webrequest.js
@@ -559,11 +559,14 @@ let getWidgetBlockList = (function () {
     }
 
     badger.widgetList.forEach(function (widget) {
-      // Only replace blocked and yellowlisted widgets and only if the widget is not on the 'do not replace' list
+      // 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 && constants.BLOCKED_ACTIONS.has(
-        badger.storage.getBestAction(widget.domain)
+      widgetsToReplace[widget.name] = replace && (
+        action == constants.BLOCK ||
+        action == constants.USER_BLOCK
       );
     });