diff --git a/go.mod b/go.mod index fc5873c..00fc450 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ProtonMail/proton-bridge +module github.com/ljanyst/peroxide go 1.15 diff --git a/internal/api/api.go b/pkg/api/api.go similarity index 88% rename from internal/api/api.go rename to pkg/api/api.go index 12f1b92..d3118bd 100644 --- a/internal/api/api.go +++ b/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" ) diff --git a/internal/api/ctx.go b/pkg/api/ctx.go similarity index 96% rename from internal/api/ctx.go rename to pkg/api/ctx.go index 12432ea..068a84c 100644 --- a/internal/api/ctx.go +++ b/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. diff --git a/internal/api/focus.go b/pkg/api/focus.go similarity index 93% rename from internal/api/focus.go rename to pkg/api/focus.go index ab5e63a..f0817de 100644 --- a/internal/api/focus.go +++ b/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 diff --git a/internal/app/base/args.go b/pkg/app/base/args.go similarity index 100% rename from internal/app/base/args.go rename to pkg/app/base/args.go diff --git a/internal/app/base/base.go b/pkg/app/base/base.go similarity index 90% rename from internal/app/base/base.go rename to pkg/app/base/base.go index 059197c..67b3a55 100644 --- a/internal/app/base/base.go +++ b/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" diff --git a/internal/app/base/migration.go b/pkg/app/base/migration.go similarity index 97% rename from internal/app/base/migration.go rename to pkg/app/base/migration.go index 0109d4d..b3f9434 100644 --- a/internal/app/base/migration.go +++ b/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" ) diff --git a/internal/app/base/profiling.go b/pkg/app/base/profiling.go similarity index 100% rename from internal/app/base/profiling.go rename to pkg/app/base/profiling.go diff --git a/internal/app/base/restart.go b/pkg/app/base/restart.go similarity index 100% rename from internal/app/base/restart.go rename to pkg/app/base/restart.go diff --git a/internal/app/base/restart_test.go b/pkg/app/base/restart_test.go similarity index 100% rename from internal/app/base/restart_test.go rename to pkg/app/base/restart_test.go diff --git a/internal/app/bridge/bridge.go b/pkg/app/bridge/bridge.go similarity index 90% rename from internal/app/bridge/bridge.go rename to pkg/app/bridge/bridge.go index ea304e6..052120d 100644 --- a/internal/app/bridge/bridge.go +++ b/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" diff --git a/internal/bridge/autostart.go b/pkg/bridge/autostart.go similarity index 100% rename from internal/bridge/autostart.go rename to pkg/bridge/autostart.go diff --git a/internal/bridge/bridge.go b/pkg/bridge/bridge.go similarity index 93% rename from internal/bridge/bridge.go rename to pkg/bridge/bridge.go index f498de9..ab95399 100644 --- a/internal/bridge/bridge.go +++ b/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" ) diff --git a/internal/bridge/bug_report.go b/pkg/bridge/bug_report.go similarity index 97% rename from internal/bridge/bug_report.go rename to pkg/bridge/bug_report.go index 0b2fd57..638295e 100644 --- a/internal/bridge/bug_report.go +++ b/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 diff --git a/internal/bridge/constants.go b/pkg/bridge/constants.go similarity index 100% rename from internal/bridge/constants.go rename to pkg/bridge/constants.go diff --git a/internal/bridge/release_notes.go b/pkg/bridge/release_notes.go similarity index 100% rename from internal/bridge/release_notes.go rename to pkg/bridge/release_notes.go diff --git a/internal/bridge/store_factory.go b/pkg/bridge/store_factory.go similarity index 87% rename from internal/bridge/store_factory.go rename to pkg/bridge/store_factory.go index eb1e7aa..5051d5c 100644 --- a/internal/bridge/store_factory.go +++ b/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 { diff --git a/internal/bridge/types.go b/pkg/bridge/types.go similarity index 96% rename from internal/bridge/types.go rename to pkg/bridge/types.go index f7f8207..4385403 100644 --- a/internal/bridge/types.go +++ b/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 { diff --git a/internal/config/cache/cache.go b/pkg/config/cache/cache.go similarity index 97% rename from internal/config/cache/cache.go rename to pkg/config/cache/cache.go index 7c3ff9d..ce10658 100644 --- a/internal/config/cache/cache.go +++ b/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 { diff --git a/internal/config/cache/cache_test.go b/pkg/config/cache/cache_test.go similarity index 100% rename from internal/config/cache/cache_test.go rename to pkg/config/cache/cache_test.go diff --git a/internal/config/settings/kvs.go b/pkg/config/settings/kvs.go similarity index 100% rename from internal/config/settings/kvs.go rename to pkg/config/settings/kvs.go diff --git a/internal/config/settings/kvs_test.go b/pkg/config/settings/kvs_test.go similarity index 100% rename from internal/config/settings/kvs_test.go rename to pkg/config/settings/kvs_test.go diff --git a/internal/config/settings/settings.go b/pkg/config/settings/settings.go similarity index 100% rename from internal/config/settings/settings.go rename to pkg/config/settings/settings.go diff --git a/internal/config/tls/cert_store_darwin.go b/pkg/config/tls/cert_store_darwin.go similarity index 100% rename from internal/config/tls/cert_store_darwin.go rename to pkg/config/tls/cert_store_darwin.go diff --git a/internal/config/tls/cert_store_linux.go b/pkg/config/tls/cert_store_linux.go similarity index 100% rename from internal/config/tls/cert_store_linux.go rename to pkg/config/tls/cert_store_linux.go diff --git a/internal/config/tls/cert_store_windows.go b/pkg/config/tls/cert_store_windows.go similarity index 100% rename from internal/config/tls/cert_store_windows.go rename to pkg/config/tls/cert_store_windows.go diff --git a/internal/config/tls/tls.go b/pkg/config/tls/tls.go similarity index 100% rename from internal/config/tls/tls.go rename to pkg/config/tls/tls.go diff --git a/internal/config/tls/tls_test.go b/pkg/config/tls/tls_test.go similarity index 100% rename from internal/config/tls/tls_test.go rename to pkg/config/tls/tls_test.go diff --git a/internal/config/useragent/platform.go b/pkg/config/useragent/platform.go similarity index 100% rename from internal/config/useragent/platform.go rename to pkg/config/useragent/platform.go diff --git a/internal/config/useragent/platform_test.go b/pkg/config/useragent/platform_test.go similarity index 100% rename from internal/config/useragent/platform_test.go rename to pkg/config/useragent/platform_test.go diff --git a/internal/config/useragent/useragent.go b/pkg/config/useragent/useragent.go similarity index 100% rename from internal/config/useragent/useragent.go rename to pkg/config/useragent/useragent.go diff --git a/internal/config/useragent/useragent_test.go b/pkg/config/useragent/useragent_test.go similarity index 100% rename from internal/config/useragent/useragent_test.go rename to pkg/config/useragent/useragent_test.go diff --git a/internal/constants/constants.go b/pkg/constants/constants.go similarity index 100% rename from internal/constants/constants.go rename to pkg/constants/constants.go diff --git a/internal/constants/update_default.go b/pkg/constants/update_default.go similarity index 100% rename from internal/constants/update_default.go rename to pkg/constants/update_default.go diff --git a/internal/constants/update_qa.go b/pkg/constants/update_qa.go similarity index 100% rename from internal/constants/update_qa.go rename to pkg/constants/update_qa.go diff --git a/internal/cookies/jar.go b/pkg/cookies/jar.go similarity index 98% rename from internal/cookies/jar.go rename to pkg/cookies/jar.go index 2633132..ea081f6 100644 --- a/internal/cookies/jar.go +++ b/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 diff --git a/internal/cookies/jar_test.go b/pkg/cookies/jar_test.go similarity index 98% rename from internal/cookies/jar_test.go rename to pkg/cookies/jar_test.go index 79aeca7..e92cb97 100644 --- a/internal/cookies/jar_test.go +++ b/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" ) diff --git a/internal/crash/actions.go b/pkg/crash/actions.go similarity index 100% rename from internal/crash/actions.go rename to pkg/crash/actions.go diff --git a/internal/crash/handler.go b/pkg/crash/handler.go similarity index 96% rename from internal/crash/handler.go rename to pkg/crash/handler.go index 62729e0..bd42bbe 100644 --- a/internal/crash/handler.go +++ b/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" ) diff --git a/internal/crash/handler_test.go b/pkg/crash/handler_test.go similarity index 100% rename from internal/crash/handler_test.go rename to pkg/crash/handler_test.go diff --git a/internal/events/events.go b/pkg/events/events.go similarity index 97% rename from internal/events/events.go rename to pkg/events/events.go index a6f3a69..c18cdcc 100644 --- a/internal/events/events.go +++ b/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. diff --git a/internal/frontend/.gitignore b/pkg/frontend/.gitignore similarity index 100% rename from internal/frontend/.gitignore rename to pkg/frontend/.gitignore diff --git a/internal/frontend/Makefile.local b/pkg/frontend/Makefile.local similarity index 100% rename from internal/frontend/Makefile.local rename to pkg/frontend/Makefile.local diff --git a/internal/frontend/cli/account_utils.go b/pkg/frontend/cli/account_utils.go similarity index 97% rename from internal/frontend/cli/account_utils.go rename to pkg/frontend/cli/account_utils.go index bdbeb03..0b6b317 100644 --- a/internal/frontend/cli/account_utils.go +++ b/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" ) diff --git a/internal/frontend/cli/accounts.go b/pkg/frontend/cli/accounts.go similarity index 97% rename from internal/frontend/cli/accounts.go rename to pkg/frontend/cli/accounts.go index 02a01d8..2f2f6dd 100644 --- a/internal/frontend/cli/accounts.go +++ b/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" ) diff --git a/internal/frontend/cli/frontend.go b/pkg/frontend/cli/frontend.go similarity index 96% rename from internal/frontend/cli/frontend.go rename to pkg/frontend/cli/frontend.go index dda9b7e..9d50283 100644 --- a/internal/frontend/cli/frontend.go +++ b/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" diff --git a/internal/frontend/cli/system.go b/pkg/frontend/cli/system.go similarity index 98% rename from internal/frontend/cli/system.go rename to pkg/frontend/cli/system.go index 43b8143..7da6614 100644 --- a/internal/frontend/cli/system.go +++ b/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" ) diff --git a/internal/frontend/cli/updates.go b/pkg/frontend/cli/updates.go similarity index 91% rename from internal/frontend/cli/updates.go rename to pkg/frontend/cli/updates.go index 8d0e9e8..1d5f887 100644 --- a/internal/frontend/cli/updates.go +++ b/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) { diff --git a/internal/frontend/cli/utils.go b/pkg/frontend/cli/utils.go similarity index 98% rename from internal/frontend/cli/utils.go rename to pkg/frontend/cli/utils.go index 0ce5183..30d35e8 100644 --- a/internal/frontend/cli/utils.go +++ b/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" ) diff --git a/internal/frontend/clientconfig/config.go b/pkg/frontend/clientconfig/config.go similarity index 92% rename from internal/frontend/clientconfig/config.go rename to pkg/frontend/clientconfig/config.go index 5495c3a..f85f599 100644 --- a/internal/frontend/clientconfig/config.go +++ b/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" ) diff --git a/internal/frontend/clientconfig/config_applemail.go b/pkg/frontend/clientconfig/config_applemail.go similarity index 92% rename from internal/frontend/clientconfig/config_applemail.go rename to pkg/frontend/clientconfig/config_applemail.go index 4af362c..5f66a9f 100644 --- a/internal/frontend/clientconfig/config_applemail.go +++ b/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 ( diff --git a/internal/frontend/frontend.go b/pkg/frontend/frontend.go similarity index 79% rename from internal/frontend/frontend.go rename to pkg/frontend/frontend.go index 0685e52..dbc965b 100644 --- a/internal/frontend/frontend.go +++ b/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 { diff --git a/internal/frontend/qml/AccountDelegate.qml b/pkg/frontend/qml/AccountDelegate.qml similarity index 100% rename from internal/frontend/qml/AccountDelegate.qml rename to pkg/frontend/qml/AccountDelegate.qml diff --git a/internal/frontend/qml/AccountView.qml b/pkg/frontend/qml/AccountView.qml similarity index 100% rename from internal/frontend/qml/AccountView.qml rename to pkg/frontend/qml/AccountView.qml diff --git a/internal/frontend/qml/Banner.qml b/pkg/frontend/qml/Banner.qml similarity index 100% rename from internal/frontend/qml/Banner.qml rename to pkg/frontend/qml/Banner.qml diff --git a/internal/frontend/qml/Bridge.qml b/pkg/frontend/qml/Bridge.qml similarity index 100% rename from internal/frontend/qml/Bridge.qml rename to pkg/frontend/qml/Bridge.qml diff --git a/internal/frontend/qml/BridgeTest/UserControl.qml b/pkg/frontend/qml/BridgeTest/UserControl.qml similarity index 100% rename from internal/frontend/qml/BridgeTest/UserControl.qml rename to pkg/frontend/qml/BridgeTest/UserControl.qml diff --git a/internal/frontend/qml/BridgeTest/UserList.qml b/pkg/frontend/qml/BridgeTest/UserList.qml similarity index 100% rename from internal/frontend/qml/BridgeTest/UserList.qml rename to pkg/frontend/qml/BridgeTest/UserList.qml diff --git a/internal/frontend/qml/BridgeTest/UserModel.qml b/pkg/frontend/qml/BridgeTest/UserModel.qml similarity index 100% rename from internal/frontend/qml/BridgeTest/UserModel.qml rename to pkg/frontend/qml/BridgeTest/UserModel.qml diff --git a/internal/frontend/qml/Bridge_test.qml b/pkg/frontend/qml/Bridge_test.qml similarity index 100% rename from internal/frontend/qml/Bridge_test.qml rename to pkg/frontend/qml/Bridge_test.qml diff --git a/internal/frontend/qml/BugReportView.qml b/pkg/frontend/qml/BugReportView.qml similarity index 100% rename from internal/frontend/qml/BugReportView.qml rename to pkg/frontend/qml/BugReportView.qml diff --git a/internal/frontend/qml/Configuration.qml b/pkg/frontend/qml/Configuration.qml similarity index 100% rename from internal/frontend/qml/Configuration.qml rename to pkg/frontend/qml/Configuration.qml diff --git a/internal/frontend/qml/ConfigurationItem.qml b/pkg/frontend/qml/ConfigurationItem.qml similarity index 100% rename from internal/frontend/qml/ConfigurationItem.qml rename to pkg/frontend/qml/ConfigurationItem.qml diff --git a/internal/frontend/qml/ContentWrapper.qml b/pkg/frontend/qml/ContentWrapper.qml similarity index 100% rename from internal/frontend/qml/ContentWrapper.qml rename to pkg/frontend/qml/ContentWrapper.qml diff --git a/internal/frontend/qml/DebugWrapper.qml b/pkg/frontend/qml/DebugWrapper.qml similarity index 100% rename from internal/frontend/qml/DebugWrapper.qml rename to pkg/frontend/qml/DebugWrapper.qml diff --git a/internal/frontend/qml/GeneralSettings.qml b/pkg/frontend/qml/GeneralSettings.qml similarity index 100% rename from internal/frontend/qml/GeneralSettings.qml rename to pkg/frontend/qml/GeneralSettings.qml diff --git a/internal/frontend/qml/HelpView.qml b/pkg/frontend/qml/HelpView.qml similarity index 100% rename from internal/frontend/qml/HelpView.qml rename to pkg/frontend/qml/HelpView.qml diff --git a/internal/frontend/qml/LocalCacheSettings.qml b/pkg/frontend/qml/LocalCacheSettings.qml similarity index 100% rename from internal/frontend/qml/LocalCacheSettings.qml rename to pkg/frontend/qml/LocalCacheSettings.qml diff --git a/internal/frontend/qml/MainWindow.qml b/pkg/frontend/qml/MainWindow.qml similarity index 100% rename from internal/frontend/qml/MainWindow.qml rename to pkg/frontend/qml/MainWindow.qml diff --git a/internal/frontend/qml/NotificationDialog.qml b/pkg/frontend/qml/NotificationDialog.qml similarity index 100% rename from internal/frontend/qml/NotificationDialog.qml rename to pkg/frontend/qml/NotificationDialog.qml diff --git a/internal/frontend/qml/NotificationPopups.qml b/pkg/frontend/qml/NotificationPopups.qml similarity index 100% rename from internal/frontend/qml/NotificationPopups.qml rename to pkg/frontend/qml/NotificationPopups.qml diff --git a/internal/frontend/qml/Notifications/Notification.qml b/pkg/frontend/qml/Notifications/Notification.qml similarity index 100% rename from internal/frontend/qml/Notifications/Notification.qml rename to pkg/frontend/qml/Notifications/Notification.qml diff --git a/internal/frontend/qml/Notifications/NotificationFilter.qml b/pkg/frontend/qml/Notifications/NotificationFilter.qml similarity index 100% rename from internal/frontend/qml/Notifications/NotificationFilter.qml rename to pkg/frontend/qml/Notifications/NotificationFilter.qml diff --git a/internal/frontend/qml/Notifications/Notifications.qml b/pkg/frontend/qml/Notifications/Notifications.qml similarity index 100% rename from internal/frontend/qml/Notifications/Notifications.qml rename to pkg/frontend/qml/Notifications/Notifications.qml diff --git a/internal/frontend/qml/Notifications/qmldir b/pkg/frontend/qml/Notifications/qmldir similarity index 100% rename from internal/frontend/qml/Notifications/qmldir rename to pkg/frontend/qml/Notifications/qmldir diff --git a/internal/frontend/qml/PortSettings.qml b/pkg/frontend/qml/PortSettings.qml similarity index 100% rename from internal/frontend/qml/PortSettings.qml rename to pkg/frontend/qml/PortSettings.qml diff --git a/internal/frontend/qml/Proton/Action.qml b/pkg/frontend/qml/Proton/Action.qml similarity index 100% rename from internal/frontend/qml/Proton/Action.qml rename to pkg/frontend/qml/Proton/Action.qml diff --git a/internal/frontend/qml/Proton/ApplicationWindow.qml b/pkg/frontend/qml/Proton/ApplicationWindow.qml similarity index 100% rename from internal/frontend/qml/Proton/ApplicationWindow.qml rename to pkg/frontend/qml/Proton/ApplicationWindow.qml diff --git a/internal/frontend/qml/Proton/Button.qml b/pkg/frontend/qml/Proton/Button.qml similarity index 100% rename from internal/frontend/qml/Proton/Button.qml rename to pkg/frontend/qml/Proton/Button.qml diff --git a/internal/frontend/qml/Proton/CheckBox.qml b/pkg/frontend/qml/Proton/CheckBox.qml similarity index 100% rename from internal/frontend/qml/Proton/CheckBox.qml rename to pkg/frontend/qml/Proton/CheckBox.qml diff --git a/internal/frontend/qml/Proton/ColorScheme.qml b/pkg/frontend/qml/Proton/ColorScheme.qml similarity index 100% rename from internal/frontend/qml/Proton/ColorScheme.qml rename to pkg/frontend/qml/Proton/ColorScheme.qml diff --git a/internal/frontend/qml/Proton/ComboBox.qml b/pkg/frontend/qml/Proton/ComboBox.qml similarity index 100% rename from internal/frontend/qml/Proton/ComboBox.qml rename to pkg/frontend/qml/Proton/ComboBox.qml diff --git a/internal/frontend/qml/Proton/Dialog.qml b/pkg/frontend/qml/Proton/Dialog.qml similarity index 100% rename from internal/frontend/qml/Proton/Dialog.qml rename to pkg/frontend/qml/Proton/Dialog.qml diff --git a/internal/frontend/qml/Proton/Label.qml b/pkg/frontend/qml/Proton/Label.qml similarity index 100% rename from internal/frontend/qml/Proton/Label.qml rename to pkg/frontend/qml/Proton/Label.qml diff --git a/internal/frontend/qml/Proton/Menu.qml b/pkg/frontend/qml/Proton/Menu.qml similarity index 100% rename from internal/frontend/qml/Proton/Menu.qml rename to pkg/frontend/qml/Proton/Menu.qml diff --git a/internal/frontend/qml/Proton/MenuItem.qml b/pkg/frontend/qml/Proton/MenuItem.qml similarity index 100% rename from internal/frontend/qml/Proton/MenuItem.qml rename to pkg/frontend/qml/Proton/MenuItem.qml diff --git a/internal/frontend/qml/Proton/Popup.qml b/pkg/frontend/qml/Proton/Popup.qml similarity index 100% rename from internal/frontend/qml/Proton/Popup.qml rename to pkg/frontend/qml/Proton/Popup.qml diff --git a/internal/frontend/qml/Proton/RadioButton.qml b/pkg/frontend/qml/Proton/RadioButton.qml similarity index 100% rename from internal/frontend/qml/Proton/RadioButton.qml rename to pkg/frontend/qml/Proton/RadioButton.qml diff --git a/internal/frontend/qml/Proton/Style.qml b/pkg/frontend/qml/Proton/Style.qml similarity index 100% rename from internal/frontend/qml/Proton/Style.qml rename to pkg/frontend/qml/Proton/Style.qml diff --git a/internal/frontend/qml/Proton/Switch.qml b/pkg/frontend/qml/Proton/Switch.qml similarity index 100% rename from internal/frontend/qml/Proton/Switch.qml rename to pkg/frontend/qml/Proton/Switch.qml diff --git a/internal/frontend/qml/Proton/TextArea.qml b/pkg/frontend/qml/Proton/TextArea.qml similarity index 100% rename from internal/frontend/qml/Proton/TextArea.qml rename to pkg/frontend/qml/Proton/TextArea.qml diff --git a/internal/frontend/qml/Proton/TextField.qml b/pkg/frontend/qml/Proton/TextField.qml similarity index 100% rename from internal/frontend/qml/Proton/TextField.qml rename to pkg/frontend/qml/Proton/TextField.qml diff --git a/internal/frontend/qml/Proton/Toggle.qml b/pkg/frontend/qml/Proton/Toggle.qml similarity index 100% rename from internal/frontend/qml/Proton/Toggle.qml rename to pkg/frontend/qml/Proton/Toggle.qml diff --git a/internal/frontend/qml/Proton/qmldir b/pkg/frontend/qml/Proton/qmldir similarity index 100% rename from internal/frontend/qml/Proton/qmldir rename to pkg/frontend/qml/Proton/qmldir diff --git a/internal/frontend/qml/SMTPSettings.qml b/pkg/frontend/qml/SMTPSettings.qml similarity index 100% rename from internal/frontend/qml/SMTPSettings.qml rename to pkg/frontend/qml/SMTPSettings.qml diff --git a/internal/frontend/qml/SettingsItem.qml b/pkg/frontend/qml/SettingsItem.qml similarity index 100% rename from internal/frontend/qml/SettingsItem.qml rename to pkg/frontend/qml/SettingsItem.qml diff --git a/internal/frontend/qml/SettingsView.qml b/pkg/frontend/qml/SettingsView.qml similarity index 100% rename from internal/frontend/qml/SettingsView.qml rename to pkg/frontend/qml/SettingsView.qml diff --git a/internal/frontend/qml/SetupGuide.qml b/pkg/frontend/qml/SetupGuide.qml similarity index 100% rename from internal/frontend/qml/SetupGuide.qml rename to pkg/frontend/qml/SetupGuide.qml diff --git a/internal/frontend/qml/SignIn.qml b/pkg/frontend/qml/SignIn.qml similarity index 100% rename from internal/frontend/qml/SignIn.qml rename to pkg/frontend/qml/SignIn.qml diff --git a/internal/frontend/qml/SplashScreen.qml b/pkg/frontend/qml/SplashScreen.qml similarity index 100% rename from internal/frontend/qml/SplashScreen.qml rename to pkg/frontend/qml/SplashScreen.qml diff --git a/internal/frontend/qml/Status.qml b/pkg/frontend/qml/Status.qml similarity index 100% rename from internal/frontend/qml/Status.qml rename to pkg/frontend/qml/Status.qml diff --git a/internal/frontend/qml/StatusWindow.qml b/pkg/frontend/qml/StatusWindow.qml similarity index 100% rename from internal/frontend/qml/StatusWindow.qml rename to pkg/frontend/qml/StatusWindow.qml diff --git a/internal/frontend/qml/WelcomeGuide.qml b/pkg/frontend/qml/WelcomeGuide.qml similarity index 100% rename from internal/frontend/qml/WelcomeGuide.qml rename to pkg/frontend/qml/WelcomeGuide.qml diff --git a/internal/frontend/qml/bridgeqml.qmlproject b/pkg/frontend/qml/bridgeqml.qmlproject similarity index 100% rename from internal/frontend/qml/bridgeqml.qmlproject rename to pkg/frontend/qml/bridgeqml.qmlproject diff --git a/internal/frontend/qml/icons/Loader_16.svg b/pkg/frontend/qml/icons/Loader_16.svg similarity index 100% rename from internal/frontend/qml/icons/Loader_16.svg rename to pkg/frontend/qml/icons/Loader_16.svg diff --git a/internal/frontend/qml/icons/Loader_48.svg b/pkg/frontend/qml/icons/Loader_48.svg similarity index 100% rename from internal/frontend/qml/icons/Loader_48.svg rename to pkg/frontend/qml/icons/Loader_48.svg diff --git a/internal/frontend/qml/icons/ic-alert.svg b/pkg/frontend/qml/icons/ic-alert.svg similarity index 100% rename from internal/frontend/qml/icons/ic-alert.svg rename to pkg/frontend/qml/icons/ic-alert.svg diff --git a/internal/frontend/qml/icons/ic-apple-mail.svg b/pkg/frontend/qml/icons/ic-apple-mail.svg similarity index 100% rename from internal/frontend/qml/icons/ic-apple-mail.svg rename to pkg/frontend/qml/icons/ic-apple-mail.svg diff --git a/internal/frontend/qml/icons/ic-arrow-left.svg b/pkg/frontend/qml/icons/ic-arrow-left.svg similarity index 100% rename from internal/frontend/qml/icons/ic-arrow-left.svg rename to pkg/frontend/qml/icons/ic-arrow-left.svg diff --git a/internal/frontend/qml/icons/ic-card-identity.svg b/pkg/frontend/qml/icons/ic-card-identity.svg similarity index 100% rename from internal/frontend/qml/icons/ic-card-identity.svg rename to pkg/frontend/qml/icons/ic-card-identity.svg diff --git a/internal/frontend/qml/icons/ic-check.svg b/pkg/frontend/qml/icons/ic-check.svg similarity index 100% rename from internal/frontend/qml/icons/ic-check.svg rename to pkg/frontend/qml/icons/ic-check.svg diff --git a/internal/frontend/qml/icons/ic-chevron-down.svg b/pkg/frontend/qml/icons/ic-chevron-down.svg similarity index 100% rename from internal/frontend/qml/icons/ic-chevron-down.svg rename to pkg/frontend/qml/icons/ic-chevron-down.svg diff --git a/internal/frontend/qml/icons/ic-chevron-up.svg b/pkg/frontend/qml/icons/ic-chevron-up.svg similarity index 100% rename from internal/frontend/qml/icons/ic-chevron-up.svg rename to pkg/frontend/qml/icons/ic-chevron-up.svg diff --git a/internal/frontend/qml/icons/ic-cog-wheel.svg b/pkg/frontend/qml/icons/ic-cog-wheel.svg similarity index 100% rename from internal/frontend/qml/icons/ic-cog-wheel.svg rename to pkg/frontend/qml/icons/ic-cog-wheel.svg diff --git a/internal/frontend/qml/icons/ic-connected.svg b/pkg/frontend/qml/icons/ic-connected.svg similarity index 100% rename from internal/frontend/qml/icons/ic-connected.svg rename to pkg/frontend/qml/icons/ic-connected.svg diff --git a/internal/frontend/qml/icons/ic-copy.svg b/pkg/frontend/qml/icons/ic-copy.svg similarity index 100% rename from internal/frontend/qml/icons/ic-copy.svg rename to pkg/frontend/qml/icons/ic-copy.svg diff --git a/internal/frontend/qml/icons/ic-cross-close.svg b/pkg/frontend/qml/icons/ic-cross-close.svg similarity index 100% rename from internal/frontend/qml/icons/ic-cross-close.svg rename to pkg/frontend/qml/icons/ic-cross-close.svg diff --git a/internal/frontend/qml/icons/ic-drive.svg b/pkg/frontend/qml/icons/ic-drive.svg similarity index 100% rename from internal/frontend/qml/icons/ic-drive.svg rename to pkg/frontend/qml/icons/ic-drive.svg diff --git a/internal/frontend/qml/icons/ic-exclamation-circle-filled.svg b/pkg/frontend/qml/icons/ic-exclamation-circle-filled.svg similarity index 100% rename from internal/frontend/qml/icons/ic-exclamation-circle-filled.svg rename to pkg/frontend/qml/icons/ic-exclamation-circle-filled.svg diff --git a/internal/frontend/qml/icons/ic-external-link.svg b/pkg/frontend/qml/icons/ic-external-link.svg similarity index 100% rename from internal/frontend/qml/icons/ic-external-link.svg rename to pkg/frontend/qml/icons/ic-external-link.svg diff --git a/internal/frontend/qml/icons/ic-eye-slash.svg b/pkg/frontend/qml/icons/ic-eye-slash.svg similarity index 100% rename from internal/frontend/qml/icons/ic-eye-slash.svg rename to pkg/frontend/qml/icons/ic-eye-slash.svg diff --git a/internal/frontend/qml/icons/ic-eye.svg b/pkg/frontend/qml/icons/ic-eye.svg similarity index 100% rename from internal/frontend/qml/icons/ic-eye.svg rename to pkg/frontend/qml/icons/ic-eye.svg diff --git a/internal/frontend/qml/icons/ic-illustrative-view-html-code.svg b/pkg/frontend/qml/icons/ic-illustrative-view-html-code.svg similarity index 100% rename from internal/frontend/qml/icons/ic-illustrative-view-html-code.svg rename to pkg/frontend/qml/icons/ic-illustrative-view-html-code.svg diff --git a/internal/frontend/qml/icons/ic-info-circle-filled.svg b/pkg/frontend/qml/icons/ic-info-circle-filled.svg similarity index 100% rename from internal/frontend/qml/icons/ic-info-circle-filled.svg rename to pkg/frontend/qml/icons/ic-info-circle-filled.svg diff --git a/internal/frontend/qml/icons/ic-info.svg b/pkg/frontend/qml/icons/ic-info.svg similarity index 100% rename from internal/frontend/qml/icons/ic-info.svg rename to pkg/frontend/qml/icons/ic-info.svg diff --git a/internal/frontend/qml/icons/ic-microsoft-outlook.svg b/pkg/frontend/qml/icons/ic-microsoft-outlook.svg similarity index 100% rename from internal/frontend/qml/icons/ic-microsoft-outlook.svg rename to pkg/frontend/qml/icons/ic-microsoft-outlook.svg diff --git a/internal/frontend/qml/icons/ic-mozilla-thunderbird.svg b/pkg/frontend/qml/icons/ic-mozilla-thunderbird.svg similarity index 100% rename from internal/frontend/qml/icons/ic-mozilla-thunderbird.svg rename to pkg/frontend/qml/icons/ic-mozilla-thunderbird.svg diff --git a/internal/frontend/qml/icons/ic-no-connection.svg b/pkg/frontend/qml/icons/ic-no-connection.svg similarity index 100% rename from internal/frontend/qml/icons/ic-no-connection.svg rename to pkg/frontend/qml/icons/ic-no-connection.svg diff --git a/internal/frontend/qml/icons/ic-other-mail-clients.svg b/pkg/frontend/qml/icons/ic-other-mail-clients.svg similarity index 100% rename from internal/frontend/qml/icons/ic-other-mail-clients.svg rename to pkg/frontend/qml/icons/ic-other-mail-clients.svg diff --git a/internal/frontend/qml/icons/ic-plus.svg b/pkg/frontend/qml/icons/ic-plus.svg similarity index 100% rename from internal/frontend/qml/icons/ic-plus.svg rename to pkg/frontend/qml/icons/ic-plus.svg diff --git a/internal/frontend/qml/icons/ic-question-circle.svg b/pkg/frontend/qml/icons/ic-question-circle.svg similarity index 100% rename from internal/frontend/qml/icons/ic-question-circle.svg rename to pkg/frontend/qml/icons/ic-question-circle.svg diff --git a/internal/frontend/qml/icons/ic-success.svg b/pkg/frontend/qml/icons/ic-success.svg similarity index 100% rename from internal/frontend/qml/icons/ic-success.svg rename to pkg/frontend/qml/icons/ic-success.svg diff --git a/internal/frontend/qml/icons/ic-systray.svg b/pkg/frontend/qml/icons/ic-systray.svg similarity index 100% rename from internal/frontend/qml/icons/ic-systray.svg rename to pkg/frontend/qml/icons/ic-systray.svg diff --git a/internal/frontend/qml/icons/ic-three-dots-vertical.svg b/pkg/frontend/qml/icons/ic-three-dots-vertical.svg similarity index 100% rename from internal/frontend/qml/icons/ic-three-dots-vertical.svg rename to pkg/frontend/qml/icons/ic-three-dots-vertical.svg diff --git a/internal/frontend/qml/icons/ic-trash.svg b/pkg/frontend/qml/icons/ic-trash.svg similarity index 100% rename from internal/frontend/qml/icons/ic-trash.svg rename to pkg/frontend/qml/icons/ic-trash.svg diff --git a/internal/frontend/qml/icons/img-welcome-dark.png b/pkg/frontend/qml/icons/img-welcome-dark.png similarity index 100% rename from internal/frontend/qml/icons/img-welcome-dark.png rename to pkg/frontend/qml/icons/img-welcome-dark.png diff --git a/internal/frontend/qml/icons/img-welcome-dark.svg b/pkg/frontend/qml/icons/img-welcome-dark.svg similarity index 100% rename from internal/frontend/qml/icons/img-welcome-dark.svg rename to pkg/frontend/qml/icons/img-welcome-dark.svg diff --git a/internal/frontend/qml/icons/img-welcome.png b/pkg/frontend/qml/icons/img-welcome.png similarity index 100% rename from internal/frontend/qml/icons/img-welcome.png rename to pkg/frontend/qml/icons/img-welcome.png diff --git a/internal/frontend/qml/icons/img-welcome.svg b/pkg/frontend/qml/icons/img-welcome.svg similarity index 100% rename from internal/frontend/qml/icons/img-welcome.svg rename to pkg/frontend/qml/icons/img-welcome.svg diff --git a/internal/frontend/qml/icons/product_logos.svg b/pkg/frontend/qml/icons/product_logos.svg similarity index 100% rename from internal/frontend/qml/icons/product_logos.svg rename to pkg/frontend/qml/icons/product_logos.svg diff --git a/internal/frontend/qml/icons/systray-mono.png b/pkg/frontend/qml/icons/systray-mono.png similarity index 100% rename from internal/frontend/qml/icons/systray-mono.png rename to pkg/frontend/qml/icons/systray-mono.png diff --git a/internal/frontend/qml/tests/Buttons.qml b/pkg/frontend/qml/tests/Buttons.qml similarity index 100% rename from internal/frontend/qml/tests/Buttons.qml rename to pkg/frontend/qml/tests/Buttons.qml diff --git a/internal/frontend/qml/tests/ButtonsColumn.qml b/pkg/frontend/qml/tests/ButtonsColumn.qml similarity index 100% rename from internal/frontend/qml/tests/ButtonsColumn.qml rename to pkg/frontend/qml/tests/ButtonsColumn.qml diff --git a/internal/frontend/qml/tests/CheckBoxes.qml b/pkg/frontend/qml/tests/CheckBoxes.qml similarity index 100% rename from internal/frontend/qml/tests/CheckBoxes.qml rename to pkg/frontend/qml/tests/CheckBoxes.qml diff --git a/internal/frontend/qml/tests/ComboBoxes.qml b/pkg/frontend/qml/tests/ComboBoxes.qml similarity index 100% rename from internal/frontend/qml/tests/ComboBoxes.qml rename to pkg/frontend/qml/tests/ComboBoxes.qml diff --git a/internal/frontend/qml/tests/RadioButtons.qml b/pkg/frontend/qml/tests/RadioButtons.qml similarity index 100% rename from internal/frontend/qml/tests/RadioButtons.qml rename to pkg/frontend/qml/tests/RadioButtons.qml diff --git a/internal/frontend/qml/tests/Switches.qml b/pkg/frontend/qml/tests/Switches.qml similarity index 100% rename from internal/frontend/qml/tests/Switches.qml rename to pkg/frontend/qml/tests/Switches.qml diff --git a/internal/frontend/qml/tests/Test.qml b/pkg/frontend/qml/tests/Test.qml similarity index 100% rename from internal/frontend/qml/tests/Test.qml rename to pkg/frontend/qml/tests/Test.qml diff --git a/internal/frontend/qml/tests/TestComponents.qml b/pkg/frontend/qml/tests/TestComponents.qml similarity index 100% rename from internal/frontend/qml/tests/TestComponents.qml rename to pkg/frontend/qml/tests/TestComponents.qml diff --git a/internal/frontend/qml/tests/TextAreas.qml b/pkg/frontend/qml/tests/TextAreas.qml similarity index 100% rename from internal/frontend/qml/tests/TextAreas.qml rename to pkg/frontend/qml/tests/TextAreas.qml diff --git a/internal/frontend/qml/tests/TextFields.qml b/pkg/frontend/qml/tests/TextFields.qml similarity index 100% rename from internal/frontend/qml/tests/TextFields.qml rename to pkg/frontend/qml/tests/TextFields.qml diff --git a/internal/frontend/qt/dockicon/DockIcon.h b/pkg/frontend/qt/dockicon/DockIcon.h similarity index 100% rename from internal/frontend/qt/dockicon/DockIcon.h rename to pkg/frontend/qt/dockicon/DockIcon.h diff --git a/internal/frontend/qt/dockicon/DockIcon.m b/pkg/frontend/qt/dockicon/DockIcon.m similarity index 100% rename from internal/frontend/qt/dockicon/DockIcon.m rename to pkg/frontend/qt/dockicon/DockIcon.m diff --git a/internal/frontend/qt/dockicon/dockicon_darwin.go b/pkg/frontend/qt/dockicon/dockicon_darwin.go similarity index 100% rename from internal/frontend/qt/dockicon/dockicon_darwin.go rename to pkg/frontend/qt/dockicon/dockicon_darwin.go diff --git a/internal/frontend/qt/dockicon/dockicon_default.go b/pkg/frontend/qt/dockicon/dockicon_default.go similarity index 100% rename from internal/frontend/qt/dockicon/dockicon_default.go rename to pkg/frontend/qt/dockicon/dockicon_default.go diff --git a/internal/frontend/qt/frontend.go b/pkg/frontend/qt/frontend.go similarity index 90% rename from internal/frontend/qt/frontend.go rename to pkg/frontend/qt/frontend.go index 6457282..0f713cd 100644 --- a/internal/frontend/qt/frontend.go +++ b/pkg/frontend/qt/frontend.go @@ -25,13 +25,13 @@ import ( "fmt" "sync" - "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/ProtonMail/proton-bridge/internal/locations" - "github.com/ProtonMail/proton-bridge/internal/updater" - "github.com/ProtonMail/proton-bridge/pkg/listener" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/config/settings" + "github.com/ljanyst/peroxide/pkg/config/useragent" + "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/ljanyst/peroxide/pkg/pmapi" "github.com/sirupsen/logrus" "github.com/therecipe/qt/core" "github.com/therecipe/qt/qml" diff --git a/internal/frontend/qt/frontend_events.go b/pkg/frontend/qt/frontend_events.go similarity index 96% rename from internal/frontend/qt/frontend_events.go rename to pkg/frontend/qt/frontend_events.go index 0b07e90..b27412d 100644 --- a/internal/frontend/qt/frontend_events.go +++ b/pkg/frontend/qt/frontend_events.go @@ -24,8 +24,8 @@ package qt import ( "strings" - "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" ) func (f *FrontendQt) watchEvents() { diff --git a/internal/frontend/qt/frontend_help.go b/pkg/frontend/qt/frontend_help.go similarity index 100% rename from internal/frontend/qt/frontend_help.go rename to pkg/frontend/qt/frontend_help.go diff --git a/internal/frontend/qt/frontend_init.go b/pkg/frontend/qt/frontend_init.go similarity index 98% rename from internal/frontend/qt/frontend_init.go rename to pkg/frontend/qt/frontend_init.go index f3d43a1..75beda0 100644 --- a/internal/frontend/qt/frontend_init.go +++ b/pkg/frontend/qt/frontend_init.go @@ -26,7 +26,7 @@ import ( "runtime" "github.com/Masterminds/semver/v3" - qmlLog "github.com/ProtonMail/proton-bridge/internal/frontend/qt/log" + qmlLog "github.com/ljanyst/peroxide/pkg/frontend/qt/log" "github.com/therecipe/qt/core" "github.com/therecipe/qt/qml" "github.com/therecipe/qt/quickcontrols2" diff --git a/internal/frontend/qt/frontend_nogui.go b/pkg/frontend/qt/frontend_nogui.go similarity index 85% rename from internal/frontend/qt/frontend_nogui.go rename to pkg/frontend/qt/frontend_nogui.go index 0381e0f..9130fa0 100644 --- a/internal/frontend/qt/frontend_nogui.go +++ b/pkg/frontend/qt/frontend_nogui.go @@ -23,12 +23,12 @@ import ( "fmt" "net/http" - "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/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/config/useragent" + "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/sirupsen/logrus" ) diff --git a/internal/frontend/qt/frontend_settings.go b/pkg/frontend/qt/frontend_settings.go similarity index 95% rename from internal/frontend/qt/frontend_settings.go rename to pkg/frontend/qt/frontend_settings.go index ab56970..0f64529 100644 --- a/internal/frontend/qt/frontend_settings.go +++ b/pkg/frontend/qt/frontend_settings.go @@ -24,10 +24,10 @@ import ( "runtime" "time" - "github.com/ProtonMail/proton-bridge/internal/config/settings" - "github.com/ProtonMail/proton-bridge/internal/frontend/clientconfig" - "github.com/ProtonMail/proton-bridge/pkg/keychain" - "github.com/ProtonMail/proton-bridge/pkg/ports" + "github.com/ljanyst/peroxide/pkg/config/settings" + "github.com/ljanyst/peroxide/pkg/frontend/clientconfig" + "github.com/ljanyst/peroxide/pkg/keychain" + "github.com/ljanyst/peroxide/pkg/ports" "github.com/therecipe/qt/core" ) diff --git a/internal/frontend/qt/frontend_updates.go b/pkg/frontend/qt/frontend_updates.go similarity index 95% rename from internal/frontend/qt/frontend_updates.go rename to pkg/frontend/qt/frontend_updates.go index 00036d4..5a0ac37 100644 --- a/internal/frontend/qt/frontend_updates.go +++ b/pkg/frontend/qt/frontend_updates.go @@ -23,8 +23,8 @@ package qt import ( "sync" - "github.com/ProtonMail/proton-bridge/internal/config/settings" - "github.com/ProtonMail/proton-bridge/internal/updater" + "github.com/ljanyst/peroxide/pkg/config/settings" + "github.com/ljanyst/peroxide/pkg/updater" ) var checkingUpdates = sync.Mutex{} diff --git a/internal/frontend/qt/frontend_users.go b/pkg/frontend/qt/frontend_users.go similarity index 96% rename from internal/frontend/qt/frontend_users.go rename to pkg/frontend/qt/frontend_users.go index ffd81ca..844d25d 100644 --- a/internal/frontend/qt/frontend_users.go +++ b/pkg/frontend/qt/frontend_users.go @@ -25,9 +25,9 @@ import ( "encoding/base64" "time" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/internal/users" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/users" + "github.com/ljanyst/peroxide/pkg/pmapi" ) func (f *FrontendQt) login(username, password string) { diff --git a/internal/frontend/qt/helpers.go b/pkg/frontend/qt/helpers.go similarity index 100% rename from internal/frontend/qt/helpers.go rename to pkg/frontend/qt/helpers.go diff --git a/internal/frontend/qt/log/log.cpp b/pkg/frontend/qt/log/log.cpp similarity index 100% rename from internal/frontend/qt/log/log.cpp rename to pkg/frontend/qt/log/log.cpp diff --git a/internal/frontend/qt/log/log.go b/pkg/frontend/qt/log/log.go similarity index 100% rename from internal/frontend/qt/log/log.go rename to pkg/frontend/qt/log/log.go diff --git a/internal/frontend/qt/log/log.h b/pkg/frontend/qt/log/log.h similarity index 100% rename from internal/frontend/qt/log/log.h rename to pkg/frontend/qt/log/log.h diff --git a/internal/frontend/qt/qml_backend.go b/pkg/frontend/qt/qml_backend.go similarity index 97% rename from internal/frontend/qt/qml_backend.go rename to pkg/frontend/qt/qml_backend.go index 62b229b..49192ac 100644 --- a/internal/frontend/qt/qml_backend.go +++ b/pkg/frontend/qt/qml_backend.go @@ -23,9 +23,9 @@ package qt import ( "runtime" - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/config/settings" - dockIcon "github.com/ProtonMail/proton-bridge/internal/frontend/qt/dockicon" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/config/settings" + dockIcon "github.com/ljanyst/peroxide/pkg/frontend/qt/dockicon" "github.com/therecipe/qt/core" ) diff --git a/internal/frontend/qt/qml_users.go b/pkg/frontend/qt/qml_users.go similarity index 98% rename from internal/frontend/qt/qml_users.go rename to pkg/frontend/qt/qml_users.go index 8aa4fb0..481feda 100644 --- a/internal/frontend/qt/qml_users.go +++ b/pkg/frontend/qt/qml_users.go @@ -23,8 +23,8 @@ package qt import ( "sync" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/internal/frontend/types" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/frontend/types" "github.com/therecipe/qt/core" ) diff --git a/internal/frontend/share/Bridge.icns b/pkg/frontend/share/Bridge.icns similarity index 100% rename from internal/frontend/share/Bridge.icns rename to pkg/frontend/share/Bridge.icns diff --git a/internal/frontend/share/info.rc b/pkg/frontend/share/info.rc similarity index 100% rename from internal/frontend/share/info.rc rename to pkg/frontend/share/info.rc diff --git a/internal/frontend/share/logo.ico b/pkg/frontend/share/logo.ico similarity index 100% rename from internal/frontend/share/logo.ico rename to pkg/frontend/share/logo.ico diff --git a/internal/frontend/share/logo.svg b/pkg/frontend/share/logo.svg similarity index 100% rename from internal/frontend/share/logo.svg rename to pkg/frontend/share/logo.svg diff --git a/internal/frontend/types/types.go b/pkg/frontend/types/types.go similarity index 95% rename from internal/frontend/types/types.go rename to pkg/frontend/types/types.go index b411d82..b20365d 100644 --- a/internal/frontend/types/types.go +++ b/pkg/frontend/types/types.go @@ -19,9 +19,9 @@ package types import ( - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/updater" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/updater" + "github.com/ljanyst/peroxide/pkg/pmapi" ) // PanicHandler is an interface of a type that can be used to gracefully handle panics which occur. diff --git a/internal/imap/backend.go b/pkg/imap/backend.go similarity index 96% rename from internal/imap/backend.go rename to pkg/imap/backend.go index 7f72799..a16094d 100644 --- a/internal/imap/backend.go +++ b/pkg/imap/backend.go @@ -36,11 +36,11 @@ import ( "sync" "time" - "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/internal/users" - "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/events" + "github.com/ljanyst/peroxide/pkg/users" + "github.com/ljanyst/peroxide/pkg/listener" "github.com/emersion/go-imap" goIMAPBackend "github.com/emersion/go-imap/backend" ) diff --git a/internal/imap/backend_cache.go b/pkg/imap/backend_cache.go similarity index 100% rename from internal/imap/backend_cache.go rename to pkg/imap/backend_cache.go diff --git a/internal/imap/bridge.go b/pkg/imap/bridge.go similarity index 93% rename from internal/imap/bridge.go rename to pkg/imap/bridge.go index a98ec55..e6c7c8e 100644 --- a/internal/imap/bridge.go +++ b/pkg/imap/bridge.go @@ -18,9 +18,9 @@ package imap import ( - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/users" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/users" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type cacheProvider interface { diff --git a/internal/imap/id/extension.go b/pkg/imap/id/extension.go similarity index 100% rename from internal/imap/id/extension.go rename to pkg/imap/id/extension.go diff --git a/internal/imap/idle/extension.go b/pkg/imap/idle/extension.go similarity index 100% rename from internal/imap/idle/extension.go rename to pkg/imap/idle/extension.go diff --git a/internal/imap/imap.go b/pkg/imap/imap.go similarity index 100% rename from internal/imap/imap.go rename to pkg/imap/imap.go diff --git a/internal/imap/mailbox.go b/pkg/imap/mailbox.go similarity index 98% rename from internal/imap/mailbox.go rename to pkg/imap/mailbox.go index 8dc09cc..a5d2b61 100644 --- a/internal/imap/mailbox.go +++ b/pkg/imap/mailbox.go @@ -21,8 +21,8 @@ import ( "strings" "time" - "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-imap" "github.com/sirupsen/logrus" ) diff --git a/internal/imap/mailbox_append.go b/pkg/imap/mailbox_append.go similarity index 98% rename from internal/imap/mailbox_append.go rename to pkg/imap/mailbox_append.go index 79952d4..17acc21 100644 --- a/internal/imap/mailbox_append.go +++ b/pkg/imap/mailbox_append.go @@ -27,9 +27,9 @@ import ( "time" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/internal/imap/uidplus" - "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/imap/uidplus" + "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-imap" "github.com/emersion/go-message/textproto" "github.com/pkg/errors" diff --git a/internal/imap/mailbox_fetch.go b/pkg/imap/mailbox_fetch.go similarity index 99% rename from internal/imap/mailbox_fetch.go rename to pkg/imap/mailbox_fetch.go index 69aaa83..9423483 100644 --- a/internal/imap/mailbox_fetch.go +++ b/pkg/imap/mailbox_fetch.go @@ -20,7 +20,7 @@ package imap import ( "bytes" - "github.com/ProtonMail/proton-bridge/pkg/message" + "github.com/ljanyst/peroxide/pkg/message" "github.com/emersion/go-imap" "github.com/pkg/errors" ) diff --git a/internal/imap/mailbox_fetch_test.go b/pkg/imap/mailbox_fetch_test.go similarity index 100% rename from internal/imap/mailbox_fetch_test.go rename to pkg/imap/mailbox_fetch_test.go diff --git a/internal/imap/mailbox_header.go b/pkg/imap/mailbox_header.go similarity index 97% rename from internal/imap/mailbox_header.go rename to pkg/imap/mailbox_header.go index a5978ae..b69a970 100644 --- a/internal/imap/mailbox_header.go +++ b/pkg/imap/mailbox_header.go @@ -21,7 +21,7 @@ import ( "bytes" "strings" - "github.com/ProtonMail/proton-bridge/pkg/message" + "github.com/ljanyst/peroxide/pkg/message" "github.com/emersion/go-imap" ) diff --git a/internal/imap/mailbox_messages.go b/pkg/imap/mailbox_messages.go similarity index 98% rename from internal/imap/mailbox_messages.go rename to pkg/imap/mailbox_messages.go index a2ca151..b50a156 100644 --- a/internal/imap/mailbox_messages.go +++ b/pkg/imap/mailbox_messages.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ProtonMail/proton-bridge/internal/imap/uidplus" - "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/parallel" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/imap/uidplus" + "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/parallel" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-imap" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/internal/imap/mailbox_root.go b/pkg/imap/mailbox_root.go similarity index 98% rename from internal/imap/mailbox_root.go rename to pkg/imap/mailbox_root.go index 062748d..12ab31a 100644 --- a/internal/imap/mailbox_root.go +++ b/pkg/imap/mailbox_root.go @@ -21,7 +21,7 @@ import ( "errors" "time" - "github.com/ProtonMail/proton-bridge/internal/store" + "github.com/ljanyst/peroxide/pkg/store" imap "github.com/emersion/go-imap" ) diff --git a/internal/imap/server.go b/pkg/imap/server.go similarity index 92% rename from internal/imap/server.go rename to pkg/imap/server.go index a6cecd3..d11f65b 100644 --- a/internal/imap/server.go +++ b/pkg/imap/server.go @@ -26,13 +26,13 @@ import ( "time" imapid "github.com/ProtonMail/go-imap-id" - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/config/useragent" - "github.com/ProtonMail/proton-bridge/internal/imap/id" - "github.com/ProtonMail/proton-bridge/internal/imap/idle" - "github.com/ProtonMail/proton-bridge/internal/imap/uidplus" - "github.com/ProtonMail/proton-bridge/internal/serverutil" - "github.com/ProtonMail/proton-bridge/pkg/listener" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/config/useragent" + "github.com/ljanyst/peroxide/pkg/imap/id" + "github.com/ljanyst/peroxide/pkg/imap/idle" + "github.com/ljanyst/peroxide/pkg/imap/uidplus" + "github.com/ljanyst/peroxide/pkg/serverutil" + "github.com/ljanyst/peroxide/pkg/listener" "github.com/emersion/go-imap" imapappendlimit "github.com/emersion/go-imap-appendlimit" imapmove "github.com/emersion/go-imap-move" diff --git a/internal/imap/store.go b/pkg/imap/store.go similarity index 95% rename from internal/imap/store.go rename to pkg/imap/store.go index a377817..de92414 100644 --- a/internal/imap/store.go +++ b/pkg/imap/store.go @@ -23,10 +23,10 @@ import ( "net/textproto" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/internal/imap/uidplus" - "github.com/ProtonMail/proton-bridge/internal/store" - pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/imap/uidplus" + "github.com/ljanyst/peroxide/pkg/store" + pkgMsg "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type storeUserProvider interface { diff --git a/internal/imap/uidplus/extension.go b/pkg/imap/uidplus/extension.go similarity index 100% rename from internal/imap/uidplus/extension.go rename to pkg/imap/uidplus/extension.go diff --git a/internal/imap/uidplus/extension_test.go b/pkg/imap/uidplus/extension_test.go similarity index 100% rename from internal/imap/uidplus/extension_test.go rename to pkg/imap/uidplus/extension_test.go diff --git a/internal/imap/updates.go b/pkg/imap/updates.go similarity index 97% rename from internal/imap/updates.go rename to pkg/imap/updates.go index 83fd87b..e1caf54 100644 --- a/internal/imap/updates.go +++ b/pkg/imap/updates.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/ProtonMail/proton-bridge/internal/store" - "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/store" + "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" imap "github.com/emersion/go-imap" goIMAPBackend "github.com/emersion/go-imap/backend" "github.com/sirupsen/logrus" diff --git a/internal/imap/updates_test.go b/pkg/imap/updates_test.go similarity index 100% rename from internal/imap/updates_test.go rename to pkg/imap/updates_test.go diff --git a/internal/imap/user.go b/pkg/imap/user.go similarity index 99% rename from internal/imap/user.go rename to pkg/imap/user.go index 84b0a99..bae9c59 100644 --- a/internal/imap/user.go +++ b/pkg/imap/user.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" imapquota "github.com/emersion/go-imap-quota" goIMAPBackend "github.com/emersion/go-imap/backend" ) diff --git a/pkg/keychain/keychain.go b/pkg/keychain/keychain.go index f5e9fc2..b5405e7 100644 --- a/pkg/keychain/keychain.go +++ b/pkg/keychain/keychain.go @@ -23,7 +23,7 @@ import ( "fmt" "sync" - "github.com/ProtonMail/proton-bridge/internal/config/settings" + "github.com/ljanyst/peroxide/pkg/config/settings" "github.com/docker/docker-credential-helpers/credentials" ) diff --git a/internal/locations/locations.go b/pkg/locations/locations.go similarity index 99% rename from internal/locations/locations.go rename to pkg/locations/locations.go index e8f3b6b..9514689 100644 --- a/internal/locations/locations.go +++ b/pkg/locations/locations.go @@ -24,7 +24,7 @@ import ( "path/filepath" "runtime" - "github.com/ProtonMail/proton-bridge/pkg/files" + "github.com/ljanyst/peroxide/pkg/files" "github.com/sirupsen/logrus" ) diff --git a/internal/locations/locations_test.go b/pkg/locations/locations_test.go similarity index 100% rename from internal/locations/locations_test.go rename to pkg/locations/locations_test.go diff --git a/internal/locations/provider.go b/pkg/locations/provider.go similarity index 100% rename from internal/locations/provider.go rename to pkg/locations/provider.go diff --git a/internal/logging/clear.go b/pkg/logging/clear.go similarity index 100% rename from internal/logging/clear.go rename to pkg/logging/clear.go diff --git a/internal/logging/crash.go b/pkg/logging/crash.go similarity index 93% rename from internal/logging/crash.go rename to pkg/logging/crash.go index 6b8d176..33a28be 100644 --- a/internal/logging/crash.go +++ b/pkg/logging/crash.go @@ -25,8 +25,8 @@ import ( "runtime/pprof" "time" - "github.com/ProtonMail/proton-bridge/internal/constants" - "github.com/ProtonMail/proton-bridge/internal/crash" + "github.com/ljanyst/peroxide/pkg/constants" + "github.com/ljanyst/peroxide/pkg/crash" "github.com/sirupsen/logrus" ) diff --git a/internal/logging/logging.go b/pkg/logging/logging.go similarity index 98% rename from internal/logging/logging.go rename to pkg/logging/logging.go index c19c19f..c177016 100644 --- a/internal/logging/logging.go +++ b/pkg/logging/logging.go @@ -25,7 +25,7 @@ import ( "regexp" "time" - "github.com/ProtonMail/proton-bridge/internal/constants" + "github.com/ljanyst/peroxide/pkg/constants" "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/writer" ) diff --git a/internal/logging/logging_test.go b/pkg/logging/logging_test.go similarity index 100% rename from internal/logging/logging_test.go rename to pkg/logging/logging_test.go diff --git a/internal/logging/rotator.go b/pkg/logging/rotator.go similarity index 100% rename from internal/logging/rotator.go rename to pkg/logging/rotator.go diff --git a/internal/logging/rotator_test.go b/pkg/logging/rotator_test.go similarity index 100% rename from internal/logging/rotator_test.go rename to pkg/logging/rotator_test.go diff --git a/pkg/message/build.go b/pkg/message/build.go index cbb8148..bcc4df1 100644 --- a/pkg/message/build.go +++ b/pkg/message/build.go @@ -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/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pool" "github.com/pkg/errors" ) diff --git a/pkg/message/build_encrypted.go b/pkg/message/build_encrypted.go index e67e73a..f7b0b98 100644 --- a/pkg/message/build_encrypted.go +++ b/pkg/message/build_encrypted.go @@ -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/ljanyst/peroxide/pkg/mime" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-message" "github.com/emersion/go-textwrapper" ) diff --git a/pkg/message/build_framework_test.go b/pkg/message/build_framework_test.go index f947313..df8aab8 100644 --- a/pkg/message/build_framework_test.go +++ b/pkg/message/build_framework_test.go @@ -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/ljanyst/peroxide/pkg/message/mocks" + "github.com/ljanyst/peroxide/pkg/message/parser" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/message/build_rfc822.go b/pkg/message/build_rfc822.go index bfcdac6..127bd76 100644 --- a/pkg/message/build_rfc822.go +++ b/pkg/message/build_rfc822.go @@ -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/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-message" "github.com/emersion/go-message/textproto" "github.com/pkg/errors" diff --git a/pkg/message/build_rfc822_custom.go b/pkg/message/build_rfc822_custom.go index e7ab46b..c8dac48 100644 --- a/pkg/message/build_rfc822_custom.go +++ b/pkg/message/build_rfc822_custom.go @@ -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/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-message" ) diff --git a/pkg/message/build_test.go b/pkg/message/build_test.go index f589a27..5fbdc28 100644 --- a/pkg/message/build_test.go +++ b/pkg/message/build_test.go @@ -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/ljanyst/peroxide/pkg/message/mocks" + tests "github.com/ljanyst/peroxide/test" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/message/encrypt.go b/pkg/message/encrypt.go index aba838f..c155d89 100644 --- a/pkg/message/encrypt.go +++ b/pkg/message/encrypt.go @@ -27,7 +27,7 @@ import ( "strings" "github.com/ProtonMail/gopenpgp/v2/crypto" - pmmime "github.com/ProtonMail/proton-bridge/pkg/mime" + pmmime "github.com/ljanyst/peroxide/pkg/mime" "github.com/emersion/go-message/textproto" "github.com/pkg/errors" ) diff --git a/pkg/message/envelope.go b/pkg/message/envelope.go index ff919fd..93c1d73 100644 --- a/pkg/message/envelope.go +++ b/pkg/message/envelope.go @@ -22,7 +22,7 @@ import ( "net/textproto" "strings" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-imap" ) diff --git a/pkg/message/flags.go b/pkg/message/flags.go index 9b4cf1b..67ed14a 100644 --- a/pkg/message/flags.go +++ b/pkg/message/flags.go @@ -18,7 +18,7 @@ package message import ( - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-imap" ) diff --git a/pkg/message/init.go b/pkg/message/init.go index 31f5cc9..0415fa0 100644 --- a/pkg/message/init.go +++ b/pkg/message/init.go @@ -19,7 +19,7 @@ package message import ( "github.com/ProtonMail/go-rfc5322" - pmmime "github.com/ProtonMail/proton-bridge/pkg/mime" + pmmime "github.com/ljanyst/peroxide/pkg/mime" ) func init() { // nolint[noinit] diff --git a/pkg/message/mocks/mocks.go b/pkg/message/mocks/mocks.go index 4c58525..e6384cb 100644 --- a/pkg/message/mocks/mocks.go +++ b/pkg/message/mocks/mocks.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ProtonMail/proton-bridge/pkg/message (interfaces: Fetcher) +// Source: github.com/ljanyst/peroxide/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/ljanyst/peroxide/pkg/pmapi" gomock "github.com/golang/mock/gomock" ) diff --git a/pkg/message/parser.go b/pkg/message/parser.go index 553e900..a1d9267 100644 --- a/pkg/message/parser.go +++ b/pkg/message/parser.go @@ -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/ljanyst/peroxide/pkg/message/parser" + pmmime "github.com/ljanyst/peroxide/pkg/mime" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/emersion/go-message" "github.com/jaytaylor/html2text" "github.com/pkg/errors" diff --git a/pkg/message/parser/part.go b/pkg/message/parser/part.go index f04cd6e..1e0f96f 100644 --- a/pkg/message/parser/part.go +++ b/pkg/message/parser/part.go @@ -23,7 +23,7 @@ import ( "mime" "unicode/utf8" - pmmime "github.com/ProtonMail/proton-bridge/pkg/mime" + pmmime "github.com/ljanyst/peroxide/pkg/mime" "github.com/PuerkitoBio/goquery" "github.com/emersion/go-message" "github.com/sirupsen/logrus" diff --git a/pkg/message/parser_test.go b/pkg/message/parser_test.go index 46f4bb6..89765f3 100644 --- a/pkg/message/parser_test.go +++ b/pkg/message/parser_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/ProtonMail/proton-bridge/pkg/message/parser" + "github.com/ljanyst/peroxide/pkg/message/parser" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/encoding/charmap" diff --git a/pkg/message/section.go b/pkg/message/section.go index ee62162..95b432f 100644 --- a/pkg/message/section.go +++ b/pkg/message/section.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - pmmime "github.com/ProtonMail/proton-bridge/pkg/mime" + pmmime "github.com/ljanyst/peroxide/pkg/mime" "github.com/emersion/go-imap" "github.com/pkg/errors" "github.com/vmihailenco/msgpack/v5" diff --git a/internal/metrics/metrics.go b/pkg/metrics/metrics.go similarity index 100% rename from internal/metrics/metrics.go rename to pkg/metrics/metrics.go diff --git a/pkg/pmapi/attachments_test.go b/pkg/pmapi/attachments_test.go index 6a78fd7..06682fe 100644 --- a/pkg/pmapi/attachments_test.go +++ b/pkg/pmapi/attachments_test.go @@ -31,7 +31,7 @@ import ( "strings" "testing" - pmmime "github.com/ProtonMail/proton-bridge/pkg/mime" + pmmime "github.com/ljanyst/peroxide/pkg/mime" "github.com/stretchr/testify/require" ) diff --git a/pkg/pmapi/import_test.go b/pkg/pmapi/import_test.go index 8ba6077..93615ba 100644 --- a/pkg/pmapi/import_test.go +++ b/pkg/pmapi/import_test.go @@ -28,7 +28,7 @@ import ( "net/http" "testing" - pmmime "github.com/ProtonMail/proton-bridge/pkg/mime" + pmmime "github.com/ljanyst/peroxide/pkg/mime" r "github.com/stretchr/testify/require" ) diff --git a/pkg/pmapi/mocks/mocks.go b/pkg/pmapi/mocks/mocks.go index 82a7570..557128b 100644 --- a/pkg/pmapi/mocks/mocks.go +++ b/pkg/pmapi/mocks/mocks.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ProtonMail/proton-bridge/pkg/pmapi (interfaces: Client,Manager) +// Source: github.com/ljanyst/peroxide/pkg/pmapi (interfaces: Client,Manager) // Package mocks is a generated GoMock package. package mocks @@ -12,7 +12,7 @@ import ( time "time" crypto "github.com/ProtonMail/gopenpgp/v2/crypto" - pmapi "github.com/ProtonMail/proton-bridge/pkg/pmapi" + pmapi "github.com/ljanyst/peroxide/pkg/pmapi" gomock "github.com/golang/mock/gomock" logrus "github.com/sirupsen/logrus" ) diff --git a/pkg/pool/pool.go b/pkg/pool/pool.go index 45c2817..bf13854 100644 --- a/pkg/pool/pool.go +++ b/pkg/pool/pool.go @@ -20,7 +20,7 @@ package pool import ( "sync" - "github.com/ProtonMail/proton-bridge/pkg/pchan" + "github.com/ljanyst/peroxide/pkg/pchan" ) type WorkFunc func(interface{}, int) (interface{}, error) diff --git a/pkg/pool/pool_test.go b/pkg/pool/pool_test.go index 6c38b32..0f9e6bf 100644 --- a/pkg/pool/pool_test.go +++ b/pkg/pool/pool_test.go @@ -20,7 +20,7 @@ package pool_test import ( "testing" - "github.com/ProtonMail/proton-bridge/pkg/pool" + "github.com/ljanyst/peroxide/pkg/pool" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/sentry/reporter.go b/pkg/sentry/reporter.go similarity index 98% rename from internal/sentry/reporter.go rename to pkg/sentry/reporter.go index 319f411..22d7f55 100644 --- a/internal/sentry/reporter.go +++ b/pkg/sentry/reporter.go @@ -24,7 +24,7 @@ import ( "runtime" "time" - "github.com/ProtonMail/proton-bridge/internal/constants" + "github.com/ljanyst/peroxide/pkg/constants" "github.com/getsentry/sentry-go" "github.com/sirupsen/logrus" ) diff --git a/internal/sentry/reporter_test.go b/pkg/sentry/reporter_test.go similarity index 59% rename from internal/sentry/reporter_test.go rename to pkg/sentry/reporter_test.go index 8b36fef..26bb22e 100644 --- a/internal/sentry/reporter_test.go +++ b/pkg/sentry/reporter_test.go @@ -35,30 +35,30 @@ func TestSkipDuringUnwind(t *testing.T) { }() wantSkippedFunctions := []string{ - "github.com/ProtonMail/proton-bridge/internal/sentry.TestSkipDuringUnwind", - "github.com/ProtonMail/proton-bridge/internal/sentry.TestSkipDuringUnwind.func1", + "github.com/ljanyst/peroxide/pkg/sentry.TestSkipDuringUnwind", + "github.com/ljanyst/peroxide/pkg/sentry.TestSkipDuringUnwind.func1", } r.Equal(t, wantSkippedFunctions, skippedFunctions) } func TestFilterOutPanicHandlers(t *testing.T) { skippedFunctions = []string{ - "github.com/ProtonMail/proton-bridge/pkg/config.(*PanicHandler).HandlePanic", - "github.com/ProtonMail/proton-bridge/pkg/config.HandlePanic", - "github.com/ProtonMail/proton-bridge/internal/sentry.ReportSentryCrash", - "github.com/ProtonMail/proton-bridge/internal/sentry.ReportSentryCrash.func1", + "github.com/ljanyst/peroxide/pkg/config.(*PanicHandler).HandlePanic", + "github.com/ljanyst/peroxide/pkg/config.HandlePanic", + "github.com/ljanyst/peroxide/pkg/sentry.ReportSentryCrash", + "github.com/ljanyst/peroxide/pkg/sentry.ReportSentryCrash.func1", } frames := []sentry.Frame{ - {Module: "github.com/ProtonMail/proton-bridge/internal/cmd", Function: "main"}, + {Module: "github.com/ljanyst/peroxide/pkg/cmd", Function: "main"}, {Module: "github.com/urfave/cli", Function: "(*App).Run"}, - {Module: "github.com/ProtonMail/proton-bridge/internal/cmd", Function: "RegisterHandlePanic"}, + {Module: "github.com/ljanyst/peroxide/pkg/cmd", Function: "RegisterHandlePanic"}, {Module: "github.com/ProtonMail/pkg", Function: "HandlePanic"}, {Module: "main", Function: "run"}, - {Module: "github.com/ProtonMail/proton-bridge/pkg/config", Function: "(*PanicHandler).HandlePanic"}, - {Module: "github.com/ProtonMail/proton-bridge/pkg/config", Function: "HandlePanic"}, - {Module: "github.com/ProtonMail/proton-bridge/internal/sentry", Function: "ReportSentryCrash"}, - {Module: "github.com/ProtonMail/proton-bridge/internal/sentry", Function: "ReportSentryCrash.func1"}, + {Module: "github.com/ljanyst/peroxide/pkg/config", Function: "(*PanicHandler).HandlePanic"}, + {Module: "github.com/ljanyst/peroxide/pkg/config", Function: "HandlePanic"}, + {Module: "github.com/ljanyst/peroxide/pkg/sentry", Function: "ReportSentryCrash"}, + {Module: "github.com/ljanyst/peroxide/pkg/sentry", Function: "ReportSentryCrash.func1"}, } gotFrames := filterOutPanicHandlers(frames) diff --git a/internal/serverutil/controller.go b/pkg/serverutil/controller.go similarity index 96% rename from internal/serverutil/controller.go rename to pkg/serverutil/controller.go index c2ba1dc..ade2681 100644 --- a/internal/serverutil/controller.go +++ b/pkg/serverutil/controller.go @@ -22,8 +22,8 @@ import ( "fmt" "net" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/pkg/listener" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/listener" "github.com/sirupsen/logrus" ) diff --git a/internal/serverutil/error_logger.go b/pkg/serverutil/error_logger.go similarity index 100% rename from internal/serverutil/error_logger.go rename to pkg/serverutil/error_logger.go diff --git a/internal/serverutil/listener.go b/pkg/serverutil/listener.go similarity index 100% rename from internal/serverutil/listener.go rename to pkg/serverutil/listener.go diff --git a/internal/serverutil/protocol.go b/pkg/serverutil/protocol.go similarity index 100% rename from internal/serverutil/protocol.go rename to pkg/serverutil/protocol.go diff --git a/internal/serverutil/server.go b/pkg/serverutil/server.go similarity index 100% rename from internal/serverutil/server.go rename to pkg/serverutil/server.go diff --git a/internal/serverutil/test/controller_test.go b/pkg/serverutil/test/controller_test.go similarity index 95% rename from internal/serverutil/test/controller_test.go rename to pkg/serverutil/test/controller_test.go index 62cab2e..19d7b8b 100644 --- a/internal/serverutil/test/controller_test.go +++ b/pkg/serverutil/test/controller_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/internal/serverutil" - "github.com/ProtonMail/proton-bridge/pkg/listener" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/serverutil" + "github.com/ljanyst/peroxide/pkg/listener" "github.com/stretchr/testify/require" ) diff --git a/internal/serverutil/test/server.go b/pkg/serverutil/test/server.go similarity index 95% rename from internal/serverutil/test/server.go rename to pkg/serverutil/test/server.go index f0615c5..0bd626b 100644 --- a/internal/serverutil/test/server.go +++ b/pkg/serverutil/test/server.go @@ -24,8 +24,8 @@ import ( "net" "net/http" - "github.com/ProtonMail/proton-bridge/internal/serverutil" - "github.com/ProtonMail/proton-bridge/pkg/ports" + "github.com/ljanyst/peroxide/pkg/serverutil" + "github.com/ljanyst/peroxide/pkg/ports" ) func newTestServer() *testServer { diff --git a/internal/smtp/backend.go b/pkg/smtp/backend.go similarity index 93% rename from internal/smtp/backend.go rename to pkg/smtp/backend.go index fa40324..8b56240 100644 --- a/internal/smtp/backend.go +++ b/pkg/smtp/backend.go @@ -21,11 +21,11 @@ import ( "strings" "time" - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/config/settings" - "github.com/ProtonMail/proton-bridge/internal/users" - "github.com/ProtonMail/proton-bridge/pkg/confirmer" - "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/users" + "github.com/ljanyst/peroxide/pkg/confirmer" + "github.com/ljanyst/peroxide/pkg/listener" goSMTPBackend "github.com/emersion/go-smtp" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/internal/smtp/bridge.go b/pkg/smtp/bridge.go similarity index 92% rename from internal/smtp/bridge.go rename to pkg/smtp/bridge.go index d616711..259ada4 100644 --- a/internal/smtp/bridge.go +++ b/pkg/smtp/bridge.go @@ -18,9 +18,9 @@ package smtp import ( - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/users" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/users" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type bridger interface { diff --git a/internal/smtp/dump_default.go b/pkg/smtp/dump_default.go similarity index 100% rename from internal/smtp/dump_default.go rename to pkg/smtp/dump_default.go diff --git a/internal/smtp/dump_qa.go b/pkg/smtp/dump_qa.go similarity index 100% rename from internal/smtp/dump_qa.go rename to pkg/smtp/dump_qa.go diff --git a/internal/smtp/keys_test.go b/pkg/smtp/keys_test.go similarity index 100% rename from internal/smtp/keys_test.go rename to pkg/smtp/keys_test.go diff --git a/internal/smtp/preferences.go b/pkg/smtp/preferences.go similarity index 99% rename from internal/smtp/preferences.go rename to pkg/smtp/preferences.go index 215a005..d55c988 100644 --- a/internal/smtp/preferences.go +++ b/pkg/smtp/preferences.go @@ -19,7 +19,7 @@ package smtp import ( "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" ) diff --git a/internal/smtp/preferences_test.go b/pkg/smtp/preferences_test.go similarity index 99% rename from internal/smtp/preferences_test.go rename to pkg/smtp/preferences_test.go index b742d0d..d03f5be 100644 --- a/internal/smtp/preferences_test.go +++ b/pkg/smtp/preferences_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/smtp/repro_test.go b/pkg/smtp/repro_test.go similarity index 100% rename from internal/smtp/repro_test.go rename to pkg/smtp/repro_test.go diff --git a/internal/smtp/send_recorder.go b/pkg/smtp/send_recorder.go similarity index 98% rename from internal/smtp/send_recorder.go rename to pkg/smtp/send_recorder.go index 360f492..456b768 100644 --- a/internal/smtp/send_recorder.go +++ b/pkg/smtp/send_recorder.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type messageGetter interface { diff --git a/internal/smtp/send_recorder_test.go b/pkg/smtp/send_recorder_test.go similarity index 99% rename from internal/smtp/send_recorder_test.go rename to pkg/smtp/send_recorder_test.go index e3d39e4..67b3585 100644 --- a/internal/smtp/send_recorder_test.go +++ b/pkg/smtp/send_recorder_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/stretchr/testify/assert" ) diff --git a/internal/smtp/server.go b/pkg/smtp/server.go similarity index 95% rename from internal/smtp/server.go rename to pkg/smtp/server.go index 3db68c6..e85f49c 100644 --- a/internal/smtp/server.go +++ b/pkg/smtp/server.go @@ -23,9 +23,9 @@ import ( "io" "net" - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/serverutil" - "github.com/ProtonMail/proton-bridge/pkg/listener" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/serverutil" + "github.com/ljanyst/peroxide/pkg/listener" "github.com/emersion/go-sasl" goSMTP "github.com/emersion/go-smtp" ) diff --git a/internal/smtp/smtp.go b/pkg/smtp/smtp.go similarity index 100% rename from internal/smtp/smtp.go rename to pkg/smtp/smtp.go diff --git a/internal/smtp/store.go b/pkg/smtp/store.go similarity index 96% rename from internal/smtp/store.go rename to pkg/smtp/store.go index 42a1bbd..0d2a242 100644 --- a/internal/smtp/store.go +++ b/pkg/smtp/store.go @@ -21,7 +21,7 @@ import ( "io" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type storeUserProvider interface { diff --git a/internal/smtp/user.go b/pkg/smtp/user.go similarity index 98% rename from internal/smtp/user.go rename to pkg/smtp/user.go index 8033430..7c86f4b 100644 --- a/internal/smtp/user.go +++ b/pkg/smtp/user.go @@ -31,11 +31,11 @@ import ( "time" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/pkg/listener" - pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/message/parser" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/listener" + pkgMsg "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/message/parser" + "github.com/ljanyst/peroxide/pkg/pmapi" goSMTPBackend "github.com/emersion/go-smtp" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/internal/smtp/utils.go b/pkg/smtp/utils.go similarity index 100% rename from internal/smtp/utils.go rename to pkg/smtp/utils.go diff --git a/internal/smtp/vcard_tools.go b/pkg/smtp/vcard_tools.go similarity index 98% rename from internal/smtp/vcard_tools.go rename to pkg/smtp/vcard_tools.go index bc9abf1..69b5a65 100644 --- a/internal/smtp/vcard_tools.go +++ b/pkg/smtp/vcard_tools.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/ProtonMail/go-vcard" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type ContactMetadata struct { diff --git a/internal/store/address.go b/pkg/store/address.go similarity index 98% rename from internal/store/address.go rename to pkg/store/address.go index 3f281a9..8281829 100644 --- a/internal/store/address.go +++ b/pkg/store/address.go @@ -18,7 +18,7 @@ package store import ( - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/address_mailbox.go b/pkg/store/address_mailbox.go similarity index 98% rename from internal/store/address_mailbox.go rename to pkg/store/address_mailbox.go index 7cc9baf..15386c1 100644 --- a/internal/store/address_mailbox.go +++ b/pkg/store/address_mailbox.go @@ -20,7 +20,7 @@ package store import ( "fmt" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) // ListMailboxes returns all mailboxes. diff --git a/internal/store/address_message.go b/pkg/store/address_message.go similarity index 96% rename from internal/store/address_message.go rename to pkg/store/address_message.go index 21d0aa8..bf37b7d 100644 --- a/internal/store/address_message.go +++ b/pkg/store/address_message.go @@ -18,7 +18,7 @@ package store import ( - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/cache.go b/pkg/store/cache.go similarity index 98% rename from internal/store/cache.go rename to pkg/store/cache.go index 0963b51..4a73cdc 100644 --- a/internal/store/cache.go +++ b/pkg/store/cache.go @@ -21,7 +21,7 @@ import ( "context" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/message" + "github.com/ljanyst/peroxide/pkg/message" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/cache/cache_test.go b/pkg/store/cache/cache_test.go similarity index 100% rename from internal/store/cache/cache_test.go rename to pkg/store/cache/cache_test.go diff --git a/internal/store/cache/compressor.go b/pkg/store/cache/compressor.go similarity index 100% rename from internal/store/cache/compressor.go rename to pkg/store/cache/compressor.go diff --git a/internal/store/cache/compressor_gzip.go b/pkg/store/cache/compressor_gzip.go similarity index 100% rename from internal/store/cache/compressor_gzip.go rename to pkg/store/cache/compressor_gzip.go diff --git a/internal/store/cache/disk.go b/pkg/store/cache/disk.go similarity index 99% rename from internal/store/cache/disk.go rename to pkg/store/cache/disk.go index 224eae2..0f3693e 100644 --- a/internal/store/cache/disk.go +++ b/pkg/store/cache/disk.go @@ -29,7 +29,7 @@ import ( "path/filepath" "sync" - "github.com/ProtonMail/proton-bridge/pkg/semaphore" + "github.com/ljanyst/peroxide/pkg/semaphore" "github.com/ricochet2200/go-disk-usage/du" ) diff --git a/internal/store/cache/hash.go b/pkg/store/cache/hash.go similarity index 100% rename from internal/store/cache/hash.go rename to pkg/store/cache/hash.go diff --git a/internal/store/cache/memory.go b/pkg/store/cache/memory.go similarity index 100% rename from internal/store/cache/memory.go rename to pkg/store/cache/memory.go diff --git a/internal/store/cache/options.go b/pkg/store/cache/options.go similarity index 100% rename from internal/store/cache/options.go rename to pkg/store/cache/options.go diff --git a/internal/store/cache/pending.go b/pkg/store/cache/pending.go similarity index 100% rename from internal/store/cache/pending.go rename to pkg/store/cache/pending.go diff --git a/internal/store/cache/pending_test.go b/pkg/store/cache/pending_test.go similarity index 100% rename from internal/store/cache/pending_test.go rename to pkg/store/cache/pending_test.go diff --git a/internal/store/cache/types.go b/pkg/store/cache/types.go similarity index 100% rename from internal/store/cache/types.go rename to pkg/store/cache/types.go diff --git a/internal/store/cache_watcher.go b/pkg/store/cache_watcher.go similarity index 96% rename from internal/store/cache_watcher.go rename to pkg/store/cache_watcher.go index 1e1471a..51be200 100644 --- a/internal/store/cache_watcher.go +++ b/pkg/store/cache_watcher.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/ProtonMail/proton-bridge/internal/store/cache" + "github.com/ljanyst/peroxide/pkg/store/cache" ) func (store *Store) StartWatcher() { diff --git a/internal/store/cache_worker.go b/pkg/store/cache_worker.go similarity index 100% rename from internal/store/cache_worker.go rename to pkg/store/cache_worker.go diff --git a/internal/store/cache_worker_test.go b/pkg/store/cache_worker_test.go similarity index 97% rename from internal/store/cache_worker_test.go rename to pkg/store/cache_worker_test.go index d3d0f8e..b8e7ad2 100644 --- a/internal/store/cache_worker_test.go +++ b/pkg/store/cache_worker_test.go @@ -20,7 +20,7 @@ package store import ( "testing" - storemocks "github.com/ProtonMail/proton-bridge/internal/store/mocks" + storemocks "github.com/ljanyst/peroxide/pkg/store/mocks" "github.com/golang/mock/gomock" "github.com/pkg/errors" ) diff --git a/internal/store/change.go b/pkg/store/change.go similarity index 98% rename from internal/store/change.go rename to pkg/store/change.go index e1b633f..d25e186 100644 --- a/internal/store/change.go +++ b/pkg/store/change.go @@ -18,7 +18,7 @@ package store import ( - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type ChangeNotifier interface { diff --git a/internal/store/change_test.go b/pkg/store/change_test.go similarity index 98% rename from internal/store/change_test.go rename to pkg/store/change_test.go index 7fba37b..6ec0fbe 100644 --- a/internal/store/change_test.go +++ b/pkg/store/change_test.go @@ -20,7 +20,7 @@ package store import ( "testing" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" ) diff --git a/internal/store/convert.go b/pkg/store/convert.go similarity index 100% rename from internal/store/convert.go rename to pkg/store/convert.go diff --git a/internal/store/cooldown.go b/pkg/store/cooldown.go similarity index 100% rename from internal/store/cooldown.go rename to pkg/store/cooldown.go diff --git a/internal/store/cooldown_test.go b/pkg/store/cooldown_test.go similarity index 100% rename from internal/store/cooldown_test.go rename to pkg/store/cooldown_test.go diff --git a/internal/store/event_loop.go b/pkg/store/event_loop.go similarity index 99% rename from internal/store/event_loop.go rename to pkg/store/event_loop.go index c7d9ab8..07e64ba 100644 --- a/internal/store/event_loop.go +++ b/pkg/store/event_loop.go @@ -22,9 +22,9 @@ import ( "math/rand" "time" - bridgeEvents "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/pkg/listener" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + bridgeEvents "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/listener" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/internal/store/event_loop_test.go b/pkg/store/event_loop_test.go similarity index 99% rename from internal/store/event_loop_test.go rename to pkg/store/event_loop_test.go index 3e0e23d..5ac3838 100644 --- a/internal/store/event_loop_test.go +++ b/pkg/store/event_loop_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" ) diff --git a/internal/store/events.go b/pkg/store/events.go similarity index 100% rename from internal/store/events.go rename to pkg/store/events.go diff --git a/internal/store/mailbox.go b/pkg/store/mailbox.go similarity index 99% rename from internal/store/mailbox.go rename to pkg/store/mailbox.go index aa7b752..eca568c 100644 --- a/internal/store/mailbox.go +++ b/pkg/store/mailbox.go @@ -23,7 +23,7 @@ import ( "strings" "sync/atomic" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/mailbox_counts.go b/pkg/store/mailbox_counts.go similarity index 99% rename from internal/store/mailbox_counts.go rename to pkg/store/mailbox_counts.go index 80d98ed..16a155a 100644 --- a/internal/store/mailbox_counts.go +++ b/pkg/store/mailbox_counts.go @@ -22,7 +22,7 @@ import ( "encoding/json" "sort" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/mailbox_counts_test.go b/pkg/store/mailbox_counts_test.go similarity index 98% rename from internal/store/mailbox_counts_test.go rename to pkg/store/mailbox_counts_test.go index c335282..15c6386 100644 --- a/internal/store/mailbox_counts_test.go +++ b/pkg/store/mailbox_counts_test.go @@ -20,7 +20,7 @@ package store import ( "testing" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" a "github.com/stretchr/testify/assert" ) diff --git a/internal/store/mailbox_ids.go b/pkg/store/mailbox_ids.go similarity index 99% rename from internal/store/mailbox_ids.go rename to pkg/store/mailbox_ids.go index 4446578..51b1fa6 100644 --- a/internal/store/mailbox_ids.go +++ b/pkg/store/mailbox_ids.go @@ -24,7 +24,7 @@ import ( "regexp" "strings" - "github.com/ProtonMail/proton-bridge/internal/imap/uidplus" + "github.com/ljanyst/peroxide/pkg/imap/uidplus" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/mailbox_ids_test.go b/pkg/store/mailbox_ids_test.go similarity index 99% rename from internal/store/mailbox_ids_test.go rename to pkg/store/mailbox_ids_test.go index 1541dff..c8045d7 100644 --- a/internal/store/mailbox_ids_test.go +++ b/pkg/store/mailbox_ids_test.go @@ -21,7 +21,7 @@ import ( "net/mail" "testing" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" a "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/store/mailbox_message.go b/pkg/store/mailbox_message.go similarity index 99% rename from internal/store/mailbox_message.go rename to pkg/store/mailbox_message.go index 1251c4c..875a715 100644 --- a/internal/store/mailbox_message.go +++ b/pkg/store/mailbox_message.go @@ -18,7 +18,7 @@ package store import ( - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" diff --git a/internal/store/main_test.go b/pkg/store/main_test.go similarity index 100% rename from internal/store/main_test.go rename to pkg/store/main_test.go diff --git a/internal/store/message.go b/pkg/store/message.go similarity index 98% rename from internal/store/message.go rename to pkg/store/message.go index 0ee8d64..db6e091 100644 --- a/internal/store/message.go +++ b/pkg/store/message.go @@ -22,8 +22,8 @@ import ( "bytes" "net/textproto" - pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + pkgMsg "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/mocks/mocks.go b/pkg/store/mocks/mocks.go similarity index 98% rename from internal/store/mocks/mocks.go rename to pkg/store/mocks/mocks.go index e0e8c6a..efa63c7 100644 --- a/internal/store/mocks/mocks.go +++ b/pkg/store/mocks/mocks.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ProtonMail/proton-bridge/internal/store (interfaces: PanicHandler,BridgeUser,ChangeNotifier,Storer) +// Source: github.com/ljanyst/peroxide/pkg/store (interfaces: PanicHandler,BridgeUser,ChangeNotifier,Storer) // Package mocks is a generated GoMock package. package mocks @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - pmapi "github.com/ProtonMail/proton-bridge/pkg/pmapi" + pmapi "github.com/ljanyst/peroxide/pkg/pmapi" gomock "github.com/golang/mock/gomock" ) diff --git a/internal/store/mocks/utils_mocks.go b/pkg/store/mocks/utils_mocks.go similarity index 98% rename from internal/store/mocks/utils_mocks.go rename to pkg/store/mocks/utils_mocks.go index 2b881f1..1b8f253 100644 --- a/internal/store/mocks/utils_mocks.go +++ b/pkg/store/mocks/utils_mocks.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ProtonMail/proton-bridge/pkg/listener (interfaces: Listener) +// Source: github.com/ljanyst/peroxide/pkg/listener (interfaces: Listener) // Package mocks is a generated GoMock package. package mocks diff --git a/internal/store/store.go b/pkg/store/store.go similarity index 97% rename from internal/store/store.go rename to pkg/store/store.go index 3c84828..cdd46d1 100644 --- a/internal/store/store.go +++ b/pkg/store/store.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ProtonMail/proton-bridge/internal/sentry" - "github.com/ProtonMail/proton-bridge/internal/store/cache" - "github.com/ProtonMail/proton-bridge/pkg/listener" - "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/pkg/pool" + "github.com/ljanyst/peroxide/pkg/sentry" + "github.com/ljanyst/peroxide/pkg/store/cache" + "github.com/ljanyst/peroxide/pkg/listener" + "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pool" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/internal/store/store_address_mode.go b/pkg/store/store_address_mode.go similarity index 100% rename from internal/store/store_address_mode.go rename to pkg/store/store_address_mode.go diff --git a/internal/store/store_structure_version.go b/pkg/store/store_structure_version.go similarity index 100% rename from internal/store/store_structure_version.go rename to pkg/store/store_structure_version.go diff --git a/internal/store/store_test.go b/pkg/store/store_test.go similarity index 96% rename from internal/store/store_test.go rename to pkg/store/store_test.go index f594817..54b2417 100644 --- a/internal/store/store_test.go +++ b/pkg/store/store_test.go @@ -28,12 +28,12 @@ import ( "time" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/internal/store/cache" - storemocks "github.com/ProtonMail/proton-bridge/internal/store/mocks" - "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - pmapimocks "github.com/ProtonMail/proton-bridge/pkg/pmapi/mocks" - tests "github.com/ProtonMail/proton-bridge/test" + "github.com/ljanyst/peroxide/pkg/store/cache" + storemocks "github.com/ljanyst/peroxide/pkg/store/mocks" + "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" + pmapimocks "github.com/ljanyst/peroxide/pkg/pmapi/mocks" + tests "github.com/ljanyst/peroxide/test" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" diff --git a/internal/store/store_test_exports.go b/pkg/store/store_test_exports.go similarity index 98% rename from internal/store/store_test_exports.go rename to pkg/store/store_test_exports.go index c0af888..55fed91 100644 --- a/internal/store/store_test_exports.go +++ b/pkg/store/store_test_exports.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/stretchr/testify/assert" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/sync.go b/pkg/store/sync.go similarity index 99% rename from internal/store/sync.go rename to pkg/store/sync.go index ede34a1..a598089 100644 --- a/internal/store/sync.go +++ b/pkg/store/sync.go @@ -22,7 +22,7 @@ import ( "math" "sync" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" ) diff --git a/internal/store/sync_state.go b/pkg/store/sync_state.go similarity index 100% rename from internal/store/sync_state.go rename to pkg/store/sync_state.go diff --git a/internal/store/sync_state_test.go b/pkg/store/sync_state_test.go similarity index 100% rename from internal/store/sync_state_test.go rename to pkg/store/sync_state_test.go diff --git a/internal/store/sync_test.go b/pkg/store/sync_test.go similarity index 99% rename from internal/store/sync_test.go rename to pkg/store/sync_test.go index 8e87741..ff78674 100644 --- a/internal/store/sync_test.go +++ b/pkg/store/sync_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/store/types.go b/pkg/store/types.go similarity index 96% rename from internal/store/types.go rename to pkg/store/types.go index 64179c1..e43bbf3 100644 --- a/internal/store/types.go +++ b/pkg/store/types.go @@ -20,7 +20,7 @@ package store import ( "context" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type PanicHandler interface { diff --git a/internal/store/ulimit.go b/pkg/store/ulimit.go similarity index 100% rename from internal/store/ulimit.go rename to pkg/store/ulimit.go diff --git a/internal/store/user.go b/pkg/store/user.go similarity index 100% rename from internal/store/user.go rename to pkg/store/user.go diff --git a/internal/store/user_address.go b/pkg/store/user_address.go similarity index 99% rename from internal/store/user_address.go rename to pkg/store/user_address.go index 9e3ed47..061f0c5 100644 --- a/internal/store/user_address.go +++ b/pkg/store/user_address.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/user_address_info.go b/pkg/store/user_address_info.go similarity index 99% rename from internal/store/user_address_info.go rename to pkg/store/user_address_info.go index c55f71a..8aabb92 100644 --- a/internal/store/user_address_info.go +++ b/pkg/store/user_address_info.go @@ -21,7 +21,7 @@ import ( "encoding/json" "strings" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" ) diff --git a/internal/store/user_mailbox.go b/pkg/store/user_mailbox.go similarity index 99% rename from internal/store/user_mailbox.go rename to pkg/store/user_mailbox.go index ad1dc16..0ae6513 100644 --- a/internal/store/user_mailbox.go +++ b/pkg/store/user_mailbox.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" ) diff --git a/internal/store/user_message.go b/pkg/store/user_message.go similarity index 99% rename from internal/store/user_message.go rename to pkg/store/user_message.go index ed1e123..80cc336 100644 --- a/internal/store/user_message.go +++ b/pkg/store/user_message.go @@ -27,8 +27,8 @@ import ( "strings" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/internal/store/cache" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/store/cache" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" diff --git a/internal/store/user_message_test.go b/pkg/store/user_message_test.go similarity index 98% rename from internal/store/user_message_test.go rename to pkg/store/user_message_test.go index 01a4a79..6c5438a 100644 --- a/internal/store/user_message_test.go +++ b/pkg/store/user_message_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + pkgMsg "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/golang/mock/gomock" a "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/store/user_sync.go b/pkg/store/user_sync.go similarity index 99% rename from internal/store/user_sync.go rename to pkg/store/user_sync.go index 0ea02a4..cb28691 100644 --- a/internal/store/user_sync.go +++ b/pkg/store/user_sync.go @@ -23,7 +23,7 @@ import ( "fmt" "strconv" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/sirupsen/logrus" bolt "go.etcd.io/bbolt" diff --git a/internal/store/user_sync_test.go b/pkg/store/user_sync_test.go similarity index 98% rename from internal/store/user_sync_test.go rename to pkg/store/user_sync_test.go index 7b8da1b..3e9c729 100644 --- a/internal/store/user_sync_test.go +++ b/pkg/store/user_sync_test.go @@ -21,7 +21,7 @@ import ( "sort" "testing" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/transfer/mocks/mocks.go b/pkg/transfer/mocks/mocks.go similarity index 98% rename from internal/transfer/mocks/mocks.go rename to pkg/transfer/mocks/mocks.go index 3b57b51..5025fde 100644 --- a/internal/transfer/mocks/mocks.go +++ b/pkg/transfer/mocks/mocks.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ProtonMail/proton-bridge/internal/transfer (interfaces: PanicHandler,IMAPClientProvider) +// Source: github.com/ljanyst/peroxide/pkg/transfer (interfaces: PanicHandler,IMAPClientProvider) // Package mocks is a generated GoMock package. package mocks diff --git a/internal/updater/channels.go b/pkg/updater/channels.go similarity index 100% rename from internal/updater/channels.go rename to pkg/updater/channels.go diff --git a/internal/updater/errors.go b/pkg/updater/errors.go similarity index 100% rename from internal/updater/errors.go rename to pkg/updater/errors.go diff --git a/internal/updater/host_default.go b/pkg/updater/host_default.go similarity index 100% rename from internal/updater/host_default.go rename to pkg/updater/host_default.go diff --git a/internal/updater/host_qa.go b/pkg/updater/host_qa.go similarity index 100% rename from internal/updater/host_qa.go rename to pkg/updater/host_qa.go diff --git a/internal/updater/install_darwin.go b/pkg/updater/install_darwin.go similarity index 94% rename from internal/updater/install_darwin.go rename to pkg/updater/install_darwin.go index bdbc5e2..8e73598 100644 --- a/internal/updater/install_darwin.go +++ b/pkg/updater/install_darwin.go @@ -25,8 +25,8 @@ import ( "path/filepath" "github.com/Masterminds/semver/v3" - "github.com/ProtonMail/proton-bridge/internal/versioner" - "github.com/ProtonMail/proton-bridge/pkg/tar" + "github.com/ljanyst/peroxide/pkg/versioner" + "github.com/ljanyst/peroxide/pkg/tar" "github.com/pkg/errors" ) diff --git a/internal/updater/install_default.go b/pkg/updater/install_default.go similarity index 95% rename from internal/updater/install_default.go rename to pkg/updater/install_default.go index c813c3a..1642fab 100644 --- a/internal/updater/install_default.go +++ b/pkg/updater/install_default.go @@ -23,7 +23,7 @@ import ( "io" "github.com/Masterminds/semver/v3" - "github.com/ProtonMail/proton-bridge/internal/versioner" + "github.com/ljanyst/peroxide/pkg/versioner" ) type InstallerDefault struct { diff --git a/internal/updater/key_default.go b/pkg/updater/key_default.go similarity index 100% rename from internal/updater/key_default.go rename to pkg/updater/key_default.go diff --git a/internal/updater/locker.go b/pkg/updater/locker.go similarity index 100% rename from internal/updater/locker.go rename to pkg/updater/locker.go diff --git a/internal/updater/locker_test.go b/pkg/updater/locker_test.go similarity index 100% rename from internal/updater/locker_test.go rename to pkg/updater/locker_test.go diff --git a/internal/updater/sync.go b/pkg/updater/sync.go similarity index 100% rename from internal/updater/sync.go rename to pkg/updater/sync.go diff --git a/internal/updater/sync_test.go b/pkg/updater/sync_test.go similarity index 100% rename from internal/updater/sync_test.go rename to pkg/updater/sync_test.go diff --git a/internal/updater/updater.go b/pkg/updater/updater.go similarity index 97% rename from internal/updater/updater.go rename to pkg/updater/updater.go index e76c374..7292375 100644 --- a/internal/updater/updater.go +++ b/pkg/updater/updater.go @@ -24,8 +24,8 @@ import ( "github.com/Masterminds/semver/v3" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/internal/config/settings" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/config/settings" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/internal/updater/updater_test.go b/pkg/updater/updater_test.go similarity index 98% rename from internal/updater/updater_test.go rename to pkg/updater/updater_test.go index c9ab092..89c1260 100644 --- a/internal/updater/updater_test.go +++ b/pkg/updater/updater_test.go @@ -27,9 +27,9 @@ import ( "time" "github.com/Masterminds/semver/v3" - "github.com/ProtonMail/proton-bridge/internal/config/settings" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/pkg/pmapi/mocks" + "github.com/ljanyst/peroxide/pkg/config/settings" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi/mocks" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/updater/version.go b/pkg/updater/version.go similarity index 100% rename from internal/updater/version.go rename to pkg/updater/version.go diff --git a/internal/users/cache.go b/pkg/users/cache.go similarity index 100% rename from internal/users/cache.go rename to pkg/users/cache.go diff --git a/internal/users/cache_test.go b/pkg/users/cache_test.go similarity index 100% rename from internal/users/cache_test.go rename to pkg/users/cache_test.go diff --git a/internal/users/credentials/credentials.go b/pkg/users/credentials/credentials.go similarity index 100% rename from internal/users/credentials/credentials.go rename to pkg/users/credentials/credentials.go diff --git a/internal/users/credentials/credentials_test.go b/pkg/users/credentials/credentials_test.go similarity index 100% rename from internal/users/credentials/credentials_test.go rename to pkg/users/credentials/credentials_test.go diff --git a/internal/users/credentials/pass.go b/pkg/users/credentials/pass.go similarity index 100% rename from internal/users/credentials/pass.go rename to pkg/users/credentials/pass.go diff --git a/internal/users/credentials/pass_imaptest.go b/pkg/users/credentials/pass_imaptest.go similarity index 100% rename from internal/users/credentials/pass_imaptest.go rename to pkg/users/credentials/pass_imaptest.go diff --git a/internal/users/credentials/store.go b/pkg/users/credentials/store.go similarity index 99% rename from internal/users/credentials/store.go rename to pkg/users/credentials/store.go index ef26968..8308248 100644 --- a/internal/users/credentials/store.go +++ b/pkg/users/credentials/store.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ProtonMail/proton-bridge/pkg/keychain" + "github.com/ljanyst/peroxide/pkg/keychain" "github.com/sirupsen/logrus" ) diff --git a/internal/users/credentials/store_test.go b/pkg/users/credentials/store_test.go similarity index 100% rename from internal/users/credentials/store_test.go rename to pkg/users/credentials/store_test.go diff --git a/internal/users/mocks/listener_mocks.go b/pkg/users/mocks/listener_mocks.go similarity index 98% rename from internal/users/mocks/listener_mocks.go rename to pkg/users/mocks/listener_mocks.go index 2b881f1..1b8f253 100644 --- a/internal/users/mocks/listener_mocks.go +++ b/pkg/users/mocks/listener_mocks.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ProtonMail/proton-bridge/pkg/listener (interfaces: Listener) +// Source: github.com/ljanyst/peroxide/pkg/listener (interfaces: Listener) // Package mocks is a generated GoMock package. package mocks diff --git a/internal/users/mocks/mocks.go b/pkg/users/mocks/mocks.go similarity index 97% rename from internal/users/mocks/mocks.go rename to pkg/users/mocks/mocks.go index 83e327d..969f800 100644 --- a/internal/users/mocks/mocks.go +++ b/pkg/users/mocks/mocks.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ProtonMail/proton-bridge/internal/users (interfaces: Locator,PanicHandler,CredentialsStorer,StoreMaker) +// Source: github.com/ljanyst/peroxide/pkg/users (interfaces: Locator,PanicHandler,CredentialsStorer,StoreMaker) // Package mocks is a generated GoMock package. package mocks @@ -7,8 +7,8 @@ package mocks import ( reflect "reflect" - store "github.com/ProtonMail/proton-bridge/internal/store" - credentials "github.com/ProtonMail/proton-bridge/internal/users/credentials" + store "github.com/ljanyst/peroxide/pkg/store" + credentials "github.com/ljanyst/peroxide/pkg/users/credentials" gomock "github.com/golang/mock/gomock" ) diff --git a/internal/users/types.go b/pkg/users/types.go similarity index 93% rename from internal/users/types.go rename to pkg/users/types.go index 19c5d42..8b1cf1c 100644 --- a/internal/users/types.go +++ b/pkg/users/types.go @@ -18,8 +18,8 @@ package users import ( - "github.com/ProtonMail/proton-bridge/internal/store" - "github.com/ProtonMail/proton-bridge/internal/users/credentials" + "github.com/ljanyst/peroxide/pkg/store" + "github.com/ljanyst/peroxide/pkg/users/credentials" ) type Locator interface { diff --git a/internal/users/user.go b/pkg/users/user.go similarity index 97% rename from internal/users/user.go rename to pkg/users/user.go index e9fdea7..929e714 100644 --- a/internal/users/user.go +++ b/pkg/users/user.go @@ -23,11 +23,11 @@ import ( "strings" "sync" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/internal/store" - "github.com/ProtonMail/proton-bridge/internal/users/credentials" - "github.com/ProtonMail/proton-bridge/pkg/listener" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/store" + "github.com/ljanyst/peroxide/pkg/users/credentials" + "github.com/ljanyst/peroxide/pkg/listener" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/internal/users/user_credentials_test.go b/pkg/users/user_credentials_test.go similarity index 98% rename from internal/users/user_credentials_test.go rename to pkg/users/user_credentials_test.go index 90ed11b..d97617d 100644 --- a/internal/users/user_credentials_test.go +++ b/pkg/users/user_credentials_test.go @@ -21,8 +21,8 @@ import ( "context" "testing" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/pmapi" gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" r "github.com/stretchr/testify/require" diff --git a/internal/users/user_new_test.go b/pkg/users/user_new_test.go similarity index 95% rename from internal/users/user_new_test.go rename to pkg/users/user_new_test.go index 215856f..0f5203d 100644 --- a/internal/users/user_new_test.go +++ b/pkg/users/user_new_test.go @@ -21,8 +21,8 @@ import ( "errors" "testing" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/internal/users/credentials" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/users/credentials" gomock "github.com/golang/mock/gomock" r "github.com/stretchr/testify/require" ) diff --git a/internal/users/user_store_test.go b/pkg/users/user_store_test.go similarity index 100% rename from internal/users/user_store_test.go rename to pkg/users/user_store_test.go diff --git a/internal/users/user_test.go b/pkg/users/user_test.go similarity index 100% rename from internal/users/user_test.go rename to pkg/users/user_test.go diff --git a/internal/users/users.go b/pkg/users/users.go similarity index 97% rename from internal/users/users.go rename to pkg/users/users.go index cd9abfe..88049b6 100644 --- a/internal/users/users.go +++ b/pkg/users/users.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/internal/metrics" - "github.com/ProtonMail/proton-bridge/internal/users/credentials" - "github.com/ProtonMail/proton-bridge/pkg/listener" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/metrics" + "github.com/ljanyst/peroxide/pkg/users/credentials" + "github.com/ljanyst/peroxide/pkg/listener" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" logrus "github.com/sirupsen/logrus" diff --git a/internal/users/users_clear_test.go b/pkg/users/users_clear_test.go similarity index 97% rename from internal/users/users_clear_test.go rename to pkg/users/users_clear_test.go index af54fb7..357ebba 100644 --- a/internal/users/users_clear_test.go +++ b/pkg/users/users_clear_test.go @@ -20,7 +20,7 @@ package users import ( "testing" - "github.com/ProtonMail/proton-bridge/internal/events" + "github.com/ljanyst/peroxide/pkg/events" gomock "github.com/golang/mock/gomock" r "github.com/stretchr/testify/require" ) diff --git a/internal/users/users_delete_test.go b/pkg/users/users_delete_test.go similarity index 97% rename from internal/users/users_delete_test.go rename to pkg/users/users_delete_test.go index de9b32c..2459e60 100644 --- a/internal/users/users_delete_test.go +++ b/pkg/users/users_delete_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/ProtonMail/proton-bridge/internal/events" + "github.com/ljanyst/peroxide/pkg/events" gomock "github.com/golang/mock/gomock" r "github.com/stretchr/testify/require" ) diff --git a/internal/users/users_get_test.go b/pkg/users/users_get_test.go similarity index 100% rename from internal/users/users_get_test.go rename to pkg/users/users_get_test.go diff --git a/internal/users/users_login_test.go b/pkg/users/users_login_test.go similarity index 96% rename from internal/users/users_login_test.go rename to pkg/users/users_login_test.go index 1e321ff..f4789db 100644 --- a/internal/users/users_login_test.go +++ b/pkg/users/users_login_test.go @@ -20,9 +20,9 @@ package users import ( "testing" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/internal/metrics" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/metrics" + "github.com/ljanyst/peroxide/pkg/pmapi" gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" r "github.com/stretchr/testify/require" diff --git a/internal/users/users_new_test.go b/pkg/users/users_new_test.go similarity index 97% rename from internal/users/users_new_test.go rename to pkg/users/users_new_test.go index 1d286be..3d1b29e 100644 --- a/internal/users/users_new_test.go +++ b/pkg/users/users_new_test.go @@ -22,8 +22,8 @@ import ( "testing" time "time" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/internal/users/credentials" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/users/credentials" gomock "github.com/golang/mock/gomock" r "github.com/stretchr/testify/require" ) diff --git a/internal/users/users_test.go b/pkg/users/users_test.go similarity index 95% rename from internal/users/users_test.go rename to pkg/users/users_test.go index 768befe..5070bba 100644 --- a/internal/users/users_test.go +++ b/pkg/users/users_test.go @@ -26,16 +26,16 @@ import ( "testing" "time" - "github.com/ProtonMail/proton-bridge/internal/events" - "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/credentials" - usersmocks "github.com/ProtonMail/proton-bridge/internal/users/mocks" - "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - pmapimocks "github.com/ProtonMail/proton-bridge/pkg/pmapi/mocks" - tests "github.com/ProtonMail/proton-bridge/test" + "github.com/ljanyst/peroxide/pkg/events" + "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/credentials" + usersmocks "github.com/ljanyst/peroxide/pkg/users/mocks" + "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" + pmapimocks "github.com/ljanyst/peroxide/pkg/pmapi/mocks" + tests "github.com/ljanyst/peroxide/test" gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/internal/versioner/install.go b/pkg/versioner/install.go similarity index 96% rename from internal/versioner/install.go rename to pkg/versioner/install.go index 10d7664..adfe967 100644 --- a/internal/versioner/install.go +++ b/pkg/versioner/install.go @@ -23,7 +23,7 @@ import ( "path/filepath" "github.com/Masterminds/semver/v3" - "github.com/ProtonMail/proton-bridge/pkg/tar" + "github.com/ljanyst/peroxide/pkg/tar" ) // InstallNewVersion installs a tgz update package of the given version. diff --git a/internal/versioner/name_default.go b/pkg/versioner/name_default.go similarity index 100% rename from internal/versioner/name_default.go rename to pkg/versioner/name_default.go diff --git a/internal/versioner/name_windows.go b/pkg/versioner/name_windows.go similarity index 100% rename from internal/versioner/name_windows.go rename to pkg/versioner/name_windows.go diff --git a/internal/versioner/remove.go b/pkg/versioner/remove.go similarity index 97% rename from internal/versioner/remove.go rename to pkg/versioner/remove.go index e0edfcb..ece3e81 100644 --- a/internal/versioner/remove.go +++ b/pkg/versioner/remove.go @@ -24,7 +24,7 @@ import ( "os" "github.com/Masterminds/semver/v3" - "github.com/ProtonMail/proton-bridge/internal/constants" + "github.com/ljanyst/peroxide/pkg/constants" "github.com/sirupsen/logrus" ) diff --git a/internal/versioner/remove_darwin.go b/pkg/versioner/remove_darwin.go similarity index 100% rename from internal/versioner/remove_darwin.go rename to pkg/versioner/remove_darwin.go diff --git a/internal/versioner/remove_linux.go b/pkg/versioner/remove_linux.go similarity index 100% rename from internal/versioner/remove_linux.go rename to pkg/versioner/remove_linux.go diff --git a/internal/versioner/remove_windows.go b/pkg/versioner/remove_windows.go similarity index 100% rename from internal/versioner/remove_windows.go rename to pkg/versioner/remove_windows.go diff --git a/internal/versioner/util.go b/pkg/versioner/util.go similarity index 100% rename from internal/versioner/util.go rename to pkg/versioner/util.go diff --git a/internal/versioner/version.go b/pkg/versioner/version.go similarity index 98% rename from internal/versioner/version.go rename to pkg/versioner/version.go index df5c119..d5c5316 100644 --- a/internal/versioner/version.go +++ b/pkg/versioner/version.go @@ -27,7 +27,7 @@ import ( "github.com/Masterminds/semver/v3" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/sum" + "github.com/ljanyst/peroxide/pkg/sum" ) const sumFile = ".sum" diff --git a/internal/versioner/version_test.go b/pkg/versioner/version_test.go similarity index 97% rename from internal/versioner/version_test.go rename to pkg/versioner/version_test.go index 3e8cb76..6fde229 100644 --- a/internal/versioner/version_test.go +++ b/pkg/versioner/version_test.go @@ -26,8 +26,8 @@ import ( "github.com/Masterminds/semver/v3" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/sum" - tests "github.com/ProtonMail/proton-bridge/test" + "github.com/ljanyst/peroxide/pkg/sum" + tests "github.com/ljanyst/peroxide/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/versioner/versioner.go b/pkg/versioner/versioner.go similarity index 100% rename from internal/versioner/versioner.go rename to pkg/versioner/versioner.go diff --git a/internal/versioner/versioner_remove_test.go b/pkg/versioner/versioner_remove_test.go similarity index 100% rename from internal/versioner/versioner_remove_test.go rename to pkg/versioner/versioner_remove_test.go diff --git a/internal/versioner/versioner_test.go b/pkg/versioner/versioner_test.go similarity index 100% rename from internal/versioner/versioner_test.go rename to pkg/versioner/versioner_test.go diff --git a/test/accounts/account.go b/test/accounts/account.go index 975ae1f..22b782e 100644 --- a/test/accounts/account.go +++ b/test/accounts/account.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) const ( diff --git a/test/accounts/accounts.go b/test/accounts/accounts.go index fcdc112..5b017e0 100644 --- a/test/accounts/accounts.go +++ b/test/accounts/accounts.go @@ -21,7 +21,7 @@ import ( "encoding/json" "io/ioutil" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" ) diff --git a/test/api_checks_test.go b/test/api_checks_test.go index 775ffe6..c9e4c47 100644 --- a/test/api_checks_test.go +++ b/test/api_checks_test.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/test/accounts" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/test/accounts" "github.com/cucumber/godog" "github.com/stretchr/testify/assert" ) diff --git a/test/bdd_test.go b/test/bdd_test.go index 469226d..3a16f9d 100644 --- a/test/bdd_test.go +++ b/test/bdd_test.go @@ -20,7 +20,7 @@ package tests import ( "context" - testContext "github.com/ProtonMail/proton-bridge/test/context" + testContext "github.com/ljanyst/peroxide/test/context" "github.com/cucumber/godog" ) diff --git a/test/benchmarks/bench_test.go b/test/benchmarks/bench_test.go index d61ba9c..f9aaa48 100644 --- a/test/benchmarks/bench_test.go +++ b/test/benchmarks/bench_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ProtonMail/proton-bridge/test/context" - "github.com/ProtonMail/proton-bridge/test/mocks" + "github.com/ljanyst/peroxide/test/context" + "github.com/ljanyst/peroxide/test/mocks" ) func benchTestContext() (*context.TestContext, *mocks.IMAPClient) { diff --git a/test/context/accounts.go b/test/context/accounts.go index 0029406..8c09b5a 100644 --- a/test/context/accounts.go +++ b/test/context/accounts.go @@ -20,7 +20,7 @@ package context import ( "os" - "github.com/ProtonMail/proton-bridge/test/accounts" + "github.com/ljanyst/peroxide/test/accounts" ) func newTestAccounts() *accounts.TestAccounts { diff --git a/test/context/bridge.go b/test/context/bridge.go index d64bb26..dc2ab74 100644 --- a/test/context/bridge.go +++ b/test/context/bridge.go @@ -21,16 +21,16 @@ import ( "time" "github.com/ProtonMail/go-autostart" - "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/constants" - "github.com/ProtonMail/proton-bridge/internal/sentry" - "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/ProtonMail/proton-bridge/pkg/pmapi" + "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/constants" + "github.com/ljanyst/peroxide/pkg/sentry" + "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" + "github.com/ljanyst/peroxide/pkg/pmapi" ) // GetBridge returns bridge instance. diff --git a/test/context/context.go b/test/context/context.go index 9fcb1ee..405d283 100644 --- a/test/context/context.go +++ b/test/context/context.go @@ -21,13 +21,13 @@ package context import ( "sync" - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/config/useragent" - "github.com/ProtonMail/proton-bridge/internal/users" - "github.com/ProtonMail/proton-bridge/pkg/listener" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/test/accounts" - "github.com/ProtonMail/proton-bridge/test/mocks" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/config/useragent" + "github.com/ljanyst/peroxide/pkg/users" + "github.com/ljanyst/peroxide/pkg/listener" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/test/accounts" + "github.com/ljanyst/peroxide/test/mocks" "github.com/sirupsen/logrus" ) diff --git a/test/context/credentials.go b/test/context/credentials.go index 500bdff..a53bc63 100644 --- a/test/context/credentials.go +++ b/test/context/credentials.go @@ -20,7 +20,7 @@ package context import ( "strings" - "github.com/ProtonMail/proton-bridge/internal/users/credentials" + "github.com/ljanyst/peroxide/pkg/users/credentials" ) // bridgePassword is password to be used for IMAP or SMTP under tests. diff --git a/test/context/globals.go b/test/context/globals.go index 619cc5f..861fcfb 100644 --- a/test/context/globals.go +++ b/test/context/globals.go @@ -20,7 +20,7 @@ package context import ( "os" - "github.com/ProtonMail/proton-bridge/test/liveapi" + "github.com/ljanyst/peroxide/test/liveapi" ) // BeforeRun does necessary setup. diff --git a/test/context/imap.go b/test/context/imap.go index f5dd8ca..22d5ac0 100644 --- a/test/context/imap.go +++ b/test/context/imap.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/config/settings" - "github.com/ProtonMail/proton-bridge/internal/config/tls" - "github.com/ProtonMail/proton-bridge/internal/imap" - "github.com/ProtonMail/proton-bridge/test/mocks" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/config/settings" + "github.com/ljanyst/peroxide/pkg/config/tls" + "github.com/ljanyst/peroxide/pkg/imap" + "github.com/ljanyst/peroxide/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/test/context/pmapi_controller.go b/test/context/pmapi_controller.go index 9ff36e8..9a8e9b2 100644 --- a/test/context/pmapi_controller.go +++ b/test/context/pmapi_controller.go @@ -20,12 +20,12 @@ package context import ( "os" - "github.com/ProtonMail/proton-bridge/internal/events" - "github.com/ProtonMail/proton-bridge/pkg/listener" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/test/accounts" - "github.com/ProtonMail/proton-bridge/test/fakeapi" - "github.com/ProtonMail/proton-bridge/test/liveapi" + "github.com/ljanyst/peroxide/pkg/events" + "github.com/ljanyst/peroxide/pkg/listener" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/test/accounts" + "github.com/ljanyst/peroxide/test/fakeapi" + "github.com/ljanyst/peroxide/test/liveapi" ) type PMAPIController interface { diff --git a/test/context/settings.go b/test/context/settings.go index bf4968e..8249bf5 100644 --- a/test/context/settings.go +++ b/test/context/settings.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "math/rand" - "github.com/ProtonMail/proton-bridge/internal/config/settings" + "github.com/ljanyst/peroxide/pkg/config/settings" ) type fakeSettings struct { diff --git a/test/context/smtp.go b/test/context/smtp.go index bc88a25..cd87828 100644 --- a/test/context/smtp.go +++ b/test/context/smtp.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/ProtonMail/proton-bridge/internal/bridge" - "github.com/ProtonMail/proton-bridge/internal/config/settings" - "github.com/ProtonMail/proton-bridge/internal/config/tls" - "github.com/ProtonMail/proton-bridge/internal/smtp" - "github.com/ProtonMail/proton-bridge/test/mocks" + "github.com/ljanyst/peroxide/pkg/bridge" + "github.com/ljanyst/peroxide/pkg/config/settings" + "github.com/ljanyst/peroxide/pkg/config/tls" + "github.com/ljanyst/peroxide/pkg/smtp" + "github.com/ljanyst/peroxide/test/mocks" "github.com/stretchr/testify/require" ) diff --git a/test/context/updater.go b/test/context/updater.go index 0c1094e..a0c288d 100644 --- a/test/context/updater.go +++ b/test/context/updater.go @@ -18,7 +18,7 @@ package context import ( - "github.com/ProtonMail/proton-bridge/internal/updater" + "github.com/ljanyst/peroxide/pkg/updater" ) type fakeUpdater struct{} diff --git a/test/context/users.go b/test/context/users.go index 1fb440b..56ff269 100644 --- a/test/context/users.go +++ b/test/context/users.go @@ -25,9 +25,9 @@ import ( "time" "github.com/ProtonMail/go-srp" - "github.com/ProtonMail/proton-bridge/internal/store" - "github.com/ProtonMail/proton-bridge/internal/users" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/store" + "github.com/ljanyst/peroxide/pkg/users" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/test/fakeapi/attachments.go b/test/fakeapi/attachments.go index d2f654a..646895e 100644 --- a/test/fakeapi/attachments.go +++ b/test/fakeapi/attachments.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "net/textproto" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) // dataPacketOutlineLightInstagram48png is data packet with encrypted data and diff --git a/test/fakeapi/auth.go b/test/fakeapi/auth.go index b63fcc4..900eb65 100644 --- a/test/fakeapi/auth.go +++ b/test/fakeapi/auth.go @@ -20,7 +20,7 @@ package fakeapi import ( "context" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) func (api *FakePMAPI) Auth2FA(_ context.Context, twoFactorCode string) error { diff --git a/test/fakeapi/contacts.go b/test/fakeapi/contacts.go index fe3f7e5..d64e7a8 100644 --- a/test/fakeapi/contacts.go +++ b/test/fakeapi/contacts.go @@ -23,7 +23,7 @@ import ( "net/url" "strconv" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) func (api *FakePMAPI) DecryptAndVerifyCards(cards []pmapi.Card) ([]pmapi.Card, error) { diff --git a/test/fakeapi/controller.go b/test/fakeapi/controller.go index b60492e..f29ff9f 100644 --- a/test/fakeapi/controller.go +++ b/test/fakeapi/controller.go @@ -20,8 +20,8 @@ package fakeapi import ( "sync" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/test/context/calls" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/test/context/calls" "github.com/sirupsen/logrus" ) diff --git a/test/fakeapi/controller_calls.go b/test/fakeapi/controller_calls.go index ef7fdd6..606600a 100644 --- a/test/fakeapi/controller_calls.go +++ b/test/fakeapi/controller_calls.go @@ -20,7 +20,7 @@ package fakeapi import ( "encoding/json" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type method string diff --git a/test/fakeapi/controller_control.go b/test/fakeapi/controller_control.go index cfec8a9..dbfdc24 100644 --- a/test/fakeapi/controller_control.go +++ b/test/fakeapi/controller_control.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/test/accounts" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/test/accounts" ) var systemLabelNameToID = map[string]string{ //nolint[gochecknoglobals] diff --git a/test/fakeapi/controller_session.go b/test/fakeapi/controller_session.go index 6fd81de..eac532f 100644 --- a/test/fakeapi/controller_session.go +++ b/test/fakeapi/controller_session.go @@ -21,7 +21,7 @@ import ( "bytes" "errors" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) type fakeSession struct { diff --git a/test/fakeapi/controller_user.go b/test/fakeapi/controller_user.go index 5524e55..596e10e 100644 --- a/test/fakeapi/controller_user.go +++ b/test/fakeapi/controller_user.go @@ -17,7 +17,7 @@ package fakeapi -import "github.com/ProtonMail/proton-bridge/pkg/pmapi" +import "github.com/ljanyst/peroxide/pkg/pmapi" type fakeUser struct { user *pmapi.User diff --git a/test/fakeapi/counts.go b/test/fakeapi/counts.go index 5fcc888..1e7a54f 100644 --- a/test/fakeapi/counts.go +++ b/test/fakeapi/counts.go @@ -20,7 +20,7 @@ package fakeapi import ( "context" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) func (api *FakePMAPI) CountMessages(_ context.Context, addressID string) ([]*pmapi.MessagesCount, error) { diff --git a/test/fakeapi/events.go b/test/fakeapi/events.go index fb24cd6..e4a22c2 100644 --- a/test/fakeapi/events.go +++ b/test/fakeapi/events.go @@ -20,7 +20,7 @@ package fakeapi import ( "context" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) func (api *FakePMAPI) GetEvent(_ context.Context, eventID string) (*pmapi.Event, error) { diff --git a/test/fakeapi/fakeapi.go b/test/fakeapi/fakeapi.go index 8d0d14c..651ac3c 100644 --- a/test/fakeapi/fakeapi.go +++ b/test/fakeapi/fakeapi.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/sirupsen/logrus" ) diff --git a/test/fakeapi/keys.go b/test/fakeapi/keys.go index cdaadfc..18352f3 100644 --- a/test/fakeapi/keys.go +++ b/test/fakeapi/keys.go @@ -20,7 +20,7 @@ package fakeapi import ( "context" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) // publicKey is used from pmapi unit tests. diff --git a/test/fakeapi/labels.go b/test/fakeapi/labels.go index aefa578..8ff73fc 100644 --- a/test/fakeapi/labels.go +++ b/test/fakeapi/labels.go @@ -21,7 +21,7 @@ import ( "context" "fmt" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) func (api *FakePMAPI) isLabelFolder(labelID string) bool { diff --git a/test/fakeapi/manager.go b/test/fakeapi/manager.go index 14eca80..6c5f7d7 100644 --- a/test/fakeapi/manager.go +++ b/test/fakeapi/manager.go @@ -24,7 +24,7 @@ import ( "time" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/sirupsen/logrus" ) diff --git a/test/fakeapi/messages.go b/test/fakeapi/messages.go index 73f57f8..cae57bc 100644 --- a/test/fakeapi/messages.go +++ b/test/fakeapi/messages.go @@ -23,8 +23,8 @@ import ( "fmt" "time" - "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" ) diff --git a/test/fakeapi/user.go b/test/fakeapi/user.go index 808b8fc..bb9f6da 100644 --- a/test/fakeapi/user.go +++ b/test/fakeapi/user.go @@ -21,7 +21,7 @@ import ( "context" "github.com/ProtonMail/gopenpgp/v2/crypto" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" ) func (api *FakePMAPI) GetMailSettings(context.Context) (pmapi.MailSettings, error) { diff --git a/test/imap_actions_messages_test.go b/test/imap_actions_messages_test.go index 8413e24..fed32be 100644 --- a/test/imap_actions_messages_test.go +++ b/test/imap_actions_messages_test.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ProtonMail/proton-bridge/test/mocks" + "github.com/ljanyst/peroxide/test/mocks" "github.com/cucumber/godog" "golang.org/x/net/html/charset" ) diff --git a/test/liveapi/cleanup.go b/test/liveapi/cleanup.go index 0563894..e60fb0f 100644 --- a/test/liveapi/cleanup.go +++ b/test/liveapi/cleanup.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" ) diff --git a/test/liveapi/controller.go b/test/liveapi/controller.go index 88ff66d..355b7bb 100644 --- a/test/liveapi/controller.go +++ b/test/liveapi/controller.go @@ -21,8 +21,8 @@ import ( "net/http" "sync" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/test/context/calls" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/test/context/calls" "github.com/sirupsen/logrus" ) diff --git a/test/liveapi/labels.go b/test/liveapi/labels.go index 974ec08..c8d13cc 100644 --- a/test/liveapi/labels.go +++ b/test/liveapi/labels.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" ) diff --git a/test/liveapi/messages.go b/test/liveapi/messages.go index ffdcec8..7eecdba 100644 --- a/test/liveapi/messages.go +++ b/test/liveapi/messages.go @@ -20,8 +20,8 @@ package liveapi import ( "context" - messageUtils "github.com/ProtonMail/proton-bridge/pkg/message" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + messageUtils "github.com/ljanyst/peroxide/pkg/message" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" ) diff --git a/test/liveapi/persistent_clients.go b/test/liveapi/persistent_clients.go index 744efa4..536d015 100644 --- a/test/liveapi/persistent_clients.go +++ b/test/liveapi/persistent_clients.go @@ -24,8 +24,8 @@ import ( "sync" "github.com/ProtonMail/go-srp" - "github.com/ProtonMail/proton-bridge/internal/constants" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/constants" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/test/liveapi/users.go b/test/liveapi/users.go index b85aaa5..27b90f0 100644 --- a/test/liveapi/users.go +++ b/test/liveapi/users.go @@ -20,8 +20,8 @@ package liveapi import ( "context" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/test/accounts" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/test/accounts" "github.com/cucumber/godog" "github.com/pkg/errors" ) diff --git a/test/main_test.go b/test/main_test.go index f4c9f27..c6812d3 100644 --- a/test/main_test.go +++ b/test/main_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/ProtonMail/proton-bridge/internal/constants" + "github.com/ljanyst/peroxide/pkg/constants" "github.com/cucumber/godog" "github.com/cucumber/godog/colors" ) diff --git a/test/mocks/imap_client.go b/test/mocks/imap_client.go index 808f551..6a14b34 100644 --- a/test/mocks/imap_client.go +++ b/test/mocks/imap_client.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - "github.com/ProtonMail/proton-bridge/pkg/message" + "github.com/ljanyst/peroxide/pkg/message" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/test/store_checks_test.go b/test/store_checks_test.go index 78d345f..b5db39e 100644 --- a/test/store_checks_test.go +++ b/test/store_checks_test.go @@ -23,9 +23,9 @@ import ( "time" "github.com/ProtonMail/go-rfc5322" - "github.com/ProtonMail/proton-bridge/internal/store" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" - "github.com/ProtonMail/proton-bridge/test/accounts" + "github.com/ljanyst/peroxide/pkg/store" + "github.com/ljanyst/peroxide/pkg/pmapi" + "github.com/ljanyst/peroxide/test/accounts" "github.com/cucumber/godog" "github.com/cucumber/messages-go/v16" "github.com/hashicorp/go-multierror" diff --git a/test/store_setup_test.go b/test/store_setup_test.go index 4988203..79be4fe 100644 --- a/test/store_setup_test.go +++ b/test/store_setup_test.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ProtonMail/proton-bridge/pkg/pmapi" + "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/cucumber/godog" )