gnus + notmuch: sync between flags

1 files changed, 22 insertions, 4 deletions

diff --git a/lib/net/jao-notmuch-gnus.el b/lib/net/jao-notmuch-gnus.el
index f5cc3b2..5cd42fa 100644
--- a/lib/net/jao-notmuch-gnus.el
+++ b/lib/net/jao-notmuch-gnus.el
@@ -1,6 +1,6 @@
 ;;; jao-notmuch-gnus.el --- notmuch-gnus interoperability  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2022, 2024  jao
+;; Copyright (C) 2022, 2024, 2025  jao
 
 ;; Author: jao <mail@jao.io>
 ;; Keywords: mail
@@ -52,7 +52,7 @@
   "Interactively add or remove tags to the current message."
   (interactive)
   (let* ((id (or id (jao-notmuch-gnus-message-id)))
-         (current (unless tags (jao-notmuch-gnus-message-tags id)))
+         (current (or tags (jao-notmuch-gnus-message-tags id)))
          (prompt (format "Change tags %s" (string-join current "/")))
          (tags (or tags (notmuch-read-tag-changes current prompt))))
     (notmuch-tag (concat "id:" id) tags)
@@ -65,6 +65,11 @@
   (when-let (id (jao-notmuch-gnus-message-id))
     (message "%s" (string-join (jao-notmuch-gnus-message-tags id) " "))))
 
+(jao-transient-major-mode+ gnus-summary
+  ["Tags"
+   ("s" "show message tags" jao-notmuch-gnus-show-tags)
+   ("t" "tag message" jao-notmuch-gnus-tag-message)])
+
 (defun jao-notmuch-gnus-toggle-tags (tags &optional id current)
   "Toggle the given TAGS list for the current Gnus message."
   (let* ((id (or id (jao-notmuch-gnus-message-id)))
@@ -76,9 +81,9 @@
     (message "New tags: %s" (jao-notmuch-gnus-message-tags id))))
 
 (defun jao-notmuch-gnus-tag-mark ()
-  "Remove the new tag for an article when it's marked as seen by Gnus."
+  "Remove the new and unread tags for an article when it's marked as seen by Gnus."
   (when-let (id (jao-notmuch-gnus-message-id t))
-    (jao-notmuch-gnus-tag-message id '("-new") t)))
+    (jao-notmuch-gnus-tag-message id '("-new" "-unread") t)))
 
 (add-hook 'gnus-mark-article-hook #'jao-notmuch-gnus-tag-mark)
 
@@ -223,6 +228,19 @@ Example:
 
   (consult-customize jao-gnus-consult-notmuch :preview-key 'any))
 
+;;; tags and flags
+
+(defun jao-notmuch-gnus-flag-current (&rest _)
+  (jao-notmuch-gnus-tag-message nil '("+flagged") t))
+
+(defun jao-notmuch-gnus-unflag-current (&rest _)
+  (jao-notmuch-gnus-tag-message nil '("-flagged") t))
+
+(advice-add 'gnus-summary-tick-article-forward
+            :before #'jao-notmuch-gnus-flag-current)
+(advice-add 'gnus-summary-mark-as-read-forward
+            :before #'jao-notmuch-gnus-unflag-current)
+
 ;;; .
 (provide 'jao-notmuch-gnus)
 ;;; jao-notmuch-gnus.el ends here