From b76e54dcc35195da55494ac6815d44a3b9434d68 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 22 Apr 2020 00:02:43 +0200 Subject: Use patched version of go-message --- go.mod | 2 ++ go.sum | 5 ++--- internal/feed/mail.go | 8 +------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index b098490..fb05566 100644 --- a/go.mod +++ b/go.mod @@ -8,3 +8,5 @@ require ( github.com/mmcdole/gofeed v1.0.0-beta2.0.20200331235650-4298e4366be3 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c ) + +replace github.com/emersion/go-message => github.com/Necoro/go-message v0.11.3-pre diff --git a/go.sum b/go.sum index dcba4f6..ee44095 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/Necoro/go-message v0.11.3-pre h1:WvMWPPTBb96Fu2ebSSPHdirkkfWNxdUh/ht2ae1G+hw= +github.com/Necoro/go-message v0.11.3-pre/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY= github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk= github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o= @@ -8,9 +10,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emersion/go-imap v1.0.4 h1:uiCAIHM6Z5Jwkma1zdNDWWXxSCqb+/xHBkHflD7XBro= github.com/emersion/go-imap v1.0.4/go.mod h1:yKASt+C3ZiDAiCSssxg9caIckWF/JG7ZQTO7GAmvicU= -github.com/emersion/go-message v0.11.1/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY= -github.com/emersion/go-message v0.11.2 h1:oxO9SQ+3wgBAQRdk07eqfkCJ26Tl8ZHF7CcpGVoE00o= -github.com/emersion/go-message v0.11.2/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY= github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b h1:uhWtEWBHgop1rqEk2klKaxPAkVDCXexai6hSuRQ7Nvs= github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod h1:G/dpzLu16WtQpBfQ/z3LYiYJn3ZhKSGWn83fyoyQe/k= github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe h1:40SWqY0zE3qCi6ZrtTf5OUdNm5lDnGnjRSq9GgmeTrg= diff --git a/internal/feed/mail.go b/internal/feed/mail.go index ab468cc..256c4fe 100644 --- a/internal/feed/mail.go +++ b/internal/feed/mail.go @@ -60,13 +60,7 @@ func writeToBuffer(b *bytes.Buffer, feed *Feed, item feeditem, cfg config.Config h.SetSubject(subject) } - mw, err := mail.CreateWriter(b, h) - if err != nil { - return err - } - defer mw.Close() - - tw, err := mw.CreateInline() + tw, err := mail.CreateInlineWriter(b, h) if err != nil { return err } -- cgit v1.2.3-54-g00ecf