From 18aa3ac7871e3867961dfe94eb79fc1694df1988 Mon Sep 17 00:00:00 2001
From: Jethro Kuan <jethrokuan95@gmail.com>
Date: Wed, 7 Apr 2021 10:01:33 +0800
Subject: [PATCH] implement correct fix for org-roam-dailies

---
 org-roam-capture.el | 9 +++++----
 org-roam-dailies.el | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/org-roam-capture.el b/org-roam-capture.el
index 97db54e..d590f10 100644
--- a/org-roam-capture.el
+++ b/org-roam-capture.el
@@ -278,11 +278,13 @@ This function is to be called in the org-capture finalization process."
 
 (defun org-roam-capture--finalize ()
   "Finalize the `org-roam-capture' process."
-  (let ((region (org-roam-capture--get :region)))
+  (let ((region (org-roam-capture--get :region))
+        id)
     (when region
       (org-roam-unshield-region (car region) (cdr region)))
     (unless org-note-abort
-      (let ((id (org-roam-capture--finalize-create-id)))
+      (setq id (org-roam-capture--finalize-create-id))
+      (when-let ((finalize (org-roam-capture--get :finalize)))
         (funcall (intern (concat "org-roam-capture--finalize-"
                                  (symbol-name (org-roam-capture--get :finalize))))
                  :id id)))
@@ -514,7 +516,7 @@ This function is used solely in Org-roam's capture templates: see
        (append converted options `(:org-roam ,org-roam-plist))))
     (_ (user-error "Invalid capture template format: %s" template))))
 
-(cl-defun org-roam-capture--capture (&optional goto &key keys info context)
+(cl-defun org-roam-capture--capture (&key goto keys info context)
   (let* ((org-capture-templates
           (mapcar #'org-roam-capture--convert-template org-roam-capture-templates))
          (org-roam-capture--info info)
@@ -522,7 +524,6 @@ This function is used solely in Org-roam's capture templates: see
          (one-template-p (= (length org-capture-templates) 1)))
     (when one-template-p
       (setq keys (caar org-capture-templates)))
-    (setq org-roam-capture-additional-template-props (list :finalize 'find-file))
     (org-capture goto keys)))
 
 ;;;###autoload
diff --git a/org-roam-dailies.el b/org-roam-dailies.el
index f2f3234..32d9a5d 100644
--- a/org-roam-dailies.el
+++ b/org-roam-dailies.el
@@ -154,7 +154,7 @@ When GOTO is non-nil, go the note without creating an entry."
                                       (if goto (list (car it)) it)))
         (org-roam-capture--info (list (cons 'time time)))
         (org-roam-capture--context 'dailies))
-    (org-roam-capture--capture (when goto '(4))
+    (org-roam-capture--capture :goto (when goto '(4))
                                :info (list (cons 'time time))
                                :context 'dailies)))