Small refact

Author: Stigmatoz

src/scripts/activity.js

@@ -40,13 +40,13 @@ class Activity {
 
     isInBlackList(domain) {
         if (setting_black_list !== undefined && setting_black_list.length > 0)
-            return setting_black_list.find(o => o === domain) !== undefined;
+            return setting_black_list.find(o => isDomainEquals(this.extractHostname(o), this.extractHostname(domain))) !== undefined;
         else return false;
     }
 
     isLimitExceeded(domain, tab) {
         if (setting_restriction_list !== undefined && setting_restriction_list.length > 0) {
-            var item = setting_restriction_list.find(o => isDomainEquals(o.domain, domain));
+            var item = setting_restriction_list.find(o => isDomainEquals(this.extractHostname(o.domain), this.extractHostname(domain)));
             if (item !== undefined) {
                 var today = new Date().toLocaleDateString("en-US");
                 var data = tab.days.find(x => x.date == today);

src/scripts/background.js

@@ -20,10 +20,6 @@ function updateStorage() {
 }
 
 function backgroundCheck() {
-    loadBlackList();
-    loadRestrictionList();
-    storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) { setting_interval_inactivity = item; });
-    storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) { setting_view_in_badge = item; });
     chrome.windows.getLastFocused({ populate: true }, function (currentWindow) {
         if (currentWindow.focused) {
             var activeTab = currentWindow.tabs.find(t => t.active === true);
@@ -163,6 +159,22 @@ function addListener() {
             checkSettingsImEmpty();
         }
     });
+    chrome.storage.onChanged.addListener(function(changes, namespace) {
+        for (var key in changes) {
+            if (key === STORAGE_BLACK_LIST){
+                loadBlackList();
+            }
+            if (key === STORAGE_RESTRICTION_LIST){
+                loadRestrictionList();
+            }
+            if (key === SETTINGS_INTERVAL_INACTIVITY){
+                storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) { setting_interval_inactivity = item; });
+            }
+            if (key === SETTINGS_VIEW_TIME_IN_BADGE){
+                storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) { setting_view_in_badge = item; });
+            }
+        }
+      });
 
     chrome.runtime.setUninstallURL("https://docs.google.com/forms/d/e/1FAIpQLSdImHtvey6sg5mzsQwWfAQscgZOOV52blSf9HkywSXJhuQQHg/viewform");
 }
@@ -188,8 +200,15 @@ function loadRestrictionList() {
     })
 }
 
+function loadSettings(){
+    storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) { setting_interval_inactivity = item; });
+    storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) { setting_view_in_badge = item; });
+}
+
 loadTabs();
 loadBlackList();
+loadRestrictionList();
+loadSettings();
 addListener();
 updateSummaryTime();
 updateStorage();