From 2364adbcacc63e06a25927ccac17fc6ca02fdfb8 Mon Sep 17 00:00:00 2001 From: Ian Main Date: Fri, 3 Oct 2014 16:50:57 +1700 Subject: [PATCH] [PATCH] VIM: Better reply handling with multiple emails --- 72/d358491a47451b1c3b55ef6d5f8c7e002141b2 | 149 ++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 72/d358491a47451b1c3b55ef6d5f8c7e002141b2 diff --git a/72/d358491a47451b1c3b55ef6d5f8c7e002141b2 b/72/d358491a47451b1c3b55ef6d5f8c7e002141b2 new file mode 100644 index 000000000..1f6417b0f --- /dev/null +++ b/72/d358491a47451b1c3b55ef6d5f8c7e002141b2 @@ -0,0 +1,149 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 98CF3431FC0 + for ; Thu, 2 Oct 2014 16:51:10 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 78Vp4OHm7tEm for ; + Thu, 2 Oct 2014 16:51:02 -0700 (PDT) +Received: from cmta5.telus.net (cmta5.telus.net [209.171.16.78]) + by olra.theworths.org (Postfix) with ESMTP id 4DC21431FB6 + for ; Thu, 2 Oct 2014 16:51:02 -0700 (PDT) +Received: from ovo.mains.priv ([207.102.88.62]) by cmta5.telus.net with TELUS + id yPr01o00B1LiWEf01Pr08k; Thu, 02 Oct 2014 17:51:01 -0600 +X-Authority-Analysis: v=2.0 cv=JvIvWrEC c=1 sm=2 + a=EcQDfIwDZEqJA1f7rVUV8Q==:17 a=S-IsBHyFrF4A:10 a=tsa3CZZnAAAA:8 + a=MIf7E3Pt4rcRRfTYnnkA:9 a=Gtbg3cE-PUpUMIzN:21 a=nIKZ8RB3skwjJD9N:21 + a=EcQDfIwDZEqJA1f7rVUV8Q==:117 +X-Telus-Outbound-IP: 207.102.88.62 +From: Ian Main +To: notmuch@notmuchmail.org +Subject: [PATCH] VIM: Better reply handling with multiple emails +Date: Thu, 2 Oct 2014 16:50:57 -0700 +Message-Id: <1412293857-31489-1-git-send-email-imain@stemwinder.org> +X-Mailer: git-send-email 1.9.3 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 02 Oct 2014 23:51:10 -0000 + +This patch fixes reply handling when using multiple emails. This adds a +config check for other_email and uses that information when formulating +reply headers. It will strip out your own email addresses from the +reply and set the From: to be an email of yours found in the original +message. + +Note that this is built on top of the config change patch. + + Ian +--- + vim/notmuch.vim | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 52 insertions(+), 5 deletions(-) + +diff --git a/vim/notmuch.vim b/vim/notmuch.vim +index b251af6..fbd0e21 100644 +--- a/vim/notmuch.vim ++++ b/vim/notmuch.vim +@@ -467,6 +467,7 @@ ruby << EOF + end + + $db_name = nil ++ $all_emails = [] + $email = $email_name = $email_address = nil + $searches = [] + $threads = [] +@@ -485,8 +486,14 @@ ruby << EOF + $db_name = get_config_item('database.path') + $email_name = get_config_item('user.name') + $email_address = get_config_item('user.primary_email') ++ $secondary_email_addresses = get_config_item('user.primary_email') + $email_name = get_config_item('user.name') + $email = "%s <%s>" % [$email_name, $email_address] ++ other_emails = get_config_item('user.other_email') ++ $all_emails = other_emails.split("\n") ++ # Add the primary to this too as we use it for checking ++ # addresses when doing a reply ++ $all_emails.unshift($email_address) + end + + def vim_puts(s) +@@ -562,14 +569,54 @@ ruby << EOF + end + end + ++ def is_our_address(address) ++ $all_emails.each do |addy| ++ if address.to_s.index(addy) != nil ++ return addy ++ end ++ end ++ return nil ++ end ++ + def open_reply(orig) + reply = orig.reply do |m| +- # fix headers +- if not m[:reply_to] +- m.to = [orig[:from].to_s, orig[:to].to_s] ++ m.cc = [] ++ email_addr = $email_address ++ # Append addresses to the new to: from the original from: ++ # so long as they are not ours. ++ if orig[:from] ++ orig[:from].each do |o| ++ if not is_our_address(o) ++ m.to << o ++ end ++ end ++ end ++ # This copies the cc list to the new email while ++ # stripping out our own addresses and sets the from: ++ # address to ours if it finds one. ++ if orig[:cc] ++ orig[:cc].each do |o| ++ if is_our_address(o) ++ email_addr = is_our_address(o) ++ else ++ m.cc << o ++ end ++ end ++ end ++ # This copies the to list to the new email while ++ # stripping out our own addresses and sets the from: ++ # address to ours if it finds one. ++ if orig[:to] ++ orig[:to].each do |o| ++ if is_our_address(o) ++ email_addr = is_our_address(o) ++ else ++ m.to << o ++ end ++ end + end +- m.cc = orig[:cc] +- m.from = $email ++ m.to = m[:reply_to] if m[:reply_to] ++ m.from = "#{$email_name} <#{email_addr}>" + m.charset = 'utf-8' + end + +-- +1.9.3 + -- 2.26.2