From 34c82f1771bf686bc1263c434b16929b6b4e7ac2 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Fri, 14 Aug 2020 09:16:58 -0400
Subject: [PATCH] only add app icons to top-level windows

---
 .../resources/bubble/rule/RequestModifierRule_icon.js.hbs | 8 +++++++-
 .../bubble/rule/bblock/BubbleBlockRuleDriver_stats.js.hbs | 6 +-----
 .../rule/social/block/JsUserBlockerRuleDriver.js.hbs      | 3 +--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bubble-server/src/main/resources/bubble/rule/RequestModifierRule_icon.js.hbs b/bubble-server/src/main/resources/bubble/rule/RequestModifierRule_icon.js.hbs
index 074d5ae5..fcdcff23 100644
--- a/bubble-server/src/main/resources/bubble/rule/RequestModifierRule_icon.js.hbs
+++ b/bubble-server/src/main/resources/bubble/rule/RequestModifierRule_icon.js.hbs
@@ -2,7 +2,13 @@
 if (typeof {{PAGE_PREFIX}}_icon_status === 'undefined') {
     let {{PAGE_PREFIX}}_doc_ready = false;
 
-    {{PAGE_PREFIX}}_icon_status = [];
+    let {{PAGE_PREFIX}}_icon_status = [];
+
+    {{PAGE_PREFIX}}_addBubbleApp = function (app) {
+        if (window.self === window.top) {
+            {{PAGE_PREFIX}}_icon_status.push(app);
+        }
+    }
 
     function {{PAGE_PREFIX}}_onReady(callback) {
         const intervalId = window.setInterval(function() {
diff --git a/bubble-server/src/main/resources/bubble/rule/bblock/BubbleBlockRuleDriver_stats.js.hbs b/bubble-server/src/main/resources/bubble/rule/bblock/BubbleBlockRuleDriver_stats.js.hbs
index 5124a58c..acb7a7a3 100644
--- a/bubble-server/src/main/resources/bubble/rule/bblock/BubbleBlockRuleDriver_stats.js.hbs
+++ b/bubble-server/src/main/resources/bubble/rule/bblock/BubbleBlockRuleDriver_stats.js.hbs
@@ -1,12 +1,8 @@
-//
-// block stats js goes here
-//
 {{{ICON_JS}}}
 
-{{PAGE_PREFIX}}_icon_status.push({
+{{PAGE_PREFIX}}_addBubbleApp({
     jsPrefix: '{{JS_PREFIX}}',
     app: '{{BUBBLE_APP_NAME}}',
     link: 'view/last_24_hours',
     icon: 'icon-gray'
 });
-console.log("BubbleBlock pushed icon, {{PAGE_PREFIX}}_icon_status="+JSON.stringify({{PAGE_PREFIX}}_icon_status));
diff --git a/bubble-server/src/main/resources/bubble/rule/social/block/JsUserBlockerRuleDriver.js.hbs b/bubble-server/src/main/resources/bubble/rule/social/block/JsUserBlockerRuleDriver.js.hbs
index fdb037e1..f0adabaa 100644
--- a/bubble-server/src/main/resources/bubble/rule/social/block/JsUserBlockerRuleDriver.js.hbs
+++ b/bubble-server/src/main/resources/bubble/rule/social/block/JsUserBlockerRuleDriver.js.hbs
@@ -53,10 +53,9 @@ function {{JS_PREFIX}}_block_user (author) {
 
 {{{ICON_JS}}}
 
-{{PAGE_PREFIX}}_icon_status.push({
+{{PAGE_PREFIX}}_addBubbleApp({
     jsPrefix: '{{JS_PREFIX}}',
     app: '{{BUBBLE_APP_NAME}}',
     link: 'site/{{BUBBLE_SITE_NAME}}/view/blocked_users',
     icon: 'icon'
 });
-console.log("JsUserBlocker pushed icon, {{PAGE_PREFIX}}_icon_status="+JSON.stringify({{PAGE_PREFIX}}_icon_status));
\ No newline at end of file