yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Add v2 to module name

Browse Source
This commit is contained in:
James Houlahan
2022-05-31 15:54:04 +02:00
parent 098956b81a
commit 4edf2eb92c
230 changed files with 696 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/message/build.go
View File

@ -24,8 +24,8 @@ import (
"sync"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/pkg/pool"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/v2/pkg/pool"
"github.com/pkg/errors"
)

4
pkg/message/build_encrypted.go
View File

@ -29,8 +29,8 @@ import (
"strings"
"github.com/ProtonMail/gopenpgp/v2/crypto"
pmmime "github.com/ProtonMail/proton-bridge/pkg/mime"
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
pmmime "github.com/ProtonMail/proton-bridge/v2/pkg/mime"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/emersion/go-message"
"github.com/emersion/go-textwrapper"
)

6
pkg/message/build_framework_test.go
View File

@ -27,9 +27,9 @@ import (
"time"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/ProtonMail/proton-bridge/pkg/message/mocks"
"github.com/ProtonMail/proton-bridge/pkg/message/parser"
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/v2/pkg/message/mocks"
"github.com/ProtonMail/proton-bridge/v2/pkg/message/parser"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

2
pkg/message/build_rfc822.go
View File

@ -28,7 +28,7 @@ import (
"github.com/ProtonMail/go-rfc5322"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/emersion/go-message"
"github.com/emersion/go-message/textproto"
"github.com/pkg/errors"

2
pkg/message/build_rfc822_custom.go
View File

@ -23,7 +23,7 @@ import (
"github.com/ProtonMail/gopenpgp/v2/constants"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/emersion/go-message"
)

4
pkg/message/build_test.go
View File

@ -26,8 +26,8 @@ import (
"time"
"github.com/ProtonMail/gopenpgp/v2/crypto"
"github.com/ProtonMail/proton-bridge/pkg/message/mocks"
tests "github.com/ProtonMail/proton-bridge/test"
"github.com/ProtonMail/proton-bridge/v2/pkg/message/mocks"
tests "github.com/ProtonMail/proton-bridge/v2/test"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

2
pkg/message/encrypt.go
View File

@ -27,7 +27,7 @@ import (
"strings"
"github.com/ProtonMail/gopenpgp/v2/crypto"
pmmime "github.com/ProtonMail/proton-bridge/pkg/mime"
pmmime "github.com/ProtonMail/proton-bridge/v2/pkg/mime"
"github.com/emersion/go-message/textproto"
"github.com/pkg/errors"
)

2
pkg/message/envelope.go
View File

@ -22,7 +22,7 @@ import (
"net/textproto"
"strings"
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/emersion/go-imap"
)

2
pkg/message/flags.go
View File

@ -18,7 +18,7 @@
package message
import (
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/emersion/go-imap"
)

2
pkg/message/init.go
View File

@ -19,7 +19,7 @@ package message
import (
"github.com/ProtonMail/go-rfc5322"
pmmime "github.com/ProtonMail/proton-bridge/pkg/mime"
pmmime "github.com/ProtonMail/proton-bridge/v2/pkg/mime"
)
func init() { //nolint:gochecknoinits

4
pkg/message/mocks/mocks.go
View File

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/ProtonMail/proton-bridge/pkg/message (interfaces: Fetcher)
// Source: github.com/ProtonMail/proton-bridge/v2/pkg/message (interfaces: Fetcher)
// Package mocks is a generated GoMock package.
package mocks
@ -10,7 +10,7 @@ import (
reflect "reflect"
crypto "github.com/ProtonMail/gopenpgp/v2/crypto"
pmapi "github.com/ProtonMail/proton-bridge/pkg/pmapi"
pmapi "github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
gomock "github.com/golang/mock/gomock"
)

6
pkg/message/parser.go
View File

@ -28,9 +28,9 @@ import (
"strings"
"github.com/ProtonMail/go-rfc5322"
"github.com/ProtonMail/proton-bridge/pkg/message/parser"
pmmime "github.com/ProtonMail/proton-bridge/pkg/mime"
"github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/ProtonMail/proton-bridge/v2/pkg/message/parser"
pmmime "github.com/ProtonMail/proton-bridge/v2/pkg/mime"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/emersion/go-message"
"github.com/jaytaylor/html2text"
"github.com/pkg/errors"

1
pkg/message/parser/parser_test.go
View File

@ -36,7 +36,6 @@ func newTestParser(t *testing.T, msg string) *Parser {
func getFileReader(filename string) io.ReadCloser {
f, err := os.Open(filepath.Join("testdata", filename))
if err != nil {
panic(err)
}

2
pkg/message/parser/part.go
View File

@ -23,7 +23,7 @@ import (
"mime"
"unicode/utf8"
pmmime "github.com/ProtonMail/proton-bridge/pkg/mime"
pmmime "github.com/ProtonMail/proton-bridge/v2/pkg/mime"
"github.com/PuerkitoBio/goquery"
"github.com/emersion/go-message"
"github.com/sirupsen/logrus"

2
pkg/message/parser/trimmer_test.go
View File

@ -26,7 +26,7 @@ import (
)
func TestEndOfMailTrimmer(t *testing.T) {
var tests = []struct {
tests := []struct {
in string
out string
}{

3
pkg/message/parser_test.go
View File

@ -25,7 +25,7 @@ import (
"path/filepath"
"testing"
"github.com/ProtonMail/proton-bridge/pkg/message/parser"
"github.com/ProtonMail/proton-bridge/v2/pkg/message/parser"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/text/encoding/charmap"
@ -604,7 +604,6 @@ func getFileReader(filename string) io.Reader {
func readerToString(r io.Reader) string {
b, err := ioutil.ReadAll(r)
if err != nil {
panic(err)
}

2
pkg/message/section.go
View File

@ -26,7 +26,7 @@ import (
"strconv"
"strings"
pmmime "github.com/ProtonMail/proton-bridge/pkg/mime"
pmmime "github.com/ProtonMail/proton-bridge/v2/pkg/mime"
"github.com/emersion/go-imap"
"github.com/pkg/errors"
"github.com/vmihailenco/msgpack/v5"

21
pkg/message/section_test.go
View File

@ -341,7 +341,8 @@ var testPaths = []struct {
path []int
expectedSection, expectedBody string
}{
{[]int{},
{
[]int{},
sampleMail,
`main summary
@ -434,7 +435,8 @@ Content-Type: text/html
`,
},
{[]int{1},
{
[]int{1},
`Content-Type: text/plain
1. main message
@ -446,7 +448,8 @@ Content-Type: text/html
`,
},
{[]int{3},
{
[]int{3},
`Subject: Inside mail 3
From: Mary Smith <mary@example.net>
To: John Doe <jdoe@machine.example>
@ -488,7 +491,8 @@ Content-Transfer-Encoding: base64
`,
},
{[]int{3, 1},
{
[]int{3, 1},
`Content-Type: text/plain
3.1 message text
@ -498,7 +502,8 @@ Content-Transfer-Encoding: base64
`,
},
{[]int{3, 2},
{
[]int{3, 2},
`Content-Type: application/octet-stream
Content-Disposition: attachment; filename="msg_3_signature.sig"
Content-Transfer-Encoding: base64
@ -510,7 +515,8 @@ Content-Transfer-Encoding: base64
`,
},
{[]int{4, 2, 2, 1},
{
[]int{4, 2, 2, 1},
`Content-Type: text/plain
4.2.2.1 plain text
@ -520,7 +526,8 @@ Content-Transfer-Encoding: base64
`,
},
{[]int{4, 2, 2, 2},
{
[]int{4, 2, 2, 2},
`Content-Type: text/html
<h1>4.2.2.2 html text</h1>