This commit is contained in:
emersion 2018-10-21 12:15:20 +02:00
parent 6524fc1913
commit 6bd8ce1b6e
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
13 changed files with 95 additions and 95 deletions

View File

@ -11,16 +11,16 @@ import (
"time"
imapmove "github.com/emersion/go-imap-move"
imapserver "github.com/emersion/go-imap/server"
imapspacialuse "github.com/emersion/go-imap-specialuse"
imapserver "github.com/emersion/go-imap/server"
"github.com/emersion/go-smtp"
"github.com/howeyc/gopass"
"github.com/emersion/hydroxide/auth"
"github.com/emersion/hydroxide/carddav"
"github.com/emersion/hydroxide/events"
"github.com/emersion/hydroxide/protonmail"
imapbackend "github.com/emersion/hydroxide/imap"
"github.com/emersion/hydroxide/protonmail"
smtpbackend "github.com/emersion/hydroxide/smtp"
)

View File

@ -74,7 +74,7 @@ func (u *User) Mailbox(labelID string) (*Mailbox, error) {
func (u *User) Message(apiID string) (*protonmail.Message, error) {
var msg *protonmail.Message
err := u.db.View(func (tx *bolt.Tx) error {
err := u.db.View(func(tx *bolt.Tx) error {
b := tx.Bucket(messagesBucket)
if b == nil {
return ErrNotFound
@ -181,7 +181,7 @@ func (u *User) UpdateMessage(apiID string, update *protonmail.EventMessageUpdate
func (u *User) DeleteMessage(apiID string) (seqNums map[string]uint32, err error) {
seqNums = make(map[string]uint32)
err = u.db.Update(func(tx *bolt.Tx) error {
messages:= tx.Bucket(messagesBucket)
messages := tx.Bucket(messagesBucket)
if messages == nil {
return nil
}

View File

@ -4,17 +4,17 @@ import (
"log"
"sync"
"golang.org/x/crypto/openpgp"
"github.com/emersion/go-imap"
imapbackend "github.com/emersion/go-imap/backend"
"github.com/emersion/go-imap-specialuse"
imapbackend "github.com/emersion/go-imap/backend"
"golang.org/x/crypto/openpgp"
"github.com/emersion/hydroxide/events"
"github.com/emersion/hydroxide/imap/database"
"github.com/emersion/hydroxide/protonmail"
)
var systemMailboxes = []struct{
var systemMailboxes = []struct {
name string
label string
flags []string
@ -52,7 +52,7 @@ func newUser(be *backend, c *protonmail.Client, u *protonmail.User, privateKeys
eventSent: make(chan struct{}),
}
db, err := database.Open(u.Name+".db")
db, err := database.Open(u.Name + ".db")
if err != nil {
return nil, err
}

View File

@ -1,9 +1,9 @@
package protonmail
import (
"io"
"crypto"
"hash"
"io"
"time"
"golang.org/x/crypto/openpgp"