Merge pull request #133 from mikeboensel/master

Stigmatoz · web-flow · commit 34337a4d876e · 2024-02-26T17:19:50.000+03:00
Typo fixes
diff --git a/src/background.ts b/src/background.ts
@@ -4,7 +4,7 @@ import { logger } from './utils/logger';
 import { scheduleJobs } from './jobs/sheduler';
 import { Settings } from './functions/settings';
 import { StorageParams } from './storage/storage-params';
-import { injecStorage } from './storage/inject-storage';
+import { injectStorage } from './storage/inject-storage';
 import { todayLocalDate } from './utils/date';
 import { checkPomodoro } from './functions/pomodoro';
 import { Messages } from './utils/messages';
@@ -34,7 +34,7 @@ Browser.runtime.setUninstallURL('https://webtracker.online/goodbye.html');
 Browser.runtime.onInstalled.addListener(async details => {
   if (details.reason == 'install') {
     logger.log('Extension installed:', details);
-    const settingsStorage = injecStorage();
+    const settingsStorage = injectStorage();
     await settingsStorage.saveValue(StorageParams.INSTALL_DATE, todayLocalDate());
 
     const initialPageUrl = Browser.runtime.getURL('src/welcome.html');
@@ -65,7 +65,7 @@ Browser.windows.onFocusChanged.addListener(() => {
 
 async function pomodoro(value?: boolean) {
   if (value == undefined) {
-    const settingsStorage = injecStorage();
+    const settingsStorage = injectStorage();
     value = await settingsStorage.getValue(StorageParams.IS_POMODORO_ENABLED);
   }
   if (value == true) pomodoroTimer = setInterval(checkPomodoro, 1000);
@@ -78,13 +78,13 @@ initTracker();
 
 Browser.runtime.onMessage.addListener(async message => {
   if (message == Messages.ClearAllData) {
-    const storage = injecStorage();
+    const storage = injectStorage();
     const repo = await injectTabsRepositorySingleton();
     repo.removeAllTabs();
     await storage.saveTabs([]);
   }
   if (message.message == Messages.Restore) {
-    const storage = injecStorage();
+    const storage = injectStorage();
     await storage.saveTabs(message.data);
     const repo = await injectTabsRepositorySingleton();
     repo.initAsync();
diff --git a/src/compositions/deferList.ts b/src/compositions/deferList.ts
@@ -3,7 +3,7 @@ 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 { injectStorage } from '../storage/inject-storage';
 import { MINUTE } from '../utils/time';
 import { log } from '../utils/logger';
 
@@ -42,7 +42,7 @@ export async function canDefering(url: string): Promise<boolean> {
 }
 
 export async function defering(url: string, timeInMinutes: number): Promise<void> {
-  const settingsStorage = injecStorage();
+  const settingsStorage = injectStorage();
 
   const deferList = (await Settings.getInstance().getSetting(
     StorageParams.BLOCK_DEFERRAL_TIME,
diff --git a/src/compositions/settings.ts b/src/compositions/settings.ts
@@ -1,4 +1,4 @@
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { StorageParams, getDefaultValue } from '../storage/storage-params';
 
 export class Settings {
@@ -26,7 +26,7 @@ export class Settings {
   }
 
   private async getValue(param: StorageParams) {
-    const storage = injecStorage();
+    const storage = injectStorage();
     const value = await storage.getValue(param, getDefaultValue(param));
     this._settings.set(param, value);
     return value;
diff --git a/src/compositions/useBlockPage.ts b/src/compositions/useBlockPage.ts
@@ -5,7 +5,7 @@ import { NO_FAVICON } from '../utils/consts';
 export async function useBlockPage(
   domain: string,
   url: string,
-  liimitTime: number,
+  limitTime: number,
   summaryCounter: number,
   favIconUrl: string | undefined,
 ): Promise<void> {
@@ -15,7 +15,7 @@ export async function useBlockPage(
       : favIconUrl;
   const blockUrl =
     Browser.runtime.getURL('src/block.html') +
-    buildBlockQuery(domain, url, liimitTime, summaryCounter, favicon);
+    buildBlockQuery(domain, url, limitTime, summaryCounter, favicon);
   const tab = await Browser.tabs.query({ currentWindow: true, active: true });
   await Browser.tabs.update(tab[0].id, { url: blockUrl });
 }
diff --git a/src/compositions/useDailyIntervals.ts b/src/compositions/useDailyIntervals.ts
@@ -1,12 +1,12 @@
 import { TimeInterval } from '../entity/time-interval';
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { StorageDeserializeParam } from '../storage/storage-params';
 import { todayLocalDate } from '../utils/date';
 
 export async function useDailyIntervals() {
   async function closeInterval(domain: string | null): Promise<void> {
     if (domain == null) return;
-    const storage = injecStorage();
+    const storage = injectStorage();
     const timeIntervalList = (await storage.getDeserializeList(
       StorageDeserializeParam.TIMEINTERVAL_LIST,
     )) as TimeInterval[];
@@ -18,7 +18,7 @@ export async function useDailyIntervals() {
   async function addInterval(domain: string | null): Promise<void> {
     if (domain == null) return;
 
-    const storage = injecStorage();
+    const storage = injectStorage();
     let timeIntervalList = (await storage.getDeserializeList(
       StorageDeserializeParam.TIMEINTERVAL_LIST,
     )) as TimeInterval[];
diff --git a/src/compositions/usePromoExtension.ts b/src/compositions/usePromoExtension.ts
@@ -1,6 +1,6 @@
 import { computed } from 'vue';
 import { Restriction } from '../entity/restriction';
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { StorageParams } from '../storage/storage-params';
 import { useExtensionPage } from './useExtensionPage';
 
@@ -11,7 +11,7 @@ export const QUERY_PARAMS_BLOCK = 'block.html';
 export const QUERY_PARAMS_BLOCK_DOMAIN = 'domain';
 
 export async function usePromoExtension() {
-  const settingsStorage = injecStorage();
+  const settingsStorage = injectStorage();
   const extensionPage = useExtensionPage();
 
   const hasReviewOnLimits = await settingsStorage.getValue(
diff --git a/src/compositions/useRemoveAllData.ts b/src/compositions/useRemoveAllData.ts
@@ -1,9 +1,9 @@
 import Browser from 'webextension-polyfill';
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { Messages } from '../utils/messages';
 
 export async function useRemoveAllData() {
-  const storage = injecStorage();
+  const storage = injectStorage();
   await storage.saveIntervalList([]);
   await Browser.runtime.sendMessage(Messages.ClearAllData);
 }
diff --git a/src/functions/deferList.ts b/src/functions/deferList.ts
@@ -3,7 +3,7 @@ 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 { injectStorage } from '../storage/inject-storage';
 import { MINUTE } from '../utils/time';
 import { log } from '../utils/logger';
 
@@ -42,7 +42,7 @@ export async function canDefering(url: string): Promise<boolean> {
 }
 
 export async function defering(url: string, timeInMinutes: number): Promise<void> {
-  const settingsStorage = injecStorage();
+  const settingsStorage = injectStorage();
 
   const deferList = (await Settings.getInstance().getSetting(
     StorageParams.BLOCK_DEFERRAL_TIME,
diff --git a/src/functions/pomodoro.ts b/src/functions/pomodoro.ts
@@ -1,5 +1,5 @@
 import { addSeconds } from 'date-fns';
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { StorageParams } from '../storage/storage-params';
 import { useBadge, BadgeIcon, BadgeColor } from './useBadge';
 import { Settings } from './settings';
@@ -72,7 +72,7 @@ export async function checkPomodoro() {
     });
   }
 
-  const storage = injecStorage();
+  const storage = injectStorage();
   const isPomodoroEnabled = (await Settings.getInstance().getSetting(
     StorageParams.IS_POMODORO_ENABLED,
   )) as boolean;
diff --git a/src/functions/settings.ts b/src/functions/settings.ts
@@ -1,4 +1,4 @@
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { StorageParams, getDefaultValue } from '../storage/storage-params';
 
 export class Settings {
@@ -26,7 +26,7 @@ export class Settings {
   }
 
   private async getValue(param: StorageParams) {
-    const storage = injecStorage();
+    const storage = injectStorage();
     const value = await storage.getValue(param, getDefaultValue(param));
     this._settings.set(param, value);
     return value;
diff --git a/src/functions/useBlockPage.ts b/src/functions/useBlockPage.ts
@@ -5,7 +5,7 @@ import { NO_FAVICON } from '../utils/consts';
 export async function useBlockPage(
   domain: string,
   url: string,
-  liimitTime: number,
+  limitTime: number,
   summaryCounter: number,
   favIconUrl: string | undefined,
 ): Promise<void> {
@@ -15,7 +15,7 @@ export async function useBlockPage(
       : favIconUrl;
   const blockUrl =
     Browser.runtime.getURL('src/block.html') +
-    buildBlockQuery(domain, url, liimitTime, summaryCounter, favicon);
+    buildBlockQuery(domain, url, limitTime, summaryCounter, favicon);
   const tab = await Browser.tabs.query({ currentWindow: true, active: true });
   await Browser.tabs.update(tab[0].id, { url: blockUrl });
 }
diff --git a/src/functions/useDailyIntervals.ts b/src/functions/useDailyIntervals.ts
@@ -1,12 +1,12 @@
 import { TimeInterval } from '../entity/time-interval';
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { StorageDeserializeParam } from '../storage/storage-params';
 import { todayLocalDate } from '../utils/date';
 
 export async function useDailyIntervals() {
   async function closeInterval(domain: string | null): Promise<void> {
     if (domain == null) return;
-    const storage = injecStorage();
+    const storage = injectStorage();
     const timeIntervalList = (await storage.getDeserializeList(
       StorageDeserializeParam.TIMEINTERVAL_LIST,
     )) as TimeInterval[];
@@ -18,7 +18,7 @@ export async function useDailyIntervals() {
   async function addInterval(domain: string | null): Promise<void> {
     if (domain == null) return;
 
-    const storage = injecStorage();
+    const storage = injectStorage();
     let timeIntervalList = (await storage.getDeserializeList(
       StorageDeserializeParam.TIMEINTERVAL_LIST,
     )) as TimeInterval[];
diff --git a/src/functions/useRemoveAllData.ts b/src/functions/useRemoveAllData.ts
@@ -1,9 +1,9 @@
 import Browser from 'webextension-polyfill';
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { Messages } from '../utils/messages';
 
 export async function useRemoveAllData() {
-  const storage = injecStorage();
+  const storage = injectStorage();
   await storage.saveIntervalList([]);
   await Browser.runtime.sendMessage(Messages.ClearAllData);
 }
diff --git a/src/jobs/remove-time-intervals.ts b/src/jobs/remove-time-intervals.ts
@@ -1,10 +1,10 @@
 import { StorageDeserializeParam } from '../storage/storage-params';
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { TimeInterval } from '../entity/time-interval';
 import { todayLocalDate } from '../utils/date';
 
 export async function removeOldTimeIntervals() {
-  const storage = injecStorage();
+  const storage = injectStorage();
   let timeIntervalList = (await storage.getDeserializeList(
     StorageDeserializeParam.TIMEINTERVAL_LIST,
   )) as TimeInterval[];
diff --git a/src/repository/tabs-repository.ts b/src/repository/tabs-repository.ts
@@ -1,6 +1,6 @@
 import { ITabsRepository } from './tabs-repository-interface';
 import { Tab } from '../entity/tab';
-import { injecStorage } from '../storage/inject-storage';
+import { injectStorage } from '../storage/inject-storage';
 import { isInBlackList } from '../functions/black-list';
 import { StorageDeserializeParam } from '../storage/storage-params';
 import { todayLocalDate } from '../utils/date';
@@ -13,7 +13,7 @@ export class TabsRepository implements ITabsRepository {
   }
 
   async initAsync() {
-    this.tabs = (await injecStorage().getDeserializeList(StorageDeserializeParam.TABS)) as Tab[];
+    this.tabs = (await injectStorage().getDeserializeList(StorageDeserializeParam.TABS)) as Tab[];
   }
 
   getTabs(): Tab[] {
diff --git a/src/storage/inject-storage.ts b/src/storage/inject-storage.ts
@@ -1,6 +1,6 @@
 import { LocalStorage } from './local-storage';
 import { IStorage } from './storage-interface';
 
-export function injecStorage(): IStorage {
+export function injectStorage(): IStorage {
   return new LocalStorage();
 }
diff --git a/src/tracker.ts b/src/tracker.ts
@@ -5,7 +5,7 @@ import { injectTabsRepositorySingleton } from './repository/inject-tabs-reposito
 import { isInBlackList } from './functions/black-list';
 import { useBadge, BadgeColor } from './functions/useBadge';
 import { INTERVAL_SAVE_STORAGE_DEFAULT, StorageParams } from './storage/storage-params';
-import { injecStorage } from './storage/inject-storage';
+import { injectStorage } from './storage/inject-storage';
 import { useDailyIntervals } from './functions/useDailyIntervals';
 import { ActiveTab } from './utils/active-tab';
 import { isLimitExceeded } from './functions/limit-list';
@@ -157,7 +157,7 @@ function isActiveTabWasChanged(activeDomain: string) {
 }
 
 async function saveTabs() {
-  const storage = injecStorage();
+  const storage = injectStorage();
   const repo = await injectTabsRepositorySingleton();
   const tabs = repo.getTabs();
   await storage.saveTabs(tabs);
diff --git a/src/utils/block-page.ts b/src/utils/block-page.ts
@@ -9,11 +9,11 @@ export enum BlockParams {
 export function buildBlockQuery(
   domain: string,
   url: string,
-  liimitTime: number,
+  limitTime: number,
   summaryCounter: number,
   favicon: string,
 ) {
-  return `?domain=${domain}&url=${url}&summaryTime=${liimitTime}&summaryCounter=${summaryCounter}&favicon=${favicon}`;
+  return `?domain=${domain}&url=${url}&summaryTime=${limitTime}&summaryCounter=${summaryCounter}&favicon=${favicon}`;
 }
 
 export function getValueFromQuery(url: string) {
