Merge pull request #75 from jspenguin2017/master

v15.0.0.67
LiCybora · Nov 4, 2018 · 6aa1e07 · 6aa1e07
2 parents c18416f + 677cedb
commit 6aa1e07
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 58 deletions.
diff --git a/docs/index.css b/docs/index.css
@@ -1,10 +1,23 @@
 code {
     background-color: rgba(255, 255, 255, 0.8);
-    border-radius: 10px;
+    border-radius: 20px;
     font-family: Consolas, monospace;
-    padding: 3px 7px 3px 7px;
+    padding: 0px 8px 0px 8px;
 }
 
-p.red {
-    padding: 5px;
+p {
+    line-height: 1.3em;
+}
+
+    p.red {
+        padding: 5px;
+    }
+
+div.scroll {
+    max-width: 100%;
+    overflow-x: auto;
+}
+
+p.no-bot {
+    margin-bottom: 0px;
 }
diff --git a/docs/index.html b/docs/index.html
@@ -64,7 +64,7 @@ <h4>October 20, 2018</h4>
         <br />
 
         <h4>September 19, 2017</h4>
-        <p>Nano Defender is 100% free, and I do not accept donation, now and in the future. My GitHub username is <code>jspenguin2017</code>, my GitLab username is <code>xuhaiyang1234</code>, and my domain is <code>jspenguin.com</code>. Be careful to not get scammed by someone who is pretending to be a developer of Nano Defender.</p>
+        <p>Nano Defender is 100% free, and I do not accept donation, now and in the future. My GitHub username is <code>jspenguin2017</code>, my GitLab username is <code>xuhaiyang1234</code>, and my domain is <code>hugoxu.com</code>. Be careful to not get scammed by someone who is pretending to be a developer of Nano Defender.</p>
         <br />
 
         <h4>August 6, 2017</h4>
@@ -314,8 +314,8 @@ <h2>Extra installation steps for uBlock Origin</h2>
 
         <p>Step 1. Enable <a href="ubo://subscribe?location=https%3A%2F%2Feasylist-downloads.adblockplus.org%2Fantiadblockfilters.txt&title=Adblock%20Warning%20Removal%20List">Adblock Warning Removal List</a>.</p>
         <p>Step 2. Subscribe to <a href="ubo://subscribe?location=https%3A%2F%2Fgitcdn.xyz%2Frepo%2FNanoAdblocker%2FNanoFilters%2Fmaster%2FNanoMirror%2FNanoDefender.txt&title=Nano%20Defender%20Integration">Nano Defender Integration</a> filter list.</p>
-        <p>Step 3. Go to uBlock Origin dashboard, select <code>Settings</code> tab, check <code>I am an advanced user</code>, click the gears that shows up, replace <code>unset</code> after <code>userResourcesLocation</code> by:</p>
-        <p><code>https://gitcdn.xyz/repo/NanoAdblocker/NanoFilters/master/NanoFilters/NanoResources.txt</code></p>
+        <p class="no-bot">Step 3. Go to uBlock Origin dashboard, select <code>Settings</code> tab, check <code>I am an advanced user</code>, click the gears that shows up, replace <code>unset</code> after <code>userResourcesLocation</code> by:</p>
+        <div class="scroll"><p class="no-bot"><code>https://gitcdn.xyz/repo/NanoAdblocker/NanoFilters/master/NanoFilters/NanoResources.txt</code></p></div>
         <p><i>Note:</i> If you have another User Resources in use, then you would need to either switch to Nano Adblocker or manually merge resources. It takes an eternity to get any resources into uAssets, I have tried.</p>
         <p><strong>Warning:</strong> The resource file is not a filter list, do not load it as a filter list or things will break.</p>
         <p>Step 4. Subscribe to <a href="ubo://subscribe?location=https%3A%2F%2Fgitcdn.xyz%2Frepo%2FNanoAdblocker%2FNanoFilters%2Fmaster%2FNanoFilters%2FNanoBase.txt&title=Nano%20filters">Nano filters</a>.</p>

diff --git a/list/2-integration.txt b/list/2-integration.txt
@@ -7,8 +7,6 @@
 ! === Resource placeholder, these files do not actually exist
 |https://jspenguin.com/uBlockProtector/Solutions/
 @@|https://jspenguin.com/uBlockProtector/Solutions/MoatFreeWheelJSPEM.js|$script
-! === Unbreak contributors loading
-@@||github.com/jspenguin2017/*/ima3.js
 ! === Generic
 @@|https://*.moatads.com/*/MoatFreeWheelJSPEM.js*$script
 @@|https://ads.korri.fr/index.js|$script

diff --git a/list/6-other.txt b/list/6-other.txt
@@ -1,9 +1,6 @@
 ! ===== Patched Anti-Adblock Killer List (originally by Reek) ====================================
 ! License and original source code are available here: https://github.com/reek/anti-adblock-killer
 ! ================================================================================================
-@@/adframe.js$script,first-party
-@@/advertisement*.js$script,first-party
-@@/advert.js$script,first-party,domain=~adultmult.tv
 ||trymask.com/api/$third-party
 @@||adworkmedia.com/gLoader.php?GID=$script,third-party
 @@||adworkmedia.com/gTemplate.php?GID=$subdocument,third-party
@@ -39,7 +36,7 @@
 /blockBlock.jquery.js$script
 /plugins/anti-block/*
 /anti-block-modal.js$script
-@@plugins/blockalyzer-adblock-counter/img/ads/$image
+@@/plugins/blockalyzer-adblock-counter/img/ads/$image
 @@/plugins/blockalyzer-adblock-counter/js/advert.js$script
 @@/plugins/ad-blocking-detector/assets/js/*$script
 /wp-content/plugins/*/adblock-detector.min.js$script
@@ -1563,25 +1560,6 @@ junksport.com##DIV[style="background-color: rgb(251, 236, 173); position: absolu
 @@||zatnawqy.net/intermission/loadTargetUrl$xmlhttprequest
 @@||zff.co/intermission/loadTargetUrl$xmlhttprequest
 @@|http://*.net/*/$subdocument,third-party,domain=allanalpass.com|amy.gs|any.gs|cash4files.com|cash4links.co|deb.gs|drstickyfingers.com|dyo.gs|eafyfsuh.net|fapoff.com|filesonthe.net|freean.us|freegaysitepass.com|galleries.bz|goneviral.com|hornywood.tv|linkbabes.com|linkbucks.com|megaline.co|miniurls.co|picbucks.com|poontown.net|qqc.co|rqq.co|sasontnwc.net|seriousdeals.net|sexpalace.gs|theseblogs.com|theseforums.com|tinylinks.co|tnabucks.com|tubeviral.com|ultrafiles.net|urlbeat.net|whackyvidz.com|youfap.me|yyv.co|zatnawqy.net|zff.co
-||cdn.adf.ly/js/entry.js$script,third-party
-||cdn.j.gs/js/entry.js$script,third-party
-||cdn.q.gs/js/entry.js$script,third-party
-||cdn.ay.gy/js/entry.js$script,third-party
-||cdn.adf.ly/js/link-converter.js$script,third-party
-||cdn.j.gs/js/link-converter.js$script,third-party
-||cdn.q.gs/js/link-converter.js$script,third-party
-||cdn.ay.gy/js/link-converter.js$script,third-party
-||cdn.adf.ly/js/display.js$script,third-party
-||cdn.j.gs/js/display.js$script,third-party
-||cdn.q.gs/js/display.js$script,third-party
-||cdn.ay.gy/js/display.js$script,third-party
-@@||adf.ly^$generichide
-@@||j.gs^$generichide
-@@||q.gs^$generichide
-@@||ay.gy^$generichide
-@@||s1-adfly.com/show.php$subdocument,domain=adf.ly|j.gs|q.gs|ay.gy
-@@/static/image/ad*.png$image,domain=adf.ly|j.gs|q.gs|ay.gy
-@@||static.adf.ly/static/image/ad*.png$image,third-party
 ||cdn.shorte.st/link-converter.min.js$script,third-party
 ||bc.vc/js/link-converter.js$script,third-party
 ||bc.vc/js/bcvc_go.js$script,third-party

diff --git a/src/content/rules-common.js b/src/content/rules-common.js
@@ -104,6 +104,7 @@
         // False positives
         "anandabazar.com",
         "animesync.tv",
+        "avgle.com",
         "babbel.com",
         "bild.de",
         "buxfer.com",

diff --git a/src/manifest.json b/src/manifest.json
@@ -54,7 +54,7 @@
     "webRequest",
     "webRequestBlocking"
   ],
-  "version": "15.0.0.66",
+  "version": "15.0.0.67",
   "web_accessible_resources": [
     "resources/*"
   ]

diff --git a/src/reporter/paper.js b/src/reporter/paper.js
@@ -47,7 +47,7 @@ const post = (payload) => {
             }
         };
 
-        req.open("POST", "https://jspenguin.com/PrivateMessage/Report.php");
+        req.open("POST", "https://legacy.hugoxu.com/PrivateMessage/Report.php");
         req.send(payload);
     });
 };
diff --git a/uBlockProtectorList.txt b/uBlockProtectorList.txt
@@ -5,7 +5,6 @@
 |https://jspenguin.com/uBlockProtector/Solutions/Blocked.php$important
 |https://jspenguin.com/uBlockProtector/Solutions/
 @@|https://jspenguin.com/uBlockProtector/Solutions/MoatFreeWheelJSPEM.js|$script
-@@||github.com/jspenguin2017/*/ima3.js
 @@|https://*.moatads.com/*/MoatFreeWheelJSPEM.js*$script
 @@|https://ads.korri.fr/index.js|$script
 @@|http://*.medianetworkinternational.com/js/advertisement.js*$script
@@ -524,9 +523,6 @@ blockads.fivefilters.org###no-blocking:style(display: block !important;)
 ! ===== Patched Anti-Adblock Killer List (originally by Reek) ====================================
 ! License and original source code are available here: https://github.com/reek/anti-adblock-killer
 ! ================================================================================================
-@@/adframe.js$script,first-party
-@@/advertisement*.js$script,first-party
-@@/advert.js$script,first-party,domain=~adultmult.tv
 ||trymask.com/api/$third-party
 @@||adworkmedia.com/gLoader.php?GID=$script,third-party
 @@||adworkmedia.com/gTemplate.php?GID=$subdocument,third-party
@@ -562,7 +558,7 @@ blockads.fivefilters.org###no-blocking:style(display: block !important;)
 /blockBlock.jquery.js$script
 /plugins/anti-block/*
 /anti-block-modal.js$script
-@@plugins/blockalyzer-adblock-counter/img/ads/$image
+@@/plugins/blockalyzer-adblock-counter/img/ads/$image
 @@/plugins/blockalyzer-adblock-counter/js/advert.js$script
 @@/plugins/ad-blocking-detector/assets/js/*$script
 /wp-content/plugins/*/adblock-detector.min.js$script
@@ -2086,25 +2082,6 @@ junksport.com##DIV[style="background-color: rgb(251, 236, 173); position: absolu
 @@||zatnawqy.net/intermission/loadTargetUrl$xmlhttprequest
 @@||zff.co/intermission/loadTargetUrl$xmlhttprequest
 @@|http://*.net/*/$subdocument,third-party,domain=allanalpass.com|amy.gs|any.gs|cash4files.com|cash4links.co|deb.gs|drstickyfingers.com|dyo.gs|eafyfsuh.net|fapoff.com|filesonthe.net|freean.us|freegaysitepass.com|galleries.bz|goneviral.com|hornywood.tv|linkbabes.com|linkbucks.com|megaline.co|miniurls.co|picbucks.com|poontown.net|qqc.co|rqq.co|sasontnwc.net|seriousdeals.net|sexpalace.gs|theseblogs.com|theseforums.com|tinylinks.co|tnabucks.com|tubeviral.com|ultrafiles.net|urlbeat.net|whackyvidz.com|youfap.me|yyv.co|zatnawqy.net|zff.co
-||cdn.adf.ly/js/entry.js$script,third-party
-||cdn.j.gs/js/entry.js$script,third-party
-||cdn.q.gs/js/entry.js$script,third-party
-||cdn.ay.gy/js/entry.js$script,third-party
-||cdn.adf.ly/js/link-converter.js$script,third-party
-||cdn.j.gs/js/link-converter.js$script,third-party
-||cdn.q.gs/js/link-converter.js$script,third-party
-||cdn.ay.gy/js/link-converter.js$script,third-party
-||cdn.adf.ly/js/display.js$script,third-party
-||cdn.j.gs/js/display.js$script,third-party
-||cdn.q.gs/js/display.js$script,third-party
-||cdn.ay.gy/js/display.js$script,third-party
-@@||adf.ly^$generichide
-@@||j.gs^$generichide
-@@||q.gs^$generichide
-@@||ay.gy^$generichide
-@@||s1-adfly.com/show.php$subdocument,domain=adf.ly|j.gs|q.gs|ay.gy
-@@/static/image/ad*.png$image,domain=adf.ly|j.gs|q.gs|ay.gy
-@@||static.adf.ly/static/image/ad*.png$image,third-party
 ||cdn.shorte.st/link-converter.min.js$script,third-party
 ||bc.vc/js/link-converter.js$script,third-party
 ||bc.vc/js/bcvc_go.js$script,third-party