fix apps

bubble-server/src/main/java/bubble/service/block/BlockStatsSummary.java

@@ -12,14 +12,12 @@ import lombok.extern.slf4j.Slf4j;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.cobbzilla.util.daemon.ZillaRuntime.now;
 import static org.cobbzilla.util.json.JsonUtil.json;
 
 @Slf4j
 public class BlockStatsSummary {
 
     private final Map<String, AtomicInteger> blocks = new HashMap<>();
-    @Getter private final long ctime = now();
 
     public void addBlock(BlockStatRecord rec) {
         final AtomicInteger ct = blocks.computeIfAbsent(rec.getFqdn(), k -> new AtomicInteger(0));

bubble-server/src/main/resources/bubble/rule/social/block/JsUserBlockerRuleDriver.js.hbs

@@ -1,8 +1,7 @@
 let {{JS_PREFIX}}_blocked_users = null;
 const {{JS_PREFIX}}_request_id = '{{BUBBLE_REQUEST_ID}}';
 
-let {{JS_PREFIX}}_doc_ready = false;
-const {{JS_PREFIX}}_interval = 50;
+let {{JS_PREFIX}}_interval = null;
 const {{JS_PREFIX}}_idle_interval = 1000;
 
 function {{JS_PREFIX}}_fetch_blocks (do_apply) {
@@ -15,29 +14,16 @@ function {{JS_PREFIX}}_fetch_blocks (do_apply) {
             for (let i=0; i<data.length; i++) {
                 blocked_users.push(data[i]);
             }
-            if ({{JS_PREFIX}}_doc_ready) {
-                {{JS_PREFIX}}_blocked_users = blocked_users;
-                {{JS_PREFIX}}_apply_blocks({{JS_PREFIX}}_blocked_users);
-                window.setInterval(function () {
-                    {{JS_PREFIX}}_apply_blocks({{JS_PREFIX}}_blocked_users)
+            {{JS_PREFIX}}_blocked_users = blocked_users;
+            {{JS_PREFIX}}_apply_blocks({{JS_PREFIX}}_blocked_users);
+            if ({{JS_PREFIX}}_interval === null) {
+                {{JS_PREFIX}}_interval = window.setInterval(function () {
+                        {{JS_PREFIX}}_apply_blocks({{JS_PREFIX}}_blocked_users)
                 }, {{JS_PREFIX}}_idle_interval);
-            } else {
-                const intervalId = window.setInterval(function() {
-                    if ({{JS_PREFIX}}_doc_ready) {
-                        window.clearInterval(intervalId);
-                        {{JS_PREFIX}}_blocked_users = blocked_users;
-                        {{JS_PREFIX}}_apply_blocks({{JS_PREFIX}}_blocked_users);
-                        window.setInterval(function () {
-                            {{JS_PREFIX}}_apply_blocks({{JS_PREFIX}}_blocked_users)
-                        }, {{JS_PREFIX}}_idle_interval);
-                    }
-                }, {{JS_PREFIX}}_interval);
             }
         });
 }
 
-{{JS_PREFIX}}_fetch_blocks();
-
 function {{JS_PREFIX}}_block_user (author) {
     {{JS_PREFIX}}_blocked_users.push(author);
     {{JS_PREFIX}}_apply_blocks({{JS_PREFIX}}_blocked_users);
@@ -57,5 +43,6 @@ function {{JS_PREFIX}}_block_user (author) {
     jsPrefix: '{{JS_PREFIX}}',
     app: '{{BUBBLE_APP_NAME}}',
     link: 'site/{{BUBBLE_SITE_NAME}}/view/blocked_users',
-    icon: 'icon'
+    icon: 'icon',
+    onReady: function () { {{JS_PREFIX}}_fetch_blocks(); }
 });