From 958328427ab8cbbb064e11f2e7f2f68d3563a6cb Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 31 Mar 2019 14:43:46 -0400
Subject: [PATCH] Improve plaintext.py

---
 config/config.go     | 1 -
 contrib/plaintext.py | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/config.go b/config/config.go
index bff188e..7c80d20 100644
--- a/config/config.go
+++ b/config/config.go
@@ -163,7 +163,6 @@ func LoadConfig(root *string) (*AercConfig, error) {
 				Command: cmd,
 				Filter:  match,
 			}
-			fmt.Println(match)
 			if strings.Contains(match, ",~") {
 				filter.FilterType = FILTER_HEADER
 				header := filter.Filter[:strings.Index(filter.Filter, ",")]
diff --git a/contrib/plaintext.py b/contrib/plaintext.py
index 3502aff..3a32679 100755
--- a/contrib/plaintext.py
+++ b/contrib/plaintext.py
@@ -8,8 +8,8 @@ import re
 ansi_escape = re.compile(r'\x1B\[[0-?]*[ -/]*[@-~]')
 # TODO: I guess this might vary from MUA to MUA. I've definitely seen localized
 # versions in the wild
-quote_prefix_re = re.compile(r"On [0-9: -]+( (AM|PM))?, .* wrote:")
-quote_re = re.compile(r">+ ")
+quote_prefix_re = re.compile(r"On .*, .* wrote:")
+quote_re = re.compile(r">+")
 
 mail = sys.stdin.read().replace("\r\n", "\n")
 mail = ansi_escape.sub('', mail)