Refact functions

Author: Stigmatoz

src/background.ts

@@ -2,7 +2,7 @@ import Browser from 'webextension-polyfill';
 import { initTracker } from './tracker';
 import { logger } from './utils/logger';
 import { scheduleJobs } from './jobs/sheduler';
-import { Settings } from './compositions/settings';
+import { Settings } from './functions/settings';
 import { StorageParams } from './storage/storage-params';
 import { injecStorage } from './storage/inject-storage';
 import { todayLocalDate } from './utils/date';

src/components/BadgeIcons.vue

@@ -15,7 +15,7 @@ export default {
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { TypeOfList, TypeOfUrl } from '../utils/enums';
-import { isDomainInLimits } from '../compositions/limit-list';
+import { isDomainInLimits } from '../functions/limit-list';
 import { computedAsync } from '@vueuse/core';
 
 const { t } = useI18n();

src/components/ByDays.vue

@@ -77,11 +77,11 @@ import NoDataByDays from './NoDataByDays.vue';
 import ByDaysChart from '../components/ByDaysChart.vue';
 import Expander from '../components/Expander.vue';
 import { TabListByDays } from '../dto/tabListSummary';
-import { useTabListByDays } from '../compositions/useTabListByDays';
+import { useTabListByDays } from '../functions/useTabListByDays';
 import { convertSummaryTimeToString } from '../utils/converter';
 import { ranges, ThisWeekRange } from '../utils/date';
-import { useImportToCsvWithData } from '../compositions/useImportToCsv';
-import { useFile, FileType } from '../compositions/useFile';
+import { useImportToCsvWithData } from '../functions/useImportToCsv';
+import { useFile, FileType } from '../functions/useFile';
 
 const { t } = useI18n();
 

src/components/GeneralSettings.vue

@@ -151,11 +151,11 @@ import {
   SHOW_CHANGELOG_DEFAULT,
 } from '../storage/storage-params';
 import { ranges, ThisWeekRange, todayLocalDate } from '../utils/date';
-import { useImportToCsv } from '../compositions/useImportToCsv';
-import { FileType, useFile } from '../compositions/useFile';
-import { useRemoveAllData } from '../compositions/useRemoveAllData';
+import { useImportToCsv } from '../functions/useImportToCsv';
+import { FileType, useFile } from '../functions/useFile';
+import { useRemoveAllData } from '../functions/useRemoveAllData';
 import { injectTabsRepository } from '../repository/inject-tabs-repository';
-import { useRestoreData } from '../compositions/useRestoreData';
+import { useRestoreData } from '../functions/useRestoreData';
 
 const { t } = useI18n();
 

src/components/TabList.vue

@@ -52,8 +52,8 @@ import DonutChart from '../components/DonutChart.vue';
 import OverallStatistics from '../components/OverallStatistics.vue';
 import { Tab } from '../entity/tab';
 import { SortingBy, TypeOfList } from '../utils/enums';
-import { useTodayTabListSummary } from '../compositions/useTodayTabListSummary';
-import { useAllTabListSummary } from '../compositions/useAllTabListSummary';
+import { useTodayTabListSummary } from '../functions/useTodayTabListSummary';
+import { useAllTabListSummary } from '../functions/useAllTabListSummary';
 import { CurrentTabItem } from '../dto/currentTabItem';
 import { todayLocalDate } from '../utils/date';
 import { OverallStats } from '../dto/tabListSummary';

src/components/WebsiteStats.vue

@@ -72,7 +72,7 @@ import { openPage } from '../utils/open-page';
 import { computed, onMounted, ref } from 'vue';
 import { SettingsTab } from '../utils/enums';
 import { ThisWeekRange, ranges } from '../utils/date';
-import { useTabStatsByDays } from '../compositions/useTabStatsByDays';
+import { useTabStatsByDays } from '../functions/useTabStatsByDays';
 import { TabListByDays } from '../dto/tabListSummary';
 import { Tab } from '../entity/tab';
 import { getTypeOfUrl } from '../utils/get-type-of-url';

src/functions/black-list.ts

@@ -0,0 +1,10 @@
+import { StorageParams } from '../storage/storage-params';
+import { isDomainEquals } from '../utils/common';
+import { extractHostname } from '../utils/extract-hostname';
+import { Settings } from './settings';
+
+export async function isInBlackList(url: string): Promise<boolean> {
+  const blackList = (await Settings.getInstance().getSetting(StorageParams.BLACK_LIST)) as string[];
+  const array = Object.values(blackList);
+  return array?.find(x => isDomainEquals(extractHostname(x), extractHostname(url))) !== undefined;
+}

src/functions/current-tab.ts

@@ -0,0 +1,8 @@
+import Browser from 'webextension-polyfill';
+
+export async function getCurrentTab() {
+  const tabs = await Browser.tabs.query({ active: true, currentWindow: true });
+  // since only one tab should be active and in the current window at once
+  // the return variable should only have one entry
+  return tabs[0];
+}

src/functions/deferList.ts

@@ -0,0 +1,56 @@
+import { differenceInHours } from 'date-fns';
+import { StorageParams } from '../storage/storage-params';
+import { isDomainEquals } from '../utils/common';
+import { Settings } from './settings';
+import { Deffering } from '../entity/deffering';
+import { injecStorage } from '../storage/inject-storage';
+import { MINUTE } from '../utils/time';
+import { log } from '../utils/logger';
+
+export async function isInDeferList(url: string): Promise<boolean> {
+  const deferList = (await Settings.getInstance().getSetting(
+    StorageParams.BLOCK_DEFERRAL_TIME,
+  )) as Deffering[];
+  const array = Object.values(deferList);
+  const item = array?.find(x => isDomainEquals(x.domain, url));
+  if (item != undefined)
+    log(
+      `Deferring time ${url} ${new Date(item.time)} diff ${differenceInHours(
+        new Date(item.time),
+        new Date(),
+      )}`,
+    );
+  return item != undefined && item.time > Date.now();
+}
+
+export async function canDefering(url: string): Promise<boolean> {
+  const deferList = (await Settings.getInstance().getSetting(
+    StorageParams.BLOCK_DEFERRAL_TIME,
+  )) as Deffering[];
+  const array = Object.values(deferList);
+  const item = array?.find(x => isDomainEquals(x.domain, url));
+  if (item != undefined)
+    log(
+      `Deferring time ${url} ${new Date(item.time)} diff ${differenceInHours(
+        new Date(item.time),
+        new Date(),
+      )}`,
+    );
+  if (item == undefined) return true;
+
+  return item != undefined && differenceInHours(new Date(item.time), new Date()) > 24;
+}
+
+export async function defering(url: string, timeInMinutes: number): Promise<void> {
+  const settingsStorage = injecStorage();
+
+  const deferList = (await Settings.getInstance().getSetting(
+    StorageParams.BLOCK_DEFERRAL_TIME,
+  )) as Deffering[];
+  const array = Object.values(deferList);
+  const item = array?.find(x => isDomainEquals(x.domain, url));
+  if (item != undefined) item.time = Date.now() + timeInMinutes * MINUTE;
+  else array.push(new Deffering(url, 5));
+
+  await settingsStorage.saveValue(StorageParams.BLOCK_DEFERRAL_TIME, array);
+}

src/functions/limit-list.ts

@@ -0,0 +1,55 @@
+import { Restriction } from '../entity/restriction';
+import { Tab } from '../entity/tab';
+import { StorageParams } from '../storage/storage-params';
+import { isDomainEquals } from '../utils/common';
+import { todayLocalDate } from '../utils/date';
+import { isInDeferList } from './deferList';
+import { log } from '../utils/logger';
+import { Settings } from './settings';
+
+export type LimitExceed = {
+  IsLimitExceeded: boolean;
+  LimitTime: number | null;
+};
+
+export async function isLimitExceeded(url: string, tab: Tab): Promise<LimitExceed> {
+  const limitList = (await Settings.getInstance().getSetting(
+    StorageParams.RESTRICTION_LIST,
+  )) as Restriction[];
+  const array = Object.values(limitList);
+  const item = array?.find(x => isDomainEquals(x.domain, url));
+  if (item != undefined) {
+    const date = tab.days.find(x => x.date == todayLocalDate());
+    if (date != undefined) {
+      if (date.summary >= item.time) {
+        log(`Limit Exceeded: website ${url} limit ${item.time} summary time ${date.summary}`);
+        if (await isInDeferList(url)) {
+          log(`Page ${url} is in deffering list`);
+          return {
+            IsLimitExceeded: false,
+            LimitTime: null,
+          };
+        }
+
+        return {
+          IsLimitExceeded: true,
+          LimitTime: item.time,
+        };
+      }
+    }
+  }
+
+  return {
+    IsLimitExceeded: false,
+    LimitTime: null,
+  };
+}
+
+export async function isDomainInLimits(url: string): Promise<boolean> {
+  const limitList = (await Settings.getInstance().getSetting(
+    StorageParams.RESTRICTION_LIST,
+  )) as Restriction[];
+  const array = Object.values(limitList);
+  const item = array?.find(x => isDomainEquals(x.domain, url));
+  return item != undefined;
+}