Optimize ads blocking, update analytics

edanchenkov · Jun 29, 2020 · e4e8362 · e4e8362
1 parent 36a7ff9
commit e4e8362
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 12 deletions.
diff --git a/index.html b/index.html
@@ -305,8 +305,16 @@
                         ga('set', 'checkProtocolTask', null);
                         ga('send', 'pageview');
                         ga('set', 'appVersion', remote && remote.app && remote.app.getVersion());
-                        ga('send', 'appVersion', remote && remote.app && remote.app.getVersion());
 
+                        ga('send', {
+                            'hitType': 'event',
+                            'eventCategory': 'app',
+                            'eventAction': 'init',
+                            'eventLabel': remote && remote.app && remote.app.getVersion(),
+                            // 'hitCallback': function () {
+                            //     alert("Event received");
+                            // }
+                        });
                     })();
                 }, 500)
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "MenuTube",
-    "version": "1.7.2",
+    "version": "1.7.3",
     "description": "Catch YouTube into your macOS menu bar!",
     "main": "main.js",
     "scripts": {

diff --git a/src/wvHelper.js b/src/wvHelper.js
@@ -1,25 +1,50 @@
-const l = document.addEventListener;
+const _newListener = document.addEventListener;
 
 // Hijack event listener to prevent YouTube from stopping on blue window (lose focus)
 document.addEventListener = () => {
-    l.apply(document, arguments);
+    _newListener.apply(document, arguments);
 };
 
 (function () {
     var AppConfig = require('./../config.js');
     var config = AppConfig.store.userPreferences;
 
     if (!!config.adBlock) {
-        const _check = v => v !== null && v !== undefined;
-        setInterval(() => {
-            const ad = [...document.querySelectorAll('.ad-showing')][0];
-            if (_check(ad)) {
-                const video = document.querySelector('video');
-                if (_check(video) && !isNaN(video.duration)) {
-                    video.currentTime = video.duration;
+        var observeDOM = (function () {
+            var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
+
+            return function (obj, callback) {
+                if (!obj || !obj.nodeType === 1) {
+                    return;
+                } // validation
+
+                if (MutationObserver) {
+                    // define a new observer
+                    var obs = new MutationObserver(function (mutations, observer) {
+                        callback(mutations);
+                    });
+                    // have the observer observe foo for changes in children
+                    obs.observe(obj, { childList: true, subtree: true });
+                } else if (window.addEventListener) {
+                    obj.addEventListener('DOMNodeInserted', callback, false);
+                    obj.addEventListener('DOMNodeRemoved', callback, false);
                 }
             }
-        }, 500);
+        })();
+
+        _newListener('DOMContentLoaded', () => {
+            observeDOM(document.body, function (m) {
+                const _check = v => v !== null && v !== undefined;
+                const ad = [...document.querySelectorAll('.ad-showing')][0];
+                if (_check(ad)) {
+                    const video = document.querySelector('video');
+                    if (_check(video) && !isNaN(video.duration)) {
+                        video.currentTime = video.duration;
+                    }
+                }
+            });
+        });
+
     }
 
     var ipcRenderer = require('electron').ipcRenderer;