Merge pull request #267 from dabalroman/master

Fix of automatic calendar note imports
YukiGasai · Sep 2, 2024 · 2ee88ec · 2ee88ec
2 parents 05d086b + 0ea6ae4
commit 2ee88ec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "google-calendar",
 	"name": "Google Calendar",
-	"version": "1.10.14",
+	"version": "1.10.15",
 	"minAppVersion": "0.12.0",
 	"description": "Interact with your Google Calendar from Inside Obsidian",
 	"author": "YukiGasai",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "google-calendar",
-	"version": "1.10.14",
+	"version": "1.10.15",
 	"description": "Interact with your Google Calendar from Inside Obsidian",
 	"main": "main.js",
 	"scripts": {

diff --git a/src/helper/AutoEventNoteCreator.ts b/src/helper/AutoEventNoteCreator.ts
@@ -55,7 +55,8 @@ export const checkForEventNotes = async (plugin: GoogleCalendarPlugin): Promise<
             const match = events[i].description?.match(regex) ?? [];
             if (match.length == 3) {
                 //the trigger text was found and a new note will be created
-                await createNoteFromEvent(events[i], match[1], match[2], true)
+                //the fallback allows for formats :folder-marker-template:, :marker-template:, :folder-marker:, :marker:
+                await createNoteFromEvent(events[i], match[1] ?? plugin.settings.defaultFolder, match[2] ?? plugin.settings.defaultTemplate, true)
             }
         }
     }