cleanup: Export internal packages, rename module and imports, don't rely on generated credits string

go.mod

@@ -1,4 +1,4 @@
-module github.com/ProtonMail/proton-bridge
+module github.com/ljanyst/peroxide
 
 go 1.15
 

pkg/api/api.go

@@ -25,11 +25,11 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/ports"
+	"github.com/ljanyst/peroxide/pkg/bridge"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/events"
+	"github.com/ljanyst/peroxide/pkg/listener"
+	"github.com/ljanyst/peroxide/pkg/ports"
 	"github.com/sirupsen/logrus"
 )
 

pkg/api/ctx.go

@@ -20,7 +20,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ljanyst/peroxide/pkg/listener"
 )
 
 // httpHandler with Go's Response and Request.

pkg/api/focus.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/events"
+	"github.com/ljanyst/peroxide/pkg/bridge"
+	"github.com/ljanyst/peroxide/pkg/events"
 )
 
 // focusHandler should be called from other instances (attempt to start bridge

pkg/app/base/base.go

@@ -39,24 +39,24 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/api"
-	"github.com/ProtonMail/proton-bridge/internal/config/cache"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/tls"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/cookies"
-	"github.com/ProtonMail/proton-bridge/internal/crash"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/logging"
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/internal/users/credentials"
-	"github.com/ProtonMail/proton-bridge/internal/versioner"
-	"github.com/ProtonMail/proton-bridge/pkg/keychain"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ljanyst/peroxide/pkg/api"
+	"github.com/ljanyst/peroxide/pkg/config/cache"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/config/tls"
+	"github.com/ljanyst/peroxide/pkg/config/useragent"
+	"github.com/ljanyst/peroxide/pkg/constants"
+	"github.com/ljanyst/peroxide/pkg/cookies"
+	"github.com/ljanyst/peroxide/pkg/crash"
+	"github.com/ljanyst/peroxide/pkg/events"
+	"github.com/ljanyst/peroxide/pkg/locations"
+	"github.com/ljanyst/peroxide/pkg/logging"
+	"github.com/ljanyst/peroxide/pkg/sentry"
+	"github.com/ljanyst/peroxide/pkg/updater"
+	"github.com/ljanyst/peroxide/pkg/users/credentials"
+	"github.com/ljanyst/peroxide/pkg/versioner"
+	"github.com/ljanyst/peroxide/pkg/keychain"
+	"github.com/ljanyst/peroxide/pkg/listener"
+	"github.com/ljanyst/peroxide/pkg/pmapi"
 	"github.com/allan-simon/go-singleinstance"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

pkg/app/base/migration.go

@@ -21,8 +21,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
+	"github.com/ljanyst/peroxide/pkg/constants"
+	"github.com/ljanyst/peroxide/pkg/locations"
 	"github.com/sirupsen/logrus"
 )
 

pkg/app/bridge/bridge.go

@@ -22,20 +22,20 @@ import (
 	"crypto/tls"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/api"
-	"github.com/ProtonMail/proton-bridge/internal/app/base"
-	pkgBridge "github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	pkgTLS "github.com/ProtonMail/proton-bridge/internal/config/tls"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/frontend"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/imap"
-	"github.com/ProtonMail/proton-bridge/internal/smtp"
-	"github.com/ProtonMail/proton-bridge/internal/store"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
+	"github.com/ljanyst/peroxide/pkg/api"
+	"github.com/ljanyst/peroxide/pkg/app/base"
+	pkgBridge "github.com/ljanyst/peroxide/pkg/bridge"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	pkgTLS "github.com/ljanyst/peroxide/pkg/config/tls"
+	"github.com/ljanyst/peroxide/pkg/constants"
+	"github.com/ljanyst/peroxide/pkg/frontend"
+	"github.com/ljanyst/peroxide/pkg/frontend/types"
+	"github.com/ljanyst/peroxide/pkg/imap"
+	"github.com/ljanyst/peroxide/pkg/smtp"
+	"github.com/ljanyst/peroxide/pkg/store"
+	"github.com/ljanyst/peroxide/pkg/store/cache"
+	"github.com/ljanyst/peroxide/pkg/updater"
+	"github.com/ljanyst/peroxide/pkg/message"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

pkg/bridge/bridge.go

@@ -26,17 +26,17 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/go-autostart"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/metrics"
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/constants"
+	"github.com/ljanyst/peroxide/pkg/metrics"
+	"github.com/ljanyst/peroxide/pkg/sentry"
+	"github.com/ljanyst/peroxide/pkg/store/cache"
+	"github.com/ljanyst/peroxide/pkg/updater"
+	"github.com/ljanyst/peroxide/pkg/users"
+	"github.com/ljanyst/peroxide/pkg/message"
+	"github.com/ljanyst/peroxide/pkg/pmapi"
+
+	"github.com/ljanyst/peroxide/pkg/listener"
 	logrus "github.com/sirupsen/logrus"
 )
 

pkg/bridge/bug_report.go

@@ -28,8 +28,8 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/ProtonMail/proton-bridge/internal/logging"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ljanyst/peroxide/pkg/logging"
+	"github.com/ljanyst/peroxide/pkg/pmapi"
 )
 
 const MaxAttachmentSize = 7 * 1024 * 1024 // 7 MB total limit

pkg/bridge/store_factory.go

@@ -21,12 +21,12 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/store"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
+	"github.com/ljanyst/peroxide/pkg/sentry"
+	"github.com/ljanyst/peroxide/pkg/store"
+	"github.com/ljanyst/peroxide/pkg/store/cache"
+	"github.com/ljanyst/peroxide/pkg/users"
+	"github.com/ljanyst/peroxide/pkg/listener"
+	"github.com/ljanyst/peroxide/pkg/message"
 )
 
 type storeFactory struct {

pkg/bridge/types.go

@@ -20,7 +20,7 @@ package bridge
 import (
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/ProtonMail/proton-bridge/internal/updater"
+	"github.com/ljanyst/peroxide/pkg/updater"
 )
 
 type Locator interface {

pkg/config/cache/cache.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ProtonMail/proton-bridge/pkg/files"
+	"github.com/ljanyst/peroxide/pkg/files"
 )
 
 type Cache struct {

pkg/cookies/jar.go

@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
 )
 
 type cookiesByHost map[string][]*http.Cookie

pkg/cookies/jar_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/crash/handler.go

@@ -19,7 +19,7 @@
 package crash
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
+	"github.com/ljanyst/peroxide/pkg/sentry"
 	"github.com/sirupsen/logrus"
 )
 

pkg/events/events.go

@@ -21,7 +21,7 @@ package events
 import (
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ljanyst/peroxide/pkg/listener"
 )
 
 // Constants of events used by the event listener in bridge.

pkg/frontend/cli/account_utils.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ljanyst/peroxide/pkg/frontend/types"
 	"github.com/abiosoft/ishell"
 )
 

pkg/frontend/cli/accounts.go

@@ -21,9 +21,9 @@ import (
 	"context"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ljanyst/peroxide/pkg/bridge"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/frontend/types"
 	"github.com/abiosoft/ishell"
 )
 

pkg/frontend/cli/frontend.go

@@ -19,12 +19,12 @@
 package cli
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/events"
+	"github.com/ljanyst/peroxide/pkg/frontend/types"
+	"github.com/ljanyst/peroxide/pkg/locations"
+	"github.com/ljanyst/peroxide/pkg/updater"
+	"github.com/ljanyst/peroxide/pkg/listener"
 
 	"github.com/abiosoft/ishell"
 	"github.com/sirupsen/logrus"

pkg/frontend/cli/system.go

@@ -23,8 +23,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/pkg/ports"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/ports"
 	"github.com/abiosoft/ishell"
 )
 

pkg/frontend/cli/updates.go

@@ -18,12 +18,9 @@
 package cli
 
 import (
-	"strings"
-
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
 	"github.com/abiosoft/ishell"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/updater"
 )
 
 func (f *frontendCLI) checkUpdates(c *ishell.Context) {
@@ -41,9 +38,6 @@ func (f *frontendCLI) checkUpdates(c *ishell.Context) {
 }
 
 func (f *frontendCLI) printCredits(c *ishell.Context) {
-	for _, pkg := range strings.Split(bridge.Credits, ";") {
-		f.Println(pkg)
-	}
 }
 
 func (f *frontendCLI) enableAutoUpdates(c *ishell.Context) {

pkg/frontend/cli/utils.go

@@ -20,7 +20,7 @@ package cli
 import (
 	"strings"
 
-	pmapi "github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	pmapi "github.com/ljanyst/peroxide/pkg/pmapi"
 	"github.com/fatih/color"
 )
 

pkg/frontend/clientconfig/config.go

@@ -22,9 +22,9 @@ package clientconfig
 import (
 	"errors"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/config/useragent"
+	"github.com/ljanyst/peroxide/pkg/frontend/types"
 	"github.com/sirupsen/logrus"
 )
 

pkg/frontend/clientconfig/config_applemail.go

@@ -28,10 +28,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/pkg/mobileconfig"
+	"github.com/ljanyst/peroxide/pkg/bridge"
+	"github.com/ljanyst/peroxide/pkg/config/useragent"
+	"github.com/ljanyst/peroxide/pkg/frontend/types"
+	"github.com/ljanyst/peroxide/pkg/mobileconfig"
 )
 
 const (

pkg/frontend/frontend.go

@@ -19,15 +19,15 @@
 package frontend
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/cli"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/qt"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ljanyst/peroxide/pkg/bridge"
+	"github.com/ljanyst/peroxide/pkg/config/settings"
+	"github.com/ljanyst/peroxide/pkg/config/useragent"
+	"github.com/ljanyst/peroxide/pkg/frontend/cli"
+	"github.com/ljanyst/peroxide/pkg/frontend/qt"
+	"github.com/ljanyst/peroxide/pkg/frontend/types"
+	"github.com/ljanyst/peroxide/pkg/locations"
+	"github.com/ljanyst/peroxide/pkg/updater"
+	"github.com/ljanyst/peroxide/pkg/listener"
 )
 
 type Frontend interface {