Skip to content

[pull] master from Stigmatoz:master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jun 16, 2024
Merged

[pull] master from Stigmatoz:master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b0dc28
Fix UI for dark mode
Stigmatoz Jun 16, 2024
43a345c
Fix deffering
Stigmatoz Jun 16, 2024
5372a28
Bump version to 2.0.23
Stigmatoz Jun 16, 2024
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
1 change: 1 addition & 0 deletions src/assets/css/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
}
.dark .settings-content{
background-color: #303030 !important;
border-left: 1px solid #494949 !important;
}
.dark .app-block .title{
color: black;
Expand Down
2 changes: 1 addition & 1 deletion src/components/TabList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();

Expand Down
33 changes: 9 additions & 24 deletions src/functions/deferList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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> {
Expand All @@ -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);
}
2 changes: 1 addition & 1 deletion src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "__MSG_extName__",
"short_name": "Web Tracker",
"version": "2.0.22",
"version": "2.0.23",
"description": "__MSG_extDescription__",
"options_page": "src/dashboard.html",
"default_locale": "en",
Expand Down