Open previous url after defering

Author: Stigmatoz

src/compositions/block-page.ts

@@ -2,12 +2,14 @@ import Browser from 'webextension-polyfill';
 import { buildBlockQuery } from '../utils/block-page';
 
 export async function useBlockPage(
+  domain: string,
   url: string,
   liimitTime: number,
   summaryCounter: number,
 ): Promise<void> {
   const blockUrl =
-    Browser.runtime.getURL('src/block.html') + buildBlockQuery(url, liimitTime, summaryCounter);
+    Browser.runtime.getURL('src/block.html') +
+    buildBlockQuery(domain, url, liimitTime, summaryCounter);
   const tab = await Browser.tabs.query({ currentWindow: true, active: true });
   Browser.tabs.update(tab[0].id, { url: blockUrl });
 }

src/pages/Block.vue

@@ -38,6 +38,7 @@ import { defering, canDefering } from '../compositions/deferList';
 const settingsStorage = injecStorage();
 
 const webSite = ref<string>();
+const sourceUrl = ref<string>();
 const limitTime = ref<number>();
 const limitTimeString = ref<string>();
 const summaryCounter = ref<number>();
@@ -47,6 +48,7 @@ const haveToShowDeffering = ref<boolean>();
 onMounted(async () => {
   const queryObj = getValueFromQuery(location.href);
   webSite.value = queryObj.domain ?? '';
+  sourceUrl.value = queryObj.url ?? '';
   limitTime.value = queryObj.limitTime;
   limitTimeString.value = convertLimitTimeToString(queryObj.limitTime);
   summaryCounter.value = queryObj.summaryCounter ?? 0;
@@ -66,7 +68,7 @@ async function deferring() {
     haveToShowDeffering.value
   ) {
     await defering(webSite.value, 5);
-    //window.open(document.referrer);
+    if (sourceUrl.value != '') window.open(sourceUrl.value);
   }
 }
 </script>

src/tracker.ts

@@ -89,7 +89,7 @@ async function mainTracker(
     const limitExceeded = await isLimitExceeded(activeDomain, tab);
     if (limitExceeded.IsLimitExceeded) {
       const summaryCounter = tab.days.at(-1)!.counter;
-      await useBlockPage(activeDomain, limitExceeded.LimitTime!, summaryCounter);
+      await useBlockPage(activeDomain, activeTab.url!, limitExceeded.LimitTime!, summaryCounter);
       return;
     }
 

src/utils/block-page.ts

@@ -1,21 +1,29 @@
 export enum BlockParams {
-  Domain = 'url',
+  Domain = 'domain',
+  URL = 'url',
   LimitTime = 'summaryTime',
   SummaryCounter = 'summaryCounter',
 }
 
-export function buildBlockQuery(url: string, liimitTime: number, summaryCounter: number) {
-  return `?url=${url}&summaryTime=${liimitTime}&summaryCounter=${summaryCounter}`;
+export function buildBlockQuery(
+  domain: string,
+  url: string,
+  liimitTime: number,
+  summaryCounter: number,
+) {
+  return `?domain=${domain}&url=${url}&summaryTime=${liimitTime}&summaryCounter=${summaryCounter}`;
 }
 
 export function getValueFromQuery(url: string) {
   const urlObj = new URL(url);
   const domain = urlObj.searchParams.get(BlockParams.Domain);
+  const sourceUrl = urlObj.searchParams.get(BlockParams.URL);
   const limitTime = Number(urlObj.searchParams.get(BlockParams.LimitTime));
   const summaryCounter = Number(urlObj.searchParams.get(BlockParams.SummaryCounter));
 
   return {
     domain: domain,
+    url: sourceUrl,
     limitTime: limitTime,
     summaryCounter: summaryCounter,
   };