From e0f0aedad6fca546e8d686bc50ecc70ba002e14f Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sat, 24 Aug 2019 13:54:31 -0400
Subject: [PATCH] Ability to negate delay in new setTimeout-if scriptlet

This also apply to setInterval-if. Thus to defuse
calls to setTimeout(fn, 1000), the filter could be:

    ##+js(stif, , !1000)

Meaning "allow setTimeout if the delay is not 1000".
---
 assets/resources/scriptlets.js | 38 +++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/assets/resources/scriptlets.js b/assets/resources/scriptlets.js
index 6411b15c6..da3efcdde 100644
--- a/assets/resources/scriptlets.js
+++ b/assets/resources/scriptlets.js
@@ -530,9 +530,12 @@
 /// alias siif.js
 (function() {
     let needle = '{{1}}';
-    const not = needle.charAt(0) === '!';
-    if ( not ) { needle = needle.slice(1); }
-    const delay = parseInt('{{2}}', 10);
+    const needleNot = needle.charAt(0) === '!';
+    if ( needleNot ) { needle = needle.slice(1); }
+    let delay = '{{2}}';
+    const delayNot = delay.charAt(0) === '!';
+    if ( delayNot ) { delay = delay.slice(1); }
+    delay = parseInt(delay, 10);
     if ( needle === '' || needle === '{{1}}' ) {
         needle = '.?';
     } else if ( needle.startsWith('/') && needle.endsWith('/') ) {
@@ -540,7 +543,8 @@
     } else {
         needle = needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     }
-    const log = not === false && needle === '.?' && isNaN(delay)
+    const log = needleNot === false && needle === '.?' &&
+                delayNot === false && isNaN(delay)
         ? console.log
         : undefined;
     needle = new RegExp(needle);
@@ -551,8 +555,11 @@
             if ( log !== undefined ) {
                 log('uBO: setInterval("%s", %s)', a, b);
             } else if (
-                (isNaN(delay) || b === delay) &&
-                needle.test(a) === not
+                (
+                    isNaN(delay) && (delayNot || needleNot) ||
+                    isNaN(delay) === false && (b === delay) === delayNot
+                ) &&
+                (needle.test(a) === needleNot)
             ) {
                 args[0] = function(){};
             }
@@ -592,9 +599,12 @@
 /// alias stif.js
 (function() {
     let needle = '{{1}}';
-    const not = needle.charAt(0) === '!';
-    if ( not ) { needle = needle.slice(1); }
-    const delay = parseInt('{{2}}', 10);
+    const needleNot = needle.charAt(0) === '!';
+    if ( needleNot ) { needle = needle.slice(1); }
+    let delay = '{{2}}';
+    const delayNot = delay.charAt(0) === '!';
+    if ( delayNot ) { delay = delay.slice(1); }
+    delay = parseInt(delay, 10);
     if ( needle === '' || needle === '{{1}}' ) {
         needle = '.?';
     } else if ( needle.startsWith('/') && needle.endsWith('/') ) {
@@ -602,7 +612,8 @@
     } else {
         needle = needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     }
-    const log = not === false && needle === '.?' && isNaN(delay)
+    const log = needleNot === false && needle === '.?' &&
+                delayNot === false && isNaN(delay)
         ? console.log
         : undefined;
     needle = new RegExp(needle);
@@ -613,8 +624,11 @@
             if ( log !== undefined ) {
                 log('uBO: setTimeout("%s", %s)', a, b);
             } else if (
-                (isNaN(delay) || b === delay) &&
-                needle.test(a) === not
+                (
+                    isNaN(delay) && (delayNot || needleNot) ||
+                    isNaN(delay) === false && (b === delay) === delayNot
+                ) &&
+                (needle.test(a) === needleNot)
             ) {
                 args[0] = function(){};
             }