diff --git a/eventstore/badger/count.go b/eventstore/badger/count.go index 77af9e6..2fa14f7 100644 --- a/eventstore/badger/count.go +++ b/eventstore/badger/count.go @@ -6,9 +6,9 @@ import ( "log" "github.com/dgraph-io/badger/v4" - bin "github.com/fiatjaf/eventstore/internal/binary" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip45/hyperloglog" + bin "fiatjaf.com/nostr/eventstore/internal/binary" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip45/hyperloglog" ) func (b *BadgerBackend) CountEvents(ctx context.Context, filter nostr.Filter) (int64, error) { diff --git a/eventstore/badger/delete.go b/eventstore/badger/delete.go index e4bd690..cec84cb 100644 --- a/eventstore/badger/delete.go +++ b/eventstore/badger/delete.go @@ -6,7 +6,7 @@ import ( "log" "github.com/dgraph-io/badger/v4" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) var serialDelete uint32 = 0 diff --git a/eventstore/badger/fuzz_test.go b/eventstore/badger/fuzz_test.go index d03a3c4..1e56ae6 100644 --- a/eventstore/badger/fuzz_test.go +++ b/eventstore/badger/fuzz_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/dgraph-io/badger/v4" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" ) diff --git a/eventstore/badger/helpers.go b/eventstore/badger/helpers.go index fd33756..3191064 100644 --- a/eventstore/badger/helpers.go +++ b/eventstore/badger/helpers.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" "golang.org/x/exp/slices" ) diff --git a/eventstore/badger/lib.go b/eventstore/badger/lib.go index 410acfc..5f7b205 100644 --- a/eventstore/badger/lib.go +++ b/eventstore/badger/lib.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "github.com/dgraph-io/badger/v4" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" ) const ( diff --git a/eventstore/badger/query.go b/eventstore/badger/query.go index cf9998b..08f9afb 100644 --- a/eventstore/badger/query.go +++ b/eventstore/badger/query.go @@ -9,10 +9,10 @@ import ( "log" "github.com/dgraph-io/badger/v4" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/internal" - bin "github.com/fiatjaf/eventstore/internal/binary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/internal" + bin "fiatjaf.com/nostr/eventstore/internal/binary" + "fiatjaf.com/nostr" "golang.org/x/exp/slices" ) diff --git a/eventstore/badger/query_planner.go b/eventstore/badger/query_planner.go index 686ff88..1efe6fe 100644 --- a/eventstore/badger/query_planner.go +++ b/eventstore/badger/query_planner.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "fmt" - "github.com/fiatjaf/eventstore/internal" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr" ) type query struct { diff --git a/eventstore/badger/replace.go b/eventstore/badger/replace.go index a5b5a3a..4b8c07c 100644 --- a/eventstore/badger/replace.go +++ b/eventstore/badger/replace.go @@ -6,8 +6,8 @@ import ( "math" "github.com/dgraph-io/badger/v4" - "github.com/fiatjaf/eventstore/internal" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr" ) func (b *BadgerBackend) ReplaceEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/badger/save.go b/eventstore/badger/save.go index 5a1cac1..4ff3389 100644 --- a/eventstore/badger/save.go +++ b/eventstore/badger/save.go @@ -7,9 +7,9 @@ import ( "math" "github.com/dgraph-io/badger/v4" - "github.com/fiatjaf/eventstore" - bin "github.com/fiatjaf/eventstore/internal/binary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + bin "fiatjaf.com/nostr/eventstore/internal/binary" + "fiatjaf.com/nostr" ) func (b *BadgerBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/bluge/bluge_test.go b/eventstore/bluge/bluge_test.go index af96523..26298fc 100644 --- a/eventstore/bluge/bluge_test.go +++ b/eventstore/bluge/bluge_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/fiatjaf/eventstore/badger" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/badger" + "fiatjaf.com/nostr" "github.com/stretchr/testify/assert" ) diff --git a/eventstore/bluge/delete.go b/eventstore/bluge/delete.go index aee1031..dfdc0af 100644 --- a/eventstore/bluge/delete.go +++ b/eventstore/bluge/delete.go @@ -3,7 +3,7 @@ package bluge import ( "context" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func (b *BlugeBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/bluge/lib.go b/eventstore/bluge/lib.go index 727f611..ea44e2c 100644 --- a/eventstore/bluge/lib.go +++ b/eventstore/bluge/lib.go @@ -6,7 +6,7 @@ import ( "github.com/blugelabs/bluge" "github.com/blugelabs/bluge/analysis/token" - "github.com/fiatjaf/eventstore" + "fiatjaf.com/nostr/eventstore" "golang.org/x/text/unicode/norm" ) diff --git a/eventstore/bluge/query.go b/eventstore/bluge/query.go index c6019c6..2cf723a 100644 --- a/eventstore/bluge/query.go +++ b/eventstore/bluge/query.go @@ -8,7 +8,7 @@ import ( "github.com/blugelabs/bluge" "github.com/blugelabs/bluge/search" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func (b *BlugeBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (chan *nostr.Event, error) { diff --git a/eventstore/bluge/replace.go b/eventstore/bluge/replace.go index 86ce0cc..014ef57 100644 --- a/eventstore/bluge/replace.go +++ b/eventstore/bluge/replace.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/internal" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr" ) func (b *BlugeBackend) ReplaceEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/bluge/save.go b/eventstore/bluge/save.go index ac5b107..f2334d0 100644 --- a/eventstore/bluge/save.go +++ b/eventstore/bluge/save.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/blugelabs/bluge" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func (b *BlugeBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/cmd/eventstore/delete.go b/eventstore/cmd/eventstore/delete.go index 2acc661..bdfeb5f 100644 --- a/eventstore/cmd/eventstore/delete.go +++ b/eventstore/cmd/eventstore/delete.go @@ -6,7 +6,7 @@ import ( "os" "github.com/urfave/cli/v3" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) var delete_ = &cli.Command{ diff --git a/eventstore/cmd/eventstore/main.go b/eventstore/cmd/eventstore/main.go index 03de8a3..0cd90c2 100644 --- a/eventstore/cmd/eventstore/main.go +++ b/eventstore/cmd/eventstore/main.go @@ -9,16 +9,16 @@ import ( "os" "strings" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/badger" - "github.com/fiatjaf/eventstore/elasticsearch" - "github.com/fiatjaf/eventstore/lmdb" - "github.com/fiatjaf/eventstore/mysql" - "github.com/fiatjaf/eventstore/postgresql" - "github.com/fiatjaf/eventstore/slicestore" - "github.com/fiatjaf/eventstore/sqlite3" - "github.com/fiatjaf/eventstore/strfry" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/badger" + "fiatjaf.com/nostr/eventstore/elasticsearch" + "fiatjaf.com/nostr/eventstore/lmdb" + "fiatjaf.com/nostr/eventstore/mysql" + "fiatjaf.com/nostr/eventstore/postgresql" + "fiatjaf.com/nostr/eventstore/slicestore" + "fiatjaf.com/nostr/eventstore/sqlite3" + "fiatjaf.com/nostr/eventstore/strfry" + "fiatjaf.com/nostr" "github.com/urfave/cli/v3" ) diff --git a/eventstore/cmd/eventstore/main_mmm.go b/eventstore/cmd/eventstore/main_mmm.go index 9b115c5..4ad499e 100644 --- a/eventstore/cmd/eventstore/main_mmm.go +++ b/eventstore/cmd/eventstore/main_mmm.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/mmm" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/mmm" + "fiatjaf.com/nostr" "github.com/rs/zerolog" ) diff --git a/eventstore/cmd/eventstore/main_other.go b/eventstore/cmd/eventstore/main_other.go index c9e9018..76e5fa3 100644 --- a/eventstore/cmd/eventstore/main_other.go +++ b/eventstore/cmd/eventstore/main_other.go @@ -6,7 +6,7 @@ import ( "fmt" "runtime" - "github.com/fiatjaf/eventstore" + "fiatjaf.com/nostr/eventstore" ) func doMmmInit(path string) (eventstore.Store, error) { diff --git a/eventstore/cmd/eventstore/neg.go b/eventstore/cmd/eventstore/neg.go index ca857de..504ff43 100644 --- a/eventstore/cmd/eventstore/neg.go +++ b/eventstore/cmd/eventstore/neg.go @@ -10,9 +10,9 @@ import ( "github.com/urfave/cli/v3" "github.com/mailru/easyjson" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip77/negentropy" - "github.com/nbd-wtf/go-nostr/nip77/negentropy/storage/vector" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip77/negentropy" + "fiatjaf.com/nostr/nip77/negentropy/storage/vector" ) var neg = &cli.Command{ diff --git a/eventstore/cmd/eventstore/query-or-save.go b/eventstore/cmd/eventstore/query-or-save.go index af515be..f40e9c3 100644 --- a/eventstore/cmd/eventstore/query-or-save.go +++ b/eventstore/cmd/eventstore/query-or-save.go @@ -7,7 +7,7 @@ import ( "os" "github.com/urfave/cli/v3" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) // this is the default command when no subcommands are given, we will just try everything diff --git a/eventstore/cmd/eventstore/query.go b/eventstore/cmd/eventstore/query.go index a75636c..e364b2f 100644 --- a/eventstore/cmd/eventstore/query.go +++ b/eventstore/cmd/eventstore/query.go @@ -6,7 +6,7 @@ import ( "os" "github.com/mailru/easyjson" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" "github.com/urfave/cli/v3" ) diff --git a/eventstore/cmd/eventstore/save.go b/eventstore/cmd/eventstore/save.go index 2628b33..5096859 100644 --- a/eventstore/cmd/eventstore/save.go +++ b/eventstore/cmd/eventstore/save.go @@ -7,7 +7,7 @@ import ( "github.com/urfave/cli/v3" "github.com/mailru/easyjson" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) var save = &cli.Command{ diff --git a/eventstore/internal/binary/cmd/decode-binary/main.go b/eventstore/internal/binary/cmd/decode-binary/main.go index 92c3046..182619e 100644 --- a/eventstore/internal/binary/cmd/decode-binary/main.go +++ b/eventstore/internal/binary/cmd/decode-binary/main.go @@ -7,8 +7,8 @@ import ( "io" "os" - "github.com/fiatjaf/eventstore/internal/binary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/internal/binary" + "fiatjaf.com/nostr" ) func main() { diff --git a/eventstore/internal/binary/hybrid.go b/eventstore/internal/binary/hybrid.go index c9c96f5..30c6b89 100644 --- a/eventstore/internal/binary/hybrid.go +++ b/eventstore/internal/binary/hybrid.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "fmt" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) // Deprecated -- the encoding used here is not very elegant, we'll have a better binary format later. diff --git a/eventstore/internal/binary/limits.go b/eventstore/internal/binary/limits.go index 0e0b50b..8383c07 100644 --- a/eventstore/internal/binary/limits.go +++ b/eventstore/internal/binary/limits.go @@ -3,7 +3,7 @@ package binary import ( "math" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) const ( diff --git a/eventstore/internal/checks/interface.go b/eventstore/internal/checks/interface.go index 4402d43..4381aa3 100644 --- a/eventstore/internal/checks/interface.go +++ b/eventstore/internal/checks/interface.go @@ -1,16 +1,16 @@ package checks import ( - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/badger" - "github.com/fiatjaf/eventstore/bluge" - "github.com/fiatjaf/eventstore/edgedb" - "github.com/fiatjaf/eventstore/lmdb" - "github.com/fiatjaf/eventstore/mongo" - "github.com/fiatjaf/eventstore/mysql" - "github.com/fiatjaf/eventstore/postgresql" - "github.com/fiatjaf/eventstore/sqlite3" - "github.com/fiatjaf/eventstore/strfry" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/badger" + "fiatjaf.com/nostr/eventstore/bluge" + "fiatjaf.com/nostr/eventstore/edgedb" + "fiatjaf.com/nostr/eventstore/lmdb" + "fiatjaf.com/nostr/eventstore/mongo" + "fiatjaf.com/nostr/eventstore/mysql" + "fiatjaf.com/nostr/eventstore/postgresql" + "fiatjaf.com/nostr/eventstore/sqlite3" + "fiatjaf.com/nostr/eventstore/strfry" ) // compile-time checks to ensure all backends implement Store diff --git a/eventstore/internal/helpers.go b/eventstore/internal/helpers.go index 239c657..2830d5f 100644 --- a/eventstore/internal/helpers.go +++ b/eventstore/internal/helpers.go @@ -7,7 +7,7 @@ import ( "strings" mergesortedslices "fiatjaf.com/lib/merge-sorted-slices" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func IsOlder(previous, next *nostr.Event) bool { diff --git a/eventstore/lmdb/count.go b/eventstore/lmdb/count.go index a32fe1b..b90e40c 100644 --- a/eventstore/lmdb/count.go +++ b/eventstore/lmdb/count.go @@ -7,10 +7,10 @@ import ( "encoding/hex" "github.com/PowerDNS/lmdb-go/lmdb" - bin "github.com/fiatjaf/eventstore/internal/binary" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip45" - "github.com/nbd-wtf/go-nostr/nip45/hyperloglog" + bin "fiatjaf.com/nostr/eventstore/internal/binary" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip45" + "fiatjaf.com/nostr/nip45/hyperloglog" "golang.org/x/exp/slices" ) diff --git a/eventstore/lmdb/delete.go b/eventstore/lmdb/delete.go index 5123696..1c64a32 100644 --- a/eventstore/lmdb/delete.go +++ b/eventstore/lmdb/delete.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func (b *LMDBBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/lmdb/fuzz_test.go b/eventstore/lmdb/fuzz_test.go index 26a1738..6be5120 100644 --- a/eventstore/lmdb/fuzz_test.go +++ b/eventstore/lmdb/fuzz_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" ) diff --git a/eventstore/lmdb/helpers.go b/eventstore/lmdb/helpers.go index d7b8e42..4ef445c 100644 --- a/eventstore/lmdb/helpers.go +++ b/eventstore/lmdb/helpers.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" "golang.org/x/exp/slices" ) diff --git a/eventstore/lmdb/lib.go b/eventstore/lmdb/lib.go index 81ea926..6beda14 100644 --- a/eventstore/lmdb/lib.go +++ b/eventstore/lmdb/lib.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore" + "fiatjaf.com/nostr/eventstore" ) var _ eventstore.Store = (*LMDBBackend)(nil) diff --git a/eventstore/lmdb/migration.go b/eventstore/lmdb/migration.go index e0f7d0e..b3746cb 100644 --- a/eventstore/lmdb/migration.go +++ b/eventstore/lmdb/migration.go @@ -6,8 +6,8 @@ import ( "log" "github.com/PowerDNS/lmdb-go/lmdb" - bin "github.com/fiatjaf/eventstore/internal/binary" - "github.com/nbd-wtf/go-nostr" + bin "fiatjaf.com/nostr/eventstore/internal/binary" + "fiatjaf.com/nostr" ) const ( diff --git a/eventstore/lmdb/query.go b/eventstore/lmdb/query.go index 7d25638..c657417 100644 --- a/eventstore/lmdb/query.go +++ b/eventstore/lmdb/query.go @@ -9,10 +9,10 @@ import ( "slices" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/internal" - bin "github.com/fiatjaf/eventstore/internal/binary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/internal" + bin "fiatjaf.com/nostr/eventstore/internal/binary" + "fiatjaf.com/nostr" ) func (b *LMDBBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (chan *nostr.Event, error) { diff --git a/eventstore/lmdb/query_planner.go b/eventstore/lmdb/query_planner.go index cf7658e..29613c6 100644 --- a/eventstore/lmdb/query_planner.go +++ b/eventstore/lmdb/query_planner.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore/internal" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr" ) type query struct { diff --git a/eventstore/lmdb/replace.go b/eventstore/lmdb/replace.go index 5aa10d1..27aa834 100644 --- a/eventstore/lmdb/replace.go +++ b/eventstore/lmdb/replace.go @@ -6,8 +6,8 @@ import ( "math" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore/internal" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr" ) func (b *LMDBBackend) ReplaceEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/lmdb/save.go b/eventstore/lmdb/save.go index 752ac80..80a0382 100644 --- a/eventstore/lmdb/save.go +++ b/eventstore/lmdb/save.go @@ -7,9 +7,9 @@ import ( "math" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore" - bin "github.com/fiatjaf/eventstore/internal/binary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + bin "fiatjaf.com/nostr/eventstore/internal/binary" + "fiatjaf.com/nostr" ) func (b *LMDBBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/mmm/betterbinary/codec.go b/eventstore/mmm/betterbinary/codec.go index 325631e..cad3d3a 100644 --- a/eventstore/mmm/betterbinary/codec.go +++ b/eventstore/mmm/betterbinary/codec.go @@ -6,7 +6,7 @@ import ( "fmt" "math" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) const ( diff --git a/eventstore/mmm/betterbinary/codec_test.go b/eventstore/mmm/betterbinary/codec_test.go index 1cefdaf..5167865 100644 --- a/eventstore/mmm/betterbinary/codec_test.go +++ b/eventstore/mmm/betterbinary/codec_test.go @@ -7,7 +7,7 @@ import ( "github.com/kr/pretty" "github.com/mailru/easyjson" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func TestBaseCase(t *testing.T) { diff --git a/eventstore/mmm/betterbinary/filtering_test.go b/eventstore/mmm/betterbinary/filtering_test.go index b10116b..e4c8741 100644 --- a/eventstore/mmm/betterbinary/filtering_test.go +++ b/eventstore/mmm/betterbinary/filtering_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/mailru/easyjson" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func TestTagFiltering(t *testing.T) { diff --git a/eventstore/mmm/count.go b/eventstore/mmm/count.go index 7567a58..b4c6c55 100644 --- a/eventstore/mmm/count.go +++ b/eventstore/mmm/count.go @@ -7,8 +7,8 @@ import ( "slices" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore/mmm/betterbinary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/mmm/betterbinary" + "fiatjaf.com/nostr" ) func (il *IndexingLayer) CountEvents(ctx context.Context, filter nostr.Filter) (int64, error) { diff --git a/eventstore/mmm/delete.go b/eventstore/mmm/delete.go index 2f08c2c..167d901 100644 --- a/eventstore/mmm/delete.go +++ b/eventstore/mmm/delete.go @@ -8,7 +8,7 @@ import ( "slices" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func (il *IndexingLayer) DeleteEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/mmm/fuzz_test.go b/eventstore/mmm/fuzz_test.go index 6fa501e..982a136 100644 --- a/eventstore/mmm/fuzz_test.go +++ b/eventstore/mmm/fuzz_test.go @@ -8,7 +8,7 @@ import ( "slices" "testing" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" "github.com/rs/zerolog" "github.com/stretchr/testify/require" ) diff --git a/eventstore/mmm/helpers.go b/eventstore/mmm/helpers.go index 04545d7..af3fddf 100644 --- a/eventstore/mmm/helpers.go +++ b/eventstore/mmm/helpers.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) // this iterator always goes backwards diff --git a/eventstore/mmm/indexinglayer.go b/eventstore/mmm/indexinglayer.go index ac74e2e..800e472 100644 --- a/eventstore/mmm/indexinglayer.go +++ b/eventstore/mmm/indexinglayer.go @@ -8,8 +8,8 @@ import ( "path/filepath" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" ) var _ eventstore.Store = (*IndexingLayer)(nil) diff --git a/eventstore/mmm/mmmm.go b/eventstore/mmm/mmmm.go index b271221..e542964 100644 --- a/eventstore/mmm/mmmm.go +++ b/eventstore/mmm/mmmm.go @@ -11,8 +11,8 @@ import ( "unsafe" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore/mmm/betterbinary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/mmm/betterbinary" + "fiatjaf.com/nostr" "github.com/rs/zerolog" ) diff --git a/eventstore/mmm/mmmm_test.go b/eventstore/mmm/mmmm_test.go index 57e966d..bf116c6 100644 --- a/eventstore/mmm/mmmm_test.go +++ b/eventstore/mmm/mmmm_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" "github.com/rs/zerolog" "github.com/stretchr/testify/require" ) diff --git a/eventstore/mmm/query.go b/eventstore/mmm/query.go index c280410..c4a2afc 100644 --- a/eventstore/mmm/query.go +++ b/eventstore/mmm/query.go @@ -10,9 +10,9 @@ import ( "slices" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore/internal" - "github.com/fiatjaf/eventstore/mmm/betterbinary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr/eventstore/mmm/betterbinary" + "fiatjaf.com/nostr" ) // GetByID returns the event -- if found in this mmm -- and all the IndexingLayers it belongs to. diff --git a/eventstore/mmm/query_planner.go b/eventstore/mmm/query_planner.go index 3e30469..bd31f9c 100644 --- a/eventstore/mmm/query_planner.go +++ b/eventstore/mmm/query_planner.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore/internal" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr" ) type query struct { diff --git a/eventstore/mmm/replace.go b/eventstore/mmm/replace.go index 720d041..76beed1 100644 --- a/eventstore/mmm/replace.go +++ b/eventstore/mmm/replace.go @@ -6,8 +6,8 @@ import ( "math" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore/internal" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr" ) func (il *IndexingLayer) ReplaceEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/eventstore/mmm/save.go b/eventstore/mmm/save.go index 33b9125..db08268 100644 --- a/eventstore/mmm/save.go +++ b/eventstore/mmm/save.go @@ -12,8 +12,8 @@ import ( "unsafe" "github.com/PowerDNS/lmdb-go/lmdb" - "github.com/fiatjaf/eventstore/mmm/betterbinary" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/mmm/betterbinary" + "fiatjaf.com/nostr" ) func (b *MultiMmapManager) StoreGlobal(ctx context.Context, evt *nostr.Event) (stored bool, err error) { diff --git a/eventstore/nullstore/lib.go b/eventstore/nullstore/lib.go index 66715f1..4bb4492 100644 --- a/eventstore/nullstore/lib.go +++ b/eventstore/nullstore/lib.go @@ -3,8 +3,8 @@ package nullstore import ( "context" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" ) var _ eventstore.Store = NullStore{} diff --git a/eventstore/relay_interface.go b/eventstore/relay_interface.go index 77259e4..20274f8 100644 --- a/eventstore/relay_interface.go +++ b/eventstore/relay_interface.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) type RelayWrapper struct { diff --git a/eventstore/slicestore/lib.go b/eventstore/slicestore/lib.go index a3fcaad..f452e33 100644 --- a/eventstore/slicestore/lib.go +++ b/eventstore/slicestore/lib.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/internal" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/internal" + "fiatjaf.com/nostr" "golang.org/x/exp/slices" ) diff --git a/eventstore/slicestore/slicestore_test.go b/eventstore/slicestore/slicestore_test.go index cc5c4bb..cd7a646 100644 --- a/eventstore/slicestore/slicestore_test.go +++ b/eventstore/slicestore/slicestore_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func TestBasicStuff(t *testing.T) { diff --git a/eventstore/store.go b/eventstore/store.go index 58d16e6..6877c4b 100644 --- a/eventstore/store.go +++ b/eventstore/store.go @@ -3,7 +3,7 @@ package eventstore import ( "context" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) // Store is a persistence layer for nostr events handled by a relay. diff --git a/eventstore/strfry/lib.go b/eventstore/strfry/lib.go index fc1d081..f72f47b 100644 --- a/eventstore/strfry/lib.go +++ b/eventstore/strfry/lib.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/fiatjaf/eventstore" + "fiatjaf.com/nostr/eventstore" "github.com/mailru/easyjson" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) var _ eventstore.Store = (*StrfryBackend)(nil) diff --git a/eventstore/test/benchmark_test.go b/eventstore/test/benchmark_test.go index 8bd9370..9f89ee0 100644 --- a/eventstore/test/benchmark_test.go +++ b/eventstore/test/benchmark_test.go @@ -7,12 +7,12 @@ import ( "os" "testing" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/badger" - "github.com/fiatjaf/eventstore/lmdb" - "github.com/fiatjaf/eventstore/slicestore" - "github.com/fiatjaf/eventstore/sqlite3" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/badger" + "fiatjaf.com/nostr/eventstore/lmdb" + "fiatjaf.com/nostr/eventstore/slicestore" + "fiatjaf.com/nostr/eventstore/sqlite3" + "fiatjaf.com/nostr" ) func BenchmarkSliceStore(b *testing.B) { diff --git a/eventstore/test/db_test.go b/eventstore/test/db_test.go index efbc311..90db4c3 100644 --- a/eventstore/test/db_test.go +++ b/eventstore/test/db_test.go @@ -6,12 +6,12 @@ import ( "testing" embeddedpostgres "github.com/fergusstrange/embedded-postgres" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/badger" - "github.com/fiatjaf/eventstore/lmdb" - "github.com/fiatjaf/eventstore/postgresql" - "github.com/fiatjaf/eventstore/slicestore" - "github.com/fiatjaf/eventstore/sqlite3" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/badger" + "fiatjaf.com/nostr/eventstore/lmdb" + "fiatjaf.com/nostr/eventstore/postgresql" + "fiatjaf.com/nostr/eventstore/slicestore" + "fiatjaf.com/nostr/eventstore/sqlite3" ) const ( diff --git a/eventstore/test/first_test.go b/eventstore/test/first_test.go index e34f13f..1846d43 100644 --- a/eventstore/test/first_test.go +++ b/eventstore/test/first_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" ) diff --git a/eventstore/test/manyauthors_test.go b/eventstore/test/manyauthors_test.go index 86b93e6..413999d 100644 --- a/eventstore/test/manyauthors_test.go +++ b/eventstore/test/manyauthors_test.go @@ -7,8 +7,8 @@ import ( "slices" "testing" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" ) diff --git a/eventstore/test/relaywrapper_test.go b/eventstore/test/relaywrapper_test.go index b9ec8fa..4478e5b 100644 --- a/eventstore/test/relaywrapper_test.go +++ b/eventstore/test/relaywrapper_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/fiatjaf/eventstore" - "github.com/fiatjaf/eventstore/slicestore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr/eventstore/slicestore" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" ) diff --git a/eventstore/test/second_test.go b/eventstore/test/second_test.go index 59fcf51..3615bf2 100644 --- a/eventstore/test/second_test.go +++ b/eventstore/test/second_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" ) diff --git a/eventstore/test/test_helpers.go b/eventstore/test/test_helpers.go index bfb2c92..259d75e 100644 --- a/eventstore/test/test_helpers.go +++ b/eventstore/test/test_helpers.go @@ -1,7 +1,7 @@ package test import ( - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func getTimestamps(events []*nostr.Event) []nostr.Timestamp { diff --git a/eventstore/test/unbalanced_test.go b/eventstore/test/unbalanced_test.go index 164ef63..912c553 100644 --- a/eventstore/test/unbalanced_test.go +++ b/eventstore/test/unbalanced_test.go @@ -7,8 +7,8 @@ import ( "slices" "testing" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" ) diff --git a/eventstore/wrappers/count/count.go b/eventstore/wrappers/count/count.go index d4ffac3..e84c888 100644 --- a/eventstore/wrappers/count/count.go +++ b/eventstore/wrappers/count/count.go @@ -3,8 +3,8 @@ package count import ( "context" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" ) type Wrapper struct { diff --git a/eventstore/wrappers/disablesearch/disablesearch.go b/eventstore/wrappers/disablesearch/disablesearch.go index c93b9fc..d6bf710 100644 --- a/eventstore/wrappers/disablesearch/disablesearch.go +++ b/eventstore/wrappers/disablesearch/disablesearch.go @@ -3,8 +3,8 @@ package disablesearch import ( "context" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" ) type Wrapper struct { diff --git a/eventstore/wrappers/skipevent/skipevent.go b/eventstore/wrappers/skipevent/skipevent.go index e2c8efe..b4bc059 100644 --- a/eventstore/wrappers/skipevent/skipevent.go +++ b/eventstore/wrappers/skipevent/skipevent.go @@ -3,8 +3,8 @@ package skipevent import ( "context" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" ) type Wrapper struct { diff --git a/khatru/adding.go b/khatru/adding.go index 40ffb42..815c6e2 100644 --- a/khatru/adding.go +++ b/khatru/adding.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" ) // AddEvent sends an event through then normal add pipeline, as if it was received from a websocket. diff --git a/khatru/blossom/authorization.go b/khatru/blossom/authorization.go index 0f259da..347f19e 100644 --- a/khatru/blossom/authorization.go +++ b/khatru/blossom/authorization.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/mailru/easyjson" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func readAuthorization(r *http.Request) (*nostr.Event, error) { diff --git a/khatru/blossom/blob.go b/khatru/blossom/blob.go index d17dd7b..7753832 100644 --- a/khatru/blossom/blob.go +++ b/khatru/blossom/blob.go @@ -3,7 +3,7 @@ package blossom import ( "context" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) type BlobDescriptor struct { diff --git a/khatru/blossom/eventstorewrapper.go b/khatru/blossom/eventstorewrapper.go index d00d761..162ab06 100644 --- a/khatru/blossom/eventstorewrapper.go +++ b/khatru/blossom/eventstorewrapper.go @@ -4,8 +4,8 @@ import ( "context" "strconv" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" ) // EventStoreBlobIndexWrapper uses fake events to keep track of what blobs we have stored and who owns them diff --git a/khatru/blossom/handlers.go b/khatru/blossom/handlers.go index 5ebdc7c..eb7cfda 100644 --- a/khatru/blossom/handlers.go +++ b/khatru/blossom/handlers.go @@ -12,7 +12,7 @@ import ( "time" "github.com/liamg/magic" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func (bs BlossomServer) handleUploadCheck(w http.ResponseWriter, r *http.Request) { diff --git a/khatru/blossom/server.go b/khatru/blossom/server.go index 4e1c7b4..60a5284 100644 --- a/khatru/blossom/server.go +++ b/khatru/blossom/server.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "github.com/fiatjaf/khatru" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/khatru" + "fiatjaf.com/nostr" ) type BlossomServer struct { diff --git a/khatru/broadcasting.go b/khatru/broadcasting.go index 8fb1d0b..87d47fb 100644 --- a/khatru/broadcasting.go +++ b/khatru/broadcasting.go @@ -1,7 +1,7 @@ package khatru import ( - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) // BroadcastEvent emits an event to all listeners whose filters' match, skipping all filters and actions diff --git a/khatru/deleting.go b/khatru/deleting.go index 1e066c4..b356447 100644 --- a/khatru/deleting.go +++ b/khatru/deleting.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func (rl *Relay) handleDeleteRequest(ctx context.Context, evt *nostr.Event) error { diff --git a/khatru/ephemeral.go b/khatru/ephemeral.go index ebd0f92..e443870 100644 --- a/khatru/ephemeral.go +++ b/khatru/ephemeral.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func (rl *Relay) handleEphemeral(ctx context.Context, evt *nostr.Event) error { diff --git a/khatru/examples/basic-badger/main.go b/khatru/examples/basic-badger/main.go index 8e54596..2173c46 100644 --- a/khatru/examples/basic-badger/main.go +++ b/khatru/examples/basic-badger/main.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/fiatjaf/eventstore/badger" - "github.com/fiatjaf/khatru" + "fiatjaf.com/nostr/eventstore/badger" + "fiatjaf.com/nostr/khatru" ) func main() { diff --git a/khatru/examples/basic-elasticsearch/main.go b/khatru/examples/basic-elasticsearch/main.go index 3202b3c..f0e8b9b 100644 --- a/khatru/examples/basic-elasticsearch/main.go +++ b/khatru/examples/basic-elasticsearch/main.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/fiatjaf/eventstore/elasticsearch" - "github.com/fiatjaf/khatru" + "fiatjaf.com/nostr/eventstore/elasticsearch" + "fiatjaf.com/nostr/khatru" ) func main() { diff --git a/khatru/examples/basic-lmdb/main.go b/khatru/examples/basic-lmdb/main.go index 203d318..4f74024 100644 --- a/khatru/examples/basic-lmdb/main.go +++ b/khatru/examples/basic-lmdb/main.go @@ -5,8 +5,8 @@ import ( "net/http" "os" - "github.com/fiatjaf/eventstore/lmdb" - "github.com/fiatjaf/khatru" + "fiatjaf.com/nostr/eventstore/lmdb" + "fiatjaf.com/nostr/khatru" ) func main() { diff --git a/khatru/examples/basic-postgres/main.go b/khatru/examples/basic-postgres/main.go index 4754c18..0d43e10 100644 --- a/khatru/examples/basic-postgres/main.go +++ b/khatru/examples/basic-postgres/main.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/fiatjaf/eventstore/postgresql" - "github.com/fiatjaf/khatru" + "fiatjaf.com/nostr/eventstore/postgresql" + "fiatjaf.com/nostr/khatru" ) func main() { diff --git a/khatru/examples/basic-sqlite3/main.go b/khatru/examples/basic-sqlite3/main.go index d1670e2..db91cb5 100644 --- a/khatru/examples/basic-sqlite3/main.go +++ b/khatru/examples/basic-sqlite3/main.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/fiatjaf/eventstore/sqlite3" - "github.com/fiatjaf/khatru" + "fiatjaf.com/nostr/eventstore/sqlite3" + "fiatjaf.com/nostr/khatru" ) func main() { diff --git a/khatru/examples/blossom/main.go b/khatru/examples/blossom/main.go index c5cf4ef..b01b17f 100644 --- a/khatru/examples/blossom/main.go +++ b/khatru/examples/blossom/main.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "github.com/fiatjaf/eventstore/badger" - "github.com/fiatjaf/khatru" - "github.com/fiatjaf/khatru/blossom" + "fiatjaf.com/nostr/eventstore/badger" + "fiatjaf.com/nostr/khatru" + "fiatjaf.com/nostr/khatru/blossom" ) func main() { diff --git a/khatru/examples/exclusive/main.go b/khatru/examples/exclusive/main.go index ab82da6..8d216ad 100644 --- a/khatru/examples/exclusive/main.go +++ b/khatru/examples/exclusive/main.go @@ -6,10 +6,10 @@ import ( "net/http" "os" - "github.com/fiatjaf/eventstore/lmdb" - "github.com/fiatjaf/khatru" - "github.com/fiatjaf/khatru/policies" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/lmdb" + "fiatjaf.com/nostr/khatru" + "fiatjaf.com/nostr/khatru/policies" + "fiatjaf.com/nostr" ) func main() { diff --git a/khatru/examples/readme-demo/main.go b/khatru/examples/readme-demo/main.go index 5fdc0ee..6edbe1b 100644 --- a/khatru/examples/readme-demo/main.go +++ b/khatru/examples/readme-demo/main.go @@ -6,9 +6,9 @@ import ( "log" "net/http" - "github.com/fiatjaf/khatru" - "github.com/fiatjaf/khatru/policies" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/khatru" + "fiatjaf.com/nostr/khatru/policies" + "fiatjaf.com/nostr" ) func main() { diff --git a/khatru/examples/routing/main.go b/khatru/examples/routing/main.go index 6fcd3ae..63ac3ce 100644 --- a/khatru/examples/routing/main.go +++ b/khatru/examples/routing/main.go @@ -5,10 +5,10 @@ import ( "net/http" "slices" - "github.com/fiatjaf/eventstore/slicestore" - "github.com/fiatjaf/eventstore/sqlite3" - "github.com/fiatjaf/khatru" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/slicestore" + "fiatjaf.com/nostr/eventstore/sqlite3" + "fiatjaf.com/nostr/khatru" + "fiatjaf.com/nostr" ) func main() { diff --git a/khatru/expiration.go b/khatru/expiration.go index e7850ce..fbdf6d8 100644 --- a/khatru/expiration.go +++ b/khatru/expiration.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip40" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip40" ) type expiringEvent struct { diff --git a/khatru/handlers.go b/khatru/handlers.go index dcf4523..3883a35 100644 --- a/khatru/handlers.go +++ b/khatru/handlers.go @@ -14,13 +14,13 @@ import ( "github.com/bep/debounce" "github.com/fasthttp/websocket" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip42" - "github.com/nbd-wtf/go-nostr/nip45" - "github.com/nbd-wtf/go-nostr/nip45/hyperloglog" - "github.com/nbd-wtf/go-nostr/nip70" - "github.com/nbd-wtf/go-nostr/nip77" - "github.com/nbd-wtf/go-nostr/nip77/negentropy" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip42" + "fiatjaf.com/nostr/nip45" + "fiatjaf.com/nostr/nip45/hyperloglog" + "fiatjaf.com/nostr/nip70" + "fiatjaf.com/nostr/nip77" + "fiatjaf.com/nostr/nip77/negentropy" "github.com/puzpuzpuz/xsync/v3" "github.com/rs/cors" ) diff --git a/khatru/helpers.go b/khatru/helpers.go index e42583a..e332223 100644 --- a/khatru/helpers.go +++ b/khatru/helpers.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func isOlder(previous, next *nostr.Event) bool { diff --git a/khatru/listener.go b/khatru/listener.go index 8a55793..9ca35f9 100644 --- a/khatru/listener.go +++ b/khatru/listener.go @@ -5,7 +5,7 @@ import ( "errors" "slices" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) var ErrSubscriptionClosedByClient = errors.New("subscription closed by client") diff --git a/khatru/listener_fuzz_test.go b/khatru/listener_fuzz_test.go index bbb87aa..82dadb9 100644 --- a/khatru/listener_fuzz_test.go +++ b/khatru/listener_fuzz_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" ) diff --git a/khatru/listener_test.go b/khatru/listener_test.go index 3afbd2a..45ef8b4 100644 --- a/khatru/listener_test.go +++ b/khatru/listener_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" "github.com/stretchr/testify/require" ) diff --git a/khatru/negentropy.go b/khatru/negentropy.go index 5b3e19c..fdc11c2 100644 --- a/khatru/negentropy.go +++ b/khatru/negentropy.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/fiatjaf/eventstore" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip77/negentropy" - "github.com/nbd-wtf/go-nostr/nip77/negentropy/storage/vector" + "fiatjaf.com/nostr/eventstore" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip77/negentropy" + "fiatjaf.com/nostr/nip77/negentropy/storage/vector" ) type NegentropySession struct { diff --git a/khatru/nip86.go b/khatru/nip86.go index e287054..1703920 100644 --- a/khatru/nip86.go +++ b/khatru/nip86.go @@ -13,8 +13,8 @@ import ( "reflect" "strings" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip86" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip86" ) type RelayManagementAPI struct { diff --git a/khatru/policies/events.go b/khatru/policies/events.go index 5ca069c..29f283a 100644 --- a/khatru/policies/events.go +++ b/khatru/policies/events.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip70" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip70" ) // PreventTooManyIndexableTags returns a function that can be used as a RejectFilter that will reject diff --git a/khatru/policies/filters.go b/khatru/policies/filters.go index a3bc213..26531d8 100644 --- a/khatru/policies/filters.go +++ b/khatru/policies/filters.go @@ -4,8 +4,8 @@ import ( "context" "slices" - "github.com/fiatjaf/khatru" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/khatru" + "fiatjaf.com/nostr" ) // NoComplexFilters disallows filters with more than 2 tags. diff --git a/khatru/policies/kind_validation.go b/khatru/policies/kind_validation.go index e3506ce..5699751 100644 --- a/khatru/policies/kind_validation.go +++ b/khatru/policies/kind_validation.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) func ValidateKind(ctx context.Context, evt *nostr.Event) (bool, string) { diff --git a/khatru/policies/nip04.go b/khatru/policies/nip04.go index d97f767..c06b6ce 100644 --- a/khatru/policies/nip04.go +++ b/khatru/policies/nip04.go @@ -4,8 +4,8 @@ import ( "context" "slices" - "github.com/fiatjaf/khatru" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/khatru" + "fiatjaf.com/nostr" ) // RejectKind04Snoopers prevents reading NIP-04 messages from people not involved in the conversation. diff --git a/khatru/policies/ratelimits.go b/khatru/policies/ratelimits.go index 9f9c497..2bdb209 100644 --- a/khatru/policies/ratelimits.go +++ b/khatru/policies/ratelimits.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - "github.com/fiatjaf/khatru" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/khatru" + "fiatjaf.com/nostr" ) func EventIPRateLimiter(tokensPerInterval int, interval time.Duration, maxTokens int) func(ctx context.Context, _ *nostr.Event) (reject bool, msg string) { diff --git a/khatru/policies/sane_defaults.go b/khatru/policies/sane_defaults.go index d76e9d9..546a938 100644 --- a/khatru/policies/sane_defaults.go +++ b/khatru/policies/sane_defaults.go @@ -3,7 +3,7 @@ package policies import ( "time" - "github.com/fiatjaf/khatru" + "fiatjaf.com/nostr/khatru" ) func ApplySaneDefaults(relay *khatru.Relay) { diff --git a/khatru/relay.go b/khatru/relay.go index a94fcdc..fd76d4a 100644 --- a/khatru/relay.go +++ b/khatru/relay.go @@ -11,9 +11,9 @@ import ( "time" "github.com/fasthttp/websocket" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip11" - "github.com/nbd-wtf/go-nostr/nip45/hyperloglog" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip11" + "fiatjaf.com/nostr/nip45/hyperloglog" ) func NewRelay() *Relay { @@ -23,7 +23,7 @@ func NewRelay() *Relay { Log: log.New(os.Stderr, "[khatru-relay] ", log.LstdFlags), Info: &nip11.RelayInformationDocument{ - Software: "https://github.com/fiatjaf/khatru", + Software: "https://fiatjaf.com/nostr/khatru", Version: "n/a", SupportedNIPs: []any{1, 11, 40, 42, 70, 86}, }, diff --git a/khatru/relay_test.go b/khatru/relay_test.go index 09e7cbb..c8533ee 100644 --- a/khatru/relay_test.go +++ b/khatru/relay_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/fiatjaf/eventstore/slicestore" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr/eventstore/slicestore" + "fiatjaf.com/nostr" ) func TestBasicRelayFunctionality(t *testing.T) { diff --git a/khatru/responding.go b/khatru/responding.go index 0cae183..4f30d51 100644 --- a/khatru/responding.go +++ b/khatru/responding.go @@ -5,8 +5,8 @@ import ( "errors" "sync" - "github.com/nbd-wtf/go-nostr" - "github.com/nbd-wtf/go-nostr/nip45/hyperloglog" + "fiatjaf.com/nostr" + "fiatjaf.com/nostr/nip45/hyperloglog" ) func (rl *Relay) handleRequest(ctx context.Context, id string, eose *sync.WaitGroup, ws *WebSocket, filter nostr.Filter) error { diff --git a/khatru/router.go b/khatru/router.go index bab833b..982348d 100644 --- a/khatru/router.go +++ b/khatru/router.go @@ -1,7 +1,7 @@ package khatru import ( - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) type Router struct{ *Relay } diff --git a/khatru/utils.go b/khatru/utils.go index 131f360..b88f57e 100644 --- a/khatru/utils.go +++ b/khatru/utils.go @@ -3,7 +3,7 @@ package khatru import ( "context" - "github.com/nbd-wtf/go-nostr" + "fiatjaf.com/nostr" ) const (