From 22f48c5ad3ec77e9afa3b3865c581adbe315d39a Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Thu, 16 Nov 2023 20:54:58 -0500 Subject: [PATCH] Change mod path --- README.md | 2 +- client/client.go | 4 ++-- client/client_test.go | 6 +++--- client/config_test.go | 2 +- client/options.go | 2 +- cmd/access.go | 4 ++-- cmd/access_test.go | 4 ++-- cmd/app.go | 2 +- cmd/app_test.go | 4 ++-- cmd/config_loader.go | 2 +- cmd/publish.go | 6 +++--- cmd/publish_test.go | 4 ++-- cmd/serve.go | 8 ++++---- cmd/serve_test.go | 6 +++--- cmd/subscribe.go | 6 +++--- cmd/tier.go | 4 ++-- cmd/tier_test.go | 4 ++-- cmd/token.go | 4 ++-- cmd/token_test.go | 4 ++-- cmd/user.go | 4 ++-- cmd/user_test.go | 6 +++--- cmd/webpush_test.go | 2 +- go.mod | 2 +- go.sum | 33 +++++++-------------------------- log/event.go | 2 +- main.go | 2 +- server/actions.go | 2 +- server/config.go | 2 +- server/config_test.go | 2 +- server/errors.go | 2 +- server/file_cache.go | 4 ++-- server/file_cache_test.go | 2 +- server/log.go | 4 ++-- server/message_cache.go | 4 ++-- server/server.go | 6 +++--- server/server_account.go | 6 +++--- server/server_account_test.go | 6 +++--- server/server_admin.go | 2 +- server/server_admin_test.go | 4 ++-- server/server_firebase.go | 4 ++-- server/server_firebase_test.go | 2 +- server/server_manager.go | 4 ++-- server/server_matrix.go | 2 +- server/server_middleware.go | 2 +- server/server_payments.go | 6 +++--- server/server_payments_test.go | 4 ++-- server/server_test.go | 6 +++--- server/server_twilio.go | 6 +++--- server/server_twilio_test.go | 4 ++-- server/server_webpush.go | 4 ++-- server/server_webpush_test.go | 4 ++-- server/smtp_sender.go | 4 ++-- server/topic.go | 4 ++-- server/types.go | 6 +++--- server/util.go | 2 +- server/visitor.go | 6 +++--- server/webpush_store.go | 2 +- test/server.go | 2 +- user/manager.go | 4 ++-- user/manager_test.go | 2 +- user/types.go | 2 +- util/batching_queue_test.go | 2 +- 62 files changed, 120 insertions(+), 139 deletions(-) diff --git a/README.md b/README.md index 90d9285f..d4c30ca0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # ntfy.sh | Send push notifications to your phone or desktop via PUT/POST [![Release](https://img.shields.io/github/release/binwiederhier/ntfy.svg?color=success&style=flat-square)](https://github.com/binwiederhier/ntfy/releases/latest) -[![Go Reference](https://pkg.go.dev/badge/heckel.io/ntfy.svg)](https://pkg.go.dev/heckel.io/ntfy) +[![Go Reference](https://pkg.go.dev/badge/heckel.io/ntfy.svg)](https://pkg.go.dev/heckel.io/ntfy/v2) [![Tests](https://github.com/binwiederhier/ntfy/workflows/test/badge.svg)](https://github.com/binwiederhier/ntfy/actions) [![Go Report Card](https://goreportcard.com/badge/github.com/binwiederhier/ntfy)](https://goreportcard.com/report/github.com/binwiederhier/ntfy) [![codecov](https://codecov.io/gh/binwiederhier/ntfy/branch/main/graph/badge.svg?token=A597KQ463G)](https://codecov.io/gh/binwiederhier/ntfy) diff --git a/client/client.go b/client/client.go index 93cf7da5..c2260966 100644 --- a/client/client.go +++ b/client/client.go @@ -7,8 +7,8 @@ import ( "encoding/json" "errors" "fmt" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" "io" "net/http" "regexp" diff --git a/client/client_test.go b/client/client_test.go index f0b15a3f..a6784ff8 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -3,9 +3,9 @@ package client_test import ( "fmt" "github.com/stretchr/testify/require" - "heckel.io/ntfy/client" - "heckel.io/ntfy/log" - "heckel.io/ntfy/test" + "heckel.io/ntfy/v2/client" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/test" "os" "testing" "time" diff --git a/client/config_test.go b/client/config_test.go index c85d3d49..5d9eeecc 100644 --- a/client/config_test.go +++ b/client/config_test.go @@ -2,7 +2,7 @@ package client_test import ( "github.com/stretchr/testify/require" - "heckel.io/ntfy/client" + "heckel.io/ntfy/v2/client" "os" "path/filepath" "testing" diff --git a/client/options.go b/client/options.go index 630f1554..027b7fb5 100644 --- a/client/options.go +++ b/client/options.go @@ -2,7 +2,7 @@ package client import ( "fmt" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "net/http" "strings" "time" diff --git a/cmd/access.go b/cmd/access.go index 87f01d11..c6be94b5 100644 --- a/cmd/access.go +++ b/cmd/access.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" "github.com/urfave/cli/v2" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" ) func init() { diff --git a/cmd/access_test.go b/cmd/access_test.go index 359beb92..81c9f2b9 100644 --- a/cmd/access_test.go +++ b/cmd/access_test.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "heckel.io/ntfy/server" - "heckel.io/ntfy/test" + "heckel.io/ntfy/v2/server" + "heckel.io/ntfy/v2/test" "testing" ) diff --git a/cmd/app.go b/cmd/app.go index edef5b47..d88a9d58 100644 --- a/cmd/app.go +++ b/cmd/app.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "heckel.io/ntfy/log" + "heckel.io/ntfy/v2/log" "os" "regexp" ) diff --git a/cmd/app_test.go b/cmd/app_test.go index ec27a67d..f7d752f0 100644 --- a/cmd/app_test.go +++ b/cmd/app_test.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/json" "github.com/urfave/cli/v2" - "heckel.io/ntfy/client" - "heckel.io/ntfy/log" + "heckel.io/ntfy/v2/client" + "heckel.io/ntfy/v2/log" "os" "strings" "testing" diff --git a/cmd/config_loader.go b/cmd/config_loader.go index 9f0a5769..e6180bed 100644 --- a/cmd/config_loader.go +++ b/cmd/config_loader.go @@ -5,7 +5,7 @@ import ( "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" "gopkg.in/yaml.v2" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "os" ) diff --git a/cmd/publish.go b/cmd/publish.go index 5ffe3adf..aaec35e9 100644 --- a/cmd/publish.go +++ b/cmd/publish.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" "github.com/urfave/cli/v2" - "heckel.io/ntfy/client" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/client" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" "io" "os" "os/exec" diff --git a/cmd/publish_test.go b/cmd/publish_test.go index a254f47d..31d01cb5 100644 --- a/cmd/publish_test.go +++ b/cmd/publish_test.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" "github.com/stretchr/testify/require" - "heckel.io/ntfy/test" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/test" + "heckel.io/ntfy/v2/util" "net/http" "net/http/httptest" "os" diff --git a/cmd/serve.go b/cmd/serve.go index 87b83dda..9fcf550c 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" "github.com/stripe/stripe-go/v74" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/user" "io/fs" "math" "net" @@ -17,12 +17,12 @@ import ( "syscall" "time" - "heckel.io/ntfy/log" + "heckel.io/ntfy/v2/log" "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "heckel.io/ntfy/server" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/server" + "heckel.io/ntfy/v2/util" ) func init() { diff --git a/cmd/serve_test.go b/cmd/serve_test.go index 774166c3..9e16540b 100644 --- a/cmd/serve_test.go +++ b/cmd/serve_test.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "heckel.io/ntfy/client" - "heckel.io/ntfy/test" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/client" + "heckel.io/ntfy/v2/test" + "heckel.io/ntfy/v2/util" ) func init() { diff --git a/cmd/subscribe.go b/cmd/subscribe.go index 77a1b5f1..1a0a7a6f 100644 --- a/cmd/subscribe.go +++ b/cmd/subscribe.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" "github.com/urfave/cli/v2" - "heckel.io/ntfy/client" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/client" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" "os" "os/exec" "os/user" diff --git a/cmd/tier.go b/cmd/tier.go index f1c8ddcb..63b023f9 100644 --- a/cmd/tier.go +++ b/cmd/tier.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" "github.com/urfave/cli/v2" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" ) func init() { diff --git a/cmd/tier_test.go b/cmd/tier_test.go index 1774aa27..145f273e 100644 --- a/cmd/tier_test.go +++ b/cmd/tier_test.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "heckel.io/ntfy/server" - "heckel.io/ntfy/test" + "heckel.io/ntfy/v2/server" + "heckel.io/ntfy/v2/test" "testing" ) diff --git a/cmd/token.go b/cmd/token.go index ab9f4447..cb92a130 100644 --- a/cmd/token.go +++ b/cmd/token.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" "github.com/urfave/cli/v2" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "net/netip" "time" ) diff --git a/cmd/token_test.go b/cmd/token_test.go index 40d7be7b..03295081 100644 --- a/cmd/token_test.go +++ b/cmd/token_test.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "heckel.io/ntfy/server" - "heckel.io/ntfy/test" + "heckel.io/ntfy/v2/server" + "heckel.io/ntfy/v2/test" "regexp" "testing" ) diff --git a/cmd/user.go b/cmd/user.go index a96c7089..9ab487dd 100644 --- a/cmd/user.go +++ b/cmd/user.go @@ -6,13 +6,13 @@ import ( "crypto/subtle" "errors" "fmt" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/user" "os" "strings" "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" ) const ( diff --git a/cmd/user_test.go b/cmd/user_test.go index 1149285f..e1bdd3ab 100644 --- a/cmd/user_test.go +++ b/cmd/user_test.go @@ -3,9 +3,9 @@ package cmd import ( "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "heckel.io/ntfy/server" - "heckel.io/ntfy/test" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/server" + "heckel.io/ntfy/v2/test" + "heckel.io/ntfy/v2/user" "os" "path/filepath" "testing" diff --git a/cmd/webpush_test.go b/cmd/webpush_test.go index 1b364701..51926ca1 100644 --- a/cmd/webpush_test.go +++ b/cmd/webpush_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "heckel.io/ntfy/server" + "heckel.io/ntfy/v2/server" ) func TestCLI_WebPush_GenerateKeys(t *testing.T) { diff --git a/go.mod b/go.mod index 567dc662..c4f4fdc9 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( golang.org/x/sync v0.5.0 golang.org/x/term v0.14.0 golang.org/x/time v0.4.0 - google.golang.org/api v0.150.0 + google.golang.org/api v0.151.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index c672f742..2031b653 100644 --- a/go.sum +++ b/go.sum @@ -11,8 +11,6 @@ cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg= cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI= -cloud.google.com/go/storage v1.34.1 h1:H2Af2dU5J0PF7A5B+ECFIce+RqxVnrVilO+cu0TS3MI= -cloud.google.com/go/storage v1.34.1/go.mod h1:VN1ElqqvR9adg1k9xlkUJ55cMOP1/QjnNNuT5xQL6dY= cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w= cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= firebase.google.com/go/v4 v4.12.1 h1:tDNvobifGsx/1HSFLnM0fmNfx/CDZSgsTO2KhZtgpcs= @@ -42,8 +40,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ= -github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y= -github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ= github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 h1:hH4PQfOndHDlpzYfLAAfl63E8Le6F2+EL/cdhlkyRJY= github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ= github.com/emersion/go-smtp v0.17.0 h1:tq90evlrcyqRfE6DSXaWVH54oX6OuZOQECEmhWBMEtI= @@ -85,7 +81,9 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -95,18 +93,16 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= -github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= -github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= @@ -127,6 +123,7 @@ github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGy github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -136,7 +133,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= @@ -153,8 +149,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -175,13 +169,9 @@ golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0= golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -208,8 +198,6 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -235,10 +223,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= -google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= -google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= -google.golang.org/api v0.150.0 h1:Z9k22qD289SZ8gCJrk4DrWXkNjtfvKAUo/l1ma8eBYE= -google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= +google.golang.org/api v0.151.0 h1:FhfXLO/NFdJIzQtCqjpysWwqKk8AzGWBUhMIx67cVDU= +google.golang.org/api v0.151.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= @@ -248,16 +234,10 @@ google.golang.org/appengine/v2 v2.0.5/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= -google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY= -google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 h1:HJMDndgxest5n2y77fnErkM62iUsptE/H8p0dC2Huo4= -google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -283,6 +263,7 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/log/event.go b/log/event.go index b4b8f59f..f16eb180 100644 --- a/log/event.go +++ b/log/event.go @@ -3,7 +3,7 @@ package log import ( "encoding/json" "fmt" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "log" "os" "sort" diff --git a/main.go b/main.go index 5b1428d1..d4600dc8 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" "github.com/urfave/cli/v2" - "heckel.io/ntfy/cmd" + "heckel.io/ntfy/v2/cmd" "os" "runtime" ) diff --git a/server/actions.go b/server/actions.go index 80065873..98b90558 100644 --- a/server/actions.go +++ b/server/actions.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" "fmt" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "regexp" "strings" "unicode/utf8" diff --git a/server/config.go b/server/config.go index 9815aa88..a0cfdcd5 100644 --- a/server/config.go +++ b/server/config.go @@ -5,7 +5,7 @@ import ( "net/netip" "time" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/user" ) // Defines default config settings (excluding limits, see below) diff --git a/server/config_test.go b/server/config_test.go index 14f028f1..0dae5725 100644 --- a/server/config_test.go +++ b/server/config_test.go @@ -2,7 +2,7 @@ package server_test import ( "github.com/stretchr/testify/assert" - "heckel.io/ntfy/server" + "heckel.io/ntfy/v2/server" "testing" ) diff --git a/server/errors.go b/server/errors.go index 27ba3df0..072bdc01 100644 --- a/server/errors.go +++ b/server/errors.go @@ -3,7 +3,7 @@ package server import ( "encoding/json" "fmt" - "heckel.io/ntfy/log" + "heckel.io/ntfy/v2/log" "net/http" ) diff --git a/server/file_cache.go b/server/file_cache.go index c097aefb..758d38ee 100644 --- a/server/file_cache.go +++ b/server/file_cache.go @@ -3,8 +3,8 @@ package server import ( "errors" "fmt" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" "io" "os" "path/filepath" diff --git a/server/file_cache_test.go b/server/file_cache_test.go index 8f267a73..e7dee3b3 100644 --- a/server/file_cache_test.go +++ b/server/file_cache_test.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" "github.com/stretchr/testify/require" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "os" "strings" "testing" diff --git a/server/log.go b/server/log.go index 978d0593..3d11ac47 100644 --- a/server/log.go +++ b/server/log.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/emersion/go-smtp" "github.com/gorilla/websocket" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" "net/http" "strings" "unicode/utf8" diff --git a/server/message_cache.go b/server/message_cache.go index 8a613ff1..f0744abb 100644 --- a/server/message_cache.go +++ b/server/message_cache.go @@ -10,8 +10,8 @@ import ( "time" _ "github.com/mattn/go-sqlite3" // SQLite driver - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" ) var ( diff --git a/server/server.go b/server/server.go index 0ab36524..c0f3b641 100644 --- a/server/server.go +++ b/server/server.go @@ -30,9 +30,9 @@ import ( "github.com/gorilla/websocket" "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/sync/errgroup" - "heckel.io/ntfy/log" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" ) // Server is the main server, providing the UI and API for ntfy diff --git a/server/server_account.go b/server/server_account.go index f26cc2ff..cb841d07 100644 --- a/server/server_account.go +++ b/server/server_account.go @@ -2,9 +2,9 @@ package server import ( "encoding/json" - "heckel.io/ntfy/log" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "net/http" "net/netip" "strings" diff --git a/server/server_account_test.go b/server/server_account_test.go index 119efb16..4c269c2f 100644 --- a/server/server_account_test.go +++ b/server/server_account_test.go @@ -3,9 +3,9 @@ package server import ( "fmt" "github.com/stretchr/testify/require" - "heckel.io/ntfy/log" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "io" "net/netip" "path/filepath" diff --git a/server/server_admin.go b/server/server_admin.go index 9380a5ff..fc9dfed1 100644 --- a/server/server_admin.go +++ b/server/server_admin.go @@ -1,7 +1,7 @@ package server import ( - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/user" "net/http" ) diff --git a/server/server_admin_test.go b/server/server_admin_test.go index 1513ea40..c2f8f95a 100644 --- a/server/server_admin_test.go +++ b/server/server_admin_test.go @@ -2,8 +2,8 @@ package server import ( "github.com/stretchr/testify/require" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "sync/atomic" "testing" "time" diff --git a/server/server_firebase.go b/server/server_firebase.go index b8158d2f..4a0cb7f9 100644 --- a/server/server_firebase.go +++ b/server/server_firebase.go @@ -8,8 +8,8 @@ import ( "firebase.google.com/go/v4/messaging" "fmt" "google.golang.org/api/option" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "strings" ) diff --git a/server/server_firebase_test.go b/server/server_firebase_test.go index fb27ea05..9b653a29 100644 --- a/server/server_firebase_test.go +++ b/server/server_firebase_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" "fmt" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/user" "net/netip" "strings" "sync" diff --git a/server/server_manager.go b/server/server_manager.go index 66d449de..9f5fe888 100644 --- a/server/server_manager.go +++ b/server/server_manager.go @@ -1,8 +1,8 @@ package server import ( - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" "strings" ) diff --git a/server/server_matrix.go b/server/server_matrix.go index c25a1b59..f99bea8f 100644 --- a/server/server_matrix.go +++ b/server/server_matrix.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" "fmt" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "io" "net/http" "strings" diff --git a/server/server_middleware.go b/server/server_middleware.go index b1428154..b2ce6f70 100644 --- a/server/server_middleware.go +++ b/server/server_middleware.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" ) type contextKey int diff --git a/server/server_payments.go b/server/server_payments.go index 1e98d059..334301bb 100644 --- a/server/server_payments.go +++ b/server/server_payments.go @@ -11,9 +11,9 @@ import ( "github.com/stripe/stripe-go/v74/price" "github.com/stripe/stripe-go/v74/subscription" "github.com/stripe/stripe-go/v74/webhook" - "heckel.io/ntfy/log" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "io" "net/http" "net/netip" diff --git a/server/server_payments_test.go b/server/server_payments_test.go index ebd559e7..8da47a65 100644 --- a/server/server_payments_test.go +++ b/server/server_payments_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" "github.com/stripe/stripe-go/v74" "golang.org/x/time/rate" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "io" "net/netip" "path/filepath" diff --git a/server/server_test.go b/server/server_test.go index d60c775a..d387c359 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "fmt" "golang.org/x/crypto/bcrypt" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/user" "io" "math/rand" "net/http" @@ -24,8 +24,8 @@ import ( "github.com/SherClockHolmes/webpush-go" "github.com/stretchr/testify/require" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" ) func TestMain(m *testing.M) { diff --git a/server/server_twilio.go b/server/server_twilio.go index 093abe63..9a8ef8ad 100644 --- a/server/server_twilio.go +++ b/server/server_twilio.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/xml" "fmt" - "heckel.io/ntfy/log" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "io" "net/http" "net/url" diff --git a/server/server_twilio_test.go b/server/server_twilio_test.go index af694a77..89a36051 100644 --- a/server/server_twilio_test.go +++ b/server/server_twilio_test.go @@ -2,8 +2,8 @@ package server import ( "github.com/stretchr/testify/require" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "io" "net/http" "net/http/httptest" diff --git a/server/server_webpush.go b/server/server_webpush.go index bb0f5408..cd41759d 100644 --- a/server/server_webpush.go +++ b/server/server_webpush.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/SherClockHolmes/webpush-go" - "heckel.io/ntfy/log" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/user" ) const ( diff --git a/server/server_webpush_test.go b/server/server_webpush_test.go index c0db79c6..c32c7bf8 100644 --- a/server/server_webpush_test.go +++ b/server/server_webpush_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" "github.com/stretchr/testify/require" - "heckel.io/ntfy/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/user" + "heckel.io/ntfy/v2/util" "io" "net/http" "net/http/httptest" diff --git a/server/smtp_sender.go b/server/smtp_sender.go index 9093687e..21eaf682 100644 --- a/server/smtp_sender.go +++ b/server/smtp_sender.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" ) type mailer interface { diff --git a/server/topic.go b/server/topic.go index 5dfafbe3..49def94b 100644 --- a/server/topic.go +++ b/server/topic.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" ) const ( diff --git a/server/types.go b/server/types.go index eeb566fc..fb08fb05 100644 --- a/server/types.go +++ b/server/types.go @@ -5,10 +5,10 @@ import ( "net/netip" "time" - "heckel.io/ntfy/log" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/user" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" ) // List of possible events diff --git a/server/util.go b/server/util.go index 09536765..fe5b3ea3 100644 --- a/server/util.go +++ b/server/util.go @@ -3,7 +3,7 @@ package server import ( "context" "fmt" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "io" "mime" "net/http" diff --git a/server/visitor.go b/server/visitor.go index e4c06f66..f8dc416a 100644 --- a/server/visitor.go +++ b/server/visitor.go @@ -2,14 +2,14 @@ package server import ( "fmt" - "heckel.io/ntfy/log" - "heckel.io/ntfy/user" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/user" "net/netip" "sync" "time" "golang.org/x/time/rate" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" ) const ( diff --git a/server/webpush_store.go b/server/webpush_store.go index b2ab0d11..62a35f7d 100644 --- a/server/webpush_store.go +++ b/server/webpush_store.go @@ -3,7 +3,7 @@ package server import ( "database/sql" "errors" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "net/netip" "time" diff --git a/test/server.go b/test/server.go index 0b9200a6..18529359 100644 --- a/test/server.go +++ b/test/server.go @@ -2,7 +2,7 @@ package test import ( "fmt" - "heckel.io/ntfy/server" + "heckel.io/ntfy/v2/server" "math/rand" "net/http" "path/filepath" diff --git a/user/manager.go b/user/manager.go index 324b7684..33e0ac4b 100644 --- a/user/manager.go +++ b/user/manager.go @@ -9,8 +9,8 @@ import ( "github.com/mattn/go-sqlite3" "github.com/stripe/stripe-go/v74" "golang.org/x/crypto/bcrypt" - "heckel.io/ntfy/log" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/log" + "heckel.io/ntfy/v2/util" "net/netip" "strings" "sync" diff --git a/user/manager_test.go b/user/manager_test.go index 468dc36a..cf797fca 100644 --- a/user/manager_test.go +++ b/user/manager_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stripe/stripe-go/v74" "golang.org/x/crypto/bcrypt" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "net/netip" "path/filepath" "strings" diff --git a/user/types.go b/user/types.go index 11895785..68ee02f3 100644 --- a/user/types.go +++ b/user/types.go @@ -3,7 +3,7 @@ package user import ( "errors" "github.com/stripe/stripe-go/v74" - "heckel.io/ntfy/log" + "heckel.io/ntfy/v2/log" "net/netip" "regexp" "strings" diff --git a/util/batching_queue_test.go b/util/batching_queue_test.go index b3c41a4c..728095ca 100644 --- a/util/batching_queue_test.go +++ b/util/batching_queue_test.go @@ -2,7 +2,7 @@ package util_test import ( "github.com/stretchr/testify/require" - "heckel.io/ntfy/util" + "heckel.io/ntfy/v2/util" "math/rand" "sync" "testing"