Disable limits temporarily Stigmatoz#39

Author: Stigmatoz

src/block.html

@@ -15,8 +15,9 @@
       <img src="icons/time.svg" height="50">
       <p class="title">Time limit</p>
       <div class="description">You've reached today your limit on <span id='site' class="current-site"></span></div>
-      <div class="description margin-top-10">Your current daily limit is <span id='limit' class="current-limit"></span>
-      </div>
+      <div class="description margin-top-10">Your current daily limit is <span id='limit' class="current-limit"></span></div>
+
+      <div class="margin-top-10"><a id="deffererBtn" class="defferer-link">Set aside for 5 minutes</a></div>
    </div>
    <p class="product-title">Web Activity Time Tracker</p>
 </body>

src/scripts/activity.js

@@ -5,7 +5,7 @@ class Activity {
         if (this.isValidPage(tab) === true) {
             if (tab.id && (tab.id != 0)) {
                 tabs = tabs || [];
-                var domain = this.extractHostname(tab.url);
+                var domain = extractHostname(tab.url);
                 var isDifferentUrl = false;
                 if (currentTab !== tab.url) {
                     isDifferentUrl = true;
@@ -41,13 +41,13 @@ class Activity {
 
     isInBlackList(domain) {
         if (setting_black_list !== undefined && setting_black_list.length > 0)
-            return setting_black_list.find(o => isDomainEquals(this.extractHostname(o), this.extractHostname(domain))) !== undefined;
+            return setting_black_list.find(o => isDomainEquals(extractHostname(o), 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(this.extractHostname(o.domain), this.extractHostname(domain)));
+            var item = setting_restriction_list.find(o => isDomainEquals(extractHostname(o.domain), extractHostname(domain)));
             if (item !== undefined) {
                 var today = new Date().toLocaleDateString("en-US");
                 var data = tab.days.find(x => x.date == today);
@@ -62,6 +62,27 @@ class Activity {
         return false;
     }
 
+    wasDeferred(domain){
+        if (deferredRestrictionsList != undefined){
+            let defItem = deferredRestrictionsList.find(x => extractHostname(x.site) == extractHostname(domain));
+            if (defItem != null){
+                let time = defItem.dateOfDeferred;
+                if (time + DEFERRED_TIMEOUT > new Date().getTime()){
+                    return true;
+                }
+                else {
+                    let index = deferredRestrictionsList.indexOf(defItem);
+                    if (index > -1)
+                        deferredRestrictionsList.splice(index, 1);
+
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
     isNewUrl(domain) {
         if (tabs.length > 0)
             return tabs.find(o => o.url === domain) === undefined;
@@ -73,24 +94,9 @@ class Activity {
             return tabs.find(o => o.url === domain);
     }
 
-    extractHostname(url) {
-        var hostname;
-
-        if (url.indexOf("//") > -1) {
-            hostname = url.split('/')[2];
-        }
-        else {
-            hostname = url.split('/')[0];
-        }
-
-        hostname = hostname.split(':')[0];
-        hostname = hostname.split('?')[0];
-
-        return hostname;
-    }
-
+   
     updateFavicon(tab) {
-        var domain = this.extractHostname(tab.url);
+        var domain = extractHostname(tab.url);
         var currentTab = this.getTab(domain);
         if (currentTab !== null && currentTab !== undefined) {
             if (tab.favIconUrl !== undefined && tab.favIconUrl !== currentTab.favicon) {
@@ -138,7 +144,7 @@ class Activity {
 
     isNeedNotifyView(domain, tab){
         if (setting_notification_list !== undefined && setting_notification_list.length > 0) {
-            var item = setting_notification_list.find(o => isDomainEquals(this.extractHostname(o.domain), this.extractHostname(domain)));
+            var item = setting_notification_list.find(o => isDomainEquals(extractHostname(o.domain), 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

@@ -6,6 +6,7 @@ var currentTab;
 var isNeedDeleteTimeIntervalFromTabs = false;
 var activity = new Activity();
 var storage = new LocalStorage();
+var deferredRestrictionsList;
 
 var setting_black_list;
 var setting_restriction_list;
@@ -33,7 +34,7 @@ function backgroundCheck() {
         if (currentWindow.focused) {
             var activeTab = currentWindow.tabs.find(t => t.active === true);
             if (activeTab !== undefined && activity.isValidPage(activeTab)) {
-                var activeUrl = activity.extractHostname(activeTab.url);
+                var activeUrl = extractHostname(activeTab.url);
                 var tab = activity.getTab(activeUrl);
                 if (tab === undefined) {
                     activity.addTab(activeTab);
@@ -63,8 +64,8 @@ function backgroundCheck() {
 }
 
 function mainTRacker(activeUrl, tab, activeTab) {
-    if (activity.isLimitExceeded(activeUrl, tab)) {
-        setBlockPageToCurrent(activeUrl);
+    if (activity.isLimitExceeded(activeUrl, tab) && !activity.wasDeferred(activeUrl)) {
+        setBlockPageToCurrent(activeTab.url);
     }
     if (!activity.isInBlackList(activeUrl)) {
         if (activity.isNeedNotifyView(activeUrl, tab)) {
@@ -130,8 +131,8 @@ function notificationAction(activeUrl, tab) {
         });
 }
 
-function setBlockPageToCurrent(activeUrl) {
-    var blockUrl = chrome.runtime.getURL("block.html") + '?url=' + activeUrl;
+function setBlockPageToCurrent(currentUrl) {
+    var blockUrl = chrome.runtime.getURL("block.html") + '?url=' + currentUrl;
     chrome.tabs.query({ currentWindow: true, active: true }, function(tab) {
         chrome.tabs.update(tab.id, { url: blockUrl });
     });

src/scripts/block.js

@@ -1,10 +1,13 @@
+'use strict';
+
 var storage = new LocalStorage();
+var blockSiteUrl;
 var restrictionList = [];
 
 document.addEventListener('DOMContentLoaded', function () {
     var url = new URL(document.URL);
-    var blockSiteUrl = url.searchParams.get("url");
-    document.getElementById('site').innerText = blockSiteUrl;
+    blockSiteUrl = url.searchParams.get("url");
+    document.getElementById('site').innerText = extractHostname(blockSiteUrl);
 
     storage.getValue(STORAGE_RESTRICTION_LIST, function (items) {
         restrictionList = items;
@@ -15,4 +18,19 @@ document.addEventListener('DOMContentLoaded', function () {
             document.getElementById('limit').innerText = convertShortSummaryTimeToString(currentItem.time);
         }
     });
+
+    document.getElementById('deffererBtn').addEventListener('click', function () {
+        chrome.runtime.getBackgroundPage(function (bg) {
+            let defList = bg.deferredRestrictionsList;
+            if (defList == undefined)
+                defList = [];
+            defList.push({ site: blockSiteUrl, dateOfDeferred: new Date().getTime()});
+
+            bg.deferredRestrictionsList = defList;
+
+            chrome.tabs.query({ currentWindow: true, active: true }, function(tab) {
+                chrome.tabs.update(tab.id, { url: blockSiteUrl });
+            });
+        });
+    });
 });

src/scripts/common.js

@@ -34,10 +34,11 @@ var STORAGE_NOTIFICATION_LIST = 'notification_list';
 var STORAGE_NOTIFICATION_MESSAGE = 'notification_message';
 var STORAGE_TIMEINTERVAL_LIST = 'time_interval';
 
+var DEFERRED_TIMEOUT = 300000;
+
 var SETTINGS_INTERVAL_INACTIVITY_DEFAULT = InactivityInterval.second30;
 var SETTINGS_INTERVAL_CHECK_DEFAULT = 1000;
-var SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT = 2000;
-var SETTINGS_INTERVAL_CHECK_STORAGE_DEFAULT = 3000;
+var SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT = 5000;
 var SETTINGS_INTERVAL_RANGE_DEFAULT = RangeForDays.days7;
 var SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT = true;
 var SETTINGS_DARK_MODE_DEFAULT = false;
@@ -202,6 +203,22 @@ function isDomainEquals(first, second) {
     }
 }
 
+function extractHostname(url) {
+    var hostname;
+
+    if (url.indexOf("//") > -1) {
+        hostname = url.split('/')[2];
+    }
+    else {
+        hostname = url.split('/')[0];
+    }
+
+    hostname = hostname.split(':')[0];
+    hostname = hostname.split('?')[0];
+
+    return hostname;
+}
+
 function treatAsUTC(date) {
     var result = new Date(date);
     result.setMinutes(result.getMinutes() - result.getTimezoneOffset());

src/style/block.css

@@ -35,4 +35,10 @@ body{
     position: absolute;
     bottom: 30px;
     right: 30px;
+}
+
+.defferer-link{
+    color: gray;
+    text-decoration: underline;
+    cursor: pointer;
 }

src/style/chart.css

@@ -109,3 +109,7 @@ g.slices > path.mouse-over{
 .grid path {
     stroke-width: 0;
 }
+
+#chart{
+  min-height: 250px;
+}