Fix deffering

Author: Stigmatoz

src/components/TabList.vue

@@ -79,7 +79,7 @@ const firstDay = ref<Date>();
 const countOfActiveDays = ref<number>();
 
 const countOfSites = computed(() => (tabs.value != undefined ? tabs.value.length : 0));
-const isLoading = ref<boolean>();
+const isLoading = ref<boolean>(true);
 
 const showOnlyFirst100Items = ref<boolean>();
 

src/functions/deferList.ts

@@ -1,44 +1,30 @@
-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 { injectStorage } from '../storage/inject-storage';
 import { MINUTE } from '../utils/time';
 import { log } from '../utils/logger';
+import { millisecondsInHour } from 'date-fns';
 
 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(),
-      )}`,
-    );
+  const item = deferList?.find(x => isDomainEquals(x.domain, url));
+  if (item != undefined) log(`Deferring time ${url} ${new Date(item.time)}`);
   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(),
-      )}`,
-    );
+  const item = deferList?.find(x => isDomainEquals(x.domain, url));
+  if (item != undefined) log(`Deferring time ${url} ${new Date(item.time)}`);
   if (item == undefined) return true;
 
-  return item != undefined && differenceInHours(new Date(item.time), new Date()) > 24;
+  return item != undefined && Date.now() - new Date(item.time).getTime() > millisecondsInHour * 24;
 }
 
 export async function defering(url: string, timeInMinutes: number): Promise<void> {
@@ -47,10 +33,9 @@ export async function defering(url: string, timeInMinutes: number): Promise<void
   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));
+  const item = deferList?.find(x => isDomainEquals(x.domain, url));
   if (item != undefined) item.time = Date.now() + timeInMinutes * MINUTE;
-  else array.push(new Deffering(url, 5));
+  else deferList.push(new Deffering(url, 5));
 
-  await settingsStorage.saveValue(StorageParams.BLOCK_DEFERRAL_TIME, array);
+  await settingsStorage.saveValue(StorageParams.BLOCK_DEFERRAL_TIME, deferList);
 }