From a220fb5b7ed9e3cf55f0a85bbb11f0f264a0020b Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sat, 15 May 2021 20:20:45 -0400
Subject: migrate from msmtp (external) to emacs's own smtpmail

todo: see if it's possible to pin cert fingerprints as with msmtp
---
 .emacs.d/lisp/bandali-gnus.el    | 7 ++++++-
 .emacs.d/lisp/bandali-message.el | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to '.emacs.d/lisp')

diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index 15f5bd5..d26e4f9 100644
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -280,7 +280,8 @@ jami:bandali")
    gnus-message-replysign t
    gnus-posting-styles
    '((".*"
-      (address "bandali@gnu.org"))
+      (address "bandali@gnu.org")
+      ("X-Message-SMTP-Method" "smtp fencepost.gnu.org 587"))
      ("nnimap\\+gnu:l\\..*"
       (signature nil))
      ((header "subject" "ThankCRM")
@@ -289,23 +290,27 @@ jami:bandali")
       (eval (setq b/message-cite-say-hi nil)))
      ("nnimap\\+shemshak:.*"
       (address "amin@shemshak.org")
+      ("X-Message-SMTP-Method" "smtp mail.shemshak.org 587")
       (body "\nBest,\n")
       (signature b/shemshak-signature)
       (gcc "nnimap+shemshak:Sent")
       (eval (setq b/message-cite-say-hi t)))
      ("nnimap\\+uwaterloo:.*"
       (address "bandali@uwaterloo.ca")
+      ("X-Message-SMTP-Method" "smtp connect.uwaterloo.ca 587")
       (body "\nBest,\n")
       (signature b/uwaterloo-signature))
      ("nnimap\\+uwaterloo:INBOX"
       (gcc "\"nnimap+uwaterloo:Sent Items\""))
      ("nnimap\\+csc:.*"
       (address "bandali@csclub.uwaterloo.ca")
+      ("X-Message-SMTP-Method" "smtp mail.csclub.uwaterloo.ca 587")
       (signature b/csc-signature)
       (gcc "nnimap+csc:Sent"))
      ("nnimap\\+sfl:.*"
       (address "amin.bandali@savoirfairelinux.com")
       (signature b/sfl-signature)
+      ("X-Message-SMTP-Method" "smtp mail.savoirfairelinux.com 587")
       (gcc "nnimap+sfl:Sent")
       (eval (setq-local b/sfl-p t))))))
 ;; hooks
diff --git a/.emacs.d/lisp/bandali-message.el b/.emacs.d/lisp/bandali-message.el
index c66a669..e7a0fa4 100644
--- a/.emacs.d/lisp/bandali-message.el
+++ b/.emacs.d/lisp/bandali-message.el
@@ -55,8 +55,7 @@
    message-citation-line-format "%N writes:\n"
    message-citation-line-function 'message-insert-formatted-citation-line
    message-kill-buffer-on-exit t
-   message-send-mail-function 'message-send-mail-with-sendmail
-   message-sendmail-envelope-from 'header
+   message-send-mail-function #'smtpmail-send-it
    message-subscribed-address-functions
    '(gnus-find-subscribed-addresses)
    message-dont-reply-to-names
-- 
cgit v1.2.3-60-g2f50