notmuch: org links

1 files changed, 30 insertions, 23 deletions

diff --git a/lib/net/jao-notmuch.el b/lib/net/jao-notmuch.el
index 73a736e..7ae9a4f 100644
--- a/lib/net/jao-notmuch.el
+++ b/lib/net/jao-notmuch.el
@@ -1,4 +1,4 @@
-;;; jao-notmuch.el --- Extensions for notmuch     -*- lexical-binding: t; -*-
+;; jao-notmuch.el --- Extensions for notmuch     -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2021, 2022, 2023, 2024, 2025  jao
 
@@ -167,7 +167,7 @@
     (jao-notmuch-goto-tree-buffer t)))
 
 (defun jao-notmuch--view-html ()
-  "Open the text/html part of the current message using `notmuch-show-view-part'."
+  "Open the text/html part of current message using `notmuch-show-view-part'."
   (interactive)
   (save-excursion
     (goto-char
@@ -346,34 +346,21 @@
 
 
 ;;; fcc
-(defvar jao-notmuch-mua-reply-not-inherited
-  '("attachment" "sent" "new" "bigml" "jao" "trove"))
-
-(defun jao-notmuch-mua--fcc-dirs ()
-  (let* ((otags (notmuch-show-get-tags))
-         (trove (or (seq-some (lambda (x) (and (member x otags) x))
-                              '("hacking" "bills" "feeds" "jao"))
-                    "jao"))
-         (tags (seq-difference otags jao-notmuch-mua-reply-not-inherited))
-         (tagstr (mapconcat (lambda (s) (concat "+" s)) tags " "))
-         (fcc (concat "trove/" trove " " tagstr " -new +sent +trove"))
-         (fcc-dirs (assoc-delete-all ".*" (copy-alist notmuch-fcc-dirs))))
-    (append fcc-dirs `((".*" . ,fcc)))))
+(defvar jao-notmuch-tags-not-inherited
+  '("attachment" "sent" "new" "trove" "flagged" "drivel"))
+
+(defvar jao-notmuch-sent-dir "sent")
 
 (defun jao-notmuch-mua--inherited-fcc ()
-  (let* ((fn (notmuch-show-get-filename))
-         (dest (and (string-match ".*/\\(var/mail\\|Mail\\)/\\(.+?\\)/.+" fn)
-                    (match-string 2 fn)))
-         (tags (seq-difference (notmuch-show-get-tags)
-                               '("attachment" "sent" "new" "flagged")))
+  (let* ((tags (seq-difference (notmuch-show-get-tags)
+                               jao-notmuch-tags-not-inherited))
          (tagstr (mapconcat (lambda (s) (concat "+" s)) tags " "))
-         (fcc (concat dest " " tagstr " -new +sent +trove"))
+         (fcc (concat jao-notmuch-sent-dir " " tagstr " -new +sent"))
          (fcc-dirs (assoc-delete-all ".*" (copy-alist notmuch-fcc-dirs))))
     (append fcc-dirs `((".*" . ,fcc)))))
 
 (defun jao-notmuch-mua-new-reply (fun &rest args)
-  (let ((notmuch-fcc-dirs (and (not (notmuch-show-get-header :List-Id))
-                               (jao-notmuch-mua--inherited-fcc))))
+  (let ((notmuch-fcc-dirs (jao-notmuch-mua--inherited-fcc)))
     (apply fun args)))
 
 (advice-add 'notmuch-mua-new-reply :around #'jao-notmuch-mua-new-reply)
@@ -405,4 +392,24 @@
           (t "  "))))
 
 (provide 'jao-notmuch)
+;;; org links
+(defun jao-notmuch-id-file-name (id)
+  (let ((cmd (format "notmuch search --output=files id:%s" id)))
+    (car (split-string (shell-command-to-string cmd)))))
+
+(defun jao-notmuch-org-store ()
+  (when-let* ((d (and (derived-mode-p '(notmuch-show-mode notmuch-tree-mode))
+                      (cons (notmuch-show-get-message-id)
+                            (notmuch-show-get-subject)))))
+    (org-link-store-props :type "mail"
+                          :link (concat "mail:" (car d))
+                          :description (concat "Mail: " (cdr d)))))
+
+(defun jao-notmuch-org-links ()
+  (org-link-set-parameters "mail"
+                           :follow #'notmuch-show
+                           :store #'jao-notmuch-org-store)
+  (org-link-set-parameters "gnus" :store #'ignore)
+  (org-link-set-parameters "notmuch" :store #'ignore))
+
 ;;; jao-notmuch.el ends here