Fix daily notifications

Author: Stigmatoz

src/_locales/en/messages.json

@@ -213,5 +213,14 @@
   },
   "5mins": {
     "message": "+ 5 minutes"
+  },
+  "todayUsageTime": {
+    "message": "Today's total usage time "
+  },
+  "comparedToYesterday": {
+    "message": " compared to yesterday "
+  },
+  "mostVisited": {
+    "message": "Most visited website "
   }
 }

src/_locales/ru/messages.json

@@ -213,5 +213,14 @@
   },
   "5mins": {
     "message": "+ 5 минут"
+  },
+  "todayUsageTime": {
+    "message": "Общее время использования на сегодняшний день "
+  },
+  "comparedToYesterday": {
+    "message": " по сравнению \u0441\u043e вчерашним днем "
+  },
+  "mostVisited": {
+    "message": "Самый посещаемый сайт "
   }
 }

src/components/Notifications.vue

@@ -113,7 +113,7 @@ async function saveNotificationMessage() {
 async function handleDate(modelData: Time) {
   if (modelData != null) {
     notificationTime.value = modelData;
-    save(
+    await save(
       StorageParams.DAILY_SUMMARY_NOTIFICATION_TIME,
       convertHHMMToSeconds(notificationTime.value.hours, notificationTime.value.minutes),
     );

src/compositions/notification-list.ts

@@ -20,7 +20,7 @@ export async function isNeedToShowNotification(url: string, tab: Tab): Promise<b
   if (item != undefined) {
     const date = tab.days.find(x => x.date == todayLocalDate());
     if (date != undefined) {
-      if (date.summary == item.time || date.summary % item.time == 0) {
+      if (date.summary != 0 && (date.summary == item.time || date.summary % item.time == 0)) {
         log(`Time for notification: website ${url} time ${item.time} summary time ${date.summary}`);
         return true;
       }

src/compositions/summary-data-today.ts

@@ -8,23 +8,28 @@ import { getPercentage } from '../utils/common';
 export async function useWebUsageSummaryForDay(): Promise<DaySummary | null> {
   const repo = await injectTabsRepository();
   const unSortedTabs = repo.getTodayTabs();
-  let tabs: Tab[] = [];
 
   if (unSortedTabs.length == 0) return null;
 
   const dataToday = getData(todayLocalDate(), unSortedTabs);
   const dataYesterday = getData(startOfYesterday().toLocaleDateString('en-US'), unSortedTabs);
 
   return {
-    time: dataToday.time,
-    mostVisitedSite: dataToday.mostVisitedSite,
-    mostVisitedSiteTime: dataToday.mostVisitedSiteTime,
-    timeYesterDay: dataYesterday.time,
-    percentageFromYesterday: `${getPercentage(dataToday.time, dataYesterday.time)}%`,
+    time: dataToday?.time,
+    mostVisitedSite: dataToday?.mostVisitedSite,
+    mostVisitedSiteTime: dataToday?.mostVisitedSiteTime,
+    timeYesterDay: dataYesterday?.time,
+    percentageFromYesterday:
+      dataToday == null
+        ? '0%'
+        : dataYesterday == null
+        ? '100%'
+        : `${getPercentage(dataToday.time, dataYesterday.time)}%`,
   };
 }
 
 function getData(date: string, unSortedTabs: Tab[]) {
+  if (unSortedTabs.find(x => x.days.find(d => d.date == date)) == null) return null;
   const tabs = unSortedTabs.sort(function (a: Tab, b: Tab) {
     return b.days.find(s => s.date === date)!.summary - a.days.find(s => s.date === date)!.summary;
   });

src/dto/daySummary.ts

@@ -1,7 +1,7 @@
 export type DaySummary = {
-  time: number;
-  timeYesterDay: number;
-  percentageFromYesterday: string;
-  mostVisitedSite: string;
-  mostVisitedSiteTime: number;
+  time: number | undefined;
+  timeYesterDay: number | undefined;
+  percentageFromYesterday: string | undefined;
+  mostVisitedSite: string | undefined;
+  mostVisitedSiteTime: number | undefined;
 };

src/jobs/daily-summary-notification.ts

@@ -3,6 +3,7 @@ import { convertLimitTimeToString } from '../utils/converter';
 import { Settings } from '../compositions/settings';
 import { StorageParams } from '../storage/storage-params';
 import { NotificationType, showNotification } from '../compositions/show-notification';
+import i18n from '../plugins/i18n';
 
 export async function dailySummaryNotification() {
   const showDailyNotifacation = (await Settings.getInstance().getSetting(
@@ -13,10 +14,14 @@ export async function dailySummaryNotification() {
     const data = await useWebUsageSummaryForDay();
     if (data == null) return;
 
-    const title = `Today's total usage time ${convertLimitTimeToString(data.time)}`;
-    const message = `${data?.percentageFromYesterday} compared to yesterday \n${
-      data.mostVisitedSite
-    } most visited website ${convertLimitTimeToString(data.mostVisitedSiteTime)}`;
+    const title = `${i18n.global.t('todayUsageTime.message')} ${convertLimitTimeToString(
+      data.time!,
+    )}`;
+    const message = `${data?.percentageFromYesterday} ${i18n.global.t(
+      'comparedToYesterday.message',
+    )} \n${data.mostVisitedSite} ${i18n.global.t('mostVisited.message')} ${convertLimitTimeToString(
+      data.mostVisitedSiteTime!,
+    )}`;
 
     await showNotification(NotificationType.DailySummaryNotification, title, message);
   }

src/jobs/sheduler.ts

@@ -42,8 +42,10 @@ async function rescheduleJobs(): Promise<void> {
     StorageParams.DAILY_SUMMARY_NOTIFICATION_TIME,
   )) as number;
   await Browser.alarms.clear(JobId.DailySummaryNotification);
+  const nextTime = getNextTimeOfDay(dailySummaryNotificationTime * SECOND);
+  log(`[schedule-jobs] ${JobId.DailySummaryNotification} start time ${new Date(nextTime)}`);
   Browser.alarms.create(JobId.DailySummaryNotification, {
-    when: getNextTimeOfDay(dailySummaryNotificationTime * SECOND),
+    when: nextTime,
     periodInMinutes: DAY_MINUTES,
   });
 
@@ -59,6 +61,11 @@ async function createAlarmIfMissing(
 ): Promise<void> {
   const existing = await Browser.alarms.get(name).catch(() => undefined);
   if (existing == null) {
+    log(
+      `[schedule-jobs] ${name} start time ${
+        alarmInfo.when != undefined ? new Date(alarmInfo.when) : null
+      }`,
+    );
     Browser.alarms.create(name, alarmInfo);
   }
 }

vite.config.ts

@@ -36,7 +36,7 @@ export default defineConfig(({ mode }) => ({
 
     emptyOutDir: true,
     sourcemap: mode === 'development' ? 'inline' : false,
-    minify: true,
+    minify: mode === 'development' ? false : true,
   },
   define: {
     'process.env': process.env,