hooked up tasks to notification modals

.vscode/settings.json

@@ -1,3 +1,65 @@
 {
-    "npm.packageManager": "yarn"
+    "npm.packageManager": "yarn",
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true,
+        "**/Thumbs.db": true,
+        "docs": true,
+        ".github": true,
+        "contributing": true,
+        "docs-snippets": true,
+        "node_modules": true,
+        "resources": true,
+        ".eslintrc.js": true,
+        ".editorconfig": true,
+        ".eslintignore": true,
+        ".gitattributes": true,
+        ".gitignore": true,
+        ".markdownlint.jsonc": true,
+        ".prettierrc.js": true,
+        "CODE_OF_CONDUCT.md": true,
+        "CONTRIBUTING.md": true,
+        "esbuild.config.mjs": true,
+        "jest.config.js": true,
+        "lefthook.yml": true,
+        "LICENSE": true,
+        "yarn.lock": true,
+        "versions.json": true,
+        "styles.css": true,
+        "release.sh": true,
+        "manifest.json": true,
+        "mdsnippets.json": true,
+        "package.json": true
+    },
+    "hide-files.files": [
+        "docs",
+        ".github",
+        "contributing",
+        "docs-snippets",
+        "node_modules",
+        "resources",
+        ".eslintrc.js",
+        ".editorconfig",
+        ".eslintignore",
+        ".gitattributes",
+        ".gitignore",
+        ".markdownlint.jsonc",
+        ".prettierrc.js",
+        "CODE_OF_CONDUCT.md",
+        "CONTRIBUTING.md",
+        "esbuild.config.mjs",
+        "jest.config.js",
+        "lefthook.yml",
+        "LICENSE",
+        "yarn.lock",
+        "versions.json",
+        "styles.css",
+        "release.sh",
+        "manifest.json",
+        "mdsnippets.json",
+        "package.json",
+    ]
 }

src/main.ts

@@ -1,6 +1,6 @@
 import { Plugin } from 'obsidian';
 
-import { TaskNotification } from './reminders/notification';
+import { TaskNotification } from './reminders/Notification';
 import { Cache } from './Cache';
 import { Commands } from './Commands';
 import { TasksEvents } from './TasksEvents';
@@ -51,6 +51,7 @@ export default class TasksPlugin extends Plugin {
             vault: this.app.vault,
             events,
         });
+        console.log('cache', this.cache);
         this.inlineRenderer = new InlineRenderer({ plugin: this });
         this.queryRenderer = new QueryRenderer({ plugin: this, events });
 

src/reminders/Reminder.ts

@@ -1,7 +1,7 @@
 import type { Moment } from 'moment';
 
 export class Reminder {
-    public date: Moment | null;
+    public date: Moment;
     private isAck: boolean;
 
     constructor(date: Moment) {
@@ -10,10 +10,10 @@ export class Reminder {
     }
 
     public toString(): string {
-        return `${this.date?.format('YYYY-MM-DD')}`;
+        return `${this.date.format('YYYY-MM-DD')}`;
     }
 
-    public getDate(): Moment | null {
+    public getDate(): Moment {
         return this.date;
     }
 
@@ -24,18 +24,4 @@ export class Reminder {
     public complete(): void {
         this.isAck = true;
     }
-
-    //   public getExpiredReminders(defaultTime: Time): Array<Reminder> {
-    //     const now = new Date().getTime();
-    //     const result: Array<Reminder> = [];
-    //     for (let i = 0; i < this.reminders.length; i++) {
-    //       const reminder = this.reminders[i]!;
-    //       if (reminder.time.getTimeInMillis(defaultTime) <= now) {
-    //         result.push(reminder);
-    //       } else {
-    //         break;
-    //       }
-    //     }
-    //     return result;
-    //   }
 }

src/reminders/components/Reminder.svelte

@@ -2,8 +2,9 @@
   import type { Component } from "obsidian";
   import Icon from "./Icon.svelte";
   import Markdown from "./Markdown.svelte";
+  import type { Task } from "../../Task";
 
-  export let reminder: any;
+  export let task: Task;
   export let component: Component;
   export let onRemindMeLater: (time: any) => void;
   export let onDone: () => void;
@@ -26,16 +27,16 @@
 <main>
   <h1>
     <Markdown
-      markdown={reminder.title}
-      sourcePath={reminder.file}
+      markdown={task.description}
+      sourcePath={task.filename ?? "NO FILE"} 
       {component}
     />
   </h1>
-  <span class="reminder-file" on:click={onOpenFile}>
+  <span class="task-file" on:click={onOpenFile}>
     <Icon icon="link" />
-    {reminder.file}
+    {"task.file"}
   </span>
-  <div class="reminder-actions">
+  <div class="task-actions">
     <button class="mod-cta" on:click={onDone}>
       <Icon icon="check-small" /> Mark as Done
     </button>
@@ -63,18 +64,18 @@
     margin: 0 auto;
   }
 
-  .reminder-actions {
+  .task-actions {
     margin-top: 1rem;
     display: flex;
     gap: 0.5rem;
   }
 
-  .reminder-file {
+  .task-file {
     color: var(--text-muted);
     cursor: pointer;
   }
 
-  .reminder-file:hover {
+  .task-file:hover {
     color: var(--text-normal);
     text-decoration: underline;
   }

src/reminders/notification.ts

@@ -7,29 +7,23 @@ const Notification = electron.remote.Notification;
 //  Platform.isDesktopApp, // Platform.isMobileApp,
 //  import { Platform } from 'obsidian';
 
+const notificationTitle = 'Task Reminder'; //TODO constant for language localization, is there a file for these already?
+
 export class TaskNotification {
     constructor(private app: App) {} //private app: App
 
-    public show() {
-        const reminder = {
-            title: 'Reminder Title',
-            file: 'path/to/file.md',
-            time: new Date(),
-            rowNumber: 1,
-            done: false,
-        };
-
+    public show(task: Task) {
         // if election notification is supported, aka desktop app
         if (Notification.isSupported()) {
             // Show system notification
             const n = new Notification({
-                title: 'Obsidian Reminder',
-                body: "Hello World, You've got mail!",
+                title: notificationTitle, // todo set to constant for language localization
+                body: task.description,
             });
             n.on('click', () => {
                 console.log('Notification clicked');
                 n.close();
-                this.showBuiltinReminder(reminder);
+                this.showBuiltinReminder(task);
             });
             n.on('close', () => {
                 console.log('Notification closed');
@@ -56,7 +50,7 @@ export class TaskNotification {
         } else {
             // Show obsidian modal notification for mobile users
             // Must be in app for this to trigger
-            this.showBuiltinReminder(reminder);
+            this.showBuiltinReminder(task);
         }
     }
 
@@ -77,7 +71,7 @@ export class TaskNotification {
             this.reminderEvent(tasks).finally(() => {
                 intervalTaskRunning = false;
             });
-        }, 1000);
+        }, 1000000);
     }
 
     private async reminderEvent(tasks: Task[]): Promise<void> {
@@ -93,16 +87,22 @@ export class TaskNotification {
             reminderTasks = reminderTasks.filter(filter.filterFunction);
         });
 
-        for (const rTask of reminderTasks) {
-            const now = window.moment();
-            const daily = window.moment().startOf('day'); // match on moments that have no time set
-            // Might want to adjust this offset to be based on the setInterval + ~1 second
-            if (rTask.reminders[0].date?.isBetween(now.subtract(30, 'seconds'), now.add(30, 'seconds'))) {
+        for (const task of reminderTasks) {
+            const now = window.moment(); // current date + time
+            const alertTime = window.moment('09:00', 'hh:mm'); // time to show daily reminders
+            const daily = window.moment().startOf('day'); // today with a blank time
+
+            // Check if reminder is within 30 seconds of now
+            // need .clone() to avoid mutating original date todo: is there a better way to do this?
+            if (task.reminders[0].date.isBetween(now, now.clone().add(30, 'seconds'))) {
                 console.log('Show Notification');
-            } else if (rTask.reminders[0].date?.isSame(daily)) {
-                // Add check for if {{9am}}
-                console.log('Daily Notification');
-                //this.show();
+                this.show(task);
+                // else check for daily reminder
+            } else if (
+                task.reminders[0].date.isSame(daily) &&
+                now.isBetween(alertTime, alertTime.clone().add(30, 'minutes'))
+            ) {
+                this.show(task);
             }
         }
     }
@@ -131,7 +131,7 @@ class ObsidianNotificationModal extends Modal {
     constructor(
         app: App,
         private laters: Array<Number>,
-        private reminder: any, // callbacks // private onRemindMeLater: (time: any) => void, // private onDone: () => void, // private onCancel: () => void, // private onOpenFile: () => void,
+        private task: Task, // callbacks // private onRemindMeLater: (time: any) => void, // private onDone: () => void, // private onCancel: () => void, // private onOpenFile: () => void,
     ) {
         super(app);
     }
@@ -141,7 +141,7 @@ class ObsidianNotificationModal extends Modal {
         new ReminderView({
             target: contentEl,
             props: {
-                reminder: this.reminder,
+                task: this.task,
                 laters: this.laters,
                 component: this,
                 onRemindMeLater: () => {