From d7461c1602a2ac50432f97a03fe5b11306dd4a61 Mon Sep 17 00:00:00 2001
From: Paz <paz@twowaysix.com>
Date: Sun, 5 Jan 2025 15:19:34 +0100
Subject: [PATCH] added more reminder types

---
 frontend/src/components/NavigationSidebar.vue |   2 +-
 frontend/src/views/HomeView.vue               |   3 +-
 internal/reminder/monitor.go                  | 102 ++++++++++++++----
 internal/reminder/monitor_test.go             |  27 ++++-
 internal/reminder/types.go                    |  16 ++-
 onyx.env                                      |   2 +-
 testdata/Reminders.md                         |  16 ++-
 testdata/Stuff.md                             |   0
 testdata/Stufffff.md                          |   0
 9 files changed, 132 insertions(+), 36 deletions(-)
 create mode 100644 testdata/Stuff.md
 create mode 100644 testdata/Stufffff.md

diff --git a/frontend/src/components/NavigationSidebar.vue b/frontend/src/components/NavigationSidebar.vue
index 387a469..6a1db2e 100644
--- a/frontend/src/components/NavigationSidebar.vue
+++ b/frontend/src/components/NavigationSidebar.vue
@@ -10,7 +10,7 @@ const props = defineProps<{
 }>()
 
 
-const emit = defineEmits(["refresh", "file-select"])
+const emit = defineEmits(["refresh"])
 
 const directoryRepository = new DirectoryContentRepository()
 const noteRepository = new NoteRepository()
diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue
index 9d652ff..2947687 100644
--- a/frontend/src/views/HomeView.vue
+++ b/frontend/src/views/HomeView.vue
@@ -132,7 +132,8 @@ function showSidebar() {
       <div id="sidebar">
         <div id="nav-area">
           <NavigationSidebar class="sidebar-content" :directory-content="directoryContent"
-            :current-directory="currentDirectory" />
+            :current-directory="currentDirectory"
+            @refresh="updateFromRoutePath()"/>
 
           <template v-if="isSidebarVisible">
             <button class="shrinker" @click="hideSidebar()">◀</button>
diff --git a/internal/reminder/monitor.go b/internal/reminder/monitor.go
index 891d411..35dcad3 100644
--- a/internal/reminder/monitor.go
+++ b/internal/reminder/monitor.go
@@ -14,15 +14,15 @@ import (
 )
 
 var interval = time.Hour
-var untilRegex *regexp.Regexp
+var onyxDirectiveRegex *regexp.Regexp
 
 func init() {
-	r, err := regexp.Compile(`\(#until:\d\d\d\d-\d{1,2}-\d{1,2}\)`)
+	r, err := regexp.Compile(`\[\[.*:.*\]\]`)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	untilRegex = r
+	onyxDirectiveRegex = r
 }
 
 type MonitoringService struct {
@@ -98,7 +98,7 @@ func (ms *MonitoringService) sendMatrixMessages(reminders []Reminder) error {
 
 	var builder strings.Builder
 	for _, reminder := range reminders {
-		builder.WriteString(fmt.Sprintf("%s\n%s\n(%s)\n\n\n", reminder.Date, reminder.ToDo, reminder.Source))
+		builder.WriteString(fmt.Sprintf("%s\n%s\n(%s)\n\n\n", reminder.Date, reminder.Content, reminder.Source))
 	}
 
 	err = ms.matrixService.SendMessage(builder.String())
@@ -118,10 +118,32 @@ func extractRemindersFromNote(note types.Note) []Reminder {
 			continue
 		}
 		reminders = append(reminders, reminder)
+
+		logging.Info(fmt.Sprintf("found reminder (%s): %s", reminder.Type, reminder.Content))
 	}
 	return reminders
 }
 
+func extractOnyxExpression(text string) (OnyxExpression, bool) {
+	match := onyxDirectiveRegex.FindString(text)
+	if match == "" {
+		return OnyxExpression{}, false
+	}
+
+	stripped := strings.Replace(match, "[[", "", 1)
+	stripped = strings.Replace(stripped, "]]", "", 1)
+
+	parts := strings.SplitN(stripped, ":", 2)
+	if len(parts) != 2 {
+		return OnyxExpression{}, false
+	}
+
+	return OnyxExpression{
+		Type:    parts[0],
+		Content: parts[1],
+	}, true
+}
+
 func extractReminderFromLine(line string, source string) (Reminder, bool) {
 	prefix := "- [ ] "
 	if !strings.HasPrefix(line, prefix) {
@@ -130,29 +152,67 @@ func extractReminderFromLine(line string, source string) (Reminder, bool) {
 
 	stripped := strings.Replace(line, prefix, "", 1)
 
-	match := untilRegex.FindString(line)
-	if match == "" {
+	onyxExpr, ok := extractOnyxExpression(stripped)
+	if !ok {
 		return Reminder{}, false
 	}
 
-	todo := strings.Replace(stripped, match, "", 1)
+	if onyxExpr.Type == deadlineType {
+		date, err := time.Parse("2006-01-02", onyxExpr.Content)
+		if err != nil {
+			logging.Error(err.Error())
+			return Reminder{}, false
+		}
 
-	dateString := strings.Replace(match, "(#until:", "", 1)
-	dateString = strings.Replace(dateString, ")", "", 1)
+		if time.Now().Before(date) {
+			return Reminder{}, false
+		}
 
-	date, err := time.Parse("2006-01-02", dateString)
-	if err != nil {
-		logging.Error(err.Error())
-		return Reminder{}, false
-	}
+		return Reminder{
+			Date:    date,
+			Content: strings.TrimSpace(stripped),
+			Type:    onyxExpr.Type,
+			Source:  source,
+		}, true
+	} else if onyxExpr.Type == birthdayType {
+		date, err := time.Parse("2006-01-02", onyxExpr.Content)
+		if err != nil {
+			logging.Error(err.Error())
+			return Reminder{}, false
+		}
 
-	if time.Now().Before(date) {
-		return Reminder{}, false
+		now := time.Now()
+		if now.Day() != date.Day() || now.Month() != date.Month() {
+			return Reminder{}, false
+		}
+
+		return Reminder{
+			Date:    date,
+			Content: strings.TrimSpace(stripped),
+			Type:    onyxExpr.Type,
+			Source:  source,
+		}, true
+	} else if onyxExpr.Type == dateType {
+		date, err := time.Parse("2006-01-02", onyxExpr.Content)
+		if err != nil {
+			logging.Error(err.Error())
+			return Reminder{}, false
+		}
+
+		now := time.Now()
+		if now.Day() != date.Day() || now.Month() != date.Month() || now.Year() != date.Year() {
+			return Reminder{}, false
+		}
+
+		return Reminder{
+			Date:    date,
+			Content: strings.TrimSpace(stripped),
+			Type:    onyxExpr.Type,
+			Source:  source,
+		}, true
+	} else {
+		logging.Warning(fmt.Sprintf("onyx expression '%s' not implemented yet", onyxExpr.Type))
 	}
 
-	return Reminder{
-		Date:   date,
-		ToDo:   strings.TrimSpace(todo),
-		Source: source,
-	}, true
+	return Reminder{}, false
 }
diff --git a/internal/reminder/monitor_test.go b/internal/reminder/monitor_test.go
index c4a6c60..78ce144 100644
--- a/internal/reminder/monitor_test.go
+++ b/internal/reminder/monitor_test.go
@@ -5,6 +5,25 @@ import (
 	"time"
 )
 
+func TestExtractOnyxExpression1(t *testing.T) {
+	line := "- [ ] Learn something [[until:2024-12-24]]"
+
+	expr, ok := extractOnyxExpression(line)
+	if !ok {
+		t.Error("could not extract onyx expression")
+	}
+
+	wantType := "until"
+	if expr.Type != wantType {
+		t.Errorf("%s != %s", expr.Type, wantType)
+	}
+
+	wantContent := "2024-12-24"
+	if expr.Content != wantContent {
+		t.Errorf("%s != %s", expr.Content, wantContent)
+	}
+}
+
 func TestExtractReminder1(t *testing.T) {
 	line := "- [ ] Learn something (#until:2024-12-24)"
 
@@ -16,8 +35,8 @@ func TestExtractReminder1(t *testing.T) {
 	}
 
 	wantToDo := "Learn something"
-	if reminder.ToDo != wantToDo {
-		t.Errorf("%s != %s", reminder.ToDo, wantToDo)
+	if reminder.Content != wantToDo {
+		t.Errorf("%s != %s", reminder.Content, wantToDo)
 	}
 
 	wantDate := time.Date(2024, time.December, 24, 0, 0, 0, 0, time.UTC)
@@ -42,8 +61,8 @@ func TestExtractReminder2(t *testing.T) {
 
 	// TODO: Should this really be the behaviour?
 	wantToDo := "Learn something  and something else"
-	if reminder.ToDo != wantToDo {
-		t.Errorf("%s != %s", reminder.ToDo, wantToDo)
+	if reminder.Content != wantToDo {
+		t.Errorf("%s != %s", reminder.Content, wantToDo)
 	}
 
 	wantDate := time.Date(2024, time.December, 24, 0, 0, 0, 0, time.UTC)
diff --git a/internal/reminder/types.go b/internal/reminder/types.go
index 5cd5b33..017c740 100644
--- a/internal/reminder/types.go
+++ b/internal/reminder/types.go
@@ -2,8 +2,18 @@ package reminder
 
 import "time"
 
+const birthdayType = "birthday"
+const deadlineType = "deadline"
+const dateType = "date"
+
 type Reminder struct {
-	Date   time.Time `json:"date"`
-	ToDo   string    `json:"todo"`
-	Source string    `json:"source"`
+	Date    time.Time `json:"date"`
+	Content string    `json:"todo"`
+	Type    string    `json:"string"`
+	Source  string    `json:"source"`
+}
+
+type OnyxExpression struct {
+	Type    string
+	Content string
 }
diff --git a/onyx.env b/onyx.env
index 34ccf9d..2d4efa8 100644
--- a/onyx.env
+++ b/onyx.env
@@ -1 +1 @@
-ONYX_VERSION=0.4.0
\ No newline at end of file
+ONYX_VERSION=0.5.0
\ No newline at end of file
diff --git a/testdata/Reminders.md b/testdata/Reminders.md
index 4d6f2bf..c429abf 100644
--- a/testdata/Reminders.md
+++ b/testdata/Reminders.md
@@ -2,9 +2,15 @@
 
 Using a list with checkboxes, a keyword and a date, reminders can be enabled:
 
-## Reminders that will be sent until they are checked
+## Reminders that will be sent on and after the date if unchecked
 
-- [x] Started Onyx development (#until:2024-12-24)
-- [ ] Fixed all bugs in Onyx (#until:2024-12-31)
-- [ ] Saved the world (#until:2022-01-21)
-- [ ] Visited Mars with a self built rocket without fuel (#until:2006-11-02)
\ No newline at end of file
+- [x] Started Onyx development [[deadline:2024-12-24]]
+- [ ] Fixed all bugs in Onyx [[deadline:2024-12-31]]
+
+## Birthdays 
+
+- [ ] Max Mustermann [[birthday:1990-01-05]]
+
+## Specific dates
+
+- [ ] Some important appointment [[date:2025-01-05]]
diff --git a/testdata/Stuff.md b/testdata/Stuff.md
new file mode 100644
index 0000000..e69de29
diff --git a/testdata/Stufffff.md b/testdata/Stufffff.md
new file mode 100644
index 0000000..e69de29