From bf28e23933a9808820ef4855257accf4634068e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leszek=20Cima=C5=82a?= Date: Wed, 8 Jan 2020 21:44:14 +0100 Subject: create OriginalMail struct --- lib/templates/template.go | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'lib/templates') diff --git a/lib/templates/template.go b/lib/templates/template.go index 21f7b35..8a345d9 100644 --- a/lib/templates/template.go +++ b/lib/templates/template.go @@ -10,6 +10,7 @@ import ( "text/template" "time" + "git.sr.ht/~sircmpwn/aerc/models" "github.com/mitchellh/go-homedir" ) @@ -28,20 +29,23 @@ type TemplateData struct { func TestTemplateData() TemplateData { defaults := map[string]string{ - "To": "John Doe ", - "Cc": "Josh Doe ", - "From": "Jane Smith ", - "Subject": "This is only a test", - "OriginalText": "This is only a test text", - "OriginalFrom": "John Doe ", - "OriginalDate": time.Now().Format("Mon Jan 2, 2006 at 3:04 PM"), + "To": "John Doe ", + "Cc": "Josh Doe ", + "From": "Jane Smith ", + "Subject": "This is only a test", } - return ParseTemplateData(defaults) + original := models.OriginalMail{ + Date: time.Now().Format("Mon Jan 2, 2006 at 3:04 PM"), + From: "John Doe ", + Text: "This is only a test text", + } + + return ParseTemplateData(defaults, original) } -func ParseTemplateData(defaults map[string]string) TemplateData { - originalDate, _ := time.Parse("Mon Jan 2, 2006 at 3:04 PM", defaults["OriginalDate"]) +func ParseTemplateData(defaults map[string]string, original models.OriginalMail) TemplateData { + originalDate, _ := time.Parse("Mon Jan 2, 2006 at 3:04 PM", original.Date) td := TemplateData{ To: parseAddressList(defaults["To"]), Cc: parseAddressList(defaults["Cc"]), @@ -49,8 +53,8 @@ func ParseTemplateData(defaults map[string]string) TemplateData { From: parseAddressList(defaults["From"]), Date: time.Now(), Subject: defaults["Subject"], - OriginalText: defaults["Original"], - OriginalFrom: parseAddressList(defaults["OriginalFrom"]), + OriginalText: original.Text, + OriginalFrom: parseAddressList(original.From), OriginalDate: originalDate, } return td -- cgit v1.2.3