Append /v2 to module

.goreleaser.yml

@@ -71,7 +71,7 @@ builds:
 nfpms:
   -
     package_name: ntfy
-    homepage: https://heckel.io/ntfy
+    homepage: https://git.zio.sh/astra/ntfy/v2
     maintainer: Philipp C. Heckel <philipp.heckel@gmail.com>
     description: Simple pub-sub notification service
     license: Apache 2.0

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/git.zio.sh/astra/ntfy/v2.svg)](https://pkg.go.dev/git.zio.sh/astra/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)

client/client.go

@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"io"
 	"net/http"
 	"regexp"

client/client_test.go

@@ -2,10 +2,10 @@ package client_test
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/client"
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/test"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/client"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/test"
 	"os"
 	"testing"
 	"time"

client/config_test.go

@@ -1,8 +1,8 @@
 package client_test
 
 import (
+	"git.zio.sh/astra/ntfy/v2/client"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/client"
 	"os"
 	"path/filepath"
 	"testing"

client/options.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	"fmt"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"net/http"
 	"strings"
 	"time"

cmd/access.go

@@ -5,9 +5,9 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 )
 
 func init() {

cmd/access_test.go

@@ -2,10 +2,10 @@ package cmd
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/server"
+	"git.zio.sh/astra/ntfy/v2/test"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/server"
-	"heckel.io/ntfy/test"
 	"testing"
 )
 

cmd/app.go

@@ -3,9 +3,9 @@ package cmd
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/log"
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
-	"heckel.io/ntfy/log"
 	"os"
 	"regexp"
 )

cmd/app_test.go

@@ -3,9 +3,9 @@ package cmd
 import (
 	"bytes"
 	"encoding/json"
+	"git.zio.sh/astra/ntfy/v2/client"
+	"git.zio.sh/astra/ntfy/v2/log"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/client"
-	"heckel.io/ntfy/log"
 	"os"
 	"strings"
 	"testing"

cmd/config_loader.go

@@ -2,10 +2,10 @@ package cmd
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
 	"gopkg.in/yaml.v2"
-	"heckel.io/ntfy/util"
 	"os"
 )
 

cmd/publish.go

@@ -3,10 +3,10 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/client"
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/client"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/util"
 	"io"
 	"os"
 	"os/exec"

cmd/publish_test.go

@@ -2,9 +2,9 @@ package cmd
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/test"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/test"
-	"heckel.io/ntfy/util"
 	"net/http"
 	"net/http/httptest"
 	"os"

cmd/serve.go

@@ -5,8 +5,8 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/user"
 	"github.com/stripe/stripe-go/v74"
-	"heckel.io/ntfy/user"
 	"io/fs"
 	"math"
 	"net"
@@ -17,12 +17,12 @@ import (
 	"syscall"
 	"time"
 
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
 
+	"git.zio.sh/astra/ntfy/v2/server"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
-	"heckel.io/ntfy/server"
-	"heckel.io/ntfy/util"
 )
 
 func init() {

cmd/serve_test.go

@@ -9,12 +9,12 @@ import (
 	"testing"
 	"time"
 
+	"git.zio.sh/astra/ntfy/v2/client"
+	"git.zio.sh/astra/ntfy/v2/test"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"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"
 )
 
 func init() {

cmd/subscribe.go

@@ -3,10 +3,10 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/client"
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/client"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/util"
 	"os"
 	"os/exec"
 	"os/user"

cmd/tier.go

@@ -5,9 +5,9 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 )
 
 func init() {

cmd/tier_test.go

@@ -1,10 +1,10 @@
 package cmd
 
 import (
+	"git.zio.sh/astra/ntfy/v2/server"
+	"git.zio.sh/astra/ntfy/v2/test"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/server"
-	"heckel.io/ntfy/test"
 	"testing"
 )
 

cmd/token.go

@@ -5,9 +5,9 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 	"net/netip"
 	"time"
 )

cmd/token_test.go

@@ -2,10 +2,10 @@ package cmd
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/server"
+	"git.zio.sh/astra/ntfy/v2/test"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/server"
-	"heckel.io/ntfy/test"
 	"regexp"
 	"testing"
 )

cmd/user.go

@@ -6,13 +6,13 @@ import (
 	"crypto/subtle"
 	"errors"
 	"fmt"
-	"heckel.io/ntfy/user"
+	"git.zio.sh/astra/ntfy/v2/user"
 	"os"
 	"strings"
 
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
-	"heckel.io/ntfy/util"
 )
 
 const (

cmd/user_test.go

@@ -1,11 +1,11 @@
 package cmd
 
 import (
+	"git.zio.sh/astra/ntfy/v2/server"
+	"git.zio.sh/astra/ntfy/v2/test"
+	"git.zio.sh/astra/ntfy/v2/user"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/server"
-	"heckel.io/ntfy/test"
-	"heckel.io/ntfy/user"
 	"os"
 	"path/filepath"
 	"testing"

cmd/webpush_test.go

@@ -3,9 +3,9 @@ package cmd
 import (
 	"testing"
 
+	"git.zio.sh/astra/ntfy/v2/server"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/server"
 )
 
 func TestCLI_WebPush_GenerateKeys(t *testing.T) {

go.mod

@@ -1,4 +1,4 @@
-module heckel.io/ntfy
+module git.zio.sh/astra/ntfy/v2
 
 go 1.18
 

log/event.go

@@ -3,7 +3,7 @@ package log
 import (
 	"encoding/json"
 	"fmt"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"log"
 	"os"
 	"sort"

main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/cmd"
 	"github.com/urfave/cli/v2"
-	"heckel.io/ntfy/cmd"
 	"os"
 	"runtime"
 )

server/actions.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"regexp"
 	"strings"
 	"unicode/utf8"

server/config.go

@@ -5,7 +5,7 @@ import (
 	"net/netip"
 	"time"
 
-	"heckel.io/ntfy/user"
+	"git.zio.sh/astra/ntfy/v2/user"
 )
 
 // Defines default config settings (excluding limits, see below)

server/config_test.go

@@ -1,8 +1,8 @@
 package server_test
 
 import (
+	"git.zio.sh/astra/ntfy/v2/server"
 	"github.com/stretchr/testify/assert"
-	"heckel.io/ntfy/server"
 	"testing"
 )
 

server/errors.go

@@ -3,7 +3,7 @@ package server
 import (
 	"encoding/json"
 	"fmt"
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
 	"net/http"
 )
 

server/file_cache.go

@@ -3,8 +3,8 @@ package server
 import (
 	"errors"
 	"fmt"
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"io"
 	"os"
 	"path/filepath"

server/file_cache_test.go

@@ -3,8 +3,8 @@ package server
 import (
 	"bytes"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/util"
 	"os"
 	"strings"
 	"testing"

server/log.go

@@ -2,10 +2,10 @@ package server
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/emersion/go-smtp"
 	"github.com/gorilla/websocket"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/util"
 	"net/http"
 	"strings"
 	"unicode/utf8"

server/message_cache.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/util"
 	_ "github.com/mattn/go-sqlite3" // SQLite driver
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/util"
 )
 
 var (

server/server.go

@@ -26,13 +26,13 @@ import (
 	"time"
 	"unicode/utf8"
 
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/emersion/go-smtp"
 	"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"
 )
 
 // Server is the main server, providing the UI and API for ntfy

server/server_account.go

@@ -2,9 +2,9 @@ package server
 
 import (
 	"encoding/json"
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/user"
+	"git.zio.sh/astra/ntfy/v2/user"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"net/http"
 	"net/netip"
 	"strings"

server/server_account_test.go

@@ -2,10 +2,10 @@ package server
 
 import (
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 	"io"
 	"net/netip"
 	"path/filepath"

server/server_admin.go

@@ -1,7 +1,7 @@
 package server
 
 import (
-	"heckel.io/ntfy/user"
+	"git.zio.sh/astra/ntfy/v2/user"
 	"net/http"
 )
 

server/server_admin_test.go

@@ -1,9 +1,9 @@
 package server
 
 import (
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 	"sync/atomic"
 	"testing"
 	"time"

server/server_firebase.go

@@ -7,9 +7,9 @@ import (
 	firebase "firebase.google.com/go/v4"
 	"firebase.google.com/go/v4/messaging"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"google.golang.org/api/option"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 	"strings"
 )
 

server/server_firebase_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"heckel.io/ntfy/user"
+	"git.zio.sh/astra/ntfy/v2/user"
 	"net/netip"
 	"strings"
 	"sync"

server/server_manager.go

@@ -1,8 +1,8 @@
 package server
 
 import (
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"strings"
 )
 

server/server_matrix.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"io"
 	"net/http"
 	"strings"

server/server_middleware.go

@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 )
 
 type contextKey int

server/server_payments.go

@@ -4,6 +4,9 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stripe/stripe-go/v74"
 	portalsession "github.com/stripe/stripe-go/v74/billingportal/session"
 	"github.com/stripe/stripe-go/v74/checkout/session"
@@ -11,9 +14,6 @@ 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"
 	"io"
 	"net/http"
 	"net/netip"

server/server_payments_test.go

@@ -2,12 +2,12 @@ package server
 
 import (
 	"encoding/json"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"github.com/stripe/stripe-go/v74"
 	"golang.org/x/time/rate"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 	"io"
 	"net/netip"
 	"path/filepath"

server/server_test.go

@@ -6,8 +6,8 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/user"
 	"golang.org/x/crypto/bcrypt"
-	"heckel.io/ntfy/user"
 	"io"
 	"math/rand"
 	"net/http"
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/SherClockHolmes/webpush-go"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/util"
 )
 
 func TestMain(m *testing.M) {

server/server_twilio.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"encoding/xml"
 	"fmt"
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/user"
+	"git.zio.sh/astra/ntfy/v2/user"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"io"
 	"net/http"
 	"net/url"

server/server_twilio_test.go

@@ -1,9 +1,9 @@
 package server
 
 import (
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 	"io"
 	"net/http"
 	"net/http/httptest"

server/server_webpush.go

@@ -7,9 +7,9 @@ import (
 	"regexp"
 	"strings"
 
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/user"
 	"github.com/SherClockHolmes/webpush-go"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/user"
 )
 
 const (

server/server_webpush_test.go

@@ -3,9 +3,9 @@ package server
 import (
 	"encoding/json"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/user"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/user"
-	"heckel.io/ntfy/util"
 	"io"
 	"net/http"
 	"net/http/httptest"

server/smtp_sender.go

@@ -11,8 +11,8 @@ import (
 	"sync"
 	"time"
 
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 )
 
 type mailer interface {

server/topic.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 )
 
 const (

server/types.go

@@ -5,10 +5,10 @@ import (
 	"net/netip"
 	"time"
 
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/user"
+	"git.zio.sh/astra/ntfy/v2/user"
 
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 )
 
 // List of possible events

server/util.go

@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 	"fmt"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"io"
 	"mime"
 	"net/http"

server/visitor.go

@@ -2,14 +2,14 @@ package server
 
 import (
 	"fmt"
-	"heckel.io/ntfy/log"
+	"git.zio.sh/astra/ntfy/v2/log"
-	"heckel.io/ntfy/user"
+	"git.zio.sh/astra/ntfy/v2/user"
 	"net/netip"
 	"sync"
 	"time"
 
+	"git.zio.sh/astra/ntfy/v2/util"
 	"golang.org/x/time/rate"
-	"heckel.io/ntfy/util"
 )
 
 const (

server/webpush_store.go

@@ -3,7 +3,7 @@ package server
 import (
 	"database/sql"
 	"errors"
-	"heckel.io/ntfy/util"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"net/netip"
 	"time"
 

test/server.go

@@ -2,7 +2,7 @@ package test
 
 import (
 	"fmt"
-	"heckel.io/ntfy/server"
+	"git.zio.sh/astra/ntfy/v2/server"
 	"math/rand"
 	"net/http"
 	"path/filepath"

user/manager.go

@@ -6,11 +6,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/log"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/mattn/go-sqlite3"
 	"github.com/stripe/stripe-go/v74"
 	"golang.org/x/crypto/bcrypt"
-	"heckel.io/ntfy/log"
-	"heckel.io/ntfy/util"
 	"net/netip"
 	"strings"
 	"sync"

user/manager_test.go

@@ -3,10 +3,10 @@ package user
 import (
 	"database/sql"
 	"fmt"
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/require"
 	"github.com/stripe/stripe-go/v74"
 	"golang.org/x/crypto/bcrypt"
-	"heckel.io/ntfy/util"
 	"net/netip"
 	"path/filepath"
 	"strings"

user/types.go

@@ -2,8 +2,8 @@ package user
 
 import (
 	"errors"
+	"git.zio.sh/astra/ntfy/v2/log"
 	"github.com/stripe/stripe-go/v74"
-	"heckel.io/ntfy/log"
 	"net/netip"
 	"regexp"
 	"strings"

util/batching_queue_test.go

@@ -1,8 +1,8 @@
 package util_test
 
 import (
+	"git.zio.sh/astra/ntfy/v2/util"
 	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/util"
 	"math/rand"
 	"sync"
 	"testing"

web/index.html

@@ -22,7 +22,7 @@
     <!-- Previews in Google, Slack, WhatsApp, etc. -->
     <meta
       name="description"
-      content="ntfy lets you send push notifications via scripts from any computer or phone. Made with ❤ by Philipp C. Heckel, Apache License 2.0, source at https://heckel.io/ntfy."
+      content="ntfy lets you send push notifications via scripts from any computer or phone. Made with ❤ by Philipp C. Heckel, Apache License 2.0, source at https://git.zio.sh/astra/ntfy/v2."
     />
     <meta property="og:type" content="website" />
     <meta property="og:locale" content="en_US" />
@@ -30,7 +30,7 @@
     <meta property="og:title" content="ntfy web" />
     <meta
       property="og:description"
-      content="ntfy lets you send push notifications via scripts from any computer or phone. Made with ❤ by Philipp C. Heckel, Apache License 2.0, source at https://heckel.io/ntfy."
+      content="ntfy lets you send push notifications via scripts from any computer or phone. Made with ❤ by Philipp C. Heckel, Apache License 2.0, source at https://git.zio.sh/astra/ntfy/v2."
     />
     <meta property="og:image" content="/static/images/ntfy.png" />
     <meta property="og:url" content="https://ntfy.sh" />