This commit is contained in:
Simon Ser 2021-07-05 11:19:07 +02:00
parent 7adc90e229
commit 556ce5b2c8
5 changed files with 27 additions and 27 deletions

View file

@ -12,10 +12,10 @@ import (
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/emersion/go-imap" "github.com/emersion/go-imap"
imapspecialuse "github.com/emersion/go-imap-specialuse"
imapclient "github.com/emersion/go-imap/client"
"github.com/emersion/go-message" "github.com/emersion/go-message"
"github.com/emersion/go-message/textproto" "github.com/emersion/go-message/textproto"
imapclient "github.com/emersion/go-imap/client"
imapspecialuse "github.com/emersion/go-imap-specialuse"
) )
type MailboxInfo struct { type MailboxInfo struct {

View file

@ -14,13 +14,13 @@ import (
"git.sr.ht/~migadu/alps" "git.sr.ht/~migadu/alps"
"github.com/emersion/go-imap" "github.com/emersion/go-imap"
imapmove "github.com/emersion/go-imap-move"
imapclient "github.com/emersion/go-imap/client"
"github.com/emersion/go-message" "github.com/emersion/go-message"
"github.com/emersion/go-message/mail" "github.com/emersion/go-message/mail"
"github.com/emersion/go-smtp" "github.com/emersion/go-smtp"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
"jaytaylor.com/html2text" "jaytaylor.com/html2text"
imapclient "github.com/emersion/go-imap/client"
imapmove "github.com/emersion/go-imap-move"
) )
func registerRoutes(p *alps.GoPlugin) { func registerRoutes(p *alps.GoPlugin) {
@ -520,7 +520,7 @@ type composeOptions struct {
// Send message, append it to the Sent mailbox, mark the original message as // Send message, append it to the Sent mailbox, mark the original message as
// answered // answered
func submitCompose(ctx *alps.Context, msg *OutgoingMessage, options *composeOptions) error { func submitCompose(ctx *alps.Context, msg *OutgoingMessage, options *composeOptions) error {
err := ctx.Session.DoSMTP(func (c *smtp.Client) error { err := ctx.Session.DoSMTP(func(c *smtp.Client) error {
return sendMessage(c, msg) return sendMessage(c, msg)
}) })
if err != nil { if err != nil {

View file

@ -87,7 +87,7 @@ func splitSearchTokens(buf []byte, eof bool) (int, []byte, error) {
terminator int terminator int
quoted bool quoted bool
) )
if colon + 1 < len(buf) && buf[colon+1] == byte('"') { if colon+1 < len(buf) && buf[colon+1] == byte('"') {
terminator = bytes.IndexByte(buf[colon+2:], byte('"')) terminator = bytes.IndexByte(buf[colon+2:], byte('"'))
terminator += colon + 3 terminator += colon + 3
quoted = true quoted = true

View file

@ -157,7 +157,7 @@ func (s *Session) PutAttachment(in *multipart.FileHeader,
for _, a := range s.attachments { for _, a := range s.attachments {
size += a.File.Size size += a.File.Size
} }
if size + in.Size > maxAttachmentSize { if size+in.Size > maxAttachmentSize {
return "", ErrAttachmentCacheSize return "", ErrAttachmentCacheSize
} }