Send daily summary notification

Author: Stigmatoz

src/components/Limits.vue

@@ -110,6 +110,8 @@ function getTimeForLimit(time: number) {
 function deleteFromLimitList(url: string) {
   limitList.value = limitList.value!.filter(x => x.domain != url);
   save(limitList.value);
+  newWebsiteForLimitList.value = '';
+  isEdit.value = false;
 }
 
 function editItemFromLimitList(url: string, timeForUrl: number) {

src/components/Notifications.vue

@@ -44,7 +44,7 @@ import {
   DAILY_NOTIFICATION_DEFAULT,
   DAILY_SUMMARY_NOTIFICATION_TIME_DEFAULT,
 } from '../storage/storage-params';
-import { convertHHMMToSeconds, convertSecondsToHHMM } from '../utils/converter';
+import { convertHHMMToMilliSeconds, convertMilliSecondsToHHMM } from '../utils/converter';
 import { Time } from '../utils/time';
 
 const settingsStorage = injecStorage();
@@ -64,7 +64,7 @@ onMounted(async () => {
     DAILY_SUMMARY_NOTIFICATION_TIME_DEFAULT,
   )) as number;
 
-  const timeObj = convertSecondsToHHMM(dailyNotificationTime.value);
+  const timeObj = convertMilliSecondsToHHMM(dailyNotificationTime.value);
   notificationTime.value = timeObj;
 });
 
@@ -73,7 +73,7 @@ function handleDate(modelData: Time) {
     notificationTime.value = modelData;
     save(
       StorageParams.DAILY_SUMMARY_NOTIFICATION_TIME,
-      convertHHMMToSeconds(notificationTime.value.hours, notificationTime.value.minutes),
+      convertHHMMToMilliSeconds(notificationTime.value.hours, notificationTime.value.minutes),
     );
   }
 }

src/compositions/deferList.ts

@@ -1,4 +1,4 @@
-import { differenceInCalendarDays } from 'date-fns';
+import { differenceInHours } from 'date-fns';
 import { StorageParams } from '../storage/storage-params';
 import { isDomainEquals } from '../utils/common';
 import { Settings } from './settings';
@@ -15,16 +15,12 @@ export async function isInDeferList(url: string): Promise<boolean> {
   const item = array?.find(x => isDomainEquals(x.domain, url));
   if (item != undefined)
     log(
-      `Deferring time ${url} ${new Date(item.time)} diff ${differenceInCalendarDays(
+      `Deferring time ${url} ${new Date(item.time)} diff ${differenceInHours(
         new Date(item.time),
         new Date(),
       )}`,
     );
-  return (
-    item != undefined &&
-    item.time > Date.now() &&
-    differenceInCalendarDays(new Date(item.time), new Date()) == 0
-  );
+  return item != undefined && item.time > Date.now();
 }
 
 export async function canDefering(url: string): Promise<boolean> {
@@ -35,16 +31,14 @@ export async function canDefering(url: string): Promise<boolean> {
   const item = array?.find(x => isDomainEquals(x.domain, url));
   if (item != undefined)
     log(
-      `Deferring time ${url} ${new Date(item.time)} diff ${differenceInCalendarDays(
+      `Deferring time ${url} ${new Date(item.time)} diff ${differenceInHours(
         new Date(item.time),
         new Date(),
       )}`,
     );
-  return !(
-    item != undefined &&
-    ((item.time < Date.now() && differenceInCalendarDays(new Date(item.time), new Date()) == 0) ||
-      item.time > Date.now())
-  );
+  if (item == undefined) return true;
+
+  return item != undefined && differenceInHours(new Date(item.time), new Date()) > 24;
 }
 
 export async function defering(url: string, timeInMinutes: number): Promise<void> {

src/compositions/summary-data-today.ts

@@ -0,0 +1,52 @@
+import { Tab } from '../entity/tab';
+import { injectTabsRepository } from '../repository/inject-tabs-repository';
+import { todayLocalDate } from '../utils/date';
+import { DaySummary } from '../dto/daySummary';
+import { startOfYesterday } from 'date-fns';
+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)}%`,
+  };
+}
+
+function getData(date: string, unSortedTabs: Tab[]) {
+  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;
+  });
+
+  const summaryTimeList = tabs?.map(function (tab) {
+    return tab.days.find(day => day.date === date)!.summary;
+  });
+
+  const summaryTime =
+    summaryTimeList != undefined && summaryTimeList.length > 0
+      ? summaryTimeList.reduce(function (a, b) {
+          return a + b;
+        })
+      : 0;
+
+  const mostVisitedTab = tabs[0];
+  const mostVisitedSite = mostVisitedTab.url;
+  const mostVisitedSiteTime = mostVisitedTab.days.find(s => s.date === date)?.summary!;
+
+  return {
+    time: summaryTime,
+    mostVisitedSite: mostVisitedSite,
+    mostVisitedSiteTime: mostVisitedSiteTime,
+  };
+}

src/dto/daySummary.ts

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

src/jobs/daily-summary-notification.ts

@@ -0,0 +1,36 @@
+import Browser from 'webextension-polyfill';
+import { useWebUsageSummaryForDay } from '../compositions/summary-data-today';
+import { convertLimitTimeToString } from '../utils/converter';
+import { Settings } from '../compositions/settings';
+import { StorageParams } from '../storage/storage-params';
+
+const NOTIFICATION_ID = 'daily-summary-notification';
+
+export async function dailySummaryNotification() {
+  const showDailyNotifacation = (await Settings.getInstance().getSetting(
+    StorageParams.DAILY_NOTIFICATION,
+  )) as boolean;
+
+  if (showDailyNotifacation) {
+    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)}`;
+
+    await showNotification(title, message);
+  }
+}
+
+async function showNotification(title: string, message: string) {
+  await Browser.notifications.clear(NOTIFICATION_ID);
+  await Browser.notifications.create(NOTIFICATION_ID, {
+    type: 'basic',
+    title: title,
+    message: message,
+    iconUrl: Browser.runtime.getURL('128x128.png'),
+    isClickable: false,
+  });
+}

src/jobs/sheduler.ts

@@ -1,36 +1,38 @@
 import Browser, { Alarms } from 'webextension-polyfill';
-import { logger } from '../compositions/logger';
+import { log } from '../compositions/logger';
 import { StorageParams } from '../storage/storage-params';
 import { DAY_MINUTES, getNextTimeOfDay } from '../utils/time';
 import { Settings } from '../compositions/settings';
+import { dailySummaryNotification } from './daily-summary-notification';
 
 export enum JobId {
   DailySummaryNotification = '@alarm/daily-summary-notification',
 }
 
 export function scheduleJobs(): void {
   Browser.alarms.onAlarm.addListener(async alarm => {
-    logger.log(`[schedule-jobs] Alarm ${alarm.name} triggered`, alarm);
+    log(`[schedule-jobs] Alarm ${alarm.name} triggered`, alarm);
     switch (alarm.name) {
       case JobId.DailySummaryNotification: {
-        //await dailySummaryNotification();
+        await dailySummaryNotification();
         break;
       }
     }
-    logger.log(`[schedule-jobs] ${alarm.name} finished`);
+    log(`[schedule-jobs] ${alarm.name} finished`);
   });
 
-  Browser.runtime.onInstalled.addListener(rescheduleJobs);
+  rescheduleJobs();
 }
 
-async function rescheduleJobs(): Promise<void> {
+export async function rescheduleJobs(): Promise<void> {
+  log('Reschedule jobs');
   const dailySummaryNotificationTime = (await Settings.getInstance().getSetting(
     StorageParams.DAILY_SUMMARY_NOTIFICATION_TIME,
   )) as number;
   await Browser.alarms.clear(JobId.DailySummaryNotification);
   Browser.alarms.create(JobId.DailySummaryNotification, {
     when: getNextTimeOfDay(dailySummaryNotificationTime),
-    periodInMinutes: DAY_MINUTES,
+    periodInMinutes: 1,
   });
 }
 

src/storage/storage-params.ts

@@ -78,5 +78,7 @@ export function getDefaultValue(param: StorageParams) {
       return [];
     case StorageParams.DAILY_SUMMARY_NOTIFICATION_TIME:
       return DAILY_SUMMARY_NOTIFICATION_TIME_DEFAULT;
+    case StorageParams.DAILY_NOTIFICATION:
+      return DAILY_NOTIFICATION_DEFAULT;
   }
 }

src/utils/converter.ts

@@ -1,9 +1,13 @@
-import { Time } from './time';
+import { HOUR, MINUTE, Time } from './time';
 
 export function convertHHMMToSeconds(hours: number, minutes: number) {
   return hours * 3600 + minutes * 60;
 }
 
+export function convertHHMMToMilliSeconds(hours: number, minutes: number) {
+  return hours * HOUR + minutes * MINUTE;
+}
+
 export function convertSecondsToHHMM(seconds: number): Time {
   const hours = Math.floor(seconds / 3600);
   const totalSeconds = seconds % 3600;
@@ -15,6 +19,17 @@ export function convertSecondsToHHMM(seconds: number): Time {
   };
 }
 
+export function convertMilliSecondsToHHMM(seconds: number): Time {
+  const hours = Math.floor(seconds / HOUR);
+  const totalSeconds = seconds % HOUR;
+  const mins = Math.floor(totalSeconds / MINUTE);
+
+  return {
+    hours: hours,
+    minutes: mins,
+  };
+}
+
 export function convertSummaryTimeToBadgeString(summaryTime: number): string {
   const sec = summaryTime;
   const min = Number((summaryTime / 60).toFixed(0));