diff --git a/cmd/insert-user/main.go b/cmd/insert-user/main.go index c745fe4..d8c70cd 100644 --- a/cmd/insert-user/main.go +++ b/cmd/insert-user/main.go @@ -17,9 +17,9 @@ import ( _ "github.com/mattn/go-sqlite3" "golang.org/x/crypto/ssh/terminal" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite" refs "go.mindeco.de/ssb-refs" ) diff --git a/cmd/server/main.go b/cmd/server/main.go index 04194e1..cebdfcb 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -31,19 +31,19 @@ import ( kitlog "go.mindeco.de/log" "go.mindeco.de/log/level" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite" - "github.com/ssb-ngi-pointer/go-ssb-room/roomsrv" - mksrv "github.com/ssb-ngi-pointer/go-ssb-room/roomsrv" - "github.com/ssb-ngi-pointer/go-ssb-room/web/handlers" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomsrv" + mksrv "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomsrv" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/handlers" ) // Version and Build are set by ldflags var ( - version = "v1.0.0-snapshot" + version = "v2.0.0-snapshot" commit = "unset" ) diff --git a/go.mod b/go.mod index 9aa5dfe..a6dbdf7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ssb-ngi-pointer/go-ssb-room +module github.com/ssb-ngi-pointer/go-ssb-room/v2 go 1.16 diff --git a/internal/aliases/confirm_test.go b/internal/aliases/confirm_test.go index 5b95500..c9e4f13 100644 --- a/internal/aliases/confirm_test.go +++ b/internal/aliases/confirm_test.go @@ -6,7 +6,7 @@ import ( "bytes" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" "github.com/stretchr/testify/require" refs "go.mindeco.de/ssb-refs" ) diff --git a/internal/broadcasts/attendants.go b/internal/broadcasts/attendants.go index d6bdb3c..7f34a3c 100644 --- a/internal/broadcasts/attendants.go +++ b/internal/broadcasts/attendants.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/multierror" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/multierror" refs "go.mindeco.de/ssb-refs" ) diff --git a/internal/broadcasts/endpoints.go b/internal/broadcasts/endpoints.go index c18c73d..5b513b7 100644 --- a/internal/broadcasts/endpoints.go +++ b/internal/broadcasts/endpoints.go @@ -6,7 +6,7 @@ import ( "io" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/multierror" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/multierror" ) type EndpointsEmitter interface { diff --git a/internal/maybemod/multicloser/multicloser.go b/internal/maybemod/multicloser/multicloser.go index 1cfd3df..da5bc8b 100644 --- a/internal/maybemod/multicloser/multicloser.go +++ b/internal/maybemod/multicloser/multicloser.go @@ -7,7 +7,7 @@ import ( "io" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/multierror" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/multierror" ) type Closer struct { diff --git a/internal/network/isserver_test.go b/internal/network/isserver_test.go index 8536395..69232a8 100644 --- a/internal/network/isserver_test.go +++ b/internal/network/isserver_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" "go.mindeco.de/log" "go.cryptoscope.co/muxrpc/v2" diff --git a/internal/network/mocked/endpoints.go b/internal/network/mocked/endpoints.go index b856aec..bb8cac5 100644 --- a/internal/network/mocked/endpoints.go +++ b/internal/network/mocked/endpoints.go @@ -4,7 +4,7 @@ package mocked import ( "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" muxrpc "go.cryptoscope.co/muxrpc/v2" refs "go.mindeco.de/ssb-refs" ) diff --git a/internal/network/new.go b/internal/network/new.go index 13d57db..d337ce5 100644 --- a/internal/network/new.go +++ b/internal/network/new.go @@ -18,7 +18,7 @@ import ( "go.mindeco.de/log" "go.mindeco.de/log/level" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" refs "go.mindeco.de/ssb-refs" ) diff --git a/internal/netwraputil/spoof_test.go b/internal/netwraputil/spoof_test.go index cf19edf..04b7ad1 100644 --- a/internal/netwraputil/spoof_test.go +++ b/internal/netwraputil/spoof_test.go @@ -6,8 +6,8 @@ import ( "net" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" "github.com/stretchr/testify/require" ) diff --git a/internal/repo/secret.go b/internal/repo/secret.go index 6073b89..bd574b6 100644 --- a/internal/repo/secret.go +++ b/internal/repo/secret.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" refs "go.mindeco.de/ssb-refs" ) diff --git a/muxrpc/handlers/alias/handler.go b/muxrpc/handlers/alias/handler.go index ac927a0..d7c1408 100644 --- a/muxrpc/handlers/alias/handler.go +++ b/muxrpc/handlers/alias/handler.go @@ -14,10 +14,10 @@ import ( "go.cryptoscope.co/muxrpc/v2" kitlog "go.mindeco.de/log" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/aliases" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/aliases" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" refs "go.mindeco.de/ssb-refs" ) diff --git a/muxrpc/handlers/signinwithssb/withssb.go b/muxrpc/handlers/signinwithssb/withssb.go index b813bfe..8022c1b 100644 --- a/muxrpc/handlers/signinwithssb/withssb.go +++ b/muxrpc/handlers/signinwithssb/withssb.go @@ -12,10 +12,10 @@ import ( "go.cryptoscope.co/muxrpc/v2" kitlog "go.mindeco.de/log" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - validate "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + validate "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) diff --git a/muxrpc/handlers/tunnel/server/attendants.go b/muxrpc/handlers/tunnel/server/attendants.go index 107399d..f50fe73 100644 --- a/muxrpc/handlers/tunnel/server/attendants.go +++ b/muxrpc/handlers/tunnel/server/attendants.go @@ -8,8 +8,8 @@ import ( "fmt" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" "go.cryptoscope.co/muxrpc/v2" refs "go.mindeco.de/ssb-refs" ) diff --git a/muxrpc/handlers/tunnel/server/connect.go b/muxrpc/handlers/tunnel/server/connect.go index fc9ac0f..d17bd22 100644 --- a/muxrpc/handlers/tunnel/server/connect.go +++ b/muxrpc/handlers/tunnel/server/connect.go @@ -12,8 +12,8 @@ import ( kitlog "go.mindeco.de/log" "go.mindeco.de/log/level" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" refs "go.mindeco.de/ssb-refs" ) diff --git a/muxrpc/handlers/tunnel/server/plugin.go b/muxrpc/handlers/tunnel/server/plugin.go index cb4f25b..448e7ee 100644 --- a/muxrpc/handlers/tunnel/server/plugin.go +++ b/muxrpc/handlers/tunnel/server/plugin.go @@ -7,9 +7,9 @@ import ( "go.cryptoscope.co/muxrpc/v2/typemux" kitlog "go.mindeco.de/log" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" ) /* manifest: diff --git a/muxrpc/handlers/tunnel/server/state.go b/muxrpc/handlers/tunnel/server/state.go index 683ec10..b459186 100644 --- a/muxrpc/handlers/tunnel/server/state.go +++ b/muxrpc/handlers/tunnel/server/state.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" "go.cryptoscope.co/muxrpc/v2" kitlog "go.mindeco.de/log" diff --git a/muxrpc/test/go/alias_test.go b/muxrpc/test/go/alias_test.go index 2b2e261..7815921 100644 --- a/muxrpc/test/go/alias_test.go +++ b/muxrpc/test/go/alias_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/require" "go.cryptoscope.co/muxrpc/v2" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/aliases" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomsrv" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/aliases" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomsrv" ) // technically we are usign two servers here diff --git a/muxrpc/test/go/attendants_test.go b/muxrpc/test/go/attendants_test.go index ba8acce..77e7d53 100644 --- a/muxrpc/test/go/attendants_test.go +++ b/muxrpc/test/go/attendants_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/tunnel/server" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/tunnel/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.cryptoscope.co/muxrpc/v2" diff --git a/muxrpc/test/go/deny_test.go b/muxrpc/test/go/deny_test.go index c0b9603..2a218c0 100644 --- a/muxrpc/test/go/deny_test.go +++ b/muxrpc/test/go/deny_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/muxrpc/test/go/roomstate_test.go b/muxrpc/test/go/roomstate_test.go index 46e4c5d..bc08515 100644 --- a/muxrpc/test/go/roomstate_test.go +++ b/muxrpc/test/go/roomstate_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.cryptoscope.co/muxrpc/v2" - "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/tunnel/server" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/tunnel/server" ) // peers not on the members list can't connect diff --git a/muxrpc/test/go/simple_test.go b/muxrpc/test/go/simple_test.go index d7f4486..43cc15e 100644 --- a/muxrpc/test/go/simple_test.go +++ b/muxrpc/test/go/simple_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "go.cryptoscope.co/muxrpc/v2" - tunserv "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/tunnel/server" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + tunserv "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/tunnel/server" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) diff --git a/muxrpc/test/go/utils_test.go b/muxrpc/test/go/utils_test.go index 8839e2d..08a2fbf 100644 --- a/muxrpc/test/go/utils_test.go +++ b/muxrpc/test/go/utils_test.go @@ -26,15 +26,15 @@ import ( "go.mindeco.de/log/level" "golang.org/x/sync/errgroup" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/testutils" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/tunnel/server" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite" - "github.com/ssb-ngi-pointer/go-ssb-room/roomsrv" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/testutils" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/tunnel/server" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomsrv" refs "go.mindeco.de/ssb-refs" ) diff --git a/muxrpc/test/go/websocket_test.go b/muxrpc/test/go/websocket_test.go index 22031fb..ff2205e 100644 --- a/muxrpc/test/go/websocket_test.go +++ b/muxrpc/test/go/websocket_test.go @@ -19,10 +19,10 @@ import ( "go.cryptoscope.co/secretstream" "go.mindeco.de/encodedTime" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - tunserv "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/tunnel/server" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + tunserv "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/tunnel/server" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) func TestWebsocketDialing(t *testing.T) { diff --git a/muxrpc/test/nodejs/aliases_test.go b/muxrpc/test/nodejs/aliases_test.go index 0697395..9427bdd 100644 --- a/muxrpc/test/nodejs/aliases_test.go +++ b/muxrpc/test/nodejs/aliases_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/aliases" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/mockdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/aliases" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/mockdb" ) func TestGoServerJSClientAliases(t *testing.T) { diff --git a/muxrpc/test/nodejs/setup_test.go b/muxrpc/test/nodejs/setup_test.go index a7e2c88..373de0a 100644 --- a/muxrpc/test/nodejs/setup_test.go +++ b/muxrpc/test/nodejs/setup_test.go @@ -26,12 +26,12 @@ import ( "go.mindeco.de/log" "golang.org/x/sync/errgroup" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/testutils" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/mockdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomsrv" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/testutils" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/mockdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomsrv" refs "go.mindeco.de/ssb-refs" ) @@ -141,7 +141,7 @@ func (ts *testSession) startGoServer( ts.done.Go(func() error { err := srv.Network.Serve(ts.ctx) // if the muxrpc protocol fucks up by e.g. unpacking body data into a header, this type of error will be surfaced here and look scary in the test output - // example: https://github.com/ssb-ngi-pointer/go-ssb-room/pull/85#issuecomment-801106687 + // example: https://github.com/ssb-ngi-pointer/go-ssb-room/v2/pull/85#issuecomment-801106687 if err != nil && !errors.Is(err, context.Canceled) { err = fmt.Errorf("go server exited: %w", err) ts.t.Log(err) diff --git a/muxrpc/test/nodejs/tunnel_connect_test.go b/muxrpc/test/nodejs/tunnel_connect_test.go index 90b2766..32bdaf9 100644 --- a/muxrpc/test/nodejs/tunnel_connect_test.go +++ b/muxrpc/test/nodejs/tunnel_connect_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/mockdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/mockdb" refs "go.mindeco.de/ssb-refs" ) @@ -134,7 +134,7 @@ func TestModernJSClient(t *testing.T) { } // found a nasty `throw err` in the JS stack around pull.drain. lets make sure it stays gone -// https://github.com/ssb-ngi-pointer/go-ssb-room/issues/190 +// https://github.com/ssb-ngi-pointer/go-ssb-room/v2/issues/190 func TestClientSurvivesShutdown(t *testing.T) { r := require.New(t) diff --git a/roomdb/mockdb/aliases.go b/roomdb/mockdb/aliases.go index 7992057..8217b28 100644 --- a/roomdb/mockdb/aliases.go +++ b/roomdb/mockdb/aliases.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/mockdb/auth.go b/roomdb/mockdb/auth.go index a7a213c..e0125de 100644 --- a/roomdb/mockdb/auth.go +++ b/roomdb/mockdb/auth.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) type FakeAuthWithSSBService struct { diff --git a/roomdb/mockdb/auth_fallback.go b/roomdb/mockdb/auth_fallback.go index e52f349..6907aed 100644 --- a/roomdb/mockdb/auth_fallback.go +++ b/roomdb/mockdb/auth_fallback.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) type FakeAuthFallbackService struct { diff --git a/roomdb/mockdb/denied.go b/roomdb/mockdb/denied.go index fadfa9a..37bfe28 100644 --- a/roomdb/mockdb/denied.go +++ b/roomdb/mockdb/denied.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/mockdb/fixed_pages.go b/roomdb/mockdb/fixed_pages.go index d9b1eef..7cebc21 100644 --- a/roomdb/mockdb/fixed_pages.go +++ b/roomdb/mockdb/fixed_pages.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) type FakePinnedNoticesService struct { diff --git a/roomdb/mockdb/invites.go b/roomdb/mockdb/invites.go index 9005fb2..a3981c4 100644 --- a/roomdb/mockdb/invites.go +++ b/roomdb/mockdb/invites.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/mockdb/members.go b/roomdb/mockdb/members.go index e450891..5ce25fa 100644 --- a/roomdb/mockdb/members.go +++ b/roomdb/mockdb/members.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/mockdb/pages.go b/roomdb/mockdb/pages.go index eced52d..5333c8d 100644 --- a/roomdb/mockdb/pages.go +++ b/roomdb/mockdb/pages.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) type FakeNoticesService struct { diff --git a/roomdb/mockdb/roomconfig.go b/roomdb/mockdb/roomconfig.go index b6a8f1b..27ea042 100644 --- a/roomdb/mockdb/roomconfig.go +++ b/roomdb/mockdb/roomconfig.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) type FakeRoomConfig struct { diff --git a/roomdb/sqlite/aliases.go b/roomdb/sqlite/aliases.go index c50e958..4929f04 100644 --- a/roomdb/sqlite/aliases.go +++ b/roomdb/sqlite/aliases.go @@ -11,8 +11,8 @@ import ( "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/sqlite/aliases_test.go b/roomdb/sqlite/aliases_test.go index 40ff6bb..93dc677 100644 --- a/roomdb/sqlite/aliases_test.go +++ b/roomdb/sqlite/aliases_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/sqlite/auth_fallback.go b/roomdb/sqlite/auth_fallback.go index a515c25..1908522 100644 --- a/roomdb/sqlite/auth_fallback.go +++ b/roomdb/sqlite/auth_fallback.go @@ -17,9 +17,9 @@ import ( "go.mindeco.de/http/auth" "golang.org/x/crypto/bcrypt" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" ) // compiler assertion to ensure the struct fullfills the interface diff --git a/roomdb/sqlite/auth_fallback_test.go b/roomdb/sqlite/auth_fallback_test.go index f3c16f7..4b104d1 100644 --- a/roomdb/sqlite/auth_fallback_test.go +++ b/roomdb/sqlite/auth_fallback_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" "github.com/stretchr/testify/require" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/sqlite/auth_withssb.go b/roomdb/sqlite/auth_withssb.go index b24ee45..03710eb 100644 --- a/roomdb/sqlite/auth_withssb.go +++ b/roomdb/sqlite/auth_withssb.go @@ -12,9 +12,9 @@ import ( "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/randutil" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/randutil" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" ) // compiler assertion to ensure the struct fullfills the interface diff --git a/roomdb/sqlite/denied.go b/roomdb/sqlite/denied.go index 9929862..2313e9d 100644 --- a/roomdb/sqlite/denied.go +++ b/roomdb/sqlite/denied.go @@ -12,8 +12,8 @@ import ( "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/sqlite/denied_test.go b/roomdb/sqlite/denied_test.go index 907d80a..3ae79c6 100644 --- a/roomdb/sqlite/denied_test.go +++ b/roomdb/sqlite/denied_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" "github.com/stretchr/testify/require" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/sqlite/invites.go b/roomdb/sqlite/invites.go index 82f5820..70b8d27 100644 --- a/roomdb/sqlite/invites.go +++ b/roomdb/sqlite/invites.go @@ -13,8 +13,8 @@ import ( "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/sqlite/invites_test.go b/roomdb/sqlite/invites_test.go index b83f855..735f7c6 100644 --- a/roomdb/sqlite/invites_test.go +++ b/roomdb/sqlite/invites_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomdb/sqlite/members.go b/roomdb/sqlite/members.go index 482ee2c..7b47306 100644 --- a/roomdb/sqlite/members.go +++ b/roomdb/sqlite/members.go @@ -7,8 +7,8 @@ import ( "github.com/friendsofgo/errors" "github.com/mattn/go-sqlite3" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" refs "go.mindeco.de/ssb-refs" diff --git a/roomdb/sqlite/members_test.go b/roomdb/sqlite/members_test.go index 95c38f2..32dbad4 100644 --- a/roomdb/sqlite/members_test.go +++ b/roomdb/sqlite/members_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" refs "go.mindeco.de/ssb-refs" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" ) func TestMembers(t *testing.T) { diff --git a/roomdb/sqlite/models/config.go b/roomdb/sqlite/models/config.go index dd42e50..9ec6ce8 100644 --- a/roomdb/sqlite/models/config.go +++ b/roomdb/sqlite/models/config.go @@ -13,7 +13,7 @@ import ( "time" "github.com/friendsofgo/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries" "github.com/volatiletech/sqlboiler/v4/queries/qm" diff --git a/roomdb/sqlite/models/denied_keys.go b/roomdb/sqlite/models/denied_keys.go index 457d6fd..23f48c7 100644 --- a/roomdb/sqlite/models/denied_keys.go +++ b/roomdb/sqlite/models/denied_keys.go @@ -13,7 +13,7 @@ import ( "time" "github.com/friendsofgo/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries" "github.com/volatiletech/sqlboiler/v4/queries/qm" diff --git a/roomdb/sqlite/models/members.go b/roomdb/sqlite/models/members.go index 75e2a37..196f2e7 100644 --- a/roomdb/sqlite/models/members.go +++ b/roomdb/sqlite/models/members.go @@ -13,7 +13,7 @@ import ( "time" "github.com/friendsofgo/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries" "github.com/volatiletech/sqlboiler/v4/queries/qm" diff --git a/roomdb/sqlite/new.go b/roomdb/sqlite/new.go index 058e9eb..5b16ab1 100644 --- a/roomdb/sqlite/new.go +++ b/roomdb/sqlite/new.go @@ -26,7 +26,7 @@ import ( migrate "github.com/rubenv/sql-migrate" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" ) type Database struct { diff --git a/roomdb/sqlite/new_test.go b/roomdb/sqlite/new_test.go index 5394876..fc7127e 100644 --- a/roomdb/sqlite/new_test.go +++ b/roomdb/sqlite/new_test.go @@ -8,7 +8,7 @@ import ( _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" ) // verify the database opens and migrates successfully from zero state diff --git a/roomdb/sqlite/notices.go b/roomdb/sqlite/notices.go index a6db1ff..8871ef7 100644 --- a/roomdb/sqlite/notices.go +++ b/roomdb/sqlite/notices.go @@ -9,8 +9,8 @@ import ( "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" ) // compiler assertion to ensure the struct fullfills the interface diff --git a/roomdb/sqlite/notices_test.go b/roomdb/sqlite/notices_test.go index bb81df6..6841585 100644 --- a/roomdb/sqlite/notices_test.go +++ b/roomdb/sqlite/notices_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" "github.com/stretchr/testify/require" ) diff --git a/roomdb/sqlite/roomconfig.go b/roomdb/sqlite/roomconfig.go index 5e00a16..76da025 100644 --- a/roomdb/sqlite/roomconfig.go +++ b/roomdb/sqlite/roomconfig.go @@ -7,8 +7,8 @@ import ( "database/sql" "fmt" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/sqlite/models" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/sqlite/models" "github.com/volatiletech/sqlboiler/v4/boil" ) diff --git a/roomdb/sqlite/roomconfig_test.go b/roomdb/sqlite/roomconfig_test.go index c35d345..29becc2 100644 --- a/roomdb/sqlite/roomconfig_test.go +++ b/roomdb/sqlite/roomconfig_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" "github.com/stretchr/testify/require" ) diff --git a/roomsrv/init_handlers.go b/roomsrv/init_handlers.go index 224f7b7..ff5e922 100644 --- a/roomsrv/init_handlers.go +++ b/roomsrv/init_handlers.go @@ -7,11 +7,11 @@ import ( "go.cryptoscope.co/muxrpc/v2/typemux" kitlog "go.mindeco.de/log" - "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/alias" - "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/gossip" - "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/tunnel/server" - "github.com/ssb-ngi-pointer/go-ssb-room/muxrpc/handlers/whoami" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/alias" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/gossip" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/tunnel/server" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/muxrpc/handlers/whoami" ) // instantiate and register the muxrpc handlers diff --git a/roomsrv/init_network.go b/roomsrv/init_network.go index 631cb3f..c8fa850 100644 --- a/roomsrv/init_network.go +++ b/roomsrv/init_network.go @@ -8,8 +8,8 @@ import ( "go.cryptoscope.co/muxrpc/v2" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) // opens the shs listener for TCP connections diff --git a/roomsrv/init_unixsock.go b/roomsrv/init_unixsock.go index 5e46e61..a074211 100644 --- a/roomsrv/init_unixsock.go +++ b/roomsrv/init_unixsock.go @@ -12,8 +12,8 @@ import ( kitlog "go.mindeco.de/log" "go.mindeco.de/log/level" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/netwraputil" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/netwraputil" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" ) // WithUNIXSocket enables listening for muxrpc connections on a unix socket files ($repo/socket). diff --git a/roomsrv/options.go b/roomsrv/options.go index aef0f60..b3d467c 100644 --- a/roomsrv/options.go +++ b/roomsrv/options.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" "go.cryptoscope.co/netwrap" kitlog "go.mindeco.de/log" ) diff --git a/roomsrv/server.go b/roomsrv/server.go index cfa71aa..9aefb5f 100644 --- a/roomsrv/server.go +++ b/roomsrv/server.go @@ -19,13 +19,13 @@ import ( kitlog "go.mindeco.de/log" "go.mindeco.de/log/level" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/multicloser" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/multicloser" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" refs "go.mindeco.de/ssb-refs" ) diff --git a/roomstate/roomstate.go b/roomstate/roomstate.go index 0079e75..35da136 100644 --- a/roomstate/roomstate.go +++ b/roomstate/roomstate.go @@ -8,7 +8,7 @@ import ( "go.cryptoscope.co/muxrpc/v2" kitlog "go.mindeco.de/log" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/broadcasts" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/broadcasts" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/embedded_dev.go b/web/embedded_dev.go index c3bb394..bf0ce8f 100644 --- a/web/embedded_dev.go +++ b/web/embedded_dev.go @@ -14,7 +14,7 @@ import ( const Production = false // absolute path of where this package is located -var pkgDir = goutils.MustLocatePackage("github.com/ssb-ngi-pointer/go-ssb-room/web") +var pkgDir = goutils.MustLocatePackage("github.com/ssb-ngi-pointer/go-ssb-room/v2/web") var Templates = http.Dir(filepath.Join(pkgDir, "templates")) diff --git a/web/errors/errhandler.go b/web/errors/errhandler.go index 1c4b0b2..c076971 100644 --- a/web/errors/errhandler.go +++ b/web/errors/errhandler.go @@ -10,8 +10,8 @@ import ( "go.mindeco.de/log/level" "go.mindeco.de/logging" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" ) type ErrorHandler struct { diff --git a/web/errors/flashes.go b/web/errors/flashes.go index 93b12d1..1432fbc 100644 --- a/web/errors/flashes.go +++ b/web/errors/flashes.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/gorilla/sessions" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" ) type FlashHelper struct { diff --git a/web/handlers/admin/aliases.go b/web/handlers/admin/aliases.go index 2fb55ff..1f126f0 100644 --- a/web/handlers/admin/aliases.go +++ b/web/handlers/admin/aliases.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/csrf" "go.mindeco.de/http/render" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" ) // aliasesHandler implements the managment endpoints for aliases (list and revoke), diff --git a/web/handlers/admin/aliases_test.go b/web/handlers/admin/aliases_test.go index 8c6ff3c..9b65d54 100644 --- a/web/handlers/admin/aliases_test.go +++ b/web/handlers/admin/aliases_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/admin/dashboard.go b/web/handlers/admin/dashboard.go index d891eb7..9c8423c 100644 --- a/web/handlers/admin/dashboard.go +++ b/web/handlers/admin/dashboard.go @@ -12,10 +12,10 @@ import ( "go.mindeco.de/logging" refs "go.mindeco.de/ssb-refs" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" ) type dashboardHandler struct { diff --git a/web/handlers/admin/denied_keys.go b/web/handlers/admin/denied_keys.go index ae4ad68..ce2ea01 100644 --- a/web/handlers/admin/denied_keys.go +++ b/web/handlers/admin/denied_keys.go @@ -10,9 +10,9 @@ import ( "github.com/gorilla/csrf" "go.mindeco.de/http/render" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/admin/denied_keys_test.go b/web/handlers/admin/denied_keys_test.go index 1a0feed..62e7823 100644 --- a/web/handlers/admin/denied_keys_test.go +++ b/web/handlers/admin/denied_keys_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/admin/handler.go b/web/handlers/admin/handler.go index de7134f..9120cdb 100644 --- a/web/handlers/admin/handler.go +++ b/web/handlers/admin/handler.go @@ -16,13 +16,13 @@ import ( "github.com/vcraescu/go-paginator/v2/view" "go.mindeco.de/http/render" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" ) // HTMLTemplates define the list of files the template system should load. diff --git a/web/handlers/admin/handler_test.go b/web/handlers/admin/handler_test.go index 0bb9e9c..70a5b2d 100644 --- a/web/handlers/admin/handler_test.go +++ b/web/handlers/admin/handler_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" "github.com/stretchr/testify/assert" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/admin/invites.go b/web/handlers/admin/invites.go index 12608c3..a9e8c98 100644 --- a/web/handlers/admin/invites.go +++ b/web/handlers/admin/invites.go @@ -9,11 +9,11 @@ import ( "github.com/gorilla/csrf" "go.mindeco.de/http/render" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" ) type invitesHandler struct { diff --git a/web/handlers/admin/invites_test.go b/web/handlers/admin/invites_test.go index 63dc19f..9242138 100644 --- a/web/handlers/admin/invites_test.go +++ b/web/handlers/admin/invites_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" ) func TestInvitesOverview(t *testing.T) { diff --git a/web/handlers/admin/members.go b/web/handlers/admin/members.go index 2702acf..32dac43 100644 --- a/web/handlers/admin/members.go +++ b/web/handlers/admin/members.go @@ -12,12 +12,12 @@ import ( "github.com/gorilla/csrf" "go.mindeco.de/http/render" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/admin/members_test.go b/web/handlers/admin/members_test.go index 2826325..8690340 100644 --- a/web/handlers/admin/members_test.go +++ b/web/handlers/admin/members_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/admin/notices.go b/web/handlers/admin/notices.go index 2eecb03..f256b9f 100644 --- a/web/handlers/admin/notices.go +++ b/web/handlers/admin/notices.go @@ -7,14 +7,14 @@ import ( "strconv" "strings" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" "github.com/gorilla/csrf" "github.com/russross/blackfriday/v2" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" "go.mindeco.de/http/render" ) diff --git a/web/handlers/admin/notices_test.go b/web/handlers/admin/notices_test.go index 926c7fa..277a3bd 100644 --- a/web/handlers/admin/notices_test.go +++ b/web/handlers/admin/notices_test.go @@ -6,9 +6,9 @@ import ( "net/url" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" "github.com/stretchr/testify/assert" ) diff --git a/web/handlers/admin/set_language_test.go b/web/handlers/admin/set_language_test.go index af5b5a1..6ac81de 100644 --- a/web/handlers/admin/set_language_test.go +++ b/web/handlers/admin/set_language_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" "github.com/stretchr/testify/assert" ) diff --git a/web/handlers/admin/settings.go b/web/handlers/admin/settings.go index 8b5492e..e5ce407 100644 --- a/web/handlers/admin/settings.go +++ b/web/handlers/admin/settings.go @@ -10,12 +10,12 @@ import ( "go.mindeco.de/http/render" "github.com/gorilla/csrf" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" ) type settingsHandler struct { diff --git a/web/handlers/admin/settings_test.go b/web/handlers/admin/settings_test.go index c05c3a8..6f75065 100644 --- a/web/handlers/admin/settings_test.go +++ b/web/handlers/admin/settings_test.go @@ -8,8 +8,8 @@ import ( "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" ) func TestSettingsOverview(t *testing.T) { diff --git a/web/handlers/admin/setup_test.go b/web/handlers/admin/setup_test.go index 99c1812..3942fc7 100644 --- a/web/handlers/admin/setup_test.go +++ b/web/handlers/admin/setup_test.go @@ -22,18 +22,18 @@ import ( "go.mindeco.de/logging/logtest" refs "go.mindeco.de/ssb-refs" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/randutil" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/mockdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrs "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n/i18ntesting" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/randutil" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/mockdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrs "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n/i18ntesting" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" ) type testSession struct { diff --git a/web/handlers/aliases.go b/web/handlers/aliases.go index 4ceedf9..064e6b4 100644 --- a/web/handlers/aliases.go +++ b/web/handlers/aliases.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/mux" "go.mindeco.de/http/render" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/aliases" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/aliases" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) // aliasHandler implements the public resolve endpoint for HTML and JSON requests. diff --git a/web/handlers/aliases_test.go b/web/handlers/aliases_test.go index c95b814..35c9584 100644 --- a/web/handlers/aliases_test.go +++ b/web/handlers/aliases_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/auth/withssb.go b/web/handlers/auth/withssb.go index eb3bbdf..0a713cc 100644 --- a/web/handlers/auth/withssb.go +++ b/web/handlers/auth/withssb.go @@ -25,12 +25,12 @@ import ( "go.mindeco.de/log/level" "go.mindeco.de/logging" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/auth_test.go b/web/handlers/auth_test.go index b694834..6717d31 100644 --- a/web/handlers/auth_test.go +++ b/web/handlers/auth_test.go @@ -18,12 +18,12 @@ import ( "go.cryptoscope.co/muxrpc/v2" "go.mindeco.de/http/auth" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/basic_test.go b/web/handlers/basic_test.go index b0c6e29..c2b9f93 100644 --- a/web/handlers/basic_test.go +++ b/web/handlers/basic_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" ) func TestIndex(t *testing.T) { diff --git a/web/handlers/http.go b/web/handlers/http.go index c4dd375..d5c23aa 100644 --- a/web/handlers/http.go +++ b/web/handlers/http.go @@ -18,18 +18,18 @@ import ( "go.mindeco.de/log/level" "go.mindeco.de/logging" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrs "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/handlers/admin" - roomsAuth "github.com/ssb-ngi-pointer/go-ssb-room/web/handlers/auth" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrs "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/handlers/admin" + roomsAuth "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/handlers/auth" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" ) var HTMLTemplates = []string{ diff --git a/web/handlers/invites.go b/web/handlers/invites.go index e92cb6c..a27d070 100644 --- a/web/handlers/invites.go +++ b/web/handlers/invites.go @@ -16,11 +16,11 @@ import ( "go.mindeco.de/log/level" "go.mindeco.de/logging" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/handlers/invites_test.go b/web/handlers/invites_test.go index 3790c89..89e18cc 100644 --- a/web/handlers/invites_test.go +++ b/web/handlers/invites_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" refs "go.mindeco.de/ssb-refs" ) @@ -34,7 +34,7 @@ func TestInviteShowAcceptForm(t *testing.T) { // request the form doc, resp := ts.Client.GetHTML(acceptURL404) - // 500 until https://github.com/ssb-ngi-pointer/go-ssb-room/issues/66 is fixed + // 500 until https://github.com/ssb-ngi-pointer/go-ssb-room/v2/issues/66 is fixed a.Equal(http.StatusInternalServerError, resp.Code) // check database calls diff --git a/web/handlers/members_password.go b/web/handlers/members_password.go index 692deae..cc789ec 100644 --- a/web/handlers/members_password.go +++ b/web/handlers/members_password.go @@ -9,11 +9,11 @@ import ( hibp "github.com/mattevans/pwned-passwords" "go.mindeco.de/http/render" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - weberrs "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - "github.com/ssb-ngi-pointer/go-ssb-room/web/members" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + weberrs "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/members" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" ) type membersHandler struct { diff --git a/web/handlers/members_password_test.go b/web/handlers/members_password_test.go index 9042fa3..5673c83 100644 --- a/web/handlers/members_password_test.go +++ b/web/handlers/members_password_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" ) func TestLoginAndChangePassword(t *testing.T) { diff --git a/web/handlers/notices.go b/web/handlers/notices.go index 3414837..57db155 100644 --- a/web/handlers/notices.go +++ b/web/handlers/notices.go @@ -7,8 +7,8 @@ import ( "github.com/russross/blackfriday/v2" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" ) type noticeHandler struct { diff --git a/web/handlers/notices_test.go b/web/handlers/notices_test.go index ff2a5a9..a0602d1 100644 --- a/web/handlers/notices_test.go +++ b/web/handlers/notices_test.go @@ -5,9 +5,9 @@ import ( "net/url" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" - "github.com/ssb-ngi-pointer/go-ssb-room/web/webassert" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/webassert" "github.com/stretchr/testify/assert" ) diff --git a/web/handlers/set_language_test.go b/web/handlers/set_language_test.go index 4c17087..202f0c3 100644 --- a/web/handlers/set_language_test.go +++ b/web/handlers/set_language_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" ) func TestLanguageDefaultNoCookie(t *testing.T) { diff --git a/web/handlers/setup_test.go b/web/handlers/setup_test.go index da9b004..1432e7b 100644 --- a/web/handlers/setup_test.go +++ b/web/handlers/setup_test.go @@ -13,16 +13,16 @@ import ( "go.mindeco.de/http/tester" "go.mindeco.de/logging/logtest" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network/mocked" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/signinwithssb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/mockdb" - "github.com/ssb-ngi-pointer/go-ssb-room/roomstate" - "github.com/ssb-ngi-pointer/go-ssb-room/web" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n/i18ntesting" - "github.com/ssb-ngi-pointer/go-ssb-room/web/router" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network/mocked" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/signinwithssb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/mockdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomstate" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n/i18ntesting" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router" refs "go.mindeco.de/ssb-refs" ) diff --git a/web/i18n/dev.go b/web/i18n/dev.go index 64360d2..bffe676 100644 --- a/web/i18n/dev.go +++ b/web/i18n/dev.go @@ -15,6 +15,6 @@ import ( var Defaults fs.FS = os.DirFS(defaultsPath) var ( - pkgDir = goutils.MustLocatePackage("github.com/ssb-ngi-pointer/go-ssb-room/web/i18n") + pkgDir = goutils.MustLocatePackage("github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n") defaultsPath = filepath.Join(pkgDir, "defaults") ) diff --git a/web/i18n/helper.go b/web/i18n/helper.go index d3dd1fb..bdf554b 100644 --- a/web/i18n/helper.go +++ b/web/i18n/helper.go @@ -18,12 +18,12 @@ import ( "github.com/BurntSushi/toml" "github.com/gorilla/sessions" "github.com/nicksnyder/go-i18n/v2/i18n" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web" "go.mindeco.de/http/render" "golang.org/x/text/language" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" ) const LanguageCookieName = "gossbroom-language" diff --git a/web/i18n/i18ntesting/i18n_helper_test.go b/web/i18n/i18ntesting/i18n_helper_test.go index ecddee5..29bc8d9 100644 --- a/web/i18n/i18ntesting/i18n_helper_test.go +++ b/web/i18n/i18ntesting/i18n_helper_test.go @@ -1,13 +1,14 @@ package i18ntesting import ( - "github.com/stretchr/testify/assert" "path/filepath" "testing" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb/mockdb" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" + "github.com/stretchr/testify/assert" + + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb/mockdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" ) func TestListLanguages(t *testing.T) { diff --git a/web/i18n/i18ntesting/testing.go b/web/i18n/i18ntesting/testing.go index 30a7819..d47ffb4 100644 --- a/web/i18n/i18ntesting/testing.go +++ b/web/i18n/i18ntesting/testing.go @@ -10,8 +10,8 @@ import ( "github.com/BurntSushi/toml" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/web/i18n" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/i18n" ) // justTheKeys auto generates from the defaults a list of Label = "Label" diff --git a/web/members/helper.go b/web/members/helper.go index e15d817..f2de3a2 100644 --- a/web/members/helper.go +++ b/web/members/helper.go @@ -11,9 +11,9 @@ import ( "go.mindeco.de/http/auth" "go.mindeco.de/http/render" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - weberrors "github.com/ssb-ngi-pointer/go-ssb-room/web/errors" - authWithSSB "github.com/ssb-ngi-pointer/go-ssb-room/web/handlers/auth" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" + weberrors "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/errors" + authWithSSB "github.com/ssb-ngi-pointer/go-ssb-room/v2/web/handlers/auth" ) type roomMemberContextKeyType string diff --git a/web/members/testing.go b/web/members/testing.go index 2ef5ef9..25bb25a 100644 --- a/web/members/testing.go +++ b/web/members/testing.go @@ -6,7 +6,7 @@ import ( "context" "net/http" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" ) // MiddlewareForTests gives us a way to inject _test members_. It should not be used in production. diff --git a/web/utils.go b/web/utils.go index c669d28..6a72144 100644 --- a/web/utils.go +++ b/web/utils.go @@ -19,9 +19,9 @@ import ( "go.mindeco.de/log/level" "go.mindeco.de/logging" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/repo" - "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/repo" + "github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb" refs "go.mindeco.de/ssb-refs" ) @@ -48,8 +48,8 @@ func NewURLTo(appRouter *mux.Router, netInfo network.ServerEndpointDetails) URLM return func(routeName string, ps ...interface{}) *url.URL { route := appRouter.Get(routeName) if route == nil { - // TODO: https://github.com/ssb-ngi-pointer/go-ssb-room/issues/35 for a - // for reference, see https://github.com/ssb-ngi-pointer/go-ssb-room/pull/64 + // TODO: https://github.com/ssb-ngi-pointer/go-ssb-room/v2/issues/35 for a + // for reference, see https://github.com/ssb-ngi-pointer/go-ssb-room/v2/pull/64 // level.Warn(l).Log("msg", "no such route", "route", routeName, "params", fmt.Sprintf("%v", ps)) return &url.URL{} }