Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/background.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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);
Expand All @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/compositions/deferList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/compositions/settings.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/compositions/useBlockPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand All @@ -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 });
}
6 changes: 3 additions & 3 deletions src/compositions/useDailyIntervals.ts
Original file line number Diff line number Diff line change
@@ -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[];
Expand All @@ -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[];
Expand Down
4 changes: 2 additions & 2 deletions src/compositions/usePromoExtension.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions src/compositions/useRemoveAllData.ts
Original file line number Diff line number Diff line change
@@ -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);
}
4 changes: 2 additions & 2 deletions src/functions/deferList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/functions/pomodoro.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/functions/settings.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/functions/useBlockPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand All @@ -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 });
}
6 changes: 3 additions & 3 deletions src/functions/useDailyIntervals.ts
Original file line number Diff line number Diff line change
@@ -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[];
Expand All @@ -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[];
Expand Down
4 changes: 2 additions & 2 deletions src/functions/useRemoveAllData.ts
Original file line number Diff line number Diff line change
@@ -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);
}
4 changes: 2 additions & 2 deletions src/jobs/remove-time-intervals.ts
Original file line number Diff line number Diff line change
@@ -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[];
Expand Down
4 changes: 2 additions & 2 deletions src/repository/tabs-repository.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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[] {
Expand Down
2 changes: 1 addition & 1 deletion src/storage/inject-storage.ts
Original file line number Diff line number Diff line change
@@ -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();
}
4 changes: 2 additions & 2 deletions src/tracker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/utils/block-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down