aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.eu>2021-02-15 01:28:07 +0100
committerRené 'Necoro' Neumann <necoro@necoro.eu>2021-02-15 01:28:07 +0100
commit95d79341bff3c66c6d32b373994d3a1be26295b9 (patch)
tree5c70d17f098c129fd1316b647aa57e3477a2f025 /internal
parent725a6dcd20abac7a629085bc4495d6e29ee3ed06 (diff)
downloadfeed2imap-go-95d79341bff3c66c6d32b373994d3a1be26295b9.tar.gz
feed2imap-go-95d79341bff3c66c6d32b373994d3a1be26295b9.tar.bz2
feed2imap-go-95d79341bff3c66c6d32b373994d3a1be26295b9.zip
Issue #46: Make the resulting email body not to include single \r or \n. This now pleases Cyrus IMAP.
Diffstat (limited to 'internal')
-rw-r--r--internal/feed/mail.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/feed/mail.go b/internal/feed/mail.go
index 2dda3ca..0bc7d37 100644
--- a/internal/feed/mail.go
+++ b/internal/feed/mail.go
@@ -11,11 +11,11 @@ import (
"strings"
"time"
- "github.com/jaytaylor/html2text"
"github.com/PuerkitoBio/goquery"
"github.com/emersion/go-message"
"github.com/emersion/go-message/mail"
"github.com/gabriel-vasile/mimetype"
+ "github.com/jaytaylor/html2text"
"golang.org/x/net/html"
"github.com/Necoro/feed2imap-go/internal/feed/template"
@@ -23,6 +23,7 @@ import (
"github.com/Necoro/feed2imap-go/internal/msg"
"github.com/Necoro/feed2imap-go/pkg/config"
"github.com/Necoro/feed2imap-go/pkg/log"
+ "github.com/Necoro/feed2imap-go/pkg/util"
"github.com/Necoro/feed2imap-go/pkg/version"
)
@@ -97,7 +98,7 @@ func (item *item) writeContentPart(w *message.Writer, typ string, tpl template.T
}
defer partW.Close()
- if err = tpl.Execute(w, item); err != nil {
+ if err = tpl.Execute(util.FixWriter(w), item); err != nil {
return fmt.Errorf("writing %s part: %w", typ, err)
}
td>2007-04-16added preferences for Qt-Frontendnecoro9-279/+710 2007-04-13Improved masking display and made most of the Qt-Frontend worknecoro7-35/+334 2007-04-10Some more functionality for the Qt-Frontend (complete emerge)necoro8-217/+347 2007-04-07Some more functionality for the Qt-Frontendnecoro11-88/+463 2007-04-07Added Qt-Terminalnecoro4-4/+213 2007-04-06First qt draftnecoro6-1/+796 2007-04-04showed masked packages unmasked by the user similar to stable marked testing ↵necoro5-13/+40 packages 2007-03-31changed changelognecoro1-1/+2 2007-03-31Some small changes for etcproposals 1.1necoro1-2/+2 2007-03-31Some small changes for etcproposals 1.1necoro2-3/+3 2007-03-31Some small changes for etcproposals 1.1necoro1-6/+13 2007-03-31Allowed Plugins to have a menunecoro7-201/+315 2007-03-15Added etc-proposals pluginnecoro7-28/+121 2007-03-10Added USE_EXPAND-supportnecoro5-11/+63 2007-03-10Added plugin-data to about-dialognecoro3-197/+264