I still don't understand

add hostux server

.github/workflows/build.yaml

@@ -13,7 +13,7 @@ jobs:
         name: Install node
         uses: actions/setup-node@v2
         with:
-          node-version: '17'
+          node-version: '18'
       -
         name: Checkout code
         uses: actions/checkout@v2

.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
         name: Install node
         uses: actions/setup-node@v2
         with:
-          node-version: '17'
+          node-version: '18'
       -
         name: Checkout code
         uses: actions/checkout@v2

.github/workflows/test.yaml

@@ -13,7 +13,7 @@ jobs:
         name: Install node
         uses: actions/setup-node@v2
         with:
-          node-version: '17'
+          node-version: '18'
       -
         name: Checkout code
         uses: actions/checkout@v2

.gitignore

@@ -11,3 +11,4 @@ secrets/
 *.iml
 node_modules/
 .DS_Store
+__pycache__

Makefile

@@ -141,25 +141,25 @@ web-deps-update:
 # Main server/client build
 
 cli: cli-deps
-	goreleaser build --snapshot --rm-dist
+	goreleaser build --snapshot --clean
 
 cli-linux-amd64: cli-deps-static-sites
-	goreleaser build --snapshot --rm-dist --id ntfy_linux_amd64
+	goreleaser build --snapshot --clean --id ntfy_linux_amd64
 
 cli-linux-armv6: cli-deps-static-sites cli-deps-gcc-armv6-armv7
-	goreleaser build --snapshot --rm-dist --id ntfy_linux_armv6
+	goreleaser build --snapshot --clean --id ntfy_linux_armv6
 
 cli-linux-armv7: cli-deps-static-sites cli-deps-gcc-armv6-armv7
-	goreleaser build --snapshot --rm-dist --id ntfy_linux_armv7
+	goreleaser build --snapshot --clean --id ntfy_linux_armv7
 
 cli-linux-arm64: cli-deps-static-sites cli-deps-gcc-arm64
-	goreleaser build --snapshot --rm-dist --id ntfy_linux_arm64
+	goreleaser build --snapshot --clean --id ntfy_linux_arm64
 
 cli-windows-amd64: cli-deps-static-sites
-	goreleaser build --snapshot --rm-dist --id ntfy_windows_amd64
+	goreleaser build --snapshot --clean --id ntfy_windows_amd64
 
 cli-darwin-all: cli-deps-static-sites
-	goreleaser build --snapshot --rm-dist --id ntfy_darwin_all
+	goreleaser build --snapshot --clean --id ntfy_darwin_all
 
 cli-linux-server: cli-deps-static-sites
 	# This is a target to build the CLI (including the server) manually.
@@ -277,11 +277,11 @@ staticcheck: .PHONY
 
 # Releasing targets
 
-release: clean update cli-deps release-checks docs web check
-	goreleaser release --rm-dist
+release: clean cli-deps release-checks docs web check
+	goreleaser release --clean
 
-release-snapshot: clean update cli-deps docs web check
-	goreleaser release --snapshot --skip-publish --rm-dist
+release-snapshot: clean cli-deps docs web check
+	goreleaser release --snapshot --skip-publish --clean
 
 release-checks:
 	$(eval LATEST_TAG := $(shell git describe --abbrev=0 --tags | cut -c2-))

README.md

@@ -126,6 +126,9 @@ account costs. Even small donations are very much appreciated. A big fat **Thank
 <a href="https://github.com/caseodilla"><img src="https://github.com/caseodilla.png" width="40px" /></a>
 <a href="https://github.com/0xAF"><img src="https://github.com/0xAF.png" width="40px" /></a>
 <a href="https://github.com/soonoo"><img src="https://github.com/soonoo.png" width="40px" /></a>
+<a href="https://github.com/nichu42"><img src="https://github.com/nichu42.png" width="40px" /></a>
+<a href="https://github.com/samliebow"><img src="https://github.com/samliebow.png" width="40px" /></a>
+<a href="https://github.com/johman10"><img src="https://github.com/johman10.png" width="40px" /></a>
 
 I'd also like to thank JetBrains for providing their awesome [IntelliJ IDEA](https://www.jetbrains.com/idea/) to me for free,
 and [DigitalOcean](https://m.do.co/c/442b929528db) (*referral link*) for supporting the project:

client/client.yml

@@ -5,10 +5,12 @@
 #
 # default-host: https://ntfy.sh
 
-# Default username and password will be used with "ntfy publish" if no credentials are provided on command line
-# Default username and password will be used with "ntfy subscribe" if no credentials are provided in subscription below
-# For an empty password, use empty double-quotes ("")
-#
+# Default credentials will be used with "ntfy publish" and "ntfy subscribe" if no other credentials are provided.
+# You can set a default token to use or a default user:password combination, but not both. For an empty password,
+# use empty double-quotes ("")
+
+# default-token:
+
 # default-user:
 # default-password:
 
@@ -30,6 +32,8 @@
 #         command: 'notify-send "$m"'
 #         user: phill
 #         password: mypass
+#       - topic: token_topic
+#         token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
 #
 # Variables:
 #     Variable        Aliases               Description

client/config.go

@@ -12,17 +12,22 @@ const (
 
 // Config is the config struct for a Client
 type Config struct {
-	DefaultHost     string  `yaml:"default-host"`
-	DefaultUser     string  `yaml:"default-user"`
-	DefaultPassword *string `yaml:"default-password"`
-	DefaultCommand  string  `yaml:"default-command"`
-	Subscribe       []struct {
-		Topic    string            `yaml:"topic"`
-		User     string            `yaml:"user"`
-		Password *string           `yaml:"password"`
-		Command  string            `yaml:"command"`
-		If       map[string]string `yaml:"if"`
-	} `yaml:"subscribe"`
+	DefaultHost     string      `yaml:"default-host"`
+	DefaultUser     string      `yaml:"default-user"`
+	DefaultPassword *string     `yaml:"default-password"`
+	DefaultToken    string      `yaml:"default-token"`
+	DefaultCommand  string      `yaml:"default-command"`
+	Subscribe       []Subscribe `yaml:"subscribe"`
+}
+
+// Subscribe is the struct for a Subscription within Config
+type Subscribe struct {
+	Topic    string            `yaml:"topic"`
+	User     string            `yaml:"user"`
+	Password *string           `yaml:"password"`
+	Token    string            `yaml:"token"`
+	Command  string            `yaml:"command"`
+	If       map[string]string `yaml:"if"`
 }
 
 // NewConfig creates a new Config struct for a Client
@@ -31,6 +36,7 @@ func NewConfig() *Config {
 		DefaultHost:     DefaultBaseURL,
 		DefaultUser:     "",
 		DefaultPassword: nil,
+		DefaultToken:    "",
 		DefaultCommand:  "",
 		Subscribe:       nil,
 	}

client/config_test.go

@@ -116,3 +116,25 @@ subscribe:
 	require.Equal(t, "phil", conf.Subscribe[0].User)
 	require.Nil(t, conf.Subscribe[0].Password)
 }
+
+func TestConfig_DefaultToken(t *testing.T) {
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(`
+default-host: http://localhost
+default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+subscribe:
+  - topic: mytopic
+`), 0600))
+
+	conf, err := client.LoadConfig(filename)
+	require.Nil(t, err)
+	require.Equal(t, "http://localhost", conf.DefaultHost)
+	require.Equal(t, "", conf.DefaultUser)
+	require.Nil(t, conf.DefaultPassword)
+	require.Equal(t, "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", conf.DefaultToken)
+	require.Equal(t, 1, len(conf.Subscribe))
+	require.Equal(t, "mytopic", conf.Subscribe[0].Topic)
+	require.Equal(t, "", conf.Subscribe[0].User)
+	require.Nil(t, conf.Subscribe[0].Password)
+	require.Equal(t, "", conf.Subscribe[0].Token)
+}

cmd/publish.go

@@ -154,8 +154,7 @@ func execPublish(c *cli.Context) error {
 	}
 	if token != "" {
 		options = append(options, client.WithBearerAuth(token))
-	}
-	if user != "" {
+	} else if user != "" {
 		var pass string
 		parts := strings.SplitN(user, ":", 2)
 		if len(parts) == 2 {
@@ -171,7 +170,9 @@ func execPublish(c *cli.Context) error {
 			fmt.Fprintf(c.App.ErrWriter, "\r%s\r", strings.Repeat(" ", 20))
 		}
 		options = append(options, client.WithBasicAuth(user, pass))
-	} else if token == "" && conf.DefaultUser != "" && conf.DefaultPassword != nil {
+	} else if conf.DefaultToken != "" {
+		options = append(options, client.WithBearerAuth(conf.DefaultToken))
+	} else if conf.DefaultUser != "" && conf.DefaultPassword != nil {
 		options = append(options, client.WithBasicAuth(conf.DefaultUser, *conf.DefaultPassword))
 	}
 	if pid > 0 {

cmd/publish_test.go

@@ -5,8 +5,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"heckel.io/ntfy/test"
 	"heckel.io/ntfy/util"
+	"net/http"
+	"net/http/httptest"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"testing"
@@ -130,7 +133,7 @@ func TestCLI_Publish_Wait_PID_And_Cmd(t *testing.T) {
 	require.Equal(t, `command failed: does-not-exist-no-really "really though", error: exec: "does-not-exist-no-really": executable file not found in $PATH`, err.Error())
 
 	// Tests with NTFY_TOPIC set ////
-	require.Nil(t, os.Setenv("NTFY_TOPIC", topic))
+	t.Setenv("NTFY_TOPIC", topic)
 
 	// Test: Successful command with NTFY_TOPIC
 	app, _, stdout, _ = newTestApp()
@@ -147,3 +150,151 @@ func TestCLI_Publish_Wait_PID_And_Cmd(t *testing.T) {
 	m = toMessage(t, stdout.String())
 	require.Regexp(t, `Process with PID \d+ exited after .+ms`, m.Message)
 }
+
+func TestCLI_Publish_Default_UserPass(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-user: philipp
+default-password: mypass
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "mytopic", "triggered"}))
+	m := toMessage(t, stdout.String())
+	require.Equal(t, "triggered", m.Message)
+}
+
+func TestCLI_Publish_Default_Token(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "mytopic", "triggered"}))
+	m := toMessage(t, stdout.String())
+	require.Equal(t, "triggered", m.Message)
+}
+
+func TestCLI_Publish_Default_UserPass_CLI_Token(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-user: philipp
+default-password: mypass
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "mytopic", "triggered"}))
+	m := toMessage(t, stdout.String())
+	require.Equal(t, "triggered", m.Message)
+}
+
+func TestCLI_Publish_Default_Token_CLI_UserPass(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "--user", "philipp:mypass", "mytopic", "triggered"}))
+	m := toMessage(t, stdout.String())
+	require.Equal(t, "triggered", m.Message)
+}
+
+func TestCLI_Publish_Default_Token_CLI_Token(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_FAKETOKEN01234567890FAKETOKEN
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "mytopic", "triggered"}))
+	m := toMessage(t, stdout.String())
+	require.Equal(t, "triggered", m.Message)
+}
+
+func TestCLI_Publish_Default_UserPass_CLI_UserPass(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-user: philipp
+default-password: fakepass
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+	require.Nil(t, app.Run([]string{"ntfy", "publish", "--config=" + filename, "--user", "philipp:mypass", "mytopic", "triggered"}))
+	m := toMessage(t, stdout.String())
+	require.Equal(t, "triggered", m.Message)
+}
+
+func TestCLI_Publish_Token_And_UserPass(t *testing.T) {
+	app, _, _, _ := newTestApp()
+	err := app.Run([]string{"ntfy", "publish", "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "--user", "philipp:mypass", "mytopic", "triggered"})
+	require.Error(t, err)
+	require.Equal(t, "cannot set both --user and --token", err.Error())
+}

cmd/serve.go

@@ -37,8 +37,8 @@ var flagsServe = append(
 	append([]cli.Flag{}, flagsDefault...),
 	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, EnvVars: []string{"NTFY_CONFIG_FILE"}, Value: defaultServerConfigFile, DefaultText: defaultServerConfigFile, Usage: "config file"},
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "base-url", Aliases: []string{"base_url", "B"}, EnvVars: []string{"NTFY_BASE_URL"}, Usage: "externally visible base URL for this host (e.g. https://ntfy.sh)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-http", Aliases: []string{"listen_http", "l"}, EnvVars: []string{"NTFY_LISTEN_HTTP"}, Value: server.DefaultListenHTTP, Usage: "ip:port used to as HTTP listen address"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-https", Aliases: []string{"listen_https", "L"}, EnvVars: []string{"NTFY_LISTEN_HTTPS"}, Usage: "ip:port used to as HTTPS listen address"}),
+	altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-http", Aliases: []string{"listen_http", "l"}, EnvVars: []string{"NTFY_LISTEN_HTTP"}, Value: server.DefaultListenHTTP, Usage: "ip:port used as HTTP listen address"}),
+	altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-https", Aliases: []string{"listen_https", "L"}, EnvVars: []string{"NTFY_LISTEN_HTTPS"}, Usage: "ip:port used as HTTPS listen address"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "listen-unix", Aliases: []string{"listen_unix", "U"}, EnvVars: []string{"NTFY_LISTEN_UNIX"}, Usage: "listen on unix socket path"}),
 	altsrc.NewIntFlag(&cli.IntFlag{Name: "listen-unix-mode", Aliases: []string{"listen_unix_mode"}, EnvVars: []string{"NTFY_LISTEN_UNIX_MODE"}, DefaultText: "system default", Usage: "file permissions of unix socket, e.g. 0700"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "key-file", Aliases: []string{"key_file", "K"}, EnvVars: []string{"NTFY_KEY_FILE"}, Usage: "private key file, if listen-https is set"}),
@@ -86,6 +86,9 @@ var flagsServe = append(
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "stripe-secret-key", Aliases: []string{"stripe_secret_key"}, EnvVars: []string{"NTFY_STRIPE_SECRET_KEY"}, Value: "", Usage: "key used for the Stripe API communication, this enables payments"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "stripe-webhook-key", Aliases: []string{"stripe_webhook_key"}, EnvVars: []string{"NTFY_STRIPE_WEBHOOK_KEY"}, Value: "", Usage: "key required to validate the authenticity of incoming webhooks from Stripe"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "billing-contact", Aliases: []string{"billing_contact"}, EnvVars: []string{"NTFY_BILLING_CONTACT"}, Value: "", Usage: "e-mail or website to display in upgrade dialog (only if payments are enabled)"}),
+	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "enable-metrics", Aliases: []string{"enable_metrics"}, EnvVars: []string{"NTFY_ENABLE_METRICS"}, Value: false, Usage: "if set, Prometheus metrics are exposed via the /metrics endpoint"}),
+	altsrc.NewStringFlag(&cli.StringFlag{Name: "metrics-listen-http", Aliases: []string{"metrics_listen_http"}, EnvVars: []string{"NTFY_METRICS_LISTEN_HTTP"}, Usage: "ip:port used to expose the metrics endpoint (implicitly enables metrics)"}),
+	altsrc.NewStringFlag(&cli.StringFlag{Name: "profile-listen-http", Aliases: []string{"profile_listen_http"}, EnvVars: []string{"NTFY_PROFILE_LISTEN_HTTP"}, Usage: "ip:port used to expose the profiling endpoints (implicitly enables profiling)"}),
 )
 
 var cmdServe = &cli.Command{
@@ -163,6 +166,9 @@ func execServe(c *cli.Context) error {
 	stripeSecretKey := c.String("stripe-secret-key")
 	stripeWebhookKey := c.String("stripe-webhook-key")
 	billingContact := c.String("billing-contact")
+	metricsListenHTTP := c.String("metrics-listen-http")
+	enableMetrics := c.Bool("enable-metrics") || metricsListenHTTP != ""
+	profileListenHTTP := c.String("profile-listen-http")
 
 	// Check values
 	if firebaseKeyFile != "" && !util.FileExists(firebaseKeyFile) {
@@ -315,6 +321,9 @@ func execServe(c *cli.Context) error {
 	conf.EnableSignup = enableSignup
 	conf.EnableLogin = enableLogin
 	conf.EnableReservations = enableReservations
+	conf.EnableMetrics = enableMetrics
+	conf.MetricsListenHTTP = metricsListenHTTP
+	conf.ProfileListenHTTP = profileListenHTTP
 	conf.Version = c.App.Version
 
 	// Set up hot-reloading of config

cmd/subscribe.go

@@ -30,6 +30,7 @@ var flagsSubscribe = append(
 	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, Usage: "client config file"},
 	&cli.StringFlag{Name: "since", Aliases: []string{"s"}, Usage: "return events since `SINCE` (Unix timestamp, or all)"},
 	&cli.StringFlag{Name: "user", Aliases: []string{"u"}, EnvVars: []string{"NTFY_USER"}, Usage: "username[:password] used to auth against the server"},
+	&cli.StringFlag{Name: "token", Aliases: []string{"k"}, EnvVars: []string{"NTFY_TOKEN"}, Usage: "access token used to auth against the server"},
 	&cli.BoolFlag{Name: "from-config", Aliases: []string{"from_config", "C"}, Usage: "read subscriptions from config file (service mode)"},
 	&cli.BoolFlag{Name: "poll", Aliases: []string{"p"}, Usage: "return events and exit, do not listen for new events"},
 	&cli.BoolFlag{Name: "scheduled", Aliases: []string{"sched", "S"}, Usage: "also return scheduled/delayed events"},
@@ -97,11 +98,18 @@ func execSubscribe(c *cli.Context) error {
 	cl := client.New(conf)
 	since := c.String("since")
 	user := c.String("user")
+	token := c.String("token")
 	poll := c.Bool("poll")
 	scheduled := c.Bool("scheduled")
 	fromConfig := c.Bool("from-config")
 	topic := c.Args().Get(0)
 	command := c.Args().Get(1)
+
+	// Checks
+	if user != "" && token != "" {
+		return errors.New("cannot set both --user and --token")
+	}
+
 	if !fromConfig {
 		conf.Subscribe = nil // wipe if --from-config not passed
 	}
@@ -109,6 +117,9 @@ func execSubscribe(c *cli.Context) error {
 	if since != "" {
 		options = append(options, client.WithSince(since))
 	}
+	if token != "" {
+		options = append(options, client.WithBearerAuth(token))
+	}
 	if user != "" {
 		var pass string
 		parts := strings.SplitN(user, ":", 2)
@@ -126,9 +137,6 @@ func execSubscribe(c *cli.Context) error {
 		}
 		options = append(options, client.WithBasicAuth(user, pass))
 	}
-	if poll {
-		options = append(options, client.WithPoll())
-	}
 	if scheduled {
 		options = append(options, client.WithScheduled())
 	}
@@ -145,6 +153,9 @@ func execSubscribe(c *cli.Context) error {
 
 func doPoll(c *cli.Context, cl *client.Client, conf *client.Config, topic, command string, options ...client.SubscribeOption) error {
 	for _, s := range conf.Subscribe { // may be nil
+		if auth := maybeAddAuthHeader(s, conf); auth != nil {
+			options = append(options, auth)
+		}
 		if err := doPollSingle(c, cl, s.Topic, s.Command, options...); err != nil {
 			return err
 		}
@@ -175,21 +186,11 @@ func doSubscribe(c *cli.Context, cl *client.Client, conf *client.Config, topic,
 		for filter, value := range s.If {
 			topicOptions = append(topicOptions, client.WithFilter(filter, value))
 		}
-		var user string
-		var password *string
-		if s.User != "" {
-			user = s.User
-		} else if conf.DefaultUser != "" {
-			user = conf.DefaultUser
-		}
-		if s.Password != nil {
-			password = s.Password
-		} else if conf.DefaultPassword != nil {
-			password = conf.DefaultPassword
-		}
-		if user != "" && password != nil {
-			topicOptions = append(topicOptions, client.WithBasicAuth(user, *password))
+
+		if auth := maybeAddAuthHeader(s, conf); auth != nil {
+			topicOptions = append(topicOptions, auth)
 		}
+
 		subscriptionID := cl.Subscribe(s.Topic, topicOptions...)
 		if s.Command != "" {
 			cmds[subscriptionID] = s.Command
@@ -214,6 +215,25 @@ func doSubscribe(c *cli.Context, cl *client.Client, conf *client.Config, topic,
 	return nil
 }
 
+func maybeAddAuthHeader(s client.Subscribe, conf *client.Config) client.SubscribeOption {
+	// check for subscription token then subscription user:pass
+	if s.Token != "" {
+		return client.WithBearerAuth(s.Token)
+	}
+	if s.User != "" && s.Password != nil {
+		return client.WithBasicAuth(s.User, *s.Password)
+	}
+
+	// if no subscription token nor subscription user:pass, check for default token then default user:pass
+	if conf.DefaultToken != "" {
+		return client.WithBearerAuth(conf.DefaultToken)
+	}
+	if conf.DefaultUser != "" && conf.DefaultPassword != nil {
+		return client.WithBasicAuth(conf.DefaultUser, *conf.DefaultPassword)
+	}
+	return nil
+}
+
 func printMessageOrRunCommand(c *cli.Context, m *client.Message, command string) {
 	if command != "" {
 		runCommand(c, command, m)

cmd/subscribe_test.go

@@ -0,0 +1,312 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/stretchr/testify/require"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func TestCLI_Subscribe_Default_UserPass_Subscription_Token(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-user: philipp
+default-password: mypass
+subscribe:
+  - topic: mytopic
+    token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_Token_Subscription_UserPass(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+subscribe:
+  - topic: mytopic
+    user: philipp
+    password: mypass
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_Token_Subscription_Token(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_FAKETOKEN01234567890FAKETOKEN
+subscribe:
+  - topic: mytopic
+    token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_UserPass_Subscription_UserPass(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-user: fake
+default-password: password
+subscribe:
+  - topic: mytopic
+    user: philipp
+    password: mypass
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_Token_Subscription_Empty(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+subscribe:
+  - topic: mytopic
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_UserPass_Subscription_Empty(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-user: philipp
+default-password: mypass
+subscribe:
+  - topic: mytopic
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_Empty_Subscription_Token(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+subscribe:
+  - topic: mytopic
+    token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_Empty_Subscription_UserPass(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+subscribe:
+  - topic: mytopic
+    user: philipp
+    password: mypass
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_Token_CLI_Token(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_FAKETOKEN0123456789FAKETOKEN
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "mytopic"}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_Token_CLI_UserPass(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Basic cGhpbGlwcDpteXBhc3M=", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "--user", "philipp:mypass", "mytopic"}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Default_Token_Subscription_Token_CLI_UserPass(t *testing.T) {
+	message := `{"id":"RXIQBFaieLVr","time":124,"expires":1124,"event":"message","topic":"mytopic","message":"triggered"}`
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic/json", r.URL.Path)
+		require.Equal(t, "Bearer tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", r.Header.Get("Authorization"))
+
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte(message))
+	}))
+	defer server.Close()
+
+	filename := filepath.Join(t.TempDir(), "client.yml")
+	require.Nil(t, os.WriteFile(filename, []byte(fmt.Sprintf(`
+default-host: %s
+default-token: tk_FAKETOKEN01234567890FAKETOKEN
+subscribe:
+  - topic: mytopic
+    token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
+`, server.URL)), 0600))
+
+	app, _, stdout, _ := newTestApp()
+
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "--user", "philipp:mypass"}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Token_And_UserPass(t *testing.T) {
+	app, _, _, _ := newTestApp()
+	err := app.Run([]string{"ntfy", "subscribe", "--poll", "--token", "tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2", "--user", "philipp:mypass", "mytopic", "triggered"})
+	require.Error(t, err)
+	require.Equal(t, "cannot set both --user and --token", err.Error())
+}

docs/config.md

@@ -1099,6 +1099,50 @@ If a non-200 HTTP status code is returned or if the returned `health` field is `
 
 See [Installation for Docker](install.md#docker) for an example of how this could be used in a `docker-compose` environment.
 
+## Monitoring
+If configured, ntfy can expose a `/metrics` endpoint for [Prometheus](https://prometheus.io/), which can then be used to
+create dashboards and alerts (e.g. via [Grafana](https://grafana.com/)).
+
+To configure the metrics endpoint, either set `enable-metrics` and/or set the `listen-metrics-http` option to a dedicated
+listen address. Metrics may be considered sensitive information, so before you enable them, be sure you know what you are
+doing, and/or secure access to the endpoint in your reverse proxy.
+
+- `enable-metrics` enables the /metrics endpoint for the default ntfy server (i.e. HTTP, HTTPS and/or Unix socket)
+- `metrics-listen-http` exposes the metrics endpoint via a dedicated `[IP]:port`. If set, this option implicitly
+  enables metrics as well, e.g. "10.0.1.1:9090" or ":9090"
+
+=== "server.yml (Using default port)"
+    ```yaml
+    enable-metrics: true
+    ```
+
+=== "server.yml (Using dedicated IP/port)"
+    ```yaml
+    metrics-listen-http: "10.0.1.1:9090"
+    ```
+
+In Prometheus, an example scrape config would look like this:
+
+=== "prometheus.yml"
+    ```yaml
+    scrape_configs:
+      - job_name: "ntfy"
+        static_configs:
+          - targets: ["10.0.1.1:9090"]
+    ```
+
+Here's an example Grafana dashboard built from the metrics (see [Grafana JSON on GitHub](https://raw.githubusercontent.com/binwiederhier/ntfy/main/examples/grafana-dashboard/ntfy-grafana.json)):
+
+<figure markdown style="padding-left: 50px; padding-right: 50px">
+  <a href="../../static/img/grafana-dashboard.png" target="_blank"><img src="../../static/img/grafana-dashboard.png"/></a>
+  <figcaption>ntfy Grafana dashboard</figcaption>
+</figure>
+
+## Profiling
+ntfy can expose Go's [net/http/pprof](https://pkg.go.dev/net/http/pprof) endpoints to support profiling of the ntfy server. 
+If enabled, ntfy will listen on a dedicated listen IP/port, which can be accessed via the web browser on `http://<ip>:<port>/debug/pprof/`.
+This can be helpful to expose bottlenecks, and visualize call flows. To enable, simply set the `profile-listen-http` config option.
+
 ## Logging & debugging
 By default, ntfy logs to the console (stderr), with an `info` log level, and in a human-readable text format.
 

docs/faq.md

@@ -43,9 +43,9 @@ of the app and [self-host your own ntfy server](install.md).
 ## How much battery does the Android app use?
 If you use the ntfy.sh server, and you don't use the [instant delivery](subscribe/phone.md#instant-delivery) feature, 
 the Android/iOS app uses no additional battery, since Firebase Cloud Messaging (FCM) is used. If you use your own server, 
-or you use *instant delivery* (Android only), the app has to maintain a constant connection to the server, which consumes 
-about 0-1% of battery in 17h of use (on my phone). There has been a ton of testing and improvement around this. I think it's pretty 
-decent now.
+or you use *instant delivery* (Android only),  or install from F-droid ([which does not support FCM](https://f-droid.org/docs/Inclusion_Policy/)),
+the app has to maintain a constant connection to the server, which consumes about 0-1% of battery in 17h of use (on my phone). 
+There has been a ton of testing and improvement around this. I think it's pretty decent now.
 
 ## Paid plans? I thought it was open source?
 All of ntfy will remain open source, with a free software license (Apache 2.0 and GPLv2). If you'd like to self-host, you

docs/hooks.py

@@ -0,0 +1,6 @@
+import os
+import shutil
+
+def copy_fonts(config, **kwargs):
+    site_dir = config['site_dir']
+    shutil.copytree('docs/static/fonts', os.path.join(site_dir, 'get'))

docs/install.md

@@ -26,37 +26,37 @@ deb/rpm packages.
 
 === "x86_64/amd64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_x86_64.tar.gz
-    tar zxvf ntfy_2.1.2_linux_x86_64.tar.gz
-    sudo cp -a ntfy_2.1.2_linux_x86_64/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.1.2_linux_x86_64/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_x86_64.tar.gz
+    tar zxvf ntfy_2.3.0_linux_x86_64.tar.gz
+    sudo cp -a ntfy_2.3.0_linux_x86_64/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.3.0_linux_x86_64/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "armv6"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_armv6.tar.gz
-    tar zxvf ntfy_2.1.2_linux_armv6.tar.gz
-    sudo cp -a ntfy_2.1.2_linux_armv6/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.1.2_linux_armv6/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_armv6.tar.gz
+    tar zxvf ntfy_2.3.0_linux_armv6.tar.gz
+    sudo cp -a ntfy_2.3.0_linux_armv6/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.3.0_linux_armv6/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "armv7/armhf"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_armv7.tar.gz
-    tar zxvf ntfy_2.1.2_linux_armv7.tar.gz
-    sudo cp -a ntfy_2.1.2_linux_armv7/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.1.2_linux_armv7/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_armv7.tar.gz
+    tar zxvf ntfy_2.3.0_linux_armv7.tar.gz
+    sudo cp -a ntfy_2.3.0_linux_armv7/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.3.0_linux_armv7/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "arm64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_arm64.tar.gz
-    tar zxvf ntfy_2.1.2_linux_arm64.tar.gz
-    sudo cp -a ntfy_2.1.2_linux_arm64/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.1.2_linux_arm64/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_arm64.tar.gz
+    tar zxvf ntfy_2.3.0_linux_arm64.tar.gz
+    sudo cp -a ntfy_2.3.0_linux_arm64/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.3.0_linux_arm64/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
@@ -106,7 +106,7 @@ Manually installing the .deb file:
 
 === "x86_64/amd64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_amd64.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_amd64.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -114,7 +114,7 @@ Manually installing the .deb file:
 
 === "armv6"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_armv6.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_armv6.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -122,7 +122,7 @@ Manually installing the .deb file:
 
 === "armv7/armhf"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_armv7.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_armv7.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -130,7 +130,7 @@ Manually installing the .deb file:
 
 === "arm64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_arm64.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_arm64.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -140,28 +140,28 @@ Manually installing the .deb file:
 
 === "x86_64/amd64"
     ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_amd64.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_amd64.rpm
     sudo systemctl enable ntfy 
     sudo systemctl start ntfy
     ```
 
 === "armv6"
     ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_armv6.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_armv6.rpm
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
     ```
 
 === "armv7/armhf"
     ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_armv7.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_armv7.rpm
     sudo systemctl enable ntfy 
     sudo systemctl start ntfy
     ```
 
 === "arm64"
     ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_linux_arm64.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_linux_arm64.rpm
     sudo systemctl enable ntfy 
     sudo systemctl start ntfy
     ```
@@ -189,18 +189,18 @@ NixOS also supports [declarative setup of the ntfy server](https://search.nixos.
 
 ## macOS
 The [ntfy CLI](subscribe/cli.md) (`ntfy publish` and `ntfy subscribe` only) is supported on macOS as well. 
-To install, please [download the tarball](https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_macOS_all.tar.gz), 
+To install, please [download the tarball](https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_macOS_all.tar.gz), 
 extract it and place it somewhere in your `PATH` (e.g. `/usr/local/bin/ntfy`). 
 
 If run as `root`, ntfy will look for its config at `/etc/ntfy/client.yml`. For all other users, it'll look for it at 
 `~/Library/Application Support/ntfy/client.yml` (sample included in the tarball).
 
 ```bash
-curl -L https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_macOS_all.tar.gz > ntfy_2.1.2_macOS_all.tar.gz
-tar zxvf ntfy_2.1.2_macOS_all.tar.gz
-sudo cp -a ntfy_2.1.2_macOS_all/ntfy /usr/local/bin/ntfy
+curl -L https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_macOS_all.tar.gz > ntfy_2.3.0_macOS_all.tar.gz
+tar zxvf ntfy_2.3.0_macOS_all.tar.gz
+sudo cp -a ntfy_2.3.0_macOS_all/ntfy /usr/local/bin/ntfy
 mkdir ~/Library/Application\ Support/ntfy 
-cp ntfy_2.1.2_macOS_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
+cp ntfy_2.3.0_macOS_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
 ntfy --help
 ```
 
@@ -212,7 +212,7 @@ ntfy --help
 
 ## Windows
 The [ntfy CLI](subscribe/cli.md) (`ntfy publish` and `ntfy subscribe` only) is supported on Windows as well.
-To install, please [download the latest ZIP](https://github.com/binwiederhier/ntfy/releases/download/v2.1.2/ntfy_2.1.2_windows_x86_64.zip),
+To install, please [download the latest ZIP](https://github.com/binwiederhier/ntfy/releases/download/v2.3.0/ntfy_2.3.0_windows_x86_64.zip),
 extract it and place the `ntfy.exe` binary somewhere in your `%Path%`. 
 
 The default path for the client config file is at `%AppData%\ntfy\client.yml` (not created automatically, sample in the ZIP file).

docs/integrations.md

@@ -16,6 +16,8 @@ ntfy community. Thanks to everyone running a public server. **You guys rock!**
 | [ntfy.jae.fi](https://ntfy.jae.fi/)               | 🇫🇮 Finland       |
 | [ntfy.adminforge.de](https://ntfy.adminforge.de/) | 🇩🇪 Germany       |
 | [ntfy.envs.net](https://ntfy.envs.net)            | 🇩🇪 Germany       |
+| [ntfy.mzte.de](https://ntfy.mzte.de/)             | 🇩🇪 Germany       |
+| [ntfy.hostux.net](https://ntfy.hostux.net/)       | 🇫🇷 France        |
 
 Please be aware that **server operators can log your messages**. The project also cannot guarantee the reliability
 and uptime of third party servers, so use of each server is **at your own discretion**.
@@ -75,6 +77,7 @@ and uptime of third party servers, so use of each server is **at your own discre
 
 - [Grafana-to-ntfy](https://github.com/kittyandrew/grafana-to-ntfy) - Grafana-to-ntfy alerts channel (Rust)
 - [Grafana-ntfy-webhook-integration](https://github.com/academo/grafana-alerting-ntfy-webhook-integration) - Integrates Grafana alerts webhooks (Go)
+- [Grafana-to-ntfy](https://gitlab.com/Saibe1111/grafana-to-ntfy) - Grafana-to-ntfy alerts channel (Node Js)
 - [ntfy-long-zsh-command](https://github.com/robfox92/ntfy-long-zsh-command) - Notifies you once a long-running command completes (zsh)
 - [ntfy-shellscripts](https://github.com/nickexyz/ntfy-shellscripts) - A few scripts for the ntfy project (Shell)
 - [QuickStatus](https://github.com/corneliusroot/QuickStatus) - A shell script to alert to any immediate problems upon login (Shell)
@@ -114,9 +117,15 @@ and uptime of third party servers, so use of each server is **at your own discre
 - [nodebb-plugin-ntfy](https://github.com/NodeBB/nodebb-plugin-ntfy) - Push notifications for NodeBB forums
 - [n8n-ntfy](https://github.com/raghavanand98/n8n-ntfy.sh) - n8n community node that lets you use ntfy in your workflows
 - [nlog-ntfy](https://github.com/MichelMichels/nlog-ntfy) - Send NLog messages over ntfy (C# / .NET / NLog)
+- [helm-charts](https://github.com/sarab97/helm-charts) - Helm charts of some of the selfhosted services, incl. ntfy
 
 ## Blog + forum posts
 
+- [ntfy.sh](https://neo-sahara.com/wp/2023/03/25/ntfy-sh/) - neo-sahara.com - 3/2023 
+- [Using Ntfy to send and receive push notifications - Samuel Rosa de Oliveria - Delphicon 2023](https://www.youtube.com/watch?v=feu0skpI9QI) - youtube.com - 3/2023 
+- [ntfy: własny darmowy system powiadomień](https://sprawdzone.it/ntfy-wlasny-darmowy-system-powiadomien/) - sprawdzone.it - 3/2023 
+- [Deploying ntfy on railway](https://www.youtube.com/watch?v=auJICXtxoNA) - youtube.com - 3/2023
+- [Start-Job,Variables, and ntfy.sh](https://klingele.dev/2023/03/01/start-jobvariables-and-ntfy-sh/) - klingele.dev - 3/2023 
 - [enviar notificaciones automáticas usando ntfy.sh](https://osiux.com/2023-02-15-send-automatic-notifications-using-ntfy.html) - osiux.com - 2/2023 
 - [Carnet IP动态解析以及通过ntfy推送IP信息](https://blog.wslll.cn/index.php/archives/201/) - blog.wslll.cn - 2/2023 
 - [Open-Source-Brieftaube: ntfy verschickt Push-Meldungen auf Smartphone und PC](https://www.heise.de/news/Open-Source-Brieftaube-ntfy-verschickt-Push-Meldungen-auf-Smartphone-und-PC-7521583.html) ⭐ - heise.de - 2/2023 
@@ -128,6 +137,7 @@ and uptime of third party servers, so use of each server is **at your own discre
 - [UnifiedPush: a decentralized, open-source push notification protocol](https://f-droid.org/en/2022/12/18/unifiedpush.html) ⭐ - 12/2022
 - [ntfy setup instructions](https://docs.benjamin-altpeter.de/network/vms/1001029-ntfy/) - benjamin-altpeter.de - 12/2022
 - [Ntfy Self-Hosted Push Notifications](https://lachlanlife.net/posts/2022-12-ntfy/) - lachlanlife.net - 12/2022 
+- [NTFY - système de notification hyper simple et complet](https://www.youtube.com/watch?v=UieZYWVVgA4) - youtube.com - 12/2022
 - [ntfy.sh](https://paramdeo.com/til/ntfy-sh) - paramdeo.com - 11/2022
 - [Using ntfy to warn me when my computer is discharging](https://ulysseszh.github.io/programming/2022/11/28/ntfy-warn-discharge.html) - ulysseszh.github.io - 11/2022
 - [ntfy - Push Notification Service](https://dizzytech.de/posts/ntfy/) - dizzytech.de - 11/2022 

docs/known-issues.md

@@ -8,7 +8,7 @@ For some (many?) users, the iOS app is not refreshing the view when new notifica
 swipe down, you do not see the newly arrived messages, even though the popup appeared before.
 
 This is caused by some weirdness between the Notification Service Extension (NSE), SwiftUI and Core Data. I am entirely
-clueless on how to fix it, sadly, as it is ephemeral and now clear to me what is causing it.
+clueless on how to fix it, sadly, as it is ephemeral and not clear to me what is causing it.
 
 Please send experienced iOS developers my way to help me figure this out.
 

docs/publish.md

@@ -3177,10 +3177,11 @@ These limits can be changed on a per-user basis using [tiers](config.md#tiers).
 a higher tier. ntfy.sh offers multiple paid tiers, which allows for much hier limits than the ones listed above. 
 
 ## List of all parameters
-The following is a list of all parameters that can be passed when publishing a message. Parameter names are **case-insensitive**,
-and can be passed as **HTTP headers** or **query parameters in the URL**. They are listed in the table in their canonical form.
+The following is a list of all parameters that can be passed when publishing a message. Parameter names are **case-insensitive**
+when used in **HTTP headers**, and must be **lowercase** when used as **query parameters in the URL**. They are listed in the 
+table in their canonical form.
 
-| Parameter       | Aliases (case-insensitive)                 | Description                                                                                   |
+| Parameter       | Aliases                                    | Description                                                                                   |
 |-----------------|--------------------------------------------|-----------------------------------------------------------------------------------------------|
 | `X-Message`     | `Message`, `m`                             | Main body of the message as shown in the notification                                         |
 | `X-Title`       | `Title`, `t`                               | [Message title](#message-title)                                                               |

docs/releases.md

@@ -2,12 +2,60 @@
 Binaries for all releases can be found on the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
 and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
 
+## ntfy server v2.3.0
+Released March 29, 2023
+
+This release primarily fixes an issue with delayed messages, and it adds support for Go's profiler (if enabled), which
+will allow investigating usage spikes in more detail. There will likely be a follow-up release this week to fix the
+actual spikes [caused by iOS devices](https://github.com/binwiederhier/ntfy/issues/677).
+
+**Features:**
+
+* ntfy now supports Go's `pprof` profiler, if enabled (relates to [#677](https://github.com/binwiederhier/ntfy/issues/677))
+
+**Bug fixes + maintenance:**
+
+* Fix delayed message sending from authenticated users ([#679](https://github.com/binwiederhier/ntfy/issues/679))
+* Fixed plural for Polish and other translations ([#678](https://github.com/binwiederhier/ntfy/pull/678), thanks to [@bmoczulski](https://github.com/bmoczulski))
+
+## ntfy server v2.2.0
+Released March 17, 2023
+
+With this release, ntfy is now able to expose metrics via a `/metrics` endpoint for [Prometheus](https://prometheus.io/), if enabled.
+The endpoint exposes about 20 different counters and gauges, from the number of published messages and emails, to active subscribers,
+visitors and topics. If you'd like more metrics, pop in the Discord/Matrix or file an issue on GitHub. 
+
+On top of this, you can now use access tokens in the ntfy CLI (defined in the `client.yml` file), fixed a bug in `ntfy subscribe`,
+removed the dependency on Google Fonts, and more.
+
+🔥 Reminder: Purchase one of three **ntfy Pro plans** for **50% off** for a limited time (if you use promo code `MYTOPIC`). 
+ntfy Pro gives you higher rate limits and lets you reserve topic names. [Buy through web app](https://ntfy.sh/app).
+
+❤️ If you don't need ntfy Pro, please consider sponsoring ntfy via [GitHub Sponsors](https://github.com/sponsors/binwiederhier)
+and [Liberapay](https://en.liberapay.com/ntfy/). ntfy will stay open source forever.
+
+**Features:**
+
+* Monitoring: ntfy now exposes a `/metrics` endpoint for [Prometheus](https://prometheus.io/) if [configured](config.md#monitoring) ([#210](https://github.com/binwiederhier/ntfy/issues/210), thanks to [@rogeliodh](https://github.com/rogeliodh) for reporting)
+* You can now use tokens in `client.yml` for publishing and subscribing ([#653](https://github.com/binwiederhier/ntfy/issues/653), thanks to [@wunter8](https://github.com/wunter8))
+
+**Bug fixes + maintenance:**
+
+* `ntfy sub --poll --from-config` will now include authentication headers from client.yml (if applicable) ([#658](https://github.com/binwiederhier/ntfy/issues/658), thanks to [@wunter8](https://github.com/wunter8))
+* Docs: Removed dependency on Google Fonts in docs ([#554](https://github.com/binwiederhier/ntfy/issues/554), thanks to [@bt90](https://github.com/bt90) for reporting, and [@ozskywalker](https://github.com/ozskywalker) for implementing)
+* Increase allowed auth failure attempts per IP address to 30 (no ticket)
+* Web app: Increase maximum incremental backoff retry interval to 2 minutes (no ticket)
+
+**Documentation:**
+
+* Make query parameter description more clear ([#630](https://github.com/binwiederhier/ntfy/issues/630), thanks to [@bbaa-bbaa](https://github.com/bbaa-bbaa) for reporting, and to [@wunter8](https://github.com/wunter8) for a fix)
+
 ## ntfy server v2.1.2
 Released March 4, 2023
 
 This is a hotfix release, mostly to combat the ridiculous amount of Matrix requests with invalid/dead pushkeys, and the
-corresponding HTTP 507 responses the ntfy.sh server is sending out. We're up to >600k HTTP 507 responses 🤦. This release
-solves this issue by rejecting Matrix pushkeys, if nobody has subscribed to the corresponding topic to 12 hours.
+corresponding HTTP 507 responses the ntfy.sh server is sending out. We're up to >600k HTTP 507 responses per day 🤦. This 
+release solves this issue by rejecting Matrix pushkeys, if nobody has subscribed to the corresponding topic for 12 hours.
 
 The release furthermore reverts the default rate limiting behavior for UnifiedPush to be publisher-based, and introduces
 a flag to enable [subscriber-based rate limiting](config.md#subscriber-based-rate-limiting) for high volume servers.
@@ -1086,3 +1134,20 @@ Released Dec 28, 2021
 ## Older releases
 For older releases, check out the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
 and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
+
+## Not released yet
+
+### ntfy Android app v1.16.1 (UNRELEASED)
+
+**Features:**
+
+* You can now disable UnifiedPush so ntfy does not act as a UnifiedPush distributor ([#646](https://github.com/binwiederhier/ntfy/issues/646), thanks to [@ollien](https://github.com/ollien) for reporting and to [@wunter8](https://github.com/wunter8) for implementing) 
+
+**Bug fixes + maintenance:**
+
+* UnifiedPush subscriptions now include the `Rate-Topics` header to facilitate subscriber-based billing ([#652](https://github.com/binwiederhier/ntfy/issues/652), thanks to [@wunter8](https://github.com/wunter8))
+* Subscriptions without icons no longer appear to use another subscription's icon ([#634](https://github.com/binwiederhier/ntfy/issues/634), thanks to [@topcaser](https://github.com/topcaser) for reporting and to [@wunter8](https://github.com/wunter8) for fixing)
+
+**Additional languages:**
+
+* Swedish (thanks to [@hellbown](https://hosted.weblate.org/user/hellbown/))

docs/static/css/extra.css

@@ -3,6 +3,8 @@
     --md-primary-fg-color--light: #338574;
     --md-primary-fg-color--dark:  #338574;
     --md-footer-bg-color:         #353744;
+    --md-text-font:               "Roboto";
+    --md-code-font:               "Roboto Mono";
 }
 
 .md-header__button.md-logo :is(img, svg) {
@@ -147,3 +149,57 @@ figure video {
 .lightbox .close-lightbox:hover::before {
     background-color: #fff;
 }
+
+/* roboto-300 - latin */
+@font-face {
+    font-display: swap;
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 300;
+    src: url('../fonts/roboto-v30-latin-300.woff2') format('woff2');
+}
+
+/* roboto-regular - latin */
+@font-face {
+    font-display: swap;
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/roboto-v30-latin-regular.woff2') format('woff2');
+}
+
+/* roboto-italic - latin */
+@font-face {
+    font-display: swap;
+    font-family: 'Roboto';
+    font-style: italic;
+    font-weight: 400;
+    src: url('../fonts/roboto-v30-latin-italic.woff2') format('woff2');
+}
+
+/* roboto-500 - latin */
+@font-face {
+    font-display: swap;
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 500;
+    src: url('../fonts/roboto-v30-latin-500.woff2') format('woff2');
+}
+
+/* roboto-700 - latin */
+@font-face {
+    font-display: swap;
+    font-family: 'Roboto';
+    font-style: normal;
+    font-weight: 700;
+    src: url('../fonts/roboto-v30-latin-700.woff2') format('woff2');
+}
+
+/* roboto-mono - latin */
+@font-face {
+    font-display: swap;
+    font-family: 'Roboto Mono';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../fonts/roboto-mono-v22-latin-regular.woff2') format('woff2');
+}

docs/subscribe/cli.md

@@ -254,13 +254,13 @@ I hope this shows how powerful this command is. Here's a short video that demons
   <figcaption>Execute all the things</figcaption>
 </figure>
 
-If most (or all) of your subscription usernames, passwords, and commands are the same, you can specify a `default-user`, `default-password`, and `default-command` at the top of the
-`client.yml`. If a subscription does not specify a username/password to use or does not have a command, the defaults will be used, otherwise, the subscription settings will
-override the defaults.
+If most (or all) of your subscriptions use the same credentials, you can set defaults in `client.yml`. Use `default-user` and `default-password` or `default-token` (but not both).
+You can also specify a `default-command` that will run when a message is received. If a subscription does not include credentials to use or does not have a command, the defaults
+will be used, otherwise, the subscription settings will override the defaults.
 
 !!! warning
-    Because the `default-user` and `default-password` will be sent for each topic that does not have its own username/password (even if the topic does not require authentication),
-    be sure that the servers/topics you subscribe to use HTTPS to prevent leaking the username and password.
+    Because the `default-user`, `default-password`, and `default-token` will be sent for each topic that does not have its own username/password (even if the topic does not
+    require authentication), be sure that the servers/topics you subscribe to use HTTPS to prevent leaking the username and password.
 
 ### Using the systemd service
 You can use the `ntfy-client` systemd service (see [ntfy-client.service](https://github.com/binwiederhier/ntfy/blob/main/client/ntfy-client.service))

docs/troubleshooting.md

@@ -0,0 +1,131 @@
+# Troubleshooting
+This page lists a few suggestions of what to do when things don't work as expected. This is not a complete list. 
+If this page does not help, feel free to drop by the [Discord](https://discord.gg/cT7ECsZj9w) or [Matrix](https://matrix.to/#/#ntfy:matrix.org)
+and ask there. We're happy to help.
+
+## ntfy server
+If you host your own ntfy server, and you're having issues with any component, it is always helpful to enable debugging/tracing
+in the server. You can find detailed instructions in the [Logging & Debugging](config.md#logging-debugging) section, but it ultimately
+boils down to setting `log-level: debug` or `log-level: trace` in the `server.yml` file:
+
+=== "server.yml (debug)"
+    ``` yaml
+    log-level: debug
+    ```
+
+=== "server.yml (trace)"
+    ``` yaml
+    log-level: trace
+    ```
+
+If you're using environment variables, set `NTFY_LOG_LEVEL=debug` (or `trace`) instead. You can also pass `--debug` or `--trace`
+to the `ntfy serve` command, e.g. `ntfy serve --trace`. If you're using systemd (i.e. `systemctl`) to run ntfy, you can look at
+the logs using `journalctl -u ntfy -f`. The logs will look something like this:
+
+=== "Example logs (debug)"
+    ```
+    $ ntfy serve --debug
+    2023/03/20 14:45:38 INFO Listening on :2586[http] :1025[smtp], ntfy 2.1.2, log level is DEBUG (tag=startup)
+    2023/03/20 14:45:38 DEBUG Waiting until 2023-03-21 00:00:00 +0000 UTC to reset visitor stats (tag=resetter)
+    2023/03/20 14:45:39 DEBUG Rate limiters reset for visitor (visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=0, visitor_messages_limit=500, visitor_messages_remaining=500, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=60, visitor_seen=2023-03-20T14:45:39.7-04:00)
+    2023/03/20 14:45:39 DEBUG HTTP request started (http_method=POST, http_path=/mytopic, tag=http, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=0, visitor_messages_limit=500, visitor_messages_remaining=500, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=60, visitor_seen=2023-03-20T14:45:39.7-04:00)
+    2023/03/20 14:45:39 DEBUG Received message (http_method=POST, http_path=/mytopic, message_body_size=2, message_delayed=false, message_email=, message_event=message, message_firebase=true, message_id=EZu6i2WZjH0v, message_sender=127.0.0.1, message_time=1679337939, message_unifiedpush=false, tag=publish, topic=mytopic, topic_last_access=2023-03-20T14:45:38.319-04:00, topic_subscribers=0, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=1, visitor_messages_limit=500, visitor_messages_remaining=499, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=59.0002132248, visitor_seen=2023-03-20T14:45:39.7-04:00)
+    2023/03/20 14:45:39 DEBUG Adding message to cache (http_method=POST, http_path=/mytopic, message_body_size=2, message_event=message, message_id=EZu6i2WZjH0v, message_sender=127.0.0.1, message_time=1679337939, tag=publish, topic=mytopic, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=1, visitor_messages_limit=500, visitor_messages_remaining=499, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=59.000259165, visitor_seen=2023-03-20T14:45:39.7-04:00)
+    2023/03/20 14:45:39 DEBUG HTTP request finished (http_method=POST, http_path=/mytopic, tag=http, time_taken_ms=2, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=1, visitor_messages_limit=500, visitor_messages_remaining=499, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=59.0004147334, visitor_seen=2023-03-20T14:45:39.7-04:00)
+    2023/03/20 14:45:39 DEBUG Wrote 1 message(s) in 8.285712ms (tag=message_cache)
+    ...    
+    ```
+
+=== "Example logs (trace)"
+    ```
+    $ ntfy serve --trace
+    2023/03/20 14:40:42 INFO Listening on :2586[http] :1025[smtp], ntfy 2.1.2, log level is TRACE (tag=startup)
+    2023/03/20 14:40:42 DEBUG Waiting until 2023-03-21 00:00:00 +0000 UTC to reset visitor stats (tag=resetter)
+    2023/03/20 14:40:59 DEBUG Rate limiters reset for visitor (visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=0, visitor_messages_limit=500, visitor_messages_remaining=500, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=60, visitor_seen=2023-03-20T14:40:59.893-04:00)
+    2023/03/20 14:40:59 TRACE HTTP request started (http_method=POST, http_path=/mytopic, http_request=POST /mytopic HTTP/1.1
+    User-Agent: curl/7.81.0
+    Accept: */*
+    Content-Length: 2
+    Content-Type: application/x-www-form-urlencoded
+    
+    hi, tag=http, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=0, visitor_messages_limit=500, visitor_messages_remaining=500, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=60, visitor_seen=2023-03-20T14:40:59.893-04:00)
+    2023/03/20 14:40:59 TRACE Received message (http_method=POST, http_path=/mytopic, message_body={
+      "id": "Khaup1RVclU3",
+      "time": 1679337659,
+      "expires": 1679380859,
+      "event": "message",
+      "topic": "mytopic",
+      "message": "hi"
+    }, message_body_size=2, message_delayed=false, message_email=, message_event=message, message_firebase=true, message_id=Khaup1RVclU3, message_sender=127.0.0.1, message_time=1679337659, message_unifiedpush=false, tag=publish, topic=mytopic, topic_last_access=2023-03-20T14:40:59.893-04:00, topic_subscribers=0, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=1, visitor_messages_limit=500, visitor_messages_remaining=499, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=59.0001785048, visitor_seen=2023-03-20T14:40:59.893-04:00)
+    2023/03/20 14:40:59 DEBUG Adding message to cache (http_method=POST, http_path=/mytopic, message_body_size=2, message_event=message, message_id=Khaup1RVclU3, message_sender=127.0.0.1, message_time=1679337659, tag=publish, topic=mytopic, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=1, visitor_messages_limit=500, visitor_messages_remaining=499, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=59.0002044368, visitor_seen=2023-03-20T14:40:59.893-04:00)
+    2023/03/20 14:40:59 DEBUG HTTP request finished (http_method=POST, http_path=/mytopic, tag=http, time_taken_ms=1, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=1, visitor_messages_limit=500, visitor_messages_remaining=499, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=59.000220502, visitor_seen=2023-03-20T14:40:59.893-04:00)
+    2023/03/20 14:40:59 TRACE No stream or WebSocket subscribers, not forwarding (message_body_size=2, message_event=message, message_id=Khaup1RVclU3, message_sender=127.0.0.1, message_time=1679337659, tag=publish, topic=mytopic, visitor_auth_limiter_limit=0.016666666666666666, visitor_auth_limiter_tokens=10, visitor_emails=0, visitor_emails_limit=12, visitor_emails_remaining=12, visitor_id=ip:127.0.0.1, visitor_ip=127.0.0.1, visitor_messages=1, visitor_messages_limit=500, visitor_messages_remaining=499, visitor_request_limiter_limit=0.2, visitor_request_limiter_tokens=59.0002369212, visitor_seen=2023-03-20T14:40:59.893-04:00)
+    2023/03/20 14:41:00 DEBUG Wrote 1 message(s) in 9.529196ms (tag=message_cache)
+    ...
+    ```
+
+## Android app
+On Android, you can turn on logging in the settings under **Settings → Record logs**. This will store up to 1,000 log
+entries, which you can then copy or upload. 
+
+<figure markdown>
+  ![Recording logs on Android](static/img/android-screenshot-logs.jpg){ width=400 }
+  <figcaption>Recording logs on Android</figcaption>
+</figure>
+
+When you copy or upload the logs, you can censor them to make it easier to share them with others. ntfy will replace all
+topics and hostnames with fruits. Here's an example:
+
+```
+This is a log of the ntfy Android app. The log shows up to 1,000 entries.
+Server URLs (aside from ntfy.sh) and topics have been replaced with fruits 🍌🥝🍋🥥🥑🍊🍎🍑.
+
+Device info:
+--
+ntfy: 1.16.0 (play)
+OS: 4.19.157-perf+
+Android: 13 (SDK 33)
+...
+
+Logs
+--
+
+1679339199507 2023-03-20 15:06:39.507 D NtfyMainActivity Battery: ignoring optimizations = true (we want this to be true); instant subscriptions = true; remind time reached = true; banner = false
+1679339199507 2023-03-20 15:06:39.507 D NtfySubscriberMgr Enqueuing work to refresh subscriber service
+1679339199589 2023-03-20 15:06:39.589 D NtfySubscriberMgr ServiceStartWorker: Starting foreground service with action START (work ID: a7eeeae9-9356-40df-afbd-236e5ed10a0b)
+1679339199602 2023-03-20 15:06:39.602 D NtfySubscriberService onStartCommand executed with startId: 262
+1679339199602 2023-03-20 15:06:39.602 D NtfySubscriberService using an intent with action START
+1679339199629 2023-03-20 15:06:39.629 D NtfySubscriberService Refreshing subscriptions
+1679339199629 2023-03-20 15:06:39.629 D NtfySubscriberService - Desired connections: [ConnectionId(baseUrl=https://ntfy.sh, topicsToSubscriptionIds={avocado=23801492, lemon=49013182, banana=1309176509201171073, peach=573300885184666424, pineapple=-5956897229801209316, durian=81453333, starfruit=30489279, fruit12=82532869}), ConnectionId(baseUrl=https://orange.example.com, topicsToSubscriptionIds={apple=4971265, dragonfruit=66809328})]
+1679339199629 2023-03-20 15:06:39.629 D NtfySubscriberService - Active connections: [ConnectionId(baseUrl=https://orange.example.com, topicsToSubscriptionIds={apple=4971265, dragonfruit=66809328}), ConnectionId(baseUrl=https://ntfy.sh, topicsToSubscriptionIds={avocado=23801492, lemon=49013182, banana=1309176509201171073, peach=573300885184666424, pineapple=-5956897229801209316, durian=81453333, starfruit=30489279, fruit12=82532869})]
+...
+```
+
+To get live logs, or to get more advanced access to an Android phone, you can use [adb](https://developer.android.com/studio/command-line/adb).
+After you install and [enable adb debugging](https://developer.android.com/studio/command-line/adb#Enabling), you can
+get detailed logs like so:
+
+```
+# Connect to phone (enable Wireless debugging first)
+adb connect 192.168.1.137:39539
+
+# Print all logs; you may have to pass the -s option
+adb logcat
+adb -s 192.168.1.137:39539 logcat
+
+# Only list ntfy logs
+adb logcat --pid=$(adb shell pidof -s io.heckel.ntfy)
+adb -s 192.168.1.137:39539 logcat --pid=$(adb -s 192.168.1.137:39539 shell pidof -s io.heckel.ntfy)
+```
+
+## Web app
+The web app logs everything to the **developer console**, which you can open by **pressing the F12 key** on your 
+keyboard.
+
+<figure markdown>
+  ![Web app logs](static/img/web-logs.png)
+  <figcaption>Web app logs in the developer console</figcaption>
+</figure>
+
+## iOS app
+Sorry, there is no way to debug or get the logs from the iOS app (yet), outside of running the app in Xcode.

go.mod

@@ -4,22 +4,22 @@ go 1.18
 
 require (
 	cloud.google.com/go/firestore v1.9.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/storage v1.30.1 // indirect
 	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/emersion/go-smtp v0.16.0
-	github.com/gabriel-vasile/mimetype v1.4.1
+	github.com/gabriel-vasile/mimetype v1.4.2
 	github.com/gorilla/websocket v1.5.0
 	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/olebedev/when v0.0.0-20221205223600-4d190b02b8d8
 	github.com/stretchr/testify v1.8.1
-	github.com/urfave/cli/v2 v2.24.4
-	golang.org/x/crypto v0.6.0
-	golang.org/x/oauth2 v0.5.0 // indirect
+	github.com/urfave/cli/v2 v2.25.1
+	golang.org/x/crypto v0.7.0
+	golang.org/x/oauth2 v0.6.0 // indirect
 	golang.org/x/sync v0.1.0
-	golang.org/x/term v0.5.0
+	golang.org/x/term v0.6.0
 	golang.org/x/time v0.3.0
-	google.golang.org/api v0.111.0
+	google.golang.org/api v0.114.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -27,39 +27,47 @@ require github.com/pkg/errors v0.9.1 // indirect
 
 require (
 	firebase.google.com/go/v4 v4.10.0
-	github.com/stripe/stripe-go/v74 v74.10.0
+	github.com/prometheus/client_golang v1.14.0
+	github.com/stripe/stripe-go/v74 v74.13.0
 )
 
 require (
 	cloud.google.com/go v0.110.0 // indirect
-	cloud.google.com/go/compute v1.18.0 // indirect
+	cloud.google.com/go/compute v1.19.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v0.12.0 // indirect
+	cloud.google.com/go/iam v0.13.0 // indirect
 	cloud.google.com/go/longrunning v0.4.1 // indirect
 	github.com/AlekSi/pointer v1.2.0 // indirect
 	github.com/MicahParks/keyfunc v1.9.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.8.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/appengine/v2 v2.0.2 // indirect
-	google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 // indirect
-	google.golang.org/grpc v1.53.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/genproto v0.0.0-20230327215041-6ac7f18bb9d5 // indirect
+	google.golang.org/grpc v1.54.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,18 +1,18 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
 cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
-cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY=
-cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
+cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ=
+cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA=
 cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE=
-cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE=
-cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
+cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
+cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
 cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
 cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
-cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
-cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
+cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM=
+cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E=
 firebase.google.com/go/v4 v4.10.0 h1:dgK/8uwfJbzc5LZK/GyRRfIkZEDObN9q0kgEXsjlXN4=
 firebase.google.com/go/v4 v4.10.0/go.mod h1:m0gLwPY9fxKggizzglgCNWOGnFnVPifLpqZzo5u3e/A=
 github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w=
@@ -22,11 +22,16 @@ github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/MicahParks/keyfunc v1.9.0 h1:lhKd5xrFHLNOWrDc4Tyb/Q1AJ4LCzQ48GVJyVIID3+o=
 github.com/MicahParks/keyfunc v1.9.0/go.mod h1:IdnCilugA0O/99dW+/MkvlyrsX8+L8+x95xuVNtM5jw=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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=
@@ -39,8 +44,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkFtf/dnN7Q=
-github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
@@ -52,6 +57,7 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -60,8 +66,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -77,19 +83,36 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=
-github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
+github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc=
+github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+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.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/olebedev/when v0.0.0-20221205223600-4d190b02b8d8 h1:0uFGkScHef2Xd8g74BMHU1jFcnKEm0PzrPn4CluQ9FI=
 github.com/olebedev/when v0.0.0-20221205223600-4d190b02b8d8/go.mod h1:T0THb4kP9D3NNqlvCwIG4GyUioTAzEhB4RNVzig/43E=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
+github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
+github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
+github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
+github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 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=
@@ -101,20 +124,18 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 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/stripe/stripe-go/v74 v74.9.0 h1:yQ3O8jmtoAjKARzjLGmwYj2ZxqYbdtWVjFeovNGDtjg=
-github.com/stripe/stripe-go/v74 v74.9.0/go.mod h1:5PoXNp30AJ3tGq57ZcFuaMylzNi8KpwlrYAFmO1fHZw=
-github.com/stripe/stripe-go/v74 v74.10.0 h1:Edd5uO1/41wyd163ZTTA8b+8t/wVgdnJQk3Ry1lbLIs=
-github.com/stripe/stripe-go/v74 v74.10.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
-github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU=
-github.com/urfave/cli/v2 v2.24.4/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
+github.com/stripe/stripe-go/v74 v74.13.0 h1:n9VIeApHaGsqRQcEsr8ANldfFrLzFSasfNBkq0roPTw=
+github.com/stripe/stripe-go/v74 v74.13.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
+github.com/urfave/cli/v2 v2.25.1 h1:zw8dSP7ghX0Gmm8vugrs6q9Ku0wzweqPyshy+syu9Gw=
+github.com/urfave/cli/v2 v2.25.1/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -125,45 +146,39 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=
-golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
+golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
+golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
@@ -176,8 +191,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-google.golang.org/api v0.111.0 h1:bwKi+z2BsdwYFRKrqwutM+axAlYLz83gt5pDSXCJT+0=
-google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0=
+google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE=
+google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
 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.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -187,17 +202,15 @@ google.golang.org/appengine/v2 v2.0.2/go.mod h1:PkgRUWz4o1XOvbqtWTkBtCitEJ5Tp4Ho
 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-20230227214838-9b19f0bdc514 h1:rtNKfB++wz5mtDY2t5C8TXlU5y52ojSu7tZo0z7u8eQ=
-google.golang.org/genproto v0.0.0-20230227214838-9b19f0bdc514/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA=
-google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 h1:QQF+HdiI4iocoxUjjpLgvTYDHKm99C/VtTBFnfiCJos=
-google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA=
+google.golang.org/genproto v0.0.0-20230327215041-6ac7f18bb9d5 h1:Kd6tRRHXw8z4TlPlWi+NaK10gsePL6GdZBQChptOLGA=
+google.golang.org/genproto v0.0.0-20230327215041-6ac7f18bb9d5/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
-google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
+google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
+google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -209,10 +222,10 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.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/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=

mkdocs.yml

@@ -9,6 +9,7 @@ edit_uri: blob/main/docs/
 
 theme:
   name: material
+  font: false
   language: en
   custom_dir: docs/_overrides
   logo: static/img/ntfy.png
@@ -70,6 +71,9 @@ plugins:
   - search
   - minify:
       minify_html: true
+  - mkdocs-simple-hooks:
+      hooks:
+        on_post_build: "docs.hooks:copy_fonts"
 
 nav:
 - "Getting started": index.md
@@ -89,6 +93,7 @@ nav:
   - "Integrations + projects": integrations.md
   - "Release notes": releases.md
   - "Emojis 🥳 🎉": emojis.md
+  - "Troubleshooting": troubleshooting.md
   - "Known issues": known-issues.md
   - "Deprecation notices": deprecations.md
   - "Development": develop.md

requirements.txt

@@ -1,3 +1,4 @@
 # The documentation uses 'mkdocs', which is written in Python
 mkdocs-material
 mkdocs-minify-plugin
+mkdocs-simple-hooks

server/config.go

@@ -49,7 +49,7 @@ const (
 	DefaultVisitorEmailLimitReplenish           = time.Hour
 	DefaultVisitorAccountCreationLimitBurst     = 3
 	DefaultVisitorAccountCreationLimitReplenish = 24 * time.Hour
-	DefaultVisitorAuthFailureLimitBurst         = 10
+	DefaultVisitorAuthFailureLimitBurst         = 30
 	DefaultVisitorAuthFailureLimitReplenish     = time.Minute
 	DefaultVisitorAttachmentTotalSizeLimit      = 100 * 1024 * 1024 // 100 MB
 	DefaultVisitorAttachmentDailyBandwidthLimit = 500 * 1024 * 1024 // 500 MB
@@ -61,7 +61,7 @@ var (
 
 	// DefaultDisallowedTopics defines the topics that are forbidden, because they are used elsewhere. This array can be
 	// extended using the server.yml config. If updated, also update in Android and web app.
-	DefaultDisallowedTopics = []string{"docs", "static", "file", "app", "account", "settings", "signup", "login", "v1"}
+	DefaultDisallowedTopics = []string{"docs", "static", "file", "app", "metrics", "account", "settings", "signup", "login", "v1"}
 )
 
 // Config is the main config struct for the application. Use New to instantiate a default config struct.
@@ -105,6 +105,9 @@ type Config struct {
 	SMTPServerListen                     string
 	SMTPServerDomain                     string
 	SMTPServerAddrPrefix                 string
+	MetricsEnable                        bool
+	MetricsListenHTTP                    string
+	ProfileListenHTTP                    string
 	MessageLimit                         int
 	MinDelay                             time.Duration
 	MaxDelay                             time.Duration
@@ -133,7 +136,8 @@ type Config struct {
 	EnableWeb                            bool
 	EnableSignup                         bool // Enable creation of accounts via API and UI
 	EnableLogin                          bool
-	EnableReservations                   bool   // Allow users with role "user" to own/reserve topics
+	EnableReservations                   bool // Allow users with role "user" to own/reserve topics
+	EnableMetrics                        bool
 	AccessControlAllowOrigin             string // CORS header field to restrict access from web clients
 	Version                              string // injected by App
 }

server/file_cache.go

@@ -67,6 +67,7 @@ func (c *fileCache) Write(id string, in io.Reader, limiters ...util.Limiter) (in
 	}
 	c.mu.Lock()
 	c.totalSizeCurrent += size
+	mset(metricAttachmentsTotalSize, c.totalSizeCurrent)
 	c.mu.Unlock()
 	return size, nil
 }
@@ -89,6 +90,7 @@ func (c *fileCache) Remove(ids ...string) error {
 	c.mu.Lock()
 	c.totalSizeCurrent = size
 	c.mu.Unlock()
+	mset(metricAttachmentsTotalSize, size)
 	return nil
 }
 

server/server.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"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"
@@ -18,6 +19,7 @@ import (
 	"io"
 	"net"
 	"net/http"
+	"net/http/pprof"
 	"net/netip"
 	"net/url"
 	"os"
@@ -37,6 +39,8 @@ type Server struct {
 	config            *Config
 	httpServer        *http.Server
 	httpsServer       *http.Server
+	httpMetricsServer *http.Server
+	httpProfileServer *http.Server
 	unixListener      net.Listener
 	smtpServer        *smtp.Server
 	smtpServerBackend *smtpBackend
@@ -50,6 +54,7 @@ type Server struct {
 	fileCache         *fileCache                          // File system based cache that stores attachments
 	stripe            stripeAPI                           // Stripe API, can be replaced with a mock
 	priceCache        *util.LookupCache[map[string]int64] // Stripe price ID -> price as cents (USD implied!)
+	metricsHandler    http.Handler                        // Handles /metrics if enable-metrics set, and listen-metrics-http not set
 	closeChan         chan bool
 	mu                sync.Mutex
 }
@@ -72,6 +77,7 @@ var (
 	webConfigPath                                        = "/config.js"
 	accountPath                                          = "/account"
 	matrixPushPath                                       = "/_matrix/push/v1/notify"
+	metricsPath                                          = "/metrics"
 	apiHealthPath                                        = "/v1/health"
 	apiTiers                                             = "/v1/tiers"
 	apiAccountPath                                       = "/v1/account"
@@ -210,6 +216,12 @@ func (s *Server) Run() error {
 	if s.config.SMTPServerListen != "" {
 		listenStr += fmt.Sprintf(" %s[smtp]", s.config.SMTPServerListen)
 	}
+	if s.config.MetricsListenHTTP != "" {
+		listenStr += fmt.Sprintf(" %s[http/metrics]", s.config.MetricsListenHTTP)
+	}
+	if s.config.ProfileListenHTTP != "" {
+		listenStr += fmt.Sprintf(" %s[http/profile]", s.config.ProfileListenHTTP)
+	}
 	log.Tag(tagStartup).Info("Listening on%s, ntfy %s, log level is %s", listenStr, s.config.Version, log.CurrentLevel().String())
 	if log.IsFile() {
 		fmt.Fprintf(os.Stderr, "Listening on%s, ntfy %s\n", listenStr, s.config.Version)
@@ -256,6 +268,28 @@ func (s *Server) Run() error {
 			errChan <- httpServer.Serve(s.unixListener)
 		}()
 	}
+	if s.config.MetricsListenHTTP != "" {
+		initMetrics()
+		s.httpMetricsServer = &http.Server{Addr: s.config.MetricsListenHTTP, Handler: promhttp.Handler()}
+		go func() {
+			errChan <- s.httpMetricsServer.ListenAndServe()
+		}()
+	} else if s.config.EnableMetrics {
+		initMetrics()
+		s.metricsHandler = promhttp.Handler()
+	}
+	if s.config.ProfileListenHTTP != "" {
+		profileMux := http.NewServeMux()
+		profileMux.HandleFunc("/debug/pprof/", pprof.Index)
+		profileMux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
+		profileMux.HandleFunc("/debug/pprof/profile", pprof.Profile)
+		profileMux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
+		profileMux.HandleFunc("/debug/pprof/trace", pprof.Trace)
+		s.httpProfileServer = &http.Server{Addr: s.config.ProfileListenHTTP, Handler: profileMux}
+		go func() {
+			errChan <- s.httpProfileServer.ListenAndServe()
+		}()
+	}
 	if s.config.SMTPServerListen != "" {
 		go func() {
 			errChan <- s.runSMTPServer()
@@ -316,6 +350,9 @@ func (s *Server) handle(w http.ResponseWriter, r *http.Request) {
 				s.handleError(w, r, v, err)
 				return
 			}
+			if metricHTTPRequests != nil {
+				metricHTTPRequests.WithLabelValues("200", "20000", r.Method).Inc()
+			}
 		}).
 		Debug("HTTP request finished")
 }
@@ -325,6 +362,9 @@ func (s *Server) handleError(w http.ResponseWriter, r *http.Request, v *visitor,
 	if !ok {
 		httpErr = errHTTPInternalError
 	}
+	if metricHTTPRequests != nil {
+		metricHTTPRequests.WithLabelValues(fmt.Sprintf("%d", httpErr.HTTPCode), fmt.Sprintf("%d", httpErr.Code), r.Method).Inc()
+	}
 	isRateLimiting := util.Contains(rateLimitingErrorCodes, httpErr.HTTPCode)
 	isNormalError := strings.Contains(err.Error(), "i/o timeout") || util.Contains(normalErrorCodes, httpErr.HTTPCode)
 	ev := logvr(v, r).Err(err)
@@ -405,6 +445,8 @@ func (s *Server) handleInternal(w http.ResponseWriter, r *http.Request, v *visit
 		return s.ensurePaymentsEnabled(s.handleBillingTiersGet)(w, r, v)
 	} else if r.Method == http.MethodGet && r.URL.Path == matrixPushPath {
 		return s.handleMatrixDiscovery(w)
+	} else if r.Method == http.MethodGet && r.URL.Path == metricsPath && s.metricsHandler != nil {
+		return s.handleMetrics(w, r, v)
 	} else if r.Method == http.MethodGet && staticRegex.MatchString(r.URL.Path) {
 		return s.ensureWebEnabled(s.handleStatic)(w, r, v)
 	} else if r.Method == http.MethodGet && docsRegex.MatchString(r.URL.Path) {
@@ -497,6 +539,13 @@ func (s *Server) handleWebConfig(w http.ResponseWriter, _ *http.Request, _ *visi
 	return err
 }
 
+// handleMetrics returns Prometheus metrics. This endpoint is only called if enable-metrics is set,
+// and listen-metrics-http is not set.
+func (s *Server) handleMetrics(w http.ResponseWriter, r *http.Request, _ *visitor) error {
+	s.metricsHandler.ServeHTTP(w, r)
+	return nil
+}
+
 func (s *Server) handleStatic(w http.ResponseWriter, r *http.Request, _ *visitor) error {
 	r.URL.Path = webSiteDir + r.URL.Path
 	util.Gzip(http.FileServer(http.FS(webFsCached))).ServeHTTP(w, r)
@@ -586,8 +635,15 @@ func (s *Server) handleMatrixDiscovery(w http.ResponseWriter) error {
 }
 
 func (s *Server) handlePublishInternal(r *http.Request, v *visitor) (*message, error) {
-	t := fromContext[*topic](r, contextTopic)
-	vrate := fromContext[*visitor](r, contextRateVisitor)
+	start := time.Now()
+	t, err := fromContext[*topic](r, contextTopic)
+	if err != nil {
+		return nil, err
+	}
+	vrate, err := fromContext[*visitor](r, contextRateVisitor)
+	if err != nil {
+		return nil, err
+	}
 	body, err := util.Peek(r.Body, s.config.MessageLimit)
 	if err != nil {
 		return nil, err
@@ -666,48 +722,70 @@ func (s *Server) handlePublishInternal(r *http.Request, v *visitor) (*message, e
 	s.mu.Lock()
 	s.messages++
 	s.mu.Unlock()
+	if unifiedpush {
+		minc(metricUnifiedPushPublishedSuccess)
+	}
+	mset(metricMessagePublishDurationMillis, time.Since(start).Milliseconds())
 	return m, nil
 }
 
 func (s *Server) handlePublish(w http.ResponseWriter, r *http.Request, v *visitor) error {
 	m, err := s.handlePublishInternal(r, v)
 	if err != nil {
+		minc(metricMessagesPublishedFailure)
 		return err
 	}
+	minc(metricMessagesPublishedSuccess)
 	return s.writeJSON(w, m)
 }
 
 func (s *Server) handlePublishMatrix(w http.ResponseWriter, r *http.Request, v *visitor) error {
 	_, err := s.handlePublishInternal(r, v)
 	if err != nil {
+		minc(metricMessagesPublishedFailure)
+		minc(metricMatrixPublishedFailure)
 		if e, ok := err.(*errHTTP); ok && e.HTTPCode == errHTTPInsufficientStorageUnifiedPush.HTTPCode {
-			topic := fromContext[*topic](r, contextTopic)
-			pushKey := fromContext[string](r, contextMatrixPushKey)
+			topic, err := fromContext[*topic](r, contextTopic)
+			if err != nil {
+				return err
+			}
+			pushKey, err := fromContext[string](r, contextMatrixPushKey)
+			if err != nil {
+				return err
+			}
 			if time.Since(topic.LastAccess()) > matrixRejectPushKeyForUnifiedPushTopicWithoutRateVisitorAfter {
 				return writeMatrixResponse(w, pushKey)
 			}
 		}
 		return err
 	}
+	minc(metricMessagesPublishedSuccess)
+	minc(metricMatrixPublishedSuccess)
 	return writeMatrixSuccess(w)
 }
 
 func (s *Server) sendToFirebase(v *visitor, m *message) {
 	logvm(v, m).Tag(tagFirebase).Debug("Publishing to Firebase")
 	if err := s.firebaseClient.Send(v, m); err != nil {
+		minc(metricFirebasePublishedFailure)
 		if err == errFirebaseTemporarilyBanned {
 			logvm(v, m).Tag(tagFirebase).Err(err).Debug("Unable to publish to Firebase: %v", err.Error())
 		} else {
 			logvm(v, m).Tag(tagFirebase).Err(err).Warn("Unable to publish to Firebase: %v", err.Error())
 		}
+		return
 	}
+	minc(metricFirebasePublishedSuccess)
 }
 
 func (s *Server) sendEmail(v *visitor, m *message, email string) {
 	logvm(v, m).Tag(tagEmail).Field("email", email).Debug("Sending email to %s", email)
 	if err := s.smtpSender.Send(v, m, email); err != nil {
 		logvm(v, m).Tag(tagEmail).Field("email", email).Err(err).Warn("Unable to send email to %s: %v", email, err.Error())
+		minc(metricEmailsPublishedFailure)
+		return
 	}
+	minc(metricEmailsPublishedSuccess)
 }
 
 func (s *Server) forwardPollRequest(v *visitor, m *message) {
@@ -1480,7 +1558,7 @@ func (s *Server) sendDelayedMessages() error {
 	for _, m := range messages {
 		var u *user.User
 		if s.userManager != nil && m.User != "" {
-			u, err = s.userManager.User(m.User)
+			u, err = s.userManager.UserByID(m.User)
 			if err != nil {
 				log.With(m).Err(err).Warn("Error sending delayed message")
 				continue
@@ -1622,6 +1700,7 @@ func (s *Server) autorizeTopic(next handleFunc, perm user.Permission) handleFunc
 // maybeAuthenticate reads the "Authorization" header and will try to authenticate the user
 // if it is set.
 //
+//   - If auth-file is not configured, immediately return an IP-based visitor
 //   - If the header is not set or not supported (anything non-Basic and non-Bearer),
 //     an IP-based visitor is returned
 //   - If the header is set, authenticate will be called to check the username/password (Basic auth),
@@ -1633,13 +1712,14 @@ func (s *Server) maybeAuthenticate(r *http.Request) (*visitor, error) {
 	// Read "Authorization" header value, and exit out early if it's not set
 	ip := extractIPAddress(r, s.config.BehindProxy)
 	vip := s.visitor(ip, nil)
+	if s.userManager == nil {
+		return vip, nil
+	}
 	header, err := readAuthHeader(r)
 	if err != nil {
 		return vip, err
 	} else if !supportedAuthHeader(header) {
 		return vip, nil
-	} else if s.userManager == nil {
-		return vip, errHTTPUnauthorized
 	}
 	// If we're trying to auth, check the rate limiter first
 	if !vip.AuthAllowed() {

server/server.yml

@@ -263,6 +263,27 @@
 # stripe-webhook-key:
 # billing-contact:
 
+# Metrics
+#
+# ntfy can expose Prometheus-style metrics via a /metrics endpoint, or on a dedicated listen IP/port.
+# Metrics may be considered sensitive information, so before you enable them, be sure you know what you are
+# doing, and/or secure access to the endpoint in your reverse proxy.
+#
+# - enable-metrics enables the /metrics endpoint for the default ntfy server (i.e. HTTP, HTTPS and/or Unix socket)
+# - metrics-listen-http exposes the metrics endpoint via a dedicated [IP]:port. If set, this option implicitly
+#   enables metrics as well, e.g. "10.0.1.1:9090" or ":9090"
+#
+# enable-metrics: false
+# metrics-listen-http:
+
+# Profiling
+#
+# ntfy can expose Go's net/http/pprof endpoints to support profiling of the ntfy server. If enabled, ntfy will listen
+# on a dedicated listen IP/port, which can be accessed via the web browser on http://<ip>:<port>/debug/pprof/.
+# This can be helpful to expose bottlenecks, and visualize call flows. See https://pkg.go.dev/net/http/pprof for details.
+#
+# profile-listen-http:
+
 # Logging options
 #
 # By default, ntfy logs to the console (stderr), with an "info" log level, and in a human-readable text format.

server/server_account_test.go

@@ -701,8 +701,7 @@ func TestAccount_Reservation_Delete_Messages_And_Attachments(t *testing.T) {
 	require.FileExists(t, filepath.Join(s.config.AttachmentCacheDir, m2.ID))
 }
 
-func TestAccount_Persist_UserStats_After_Tier_Change(t *testing.T) {
-	t.Parallel()
+/*func TestAccount_Persist_UserStats_After_Tier_Change(t *testing.T) {
 	conf := newTestConfigWithAuthFile(t)
 	conf.AuthDefault = user.PermissionReadWrite
 	conf.AuthStatsQueueWriterInterval = 300 * time.Millisecond
@@ -763,4 +762,4 @@ func TestAccount_Persist_UserStats_After_Tier_Change(t *testing.T) {
 	require.Equal(t, 200, rr.Code)
 	account, _ = util.UnmarshalJSON[apiAccountResponse](io.NopCloser(rr.Body))
 	require.Equal(t, int64(2), account.Stats.Messages) // Is not reset!
-}
+}*/

server/server_manager.go

@@ -63,6 +63,15 @@ func (s *Server) execManager() {
 		sentMailTotal, sentMailSuccess, sentMailFailure = s.smtpSender.Counts()
 	}
 
+	// Users
+	var usersCount int64
+	if s.userManager != nil {
+		usersCount, err = s.userManager.UsersCount()
+		if err != nil {
+			log.Tag(tagManager).Err(err).Warn("Error counting users")
+		}
+	}
+
 	// Print stats
 	s.mu.Lock()
 	messagesCount, topicsCount, visitorsCount := s.messages, len(s.topics), len(s.visitors)
@@ -75,6 +84,7 @@ func (s *Server) execManager() {
 			"topics_active":           topicsCount,
 			"subscribers":             subscribers,
 			"visitors":                visitorsCount,
+			"users":                   usersCount,
 			"emails_received":         receivedMailTotal,
 			"emails_received_success": receivedMailSuccess,
 			"emails_received_failure": receivedMailFailure,
@@ -83,6 +93,11 @@ func (s *Server) execManager() {
 			"emails_sent_failure":     sentMailFailure,
 		}).
 		Info("Server stats")
+	mset(metricMessagesCached, messagesCached)
+	mset(metricVisitors, visitorsCount)
+	mset(metricUsers, usersCount)
+	mset(metricSubscribers, subscribers)
+	mset(metricTopics, topicsCount)
 }
 
 func (s *Server) pruneVisitors() {

server/server_metrics.go

@@ -0,0 +1,122 @@
+package server
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+var (
+	metricMessagesPublishedSuccess     prometheus.Counter
+	metricMessagesPublishedFailure     prometheus.Counter
+	metricMessagesCached               prometheus.Gauge
+	metricMessagePublishDurationMillis prometheus.Gauge
+	metricFirebasePublishedSuccess     prometheus.Counter
+	metricFirebasePublishedFailure     prometheus.Counter
+	metricEmailsPublishedSuccess       prometheus.Counter
+	metricEmailsPublishedFailure       prometheus.Counter
+	metricEmailsReceivedSuccess        prometheus.Counter
+	metricEmailsReceivedFailure        prometheus.Counter
+	metricUnifiedPushPublishedSuccess  prometheus.Counter
+	metricMatrixPublishedSuccess       prometheus.Counter
+	metricMatrixPublishedFailure       prometheus.Counter
+	metricAttachmentsTotalSize         prometheus.Gauge
+	metricVisitors                     prometheus.Gauge
+	metricSubscribers                  prometheus.Gauge
+	metricTopics                       prometheus.Gauge
+	metricUsers                        prometheus.Gauge
+	metricHTTPRequests                 *prometheus.CounterVec
+)
+
+func initMetrics() {
+	metricMessagesPublishedSuccess = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_messages_published_success",
+	})
+	metricMessagesPublishedFailure = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_messages_published_failure",
+	})
+	metricMessagesCached = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "ntfy_messages_cached_total",
+	})
+	metricMessagePublishDurationMillis = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "ntfy_message_publish_duration_ms",
+	})
+	metricFirebasePublishedSuccess = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_firebase_published_success",
+	})
+	metricFirebasePublishedFailure = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_firebase_published_failure",
+	})
+	metricEmailsPublishedSuccess = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_emails_sent_success",
+	})
+	metricEmailsPublishedFailure = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_emails_sent_failure",
+	})
+	metricEmailsReceivedSuccess = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_emails_received_success",
+	})
+	metricEmailsReceivedFailure = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_emails_received_failure",
+	})
+	metricUnifiedPushPublishedSuccess = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_unifiedpush_published_success",
+	})
+	metricMatrixPublishedSuccess = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_matrix_published_success",
+	})
+	metricMatrixPublishedFailure = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "ntfy_matrix_published_failure",
+	})
+	metricAttachmentsTotalSize = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "ntfy_attachments_total_size",
+	})
+	metricVisitors = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "ntfy_visitors_total",
+	})
+	metricUsers = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "ntfy_users_total",
+	})
+	metricSubscribers = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "ntfy_subscribers_total",
+	})
+	metricTopics = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "ntfy_topics_total",
+	})
+	metricHTTPRequests = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: "ntfy_http_requests_total",
+	}, []string{"http_code", "ntfy_code", "http_method"})
+	prometheus.MustRegister(
+		metricMessagesPublishedSuccess,
+		metricMessagesPublishedFailure,
+		metricMessagesCached,
+		metricMessagePublishDurationMillis,
+		metricFirebasePublishedSuccess,
+		metricFirebasePublishedFailure,
+		metricEmailsPublishedSuccess,
+		metricEmailsPublishedFailure,
+		metricEmailsReceivedSuccess,
+		metricEmailsReceivedFailure,
+		metricUnifiedPushPublishedSuccess,
+		metricMatrixPublishedSuccess,
+		metricMatrixPublishedFailure,
+		metricAttachmentsTotalSize,
+		metricVisitors,
+		metricUsers,
+		metricSubscribers,
+		metricTopics,
+		metricHTTPRequests,
+	)
+}
+
+// minc increments a prometheus.Counter if it is non-nil
+func minc(counter prometheus.Counter) {
+	if counter != nil {
+		counter.Inc()
+	}
+}
+
+// mset sets a prometheus.Gauge if it is non-nil
+func mset[T int | int64 | float64](gauge prometheus.Gauge, value T) {
+	if gauge != nil {
+		gauge.Set(float64(value))
+	}
+}

server/server_test.go

@@ -327,13 +327,10 @@ func TestServer_PublishNoCache(t *testing.T) {
 
 func TestServer_PublishAt(t *testing.T) {
 	t.Parallel()
-	c := newTestConfig(t)
-	c.MinDelay = time.Second
-	c.DelayedSenderInterval = 100 * time.Millisecond
-	s := newTestServer(t, c)
+	s := newTestServer(t, newTestConfig(t))
 
 	response := request(t, s, "PUT", "/mytopic", "a message", map[string]string{
-		"In": "1s",
+		"In": "1h",
 	})
 	require.Equal(t, 200, response.Code)
 
@@ -341,22 +338,62 @@ func TestServer_PublishAt(t *testing.T) {
 	messages := toMessages(t, response.Body.String())
 	require.Equal(t, 0, len(messages))
 
-	time.Sleep(time.Second)
-	require.Nil(t, s.sendDelayedMessages())
+	// Update message time to the past
+	fakeTime := time.Now().Add(-10 * time.Second).Unix()
+	_, err := s.messageCache.db.Exec(`UPDATE messages SET time=?`, fakeTime)
+	require.Nil(t, err)
 
+	// Trigger delayed message sending
+	require.Nil(t, s.sendDelayedMessages())
 	response = request(t, s, "GET", "/mytopic/json?poll=1", "", nil)
 	messages = toMessages(t, response.Body.String())
 	require.Equal(t, 1, len(messages))
 	require.Equal(t, "a message", messages[0].Message)
 	require.Equal(t, netip.Addr{}, messages[0].Sender) // Never return the sender!
 
-	messages, err := s.messageCache.Messages("mytopic", sinceAllMessages, true)
+	messages, err = s.messageCache.Messages("mytopic", sinceAllMessages, true)
 	require.Nil(t, err)
 	require.Equal(t, 1, len(messages))
 	require.Equal(t, "a message", messages[0].Message)
 	require.Equal(t, "9.9.9.9", messages[0].Sender.String()) // It's stored in the DB though!
 }
 
+func TestServer_PublishAt_FromUser(t *testing.T) {
+	t.Parallel()
+	s := newTestServer(t, newTestConfigWithAuthFile(t))
+
+	require.Nil(t, s.userManager.AddUser("phil", "phil", user.RoleAdmin))
+	response := request(t, s, "PUT", "/mytopic", "a message", map[string]string{
+		"Authorization": util.BasicAuth("phil", "phil"),
+		"In":            "1h",
+	})
+	require.Equal(t, 200, response.Code)
+
+	// Message doesn't show up immediately
+	response = request(t, s, "GET", "/mytopic/json?poll=1", "", nil)
+	messages := toMessages(t, response.Body.String())
+	require.Equal(t, 0, len(messages))
+
+	// Update message time to the past
+	fakeTime := time.Now().Add(-10 * time.Second).Unix()
+	_, err := s.messageCache.db.Exec(`UPDATE messages SET time=?`, fakeTime)
+	require.Nil(t, err)
+
+	// Trigger delayed message sending
+	require.Nil(t, s.sendDelayedMessages())
+	response = request(t, s, "GET", "/mytopic/json?poll=1", "", nil)
+	messages = toMessages(t, response.Body.String())
+	require.Equal(t, 1, len(messages))
+	require.Equal(t, fakeTime, messages[0].Time)
+	require.Equal(t, "a message", messages[0].Message)
+
+	messages, err = s.messageCache.Messages("mytopic", sinceAllMessages, true)
+	require.Nil(t, err)
+	require.Equal(t, 1, len(messages))
+	require.Equal(t, "a message", messages[0].Message)
+	require.True(t, strings.HasPrefix(messages[0].User, "u_"))
+}
+
 func TestServer_PublishAt_Expires(t *testing.T) {
 	s := newTestServer(t, newTestConfig(t))
 
@@ -796,6 +833,7 @@ func TestServer_Auth_Fail_CannotPublish(t *testing.T) {
 
 func TestServer_Auth_Fail_Rate_Limiting(t *testing.T) {
 	c := newTestConfigWithAuthFile(t)
+	c.VisitorAuthFailureLimitBurst = 10
 	s := newTestServer(t, c)
 
 	for i := 0; i < 10; i++ {
@@ -1185,8 +1223,13 @@ func TestServer_PublishAndExpungeTopicAfter16Hours(t *testing.T) {
 		"Cache": "no",
 	})
 	require.Equal(t, 200, response.Code)
-	require.True(t, s.topics["mytopic"].lastAccess.Unix() >= time.Now().Unix()-2)
-	require.True(t, s.topics["mytopic"].lastAccess.Unix() <= time.Now().Unix()+2)
+	waitFor(t, func() bool {
+		// .lastAccess set in t.Publish() -> t.Keepalive() in Goroutine
+		s.topics["mytopic"].mu.RLock()
+		defer s.topics["mytopic"].mu.RUnlock()
+		return s.topics["mytopic"].lastAccess.Unix() >= time.Now().Unix()-2 &&
+			s.topics["mytopic"].lastAccess.Unix() <= time.Now().Unix()+2
+	})
 
 	// Topic won't get pruned
 	s.execManager()
@@ -1194,7 +1237,9 @@ func TestServer_PublishAndExpungeTopicAfter16Hours(t *testing.T) {
 
 	// Fudge with last access, but subscribe, and see that it won't get pruned (because of subscriber)
 	subID := s.topics["mytopic"].Subscribe(subFn, "", func() {})
+	s.topics["mytopic"].mu.Lock()
 	s.topics["mytopic"].lastAccess = time.Now().Add(-17 * time.Hour)
+	s.topics["mytopic"].mu.Unlock()
 	s.execManager()
 	require.NotNil(t, s.topics["mytopic"])
 

server/smtp_server.go

@@ -165,6 +165,7 @@ func (s *smtpSession) Data(r io.Reader) error {
 		s.backend.mu.Lock()
 		s.backend.success++
 		s.backend.mu.Unlock()
+		minc(metricEmailsReceivedSuccess)
 		return nil
 	})
 }
@@ -217,6 +218,7 @@ func (s *smtpSession) withFailCount(fn func() error) error {
 		// We do not want to spam the log with WARN messages.
 		logem(s.conn).Err(err).Debug("Incoming mail error")
 		s.backend.failure++
+		minc(metricEmailsReceivedFailure)
 	}
 	return err
 }

server/util.go

@@ -107,10 +107,10 @@ func withContext(r *http.Request, ctx map[contextKey]any) *http.Request {
 	return r.WithContext(c)
 }
 
-func fromContext[T any](r *http.Request, key contextKey) T {
+func fromContext[T any](r *http.Request, key contextKey) (T, error) {
 	t, ok := r.Context().Value(key).(T)
 	if !ok {
-		panic(fmt.Sprintf("cannot find key %v in request context", key))
+		return t, fmt.Errorf("cannot find key %v in request context", key)
 	}
-	return t
+	return t, nil
 }

tools/loadgen/main.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	"bufio"
+	"context"
+	"fmt"
+	"net/http"
+	"os"
+	"time"
+)
+
+func main() {
+	baseURL := "https://staging.ntfy.sh"
+	if len(os.Args) > 1 {
+		baseURL = os.Args[1]
+	}
+	for i := 0; i < 2000; i++ {
+		go subscribe(i, baseURL)
+	}
+	time.Sleep(5 * time.Second)
+	for i := 0; i < 2000; i++ {
+		go func(worker int) {
+			for {
+				poll(worker, baseURL)
+			}
+		}(i)
+	}
+	time.Sleep(time.Hour)
+}
+
+func subscribe(worker int, baseURL string) {
+	fmt.Printf("[subscribe] worker=%d STARTING\n", worker)
+	start := time.Now()
+	topic, ip := fmt.Sprintf("subtopic%d", worker), fmt.Sprintf("1.2.%d.%d", (worker/255)%255, worker%255)
+	req, _ := http.NewRequest("GET", fmt.Sprintf("%s/%s/json", baseURL, topic), nil)
+	req.Header.Set("X-Forwarded-For", ip)
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		fmt.Printf("[subscribe] worker=%d time=%d error=%s\n", worker, time.Since(start).Milliseconds(), err.Error())
+		return
+	}
+	defer resp.Body.Close()
+	scanner := bufio.NewScanner(resp.Body)
+	for scanner.Scan() {
+		// Do nothing
+	}
+	fmt.Printf("[subscribe] worker=%d status=%d time=%d EXITED\n", worker, resp.StatusCode, time.Since(start).Milliseconds())
+}
+
+func poll(worker int, baseURL string) {
+	fmt.Printf("[poll] worker=%d STARTING\n", worker)
+	topic, ip := fmt.Sprintf("polltopic%d", worker), fmt.Sprintf("1.2.%d.%d", (worker/255)%255, worker%255)
+	start := time.Now()
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
+	defer cancel()
+
+	//req, _ := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("https://staging.ntfy.sh/%s/json?poll=1&since=all", topic), nil)
+	req, _ := http.NewRequestWithContext(ctx, "GET", fmt.Sprintf("%s/%s/json?poll=1&since=all", baseURL, topic), nil)
+	req.Header.Set("X-Forwarded-For", ip)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		fmt.Printf("[poll] worker=%d time=%d status=- error=%s\n", worker, time.Since(start).Milliseconds(), err.Error())
+		cancel()
+		return
+	}
+	defer resp.Body.Close()
+	fmt.Printf("[poll] worker=%d time=%d status=%s\n", worker, time.Since(start).Milliseconds(), resp.Status)
+}

user/manager.go

@@ -169,6 +169,7 @@ const (
 				ELSE 2
 			END, user
 	`
+	selectUserCountQuery         = `SELECT COUNT(*) FROM user`
 	updateUserPassQuery          = `UPDATE user SET pass = ? WHERE user = ?`
 	updateUserRoleQuery          = `UPDATE user SET role = ? WHERE user = ?`
 	updateUserPrefsQuery         = `UPDATE user SET prefs = ? WHERE id = ?`
@@ -853,6 +854,23 @@ func (a *Manager) Users() ([]*User, error) {
 	return users, nil
 }
 
+// UsersCount returns the number of users in the databsae
+func (a *Manager) UsersCount() (int64, error) {
+	rows, err := a.db.Query(selectUserCountQuery)
+	if err != nil {
+		return 0, err
+	}
+	defer rows.Close()
+	if !rows.Next() {
+		return 0, errNoRows
+	}
+	var count int64
+	if err := rows.Scan(&count); err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
 // User returns the user with the given username if it exists, or ErrUserNotFound otherwise.
 // You may also pass Everyone to retrieve the anonymous user and its Grant list.
 func (a *Manager) User(username string) (*User, error) {

user/manager_test.go

@@ -133,29 +133,6 @@ func TestManager_AddUser_And_Query(t *testing.T) {
 	require.Equal(t, u.ID, u3.ID)
 }
 
-func TestManager_Authenticate_Timing(t *testing.T) {
-	a := newTestManagerFromFile(t, filepath.Join(t.TempDir(), "user.db"), "", PermissionDenyAll, DefaultUserPasswordBcryptCost, DefaultUserStatsQueueWriterInterval)
-	require.Nil(t, a.AddUser("user", "pass", RoleAdmin))
-
-	// Timing a correct attempt
-	start := time.Now().UnixMilli()
-	_, err := a.Authenticate("user", "pass")
-	require.Nil(t, err)
-	require.GreaterOrEqual(t, time.Now().UnixMilli()-start, minBcryptTimingMillis)
-
-	// Timing an incorrect attempt
-	start = time.Now().UnixMilli()
-	_, err = a.Authenticate("user", "INCORRECT")
-	require.Equal(t, ErrUnauthenticated, err)
-	require.GreaterOrEqual(t, time.Now().UnixMilli()-start, minBcryptTimingMillis)
-
-	// Timing a non-existing user attempt
-	start = time.Now().UnixMilli()
-	_, err = a.Authenticate("DOES-NOT-EXIST", "hithere")
-	require.Equal(t, ErrUnauthenticated, err)
-	require.GreaterOrEqual(t, time.Now().UnixMilli()-start, minBcryptTimingMillis)
-}
-
 func TestManager_MarkUserRemoved_RemoveDeletedUsers(t *testing.T) {
 	a := newTestManager(t, PermissionDenyAll)
 

web/public/static/css/fonts.css

@@ -6,8 +6,7 @@
     font-style: normal;
     font-weight: 300;
     src: local(''),
-    url('../fonts/roboto-v29-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('../fonts/roboto-v29-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('../fonts/roboto-v29-latin-300.woff2') format('woff2');
 }
 
 /* roboto-regular - latin */
@@ -16,8 +15,7 @@
     font-style: normal;
     font-weight: 400;
     src: local(''),
-    url('../fonts/roboto-v29-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('../fonts/roboto-v29-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('../fonts/roboto-v29-latin-regular.woff2') format('woff2');
 }
 
 /* roboto-500 - latin */
@@ -26,8 +24,7 @@
     font-style: normal;
     font-weight: 500;
     src: local(''),
-    url('../fonts/roboto-v29-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('../fonts/roboto-v29-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('../fonts/roboto-v29-latin-500.woff2') format('woff2');
 }
 
 /* roboto-700 - latin */
@@ -36,6 +33,5 @@
     font-style: normal;
     font-weight: 700;
     src: local(''),
-    url('../fonts/roboto-v29-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('../fonts/roboto-v29-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('../fonts/roboto-v29-latin-700.woff2') format('woff2');
 }

web/public/static/langs/ar.json

@@ -56,12 +56,12 @@
     "publish_dialog_title_topic": "أنشُر إلى {{topic}}",
     "publish_dialog_title_no_topic": "انشُر الإشعار",
     "publish_dialog_emoji_picker_show": "اختر رمزًا تعبيريًا",
-    "publish_dialog_priority_min": "الحد الأدنى للأولوية",
+    "publish_dialog_priority_min": "أولوية دنيا",
     "publish_dialog_priority_low": "أولوية منخفضة",
     "publish_dialog_priority_default": "الأولوية الافتراضية",
     "publish_dialog_priority_high": "أولوية عالية",
     "publish_dialog_base_url_label": "الرابط التشعبي للخدمة",
-    "publish_dialog_priority_max": "الأولوية القصوى",
+    "publish_dialog_priority_max": "أولوية قصوى",
     "publish_dialog_topic_placeholder": "اسم الموضوع، على سبيل المثال phil_alerts",
     "publish_dialog_title_label": "العنوان",
     "publish_dialog_title_placeholder": "عنوان الإشعار، على سبيل المثال تنبيه مساحة القرص",
@@ -154,7 +154,7 @@
     "subscribe_dialog_subscribe_button_cancel": "إلغاء",
     "subscribe_dialog_login_button_back": "العودة",
     "prefs_notifications_sound_play": "تشغيل الصوت المحدد",
-    "prefs_notifications_min_priority_title": "الحد الأدنى للأولوية",
+    "prefs_notifications_min_priority_title": "أولوية دنيا",
     "prefs_notifications_min_priority_max_only": "الأولوية القصوى فقط",
     "notifications_no_subscriptions_description": "انقر فوق الرابط \"{{linktext}}\" لإنشاء موضوع أو الاشتراك فيه. بعد ذلك، يمكنك إرسال رسائل عبر PUT أو POST وستتلقى إشعارات هنا.",
     "publish_dialog_click_label": "الرابط التشعبي URL للنقر",
@@ -214,8 +214,8 @@
     "account_delete_description": "احذف حسابك نهائيا",
     "account_delete_dialog_label": "كلمة المرور",
     "account_upgrade_dialog_title": "تغيير فئة الحساب",
-    "account_upgrade_dialog_tier_features_messages": "{{messages}} رسائل يومية",
-    "account_upgrade_dialog_tier_features_emails": "{{emails}} من رسائل البريد الإلكتروني اليومية",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} رسائل يومية",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} من رسائل البريد الإلكتروني اليومية",
     "account_upgrade_dialog_button_cancel": "إلغاء",
     "account_upgrade_dialog_button_pay_now": "ادفع الآن واشترك",
     "account_upgrade_dialog_button_cancel_subscription": "إلغاء الاشتراك",
@@ -283,5 +283,51 @@
     "publish_dialog_details_examples_description": "للحصول على أمثلة ووصف مُفصّل لجميع ميزات الإرسال، يرجى الاستناد إلى <docsLink>الدليل</docsLink>.",
     "subscribe_dialog_subscribe_description": "قد لا تكون الموضوعات محمية بكلمة سر لذا اختر اسمًا ليس من السهل تخمينه وبمجرد اشتراكك، يمكنك الحصول على إشعارات عبر \"PUT/POST\".",
     "prefs_notifications_sound_description_some": "تقوم الإشعارات بتشغيل صوت {{sound}} عند وصولها",
-    "notifications_none_for_topic_description": "لإرسال إشعارات إلى هذا الموضوع، ما عليك سوى PUT أو POST إلى عنوان URL الخاص بالموضوع."
+    "notifications_none_for_topic_description": "لإرسال إشعارات إلى هذا الموضوع، ما عليك سوى PUT أو POST إلى عنوان URL الخاص بالموضوع.",
+    "priority_low": "منخفضة",
+    "signup_form_toggle_password_visibility": "تبديل رؤية كلمة المرور",
+    "account_usage_limits_reset_daily": "يعاد تحديد حدود الاستخدام يوميا في منتصف الليل (UTC)",
+    "account_tokens_table_label_header": "المُلصَقة",
+    "account_upgrade_dialog_button_redirect_signup": "تسجيل فوري",
+    "account_upgrade_dialog_tier_current_label": "الحالي",
+    "account_tokens_dialog_expires_x_days": "تنتهي صلاحية الرمز المميز في غضون {{days}} أيام",
+    "prefs_reservations_dialog_title_add": "حجز موضوع",
+    "prefs_reservations_description": "يمكنك حجز أسماء الموضوعات للاستخدام الشخصي هنا. يمنحك حجز موضوع ما ملكية الموضوع، ويسمح لك بتحديد تصريحات الوصول للمستخدمين الآخرين إلى الموضوع.",
+    "prefs_users_description_no_sync": "لا تتم مزامنة المستخدمين وكلمات المرور مع حسابك.",
+    "reservation_delete_dialog_action_delete_description": "سيتم حذف الرسائل والمرفقات المخزنة مؤقتا نهائيا. لا يمكن التراجع عن هذا الإجراء.",
+    "notifications_actions_http_request_title": "إرسال طلب HTTP {{method}} إلى {{url}}",
+    "notifications_none_for_any_description": "لإرسال إشعارات إلى موضوع ما، ما عليك سوى إرسال طلب PUT أو POST إلى الرابط التشعبي URL للموضوع. إليك مثال باستخدام أحد مواضيعك.",
+    "error_boundary_description": "من الواضح أن هذا لا ينبغي أن يحدث. آسف جدًا بشأن هذا. <br/> إن كان لديك دقيقة، يرجى <githubLink> الإبلاغ عن ذلك على GitHub </githubLink> ، أو إعلامنا عبر <discordLink> Discord </discordLink> أو <matrixLink> Matrix </matrixLink>.",
+    "nav_button_muted": "الإشعارات المكتومة",
+    "priority_min": "دنيا",
+    "signup_error_username_taken": "تم حجز اسم المستخدم {{username}} مِن قَبلُ",
+    "action_bar_reservation_limit_reached": "بلغت الحد الأقصى",
+    "prefs_reservations_delete_button": "إعادة تعيين الوصول إلى الموضوع",
+    "prefs_reservations_edit_button": "تعديل الوصول إلى موضوع",
+    "prefs_reservations_limit_reached": "لقد بلغت الحد الأقصى من المواضيع المحجوزة.",
+    "reservation_delete_dialog_action_keep_description": "ستصبح الرسائل والمرفقات المخزنة مؤقتًا على الخادم مرئية للعموم وللأشخاص الذين لديهم معرفة باسم الموضوع.",
+    "reservation_delete_dialog_description": "تؤدي إزالة الحجز إلى التخلي عن ملكية الموضوع، مما يسمح للآخرين بحجزه. يمكنك الاحتفاظ بالرسائل والمرفقات الموجودة أو حذفها.",
+    "prefs_reservations_dialog_description": "يمنحك حجز موضوع ما ملكية الموضوع، ويسمح لك بتحديد تصريحات وصول المستخدمين الآخرين إليه.",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "توفير ما يصل إلى {{discount}}٪",
+    "account_upgrade_dialog_interval_monthly": "شهريا",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "إجمالي مساحة التخزين {{totalsize}}",
+    "publish_dialog_progress_uploading_detail": "تحميل {{loaded}}/{{total}} ({{percent}}٪) …",
+    "account_basics_tier_interval_monthly": "شهريا",
+    "account_basics_tier_interval_yearly": "سنويا",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} مواضيع محجوزة",
+    "account_upgrade_dialog_billing_contact_website": "للأسئلة المتعلقة بالفوترة، يرجى الرجوع إلى <Link>موقعنا على الويب</Link>.",
+    "prefs_notifications_min_priority_description_x_or_higher": "إظهار الإشعارات إذا كانت الأولوية {{number}} ({{name}}) أو أعلى",
+    "account_upgrade_dialog_billing_contact_email": "للأسئلة المتعلقة بالفوترة، الرجاء <Link>الاتصال بنا</Link> مباشرة.",
+    "account_upgrade_dialog_tier_selected_label": "المحدد",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} لكل ملف",
+    "account_upgrade_dialog_interval_yearly": "سنويا",
+    "account_upgrade_dialog_tier_features_no_reservations": "لا توجد مواضيع محجوزة",
+    "account_upgrade_dialog_interval_yearly_discount_save": "وفر {{discount}}٪",
+    "publish_dialog_click_reset": "إزالة الرابط التشعبي URL للنقر",
+    "prefs_notifications_min_priority_description_max": "إظهار الإشعارات إذا كانت الأولوية 5 (كحد أقصى)",
+    "publish_dialog_attachment_limits_file_reached": "يتجاوز الحد الأقصى للملف {{fileSizeLimit}}",
+    "publish_dialog_attachment_limits_quota_reached": "يتجاوز الحصة، {{remainingBytes}} متبقية",
+    "account_basics_tier_paid_until": "تم دفع مبلغ الاشتراك إلى غاية {{date}}، وسيتم تجديده تِلْقائيًا",
+    "account_basics_tier_canceled_subscription": "تم إلغاء اشتراكك وسيتم إعادته إلى مستوى حساب مجاني بداية مِن {{date}}.",
+    "account_delete_dialog_billing_warning": "إلغاء حسابك أيضاً يلغي اشتراكك في الفوترة فوراً ولن تتمكن من الوصول إلى لوح الفوترة بعد الآن."
 }

web/public/static/langs/bg.json

@@ -228,5 +228,55 @@
     "account_basics_username_description": "Хей, това сте вие ❤",
     "account_basics_username_admin_tooltip": "Вие сте администратор",
     "account_basics_password_title": "Парола",
-    "account_delete_dialog_label": "Парола"
+    "account_delete_dialog_label": "Парола",
+    "account_basics_password_dialog_title": "Смяна на парола",
+    "account_basics_password_dialog_current_password_label": "Текуща парола",
+    "account_basics_password_dialog_new_password_label": "Нова парола",
+    "account_basics_password_dialog_confirm_password_label": "Парола отново",
+    "account_basics_password_dialog_button_submit": "Смяна на парола",
+    "account_usage_title": "Употреба",
+    "account_usage_of_limit": "от {{limit}}",
+    "account_usage_unlimited": "Неограничено",
+    "account_usage_limits_reset_daily": "Ограниченията се нулират всеки ден в полунощ (UTC)",
+    "account_basics_tier_interval_monthly": "месечно",
+    "account_basics_tier_interval_yearly": "годишно",
+    "account_basics_password_description": "Промяна на паролата на профила",
+    "account_basics_tier_title": "Вид на профила",
+    "account_basics_tier_admin": "Администратор",
+    "account_basics_tier_admin_suffix_with_tier": "(с {{tier}} ниво)",
+    "account_basics_tier_admin_suffix_no_tier": "(без ниво)",
+    "account_basics_tier_free": "безплатен",
+    "account_basics_tier_basic": "базов",
+    "account_basics_tier_change_button": "Променяне",
+    "account_basics_tier_paid_until": "Абонаментът е платен до {{date}} и автоматично ще се поднови",
+    "account_usage_attachment_storage_title": "Хранилище за прикачени файлове",
+    "account_delete_dialog_button_cancel": "Отказ",
+    "account_upgrade_dialog_interval_monthly": "Месечно",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} резервирани теми",
+    "account_upgrade_dialog_tier_features_no_reservations": "Няма резервирани теми",
+    "account_tokens_dialog_button_cancel": "Отказ",
+    "account_delete_title": "Премахване на профила",
+    "account_upgrade_dialog_title": "Промяна нивото на профила",
+    "account_usage_emails_title": "Изпратени съобщения",
+    "account_usage_reservations_title": "Резервирани теми",
+    "account_usage_reservations_none": "Няма резервирани теми",
+    "account_usage_cannot_create_portal_session": "Порталът за разплащане не може да бъде отворен",
+    "account_upgrade_dialog_interval_yearly": "Годишно",
+    "account_delete_description": "Безвъзвратно премахване на профила",
+    "account_delete_dialog_button_submit": "Безвъзвратно премахване на профила",
+    "account_upgrade_dialog_interval_yearly_discount_save": "отстъпка {{discount}}%",
+    "account_upgrade_dialog_button_cancel": "Отказ",
+    "account_upgrade_dialog_button_redirect_signup": "Регистриране",
+    "account_tokens_table_label_header": "Етикет",
+    "prefs_reservations_edit_button": "Настройки на достъпа",
+    "prefs_reservations_table_topic_header": "Тема",
+    "prefs_reservations_table_access_header": "Достъп",
+    "prefs_reservations_dialog_topic_label": "Тема",
+    "prefs_reservations_dialog_access_label": "Достъп",
+    "account_basics_password_dialog_current_password_incorrect": "Грешна парола",
+    "account_basics_tier_description": "Ниво на профила",
+    "account_basics_tier_upgrade_button": "Надграждане до Pro",
+    "account_usage_messages_title": "Публикувани съобщения",
+    "account_tokens_table_last_access_header": "Последен достъп",
+    "account_basics_tier_payment_overdue": "Имате просрочено задължение. Обновете начина на плащане, защото в противен случай скоро профилът ви ще загуби предимствата на абонамента."
 }

web/public/static/langs/cs.json

@@ -285,11 +285,11 @@
     "account_delete_dialog_button_submit": "Trvale odstranit účet",
     "account_delete_dialog_billing_warning": "Odstraněním účtu se také okamžitě zruší vaše předplatné. Nebudete již mít přístup k fakturačnímu panelu.",
     "account_upgrade_dialog_title": "Změna úrovně účtu",
-    "account_upgrade_dialog_proration_info": "<strong>Prohlášení</strong>: Při přechodu mezi placenými úrovněmi bude rozdíl v ceně účtován nebo vrácen v následující faktuře. Další fakturu obdržíte až na konci dalšího zúčtovacího období.",
+    "account_upgrade_dialog_proration_info": "<strong>Prohlášení</strong>: Při přechodu mezi placenými úrovněmi bude rozdíl v ceně <strong>zaúčtován okamžitě</strong>. Při přechodu na nižší úroveň se zůstatek použije na platbu za budoucí zúčtovací období.",
     "account_upgrade_dialog_reservations_warning_one": "Vybraná úroveň umožňuje méně rezervovaných témat než vaše aktuální úroveň. Než změníte svou úroveň, <strong>odstraňte alespoň jednu rezervaci</strong>. Rezervace můžete odstranit v <Link>Nastavení</Link>.",
-    "account_upgrade_dialog_tier_features_reservations": "{{reservations}} rezervovaných témat",
-    "account_upgrade_dialog_tier_features_messages": "{{messages}} denních zpráv",
-    "account_upgrade_dialog_tier_features_emails": "{{emails}} denních e-mailů",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} rezervovaných témat",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} denních zpráv",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} denních e-mailů",
     "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} na soubor",
     "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} celkový úložný prostor",
     "account_upgrade_dialog_tier_selected_label": "Vybráno",
@@ -340,5 +340,17 @@
     "reservation_delete_dialog_action_keep_description": "Zprávy a přílohy, které jsou uloženy v mezipaměti serveru, se stanou veřejně viditelnými pro osoby, které znají název tématu.",
     "reservation_delete_dialog_action_delete_title": "Odstranění zpráv a příloh uložených v mezipaměti",
     "reservation_delete_dialog_action_delete_description": "Zprávy a přílohy uložené v mezipaměti budou trvale odstraněny. Tuto akci nelze vrátit zpět.",
-    "reservation_delete_dialog_submit_button": "Odstranit rezervaci"
+    "reservation_delete_dialog_submit_button": "Odstranit rezervaci",
+    "account_basics_tier_interval_yearly": "roční",
+    "account_upgrade_dialog_interval_yearly_discount_save": "ušetříte {{discount}}%",
+    "account_upgrade_dialog_tier_price_per_month": "měsíc",
+    "account_upgrade_dialog_tier_features_no_reservations": "Žádná rezervovaná témata",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "ušetříte až {{discount}}%",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} účtováno ročně. Ušetříte {{save}}.",
+    "account_basics_tier_interval_monthly": "měsíční",
+    "account_upgrade_dialog_interval_monthly": "Měsíční",
+    "account_upgrade_dialog_interval_yearly": "Roční",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} za rok. Účtuje se měsíčně.",
+    "account_upgrade_dialog_billing_contact_email": "V případě dotazů týkajících se fakturace nás prosím <Link>kontaktujte</Link> přímo.",
+    "account_upgrade_dialog_billing_contact_website": "Otázky týkající se fakturace naleznete na našich <Link>webových stránkách</Link>."
 }

web/public/static/langs/da.json

@@ -201,18 +201,18 @@
     "account_basics_password_dialog_current_password_label": "Nuværende kodeord",
     "account_basics_password_dialog_new_password_label": "Nyt kodeord",
     "notifications_loading": "Indlæser notifikationer…",
-    "account_upgrade_dialog_tier_features_emails": "{{emails}} daglige e-mails",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} daglige e-mails",
     "account_tokens_table_create_token_button": "Opret adgangstoken",
     "account_tokens_dialog_title_delete": "Slet adgangstoken",
     "publish_dialog_chip_email_label": "Videresend til e-mail",
     "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} samlet lagerplads",
     "subscribe_dialog_subscribe_use_another_label": "Brug en anden server",
     "account_basics_tier_upgrade_button": "Opgrader til Pro",
-    "account_upgrade_dialog_tier_features_messages": "{{messages}} daglige beskeder",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} daglige beskeder",
     "account_tokens_table_copy_to_clipboard": "Kopier til udklipsholder",
     "prefs_reservations_edit_button": "Rediger emneadgang",
     "account_upgrade_dialog_title": "Skift kontoniveau",
-    "account_upgrade_dialog_tier_features_reservations": "{{reservations}} reserverede emner",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} reserverede emner",
     "account_tokens_dialog_expires_never": "Token udløber aldrig",
     "account_tokens_table_current_session": "Nuværende browsersession",
     "account_tokens_dialog_title_edit": "Rediger adgangstoken",
@@ -221,5 +221,63 @@
     "account_tokens_delete_dialog_submit_button": "Slet token permanent",
     "prefs_notifications_delete_after_one_month": "Efter en måned",
     "prefs_notifications_delete_after_one_week": "Efter en uge",
-    "prefs_users_dialog_username_label": "Brugernavn, f.eks. phil"
+    "prefs_users_dialog_username_label": "Brugernavn, f.eks. phil",
+    "prefs_notifications_delete_after_one_day_description": "Notifikationer slettes automatisk efter en dag",
+    "notifications_none_for_topic_description": "For at sende en notifikation til dette emne, skal du blot sende en PUT eller POST til emne-URL'en.",
+    "notifications_none_for_any_description": "For at sende en notifikation til et emne, skal du blot sende en PUT eller POST til emne-URL'en. Her er et eksempel med et af dine emner.",
+    "notifications_no_subscriptions_title": "Det ser ud til, at du ikke har nogen abonnementer endnu.",
+    "notifications_more_details": "For mere information, se <websiteLink>webstedet</websiteLink> eller <docsLink>dokumentationen</docsLink>.",
+    "display_name_dialog_description": "Angiv et alternativt navn for et emne, der vises på abonnementslisten. Dette gør det nemmere at identificere emner med komplicerede navne.",
+    "reserve_dialog_checkbox_label": "Reserver emne og konfigurer adgang",
+    "publish_dialog_attachment_limits_file_reached": "overskrider {{fileSizeLimit}} filgrænse",
+    "publish_dialog_attachment_limits_quota_reached": "overskrider kvote, {{remainingBytes}} tilbage",
+    "publish_dialog_topic_label": "Emnenavn",
+    "publish_dialog_topic_placeholder": "Emnenavn, f.eks. phil_alerts",
+    "publish_dialog_topic_reset": "Nulstil emne",
+    "publish_dialog_click_reset": "Fjern klik-URL",
+    "publish_dialog_delay_placeholder": "Forsink levering, f.eks. {{unixTimestamp}}, {{relativeTime}} eller \"{{naturalLanguage}}\" (kun på engelsk)",
+    "publish_dialog_other_features": "Andre funktioner:",
+    "publish_dialog_chip_attach_url_label": "Vedhæft fil via URL",
+    "publish_dialog_chip_attach_file_label": "Vedhæft lokal fil",
+    "publish_dialog_details_examples_description": "For eksempler og en detaljeret beskrivelse af alle afsendelsesfunktioner henvises til <docsLink>dokumentationen</docsLink>.",
+    "publish_dialog_button_cancel_sending": "Annuller afsendelse",
+    "publish_dialog_attached_file_title": "Vedhæftet fil:",
+    "emoji_picker_search_placeholder": "Søg emoji",
+    "emoji_picker_search_clear": "Ryd søgning",
+    "subscribe_dialog_subscribe_title": "Abonner på emne",
+    "subscribe_dialog_subscribe_topic_placeholder": "Emnenavn, f.eks. phil_alerts",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "Generer navn",
+    "subscribe_dialog_login_title": "Login påkrævet",
+    "subscribe_dialog_login_description": "Dette emne er adgangskodebeskyttet. Indtast venligst brugernavn og adgangskode for at abonnere.",
+    "subscribe_dialog_error_user_not_authorized": "Brugeren {{username}} er ikke autoriseret",
+    "account_basics_password_description": "Skift adgangskoden til din konto",
+    "account_usage_limits_reset_daily": "Brugsgrænser nulstilles dagligt ved midnat (UTC)",
+    "account_basics_tier_paid_until": "Abonnementet er betalt indtil {{date}} og fornys automatisk",
+    "account_basics_tier_payment_overdue": "Din betaling er forfalden. Opdater venligst din betalingsmetode, ellers bliver din konto snart nedgraderet.",
+    "account_basics_tier_canceled_subscription": "Dit abonnement blev annulleret og vil blive nedgraderet til en gratis konto den {{date}}.",
+    "account_usage_cannot_create_portal_session": "Kan ikke åbne faktureringsportalen",
+    "account_delete_description": "Slet din konto permanent",
+    "account_delete_dialog_description": "Dette vil slette din konto permanent, inklusive alle data, der er gemt på serveren. Efter sletning vil dit brugernavn være utilgængeligt i 7 dage. Hvis du virkelig ønsker at fortsætte, bedes du bekræfte med dit kodeord i feltet nedenfor.",
+    "account_upgrade_dialog_button_pay_now": "Betal nu og abonner",
+    "account_tokens_table_last_origin_tooltip": "Fra IP-adresse {{ip}}, klik for at slå op",
+    "account_tokens_dialog_label": "Label, f.eks. radarmeddelelser",
+    "account_tokens_dialog_expires_label": "Adgangstoken udløber om",
+    "account_tokens_dialog_expires_unchanged": "Lad udløbsdatoen forblive uændret",
+    "account_tokens_dialog_expires_x_hours": "Token udløber om {{hours}} timer",
+    "account_tokens_dialog_expires_x_days": "Token udløber om {{days}} dage",
+    "prefs_notifications_sound_description_none": "Notifikationer afspiller ingen lyd, når de ankommer",
+    "prefs_notifications_sound_description_some": "Notifikationer afspiller {{sound}}-lyden, når de ankommer",
+    "prefs_notifications_min_priority_low_and_higher": "Lav prioritet og højere",
+    "prefs_notifications_min_priority_default_and_higher": "Standardprioritet og højere",
+    "prefs_notifications_min_priority_high_and_higher": "Høj prioritet og højere",
+    "prefs_notifications_delete_after_never_description": "Notifikationer slettes aldrig automatisk",
+    "prefs_notifications_delete_after_three_hours_description": "Notifikationer slettes automatisk efter tre timer",
+    "prefs_notifications_delete_after_one_week_description": "Notifikationer slettes automatisk efter en uge",
+    "prefs_notifications_delete_after_one_month_description": "Notifikationer slettes automatisk efter en måned",
+    "prefs_reservations_limit_reached": "Du har nået din grænse for reserverede emner.",
+    "prefs_reservations_table_click_to_subscribe": "Klik for at abonnere",
+    "reservation_delete_dialog_action_keep_title": "Behold cachelagrede meddelelser og vedhæftede filer",
+    "reservation_delete_dialog_action_delete_title": "Slet cachelagrede meddelelser og vedhæftede filer",
+    "error_boundary_title": "Oh nej, ntfy brød sammen",
+    "error_boundary_description": "Dette bør naturligvis ikke ske. Det beklager vi meget.<br/>Hvis du har et øjeblik, bedes du <githubLink>rapportere dette på GitHub</githubLink>, eller give os besked via <discordLink>Discord</discordLink> eller <matrixLink>Matrix</matrixLink>."
 }

web/public/static/langs/de.json

@@ -82,7 +82,7 @@
     "publish_dialog_attach_placeholder": "Datei von URL anhängen, z.B. https://f-droid.org/F-Droid.apk",
     "publish_dialog_filename_placeholder": "Dateiname des Anhangs",
     "publish_dialog_delay_label": "Verzögerung",
-    "publish_dialog_email_placeholder": "E-Mail-Adresse, an die die Benachrichtigung gesendet werden soll, z. B. phil@example.com",
+    "publish_dialog_email_placeholder": "E-Mail-Adresse, an welche die Benachrichtigung gesendet werden soll, z. B. phil@example.com",
     "publish_dialog_chip_click_label": "Klick-URL",
     "publish_dialog_button_cancel_sending": "Senden abbrechen",
     "publish_dialog_drop_file_here": "Datei hierher ziehen",
@@ -261,12 +261,12 @@
     "account_usage_basis_ip_description": "Nutzungsstatistiken und Limits für diesen Account basieren auf Deiner IP-Adresse, können also mit anderen Usern geteilt sein. Die oben gezeigten Limits sind Schätzungen basierend auf den bestehenden Limits.",
     "account_delete_dialog_billing_warning": "Das Löschen Deines Kontos storniert auch sofort Deine Zahlung. Du wirst dann keinen Zugang zum Abrechnungs-Dashboard haben.",
     "account_upgrade_dialog_title": "Konto-Level ändern",
-    "account_upgrade_dialog_proration_info": "<strong>Anrechnung</strong>: Wenn Du zwischen kostenpflichtigen Leveln wechselst wir die Differenz bei der nächsten Abrechnung nachberechnet oder erstattet. Du erhältst bis zum Ende der Abrechnungsperiode keine neue Rechnung.",
+    "account_upgrade_dialog_proration_info": "<strong>Anrechnung</strong>: Wenn Du auf einen höheren kostenpflichtigen Level wechselst wird die Differenz <strong>sofort berechnet</strong>. Beim Wechsel auf ein kleineres Level verwenden wir Dein Guthaben für zukünftige Abrechnungsperioden.",
     "account_upgrade_dialog_reservations_warning_one": "Das gewählte Level erlaubt weniger reservierte Themen als Dein aktueller Level. <strong>Bitte löschen vor dem Wechsel Deines Levels mindestens eine Reservierung</strong>. Du kannst Reservierungen in den <Link>Einstellungen</Link> löschen.",
     "account_upgrade_dialog_reservations_warning_other": "Das gewählte Level erlaubt weniger reservierte Themen als Dein aktueller Level. <strong>Bitte löschen vor dem Wechsel Deines Levels mindestens {{count}} Reservierungen</strong>. Du kannst Reservierungen in den <Link>Einstellungen</Link> löschen.",
-    "account_upgrade_dialog_tier_features_reservations": "{{reservations}} reservierte Themen",
-    "account_upgrade_dialog_tier_features_messages": "{{messages}} Nachrichten pro Tag",
-    "account_upgrade_dialog_tier_features_emails": "{{emails}} Emails pro Tag",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} reservierte Themen",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} Nachrichten pro Tag",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} Emails pro Tag",
     "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} pro Datei",
     "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} gesamter Speicherplatz",
     "account_upgrade_dialog_tier_selected_label": "Ausgewählt",
@@ -340,5 +340,17 @@
     "nav_upgrade_banner_label": "Upgrade auf ntfy Pro",
     "alert_not_supported_context_description": "Benachrichtigungen werden nur über HTTPS unterstützt. Das ist eine Einschränkung der <mdnLink>Notifications API</mdnLink>.",
     "display_name_dialog_description": "Lege einen alternativen Namen für ein Thema fest, der in der Abo-Liste angezeigt wird. So kannst Du Themen mit komplizierten Namen leichter finden.",
-    "account_basics_username_admin_tooltip": "Du bist Admin"
+    "account_basics_username_admin_tooltip": "Du bist Admin",
+    "account_upgrade_dialog_interval_yearly_discount_save": "spare {{discount}}%",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "spare bis zu {{discount}}%",
+    "account_upgrade_dialog_tier_price_per_month": "Monat",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} pro Jahr. Spare {{save}}.",
+    "account_upgrade_dialog_billing_contact_email": "Bei Fragen zur Abrechnung, <Link>kontaktiere uns</Link> bitte direkt.",
+    "account_upgrade_dialog_billing_contact_website": "Bei Fragen zur Abrechnung sieh bitte auf unserer <Link>Webseite</Link> nach.",
+    "account_upgrade_dialog_tier_features_no_reservations": "Keine reservierten Themen",
+    "account_basics_tier_interval_yearly": "jährlich",
+    "account_basics_tier_interval_monthly": "monatlich",
+    "account_upgrade_dialog_interval_monthly": "Monatlich",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} pro Jahr. Monatlich abgerechnet.",
+    "account_upgrade_dialog_interval_yearly": "Jährlich"
 }

web/public/static/langs/en.json

@@ -225,10 +225,13 @@
   "account_upgrade_dialog_proration_info": "<strong>Proration</strong>: When upgrading between paid plans, the price difference will be <strong>charged immediately</strong>. When downgrading to a lower tier, the balance will be used to pay for future billing periods.",
   "account_upgrade_dialog_reservations_warning_one": "The selected tier allows fewer reserved topics than your current tier. Before changing your tier, <strong>please delete at least one reservation</strong>. You can remove reservations in the <Link>Settings</Link>.",
   "account_upgrade_dialog_reservations_warning_other": "The selected tier allows fewer reserved topics than your current tier. Before changing your tier, <strong>please delete at least {{count}} reservations</strong>. You can remove reservations in the <Link>Settings</Link>.",
-  "account_upgrade_dialog_tier_features_reservations": "{{reservations}} reserved topics",
+  "account_upgrade_dialog_tier_features_reservations_one": "{{reservations}} reserved topic",
+  "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} reserved topics",
   "account_upgrade_dialog_tier_features_no_reservations": "No reserved topics",
-  "account_upgrade_dialog_tier_features_messages": "{{messages}} daily messages",
-  "account_upgrade_dialog_tier_features_emails": "{{emails}} daily emails",
+  "account_upgrade_dialog_tier_features_messages_one": "{{messages}} daily message",
+  "account_upgrade_dialog_tier_features_messages_other": "{{messages}} daily messages",
+  "account_upgrade_dialog_tier_features_emails_one": "{{emails}} daily email",
+  "account_upgrade_dialog_tier_features_emails_other": "{{emails}} daily emails",
   "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} per file",
   "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} total storage",
   "account_upgrade_dialog_tier_price_per_month": "month",

web/public/static/langs/es.json

@@ -240,5 +240,117 @@
     "account_basics_password_title": "Contraseña",
     "account_basics_password_dialog_title": "Cambiar contraseña",
     "account_basics_password_dialog_current_password_label": "Contraseña actual",
-    "account_basics_password_dialog_new_password_label": "Contraseña nueva"
+    "account_basics_password_dialog_new_password_label": "Contraseña nueva",
+    "account_basics_tier_basic": "Básico",
+    "account_basics_tier_admin_suffix_with_tier": "(con nivel {{tier}})",
+    "account_basics_tier_admin_suffix_no_tier": "(sin nivel)",
+    "account_basics_tier_free": "Gratis",
+    "account_basics_tier_upgrade_button": "Actualizar a Pro",
+    "account_basics_tier_change_button": "Cambiar",
+    "account_basics_tier_paid_until": "Suscripción pagada hasta {{fecha}}, y se renovará automáticamente",
+    "account_basics_tier_manage_billing_button": "Administrar la facturación",
+    "account_basics_tier_title": "Tipo de cuenta",
+    "account_tokens_description": "Utilice tokens de acceso al publicar y suscribirse a través de la API de ntfy para no tener que enviar las credenciales de su cuenta. Consulte la <Link>documentación</Link> para obtener más información.",
+    "account_tokens_table_token_header": "Token",
+    "account_tokens_table_label_header": "Etiqueta",
+    "account_tokens_table_last_access_header": "Último acceso",
+    "account_tokens_table_expires_header": "Expira",
+    "account_tokens_table_never_expires": "Nunca expira",
+    "account_tokens_table_current_session": "Sesión del navegador actual",
+    "account_tokens_table_copy_to_clipboard": "Copiar al portapapeles",
+    "account_tokens_table_copied_to_clipboard": "Token de acceso copiado",
+    "account_tokens_table_cannot_delete_or_edit": "No se puede editar ni eliminar el token de sesión actual",
+    "account_tokens_table_create_token_button": "Crear token de acceso",
+    "account_tokens_table_last_origin_tooltip": "Desde la dirección IP {{ip}}, haga clic para buscar",
+    "account_tokens_dialog_title_create": "Crear token de acceso",
+    "account_tokens_dialog_title_edit": "Editar token de acceso",
+    "account_tokens_dialog_title_delete": "Eliminar token de acceso",
+    "account_tokens_dialog_label": "Etiqueta, por ejemplo, notificaciones de Radarr",
+    "account_tokens_dialog_button_create": "Crear token",
+    "prefs_reservations_table_everyone_write_only": "Puedo publicar y suscribirme, todo el mundo puede publicar",
+    "account_usage_messages_title": "Mensajes publicados",
+    "account_usage_reservations_title": "Tópicos reservados",
+    "account_usage_reservations_none": "No hay tópicos reservados para esta cuenta",
+    "account_usage_cannot_create_portal_session": "No se puede abrir el portal de facturación",
+    "account_upgrade_dialog_title": "Cambiar nivel de cuenta",
+    "account_basics_tier_payment_overdue": "Su pago ha vencido. Por favor actualice su método de pago o su cuenta será degradada en breve.",
+    "account_basics_tier_canceled_subscription": "Su suscripción fue cancelada y será degradada a una cuenta gratuita el {{date}}.",
+    "account_usage_emails_title": "Correos enviados",
+    "account_usage_attachment_storage_title": "Almacenamiento de archivos adjuntos",
+    "account_usage_attachment_storage_description": "{{filesize}} por archivo, eliminado después de {{expiry}}",
+    "account_usage_basis_ip_description": "Las estadísticas de uso y los límites de esta cuenta se basan en su dirección IP, por lo que podrían ser compartidos con otros usuarios. Los límites mostrados anteriormente son aproximados basados en los límites existentes.",
+    "account_delete_title": "Elimina cuenta",
+    "account_delete_dialog_button_cancel": "Cancelar",
+    "account_delete_dialog_billing_warning": "La eliminación de su cuenta también cancela su suscripción de facturación inmediatamente. Ya no tendrá acceso al panel de facturación.",
+    "account_upgrade_dialog_reservations_warning_one": "El nivel seleccionado permite menos tópicos reservados que su nivel actual. Antes de cambiar de nivel, <strong>por favor elimine al menos una reserva</strong>. Puede eliminar reservas en <Link>Configuración</Link>.",
+    "account_upgrade_dialog_tier_selected_label": "Seleccionado",
+    "account_upgrade_dialog_button_cancel": "Cancelar",
+    "account_upgrade_dialog_button_cancel_subscription": "Cancelar suscripción",
+    "account_tokens_title": "Tokens de acceso",
+    "account_delete_description": "Eliminar permanentemente su cuenta",
+    "account_delete_dialog_description": "Esto borrará permanentemente su cuenta, incluyendo todos los datos almacenados en el servidor. Tras la eliminación, su nombre de usuario no estará disponible durante 7 días. Si realmente desea continuar, por favor confirme su contraseña en la casilla de abajo.",
+    "account_delete_dialog_label": "Contraseña",
+    "account_delete_dialog_button_submit": "Eliminar permanentemente la cuenta",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} tópicos reservados",
+    "account_upgrade_dialog_cancel_warning": "Esto <strong>cancelará su suscripción</strong> y degradará su cuenta en {{date}}. En esa fecha, sus tópicos reservados y sus mensajes almacenados en caché en el servidor <strong>serán eliminados</strong>.",
+    "account_upgrade_dialog_proration_info": "<strong>Prorrateo</strong>: al actualizar entre planes pagos, la diferencia de precio se <strong>cobrará de inmediato</strong>. Al cambiar a un nivel inferior, el saldo se utilizará para pagar futuros períodos de facturación.",
+    "account_upgrade_dialog_reservations_warning_other": "El nivel seleccionado permite menos tópicos reservados que su nivel actual. Antes de cambiar de nivel, <strong>por favor elimine al menos {{count}} reservaciones</strong>. Puede eliminar reservaciones en <Link>Configuración</Link>.",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} mensajes diarios",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} correos diarios",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} por archivo",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} almacenamiento total",
+    "account_upgrade_dialog_tier_current_label": "Actual",
+    "account_upgrade_dialog_button_redirect_signup": "Regístrese ahora",
+    "account_upgrade_dialog_button_pay_now": "Pague ahora y suscríbase",
+    "account_upgrade_dialog_button_update_subscription": "Actualizar suscripción",
+    "account_tokens_dialog_button_update": "Actualizar token",
+    "account_tokens_dialog_expires_label": "El token de acceso expira en",
+    "prefs_reservations_table": "Tabla de tópicos reservados",
+    "prefs_reservations_dialog_description": "Reservar un tópico le otorga la propiedad sobre el mismo y le permite definir permisos de acceso para otros usuarios sobre el tópico.",
+    "account_tokens_dialog_button_cancel": "Cancelar",
+    "account_tokens_dialog_expires_unchanged": "No modificar la fecha de expiración",
+    "prefs_reservations_add_button": "Agregar tópico reservado",
+    "prefs_reservations_table_access_header": "Acceso",
+    "reservation_delete_dialog_action_delete_description": "Los mensajes y archivos adjuntos almacenados en caché se eliminarán de forma permanente. Esta acción no se puede deshacer.",
+    "account_tokens_dialog_expires_x_hours": "El token expira en {{hours}} horas",
+    "account_tokens_delete_dialog_title": "Eliminar token de acceso",
+    "prefs_reservations_limit_reached": "Ha alcanzado su límite de tópicos reservados.",
+    "prefs_reservations_table_everyone_read_write": "Todo el mundo puede publicar y suscribirse",
+    "reservation_delete_dialog_action_keep_description": "Los mensajes y archivos adjuntos que se almacenen en caché en el servidor pasarán a ser visibles públicamente para las personas que conozcan el nombre del tópico.",
+    "account_tokens_dialog_expires_x_days": "El token expira en {{days}} días",
+    "account_tokens_dialog_expires_never": "El token nunca expira",
+    "account_tokens_delete_dialog_description": "Antes de eliminar un token de acceso, asegúrese de que ninguna aplicación o script lo está utilizando activamente. <strong>Esta acción no se puede deshacer</strong>.",
+    "prefs_users_table_cannot_delete_or_edit": "No se puede eliminar o editar el usuario conectado",
+    "prefs_reservations_title": "Tópicos reservados",
+    "prefs_reservations_edit_button": "Editar acceso al tópico",
+    "prefs_reservations_table_topic_header": "Tópico",
+    "prefs_reservations_table_everyone_read_only": "Puedo publicar y suscribirme, todo el mundo puede suscribirse",
+    "prefs_reservations_table_everyone_deny_all": "Sólo yo puedo publicar y suscribirme",
+    "prefs_reservations_table_click_to_subscribe": "Haga clic para suscribirse",
+    "prefs_reservations_dialog_title_edit": "Edita tópico reservado",
+    "account_tokens_delete_dialog_submit_button": "Eliminar permanentemente el token",
+    "prefs_reservations_description": "Aquí puede reservar nombres de tópicos para uso personal. Reservar un tópico le otorga la propiedad sobre el mismo y le permite definir permisos de acceso para otros usuarios sobre el tópico.",
+    "prefs_reservations_delete_button": "Restablecer acceso a tópico",
+    "prefs_reservations_table_not_subscribed": "No suscrito",
+    "prefs_reservations_dialog_title_add": "Reservar tópico",
+    "prefs_users_description_no_sync": "Los usuarios y las contraseñas no están sincronizados con su cuenta.",
+    "prefs_reservations_dialog_title_delete": "Borrar reserva de tópico",
+    "prefs_reservations_dialog_access_label": "Acceso",
+    "reservation_delete_dialog_action_keep_title": "Conservar mensajes y archivos adjuntos en caché",
+    "prefs_reservations_dialog_topic_label": "Tópico",
+    "reservation_delete_dialog_description": "Al eliminar una reserva se renuncia a la propiedad sobre el tópico y se permite que otros lo reserven. Puede conservar o eliminar los mensajes y archivos adjuntos existentes.",
+    "reservation_delete_dialog_action_delete_title": "Eliminar mensajes y archivos adjuntos en caché",
+    "reservation_delete_dialog_submit_button": "Eliminar reserva",
+    "account_basics_tier_interval_monthly": "mensualmente",
+    "account_basics_tier_interval_yearly": "anualmente",
+    "account_upgrade_dialog_interval_monthly": "Mensualmente",
+    "account_upgrade_dialog_interval_yearly": "Anualmente",
+    "account_upgrade_dialog_interval_yearly_discount_save": "ahorrar {{discount}}%",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "ahorra hasta un {{discount}}%",
+    "account_upgrade_dialog_tier_features_no_reservations": "Ningún tema reservado",
+    "account_upgrade_dialog_tier_price_per_month": "mes",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} facturado anualmente. Guardar {{save}}.",
+    "account_upgrade_dialog_billing_contact_website": "Si tiene preguntas sobre facturación, consulte nuestra <Link>página web</Link>.",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} al año. Facturación mensual.",
+    "account_upgrade_dialog_billing_contact_email": "Para preguntas sobre facturación, por favor <Link>contáctenos</Link> directamente."
 }

web/public/static/langs/fr.json

@@ -273,10 +273,10 @@
     "account_delete_dialog_billing_warning": "Supprimer votre compte annule aussi immédiatement votre facturation. Vous n'aurez plus accès à votre tableau de bord de facturation.",
     "account_upgrade_dialog_title": "Changer le tarif du compte",
     "account_upgrade_dialog_proration_info": "<strong>Facturation</strong> : Lors d'un changement entre un plan payant et un autre, la différence de prix sera créditée ou remboursée sur la prochaine facture. Vous ne recevrez pas d'autre facture avant la fin de la prochaine période de facturation.",
-    "account_upgrade_dialog_reservations_warning_other": "Le tarif sélectionné autorise moins de sujets réservés que votre tarif actuel. Avant de changer de tarif, <strong>veuillez supprimer au moins {{count}} sujets réservés</strong>. Vous pouvez supprimer des sujets réservés dans les <Link>Settings</Link>.",
-    "account_upgrade_dialog_tier_features_reservations": "{{reservations}} sujets réservés",
-    "account_upgrade_dialog_tier_features_messages": "{{messages}} messages journaliers",
-    "account_upgrade_dialog_tier_features_emails": "{{emails}} emails journaliers",
+    "account_upgrade_dialog_reservations_warning_other": "Le tarif sélectionné autorise moins de sujets réservés que votre tarif actuel. Avant de changer de tarif, <strong>veuillez supprimer au moins {{count}} sujets réservés</strong>. Vous pouvez supprimer des sujets réservés dans les <Link>Paramètres</Link>.",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} sujets réservés",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} messages journaliers",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} emails journaliers",
     "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} par fichier",
     "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} stockage total",
     "account_upgrade_dialog_tier_selected_label": "Sélectionné",
@@ -337,8 +337,20 @@
     "alert_not_supported_context_description": "Les notifications ne sont supportées qu'en HTTPS. C'est une limitation de la <mdnLink>Notifications API</mdnLink>.",
     "account_basics_tier_payment_overdue": "Votre paiement est en retard. Veuillez mettre à jour votre méthode de paiement, ou votre compte va bientôt être rétrogradé.",
     "account_upgrade_dialog_cancel_warning": "Cela va <strong>annuler votre abonnement</strong> et rétrograder votre compte le {{date}}. Ce jour là, les sujets réservés ainsi que tous les messages dans le cache du serveur <strong>seront supprimés</strong>.",
-    "account_upgrade_dialog_reservations_warning_one": "Le tarif sélectionné autorise moins de sujets réservés que votre tarif actuel. Avant de changer de tarif, <strong>veuillez supprimer au moins un sujet réservé</strong>. Vous pouvez supprimer des sujets réservés dans les <Link>Settings</Link>.",
+    "account_upgrade_dialog_reservations_warning_one": "Le tarif sélectionné autorise moins de sujets réservés que votre tarif actuel. Avant de changer de tarif, <strong>veuillez supprimer au moins un sujet réservé</strong>. Vous pouvez supprimer des sujets réservés dans les <Link>Paramètres</Link>.",
     "account_tokens_description": "Utilisez des jetons d'accès lors de la publication ou de l'abonnement via l'API de ntfy, afin d'éviter d'envoyer vos identifiants de compte. Regardez la <Link>documentation</Link> pour en savoir plus.",
     "account_tokens_delete_dialog_description": "Avant de supprimer un jeton d'accès, assurez-vous qu'aucune application ou script ne soit en train de l'utiliser. <strong>Cette action ne peut pas être annulée</strong>.",
-    "prefs_reservations_description": "Vous pouvez réserver les noms de sujet à usage personnel ici. Réserver un sujet vous donne la propriété sur ce sujet et vous permet de définir les permissions d'accès à ce sujet pour d'autres utilisateurs."
+    "prefs_reservations_description": "Vous pouvez réserver les noms de sujet à usage personnel ici. Réserver un sujet vous donne la propriété sur ce sujet et vous permet de définir les permissions d'accès à ce sujet pour d'autres utilisateurs.",
+    "account_basics_tier_interval_yearly": "annuel",
+    "account_upgrade_dialog_interval_yearly": "Annuel",
+    "account_upgrade_dialog_interval_yearly_discount_save": "économisez {{discount}}%",
+    "account_upgrade_dialog_tier_features_no_reservations": "Aucun sujet(s) réservé(s)",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} par an. Prélevé mensuellement.",
+    "account_upgrade_dialog_billing_contact_website": "Pour des questions en rapport avec la facturation, se référer à notre <Link>site internet</Link>.",
+    "account_basics_tier_interval_monthly": "mensuel",
+    "account_upgrade_dialog_interval_monthly": "Mensuel",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "économisez jusqu'à {{discount}}%",
+    "account_upgrade_dialog_tier_price_per_month": "mois",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} prélevé annuellement. Économisez {{save}}.",
+    "account_upgrade_dialog_billing_contact_email": "Pour des questions concernant la facturation, merci de nous <Link>contacter</Link> directement."
 }

web/public/static/langs/id.json

@@ -256,11 +256,11 @@
     "account_usage_cannot_create_portal_session": "Tidak dapat membuka portal tagihan",
     "account_delete_dialog_billing_warning": "Menghapus akun Anda juga membatalkan tagihan langganan dengan segera. Anda tidak akan memiliki akses lagi ke dasbor tagihan.",
     "account_upgrade_dialog_title": "Ubah peringkat akun",
-    "account_upgrade_dialog_proration_info": "<strong>Prorasi</strong>: Ketika mengubah rencana berbayar, perubahan harga akan ditagih atau dikembalikan di faktur berikutnya. Anda tidak akan menerima faktur lain sampai akhir periode tagihan.",
+    "account_upgrade_dialog_proration_info": "<strong>Prorasi</strong>: Saat melakukan upgrade antar paket berbayar, selisih harga akan <strong>langsung dibebankan ke</strong>. Saat menurunkan ke tingkat yang lebih rendah, saldo akan digunakan untuk membayar periode penagihan di masa mendatang.",
     "account_upgrade_dialog_reservations_warning_other": "Peringkat yang dipilih memperbolehkan lebih sedikit reservasi topik daripada peringkat Anda saat ini. Sebelum mengubah peringkat Anda, <strong>silakan menghapus setidaknya {{count}} reservasi</strong>. Anda dapat menghapus reservasi di <Link>Pengaturan</Link>.",
-    "account_upgrade_dialog_tier_features_reservations": "{{reservations}} topik yang telah direservasi",
-    "account_upgrade_dialog_tier_features_messages": "{{messages}} pesan harian",
-    "account_upgrade_dialog_tier_features_emails": "{{emails}} surel harian",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} topik yang telah direservasi",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} pesan harian",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} surel harian",
     "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} per berkas",
     "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} jumlah penyimpanan",
     "account_upgrade_dialog_tier_selected_label": "Dipilih",
@@ -340,5 +340,17 @@
     "prefs_reservations_dialog_description": "Mereservasikan sebuah topik memberikan Anda kemilikan pada topik, dan memungkinkan Anda untuk mendefinisikan perizinan akses untuk pengguna lain melalui topik.",
     "prefs_reservations_dialog_topic_label": "Topik",
     "prefs_reservations_dialog_access_label": "Akses",
-    "reservation_delete_dialog_description": "Menghapus sebuah reservasi menghapus kemilikan pada topik, dan memperbolehkan orang-orang lain untuk mereservasinya."
+    "reservation_delete_dialog_description": "Menghapus sebuah reservasi menghapus kemilikan pada topik, dan memperbolehkan orang-orang lain untuk mereservasinya.",
+    "account_upgrade_dialog_interval_yearly": "Setiap tahun",
+    "account_upgrade_dialog_tier_price_billed_yearly": "Ditagih {{price}} setiap tahun. Hemat {{save}}.",
+    "account_upgrade_dialog_interval_yearly_discount_save": "hemat {{discount}}%",
+    "account_upgrade_dialog_interval_monthly": "Setiap bulan",
+    "account_basics_tier_interval_monthly": "setiap bulan",
+    "account_basics_tier_interval_yearly": "setiap tahun",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "hemat sampai {{discount}}%",
+    "account_upgrade_dialog_tier_features_no_reservations": "Tidak ada topik yang direservasi",
+    "account_upgrade_dialog_tier_price_per_month": "bulan",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} per bulan. Ditagih setiap bulan.",
+    "account_upgrade_dialog_billing_contact_email": "Untuk pertanyaan penagihan, silakan <Link>hubungi kami</Link> secara langsung.",
+    "account_upgrade_dialog_billing_contact_website": "Untuk pertanyaan penagihan, silakan menuju ke <Link>situs web</Link> kami."
 }

web/public/static/langs/it.json

@@ -187,5 +187,74 @@
     "prefs_notifications_delete_after_one_week": "Dopo una settimana",
     "prefs_notifications_delete_after_one_month": "Dopo un mese",
     "prefs_notifications_delete_after_three_hours_description": "Le notifiche vengono eliminate automaticamente dopo tre ore",
-    "error_boundary_unsupported_indexeddb_description": "L'app web ntfy ha bisogno di IndexedDB per funzionare e il tuo browser non supporta IndexedDB in modalità di navigazione privata.<br/><br/>Anche se questo è un peccato, non ha molto senso usare il web ntfy app in modalità di navigazione privata comunque, perché tutto è archiviato nella memoria del browser. Puoi leggere di più a riguardo <githubLink>in questo numero di GitHub</githubLink> o parlarci su <discordLink>Discord</discordLink> o <matrixLink>Matrix</matrixLink>."
+    "error_boundary_unsupported_indexeddb_description": "L'app web ntfy ha bisogno di IndexedDB per funzionare e il tuo browser non supporta IndexedDB in modalità di navigazione privata.<br/><br/>Anche se questo è un peccato, non ha molto senso usare il web ntfy app in modalità di navigazione privata comunque, perché tutto è archiviato nella memoria del browser. Puoi leggere di più a riguardo <githubLink>in questo numero di GitHub</githubLink> o parlarci su <discordLink>Discord</discordLink> o <matrixLink>Matrix</matrixLink>.",
+    "nav_upgrade_banner_label": "Passa alla versione Pro di ntfy",
+    "alert_not_supported_context_description": "Le Notificche sono supportate solo tramite HTTPS. Questa è una limitazione delle <mdnLink>Notifications API</mdnLink>.",
+    "account_basics_password_dialog_new_password_label": "Nuova password",
+    "action_bar_profile_logout": "Esci",
+    "account_basics_tier_interval_monthly": "mensile",
+    "account_basics_tier_interval_yearly": "annuale",
+    "account_basics_tier_upgrade_button": "Passa alla versione Pro",
+    "account_basics_tier_change_button": "Cambia",
+    "account_basics_tier_paid_until": "Abbonamento pagato fino a {{data}}, e si rinnoverà automaticamente",
+    "account_basics_tier_payment_overdue": "Il pagamento è scaduto. La preghiamo di aggiornare il suo metodo di pagamento, altrimenti il suo account verrà presto declassato.",
+    "account_basics_tier_canceled_subscription": "L'abbonamento è stato annullato e sarà declassato ad account gratuito a partire dalla {{data}}.",
+    "account_basics_tier_manage_billing_button": "Gestire la fatturazione",
+    "account_usage_messages_title": "Messaggi pubblicati",
+    "account_usage_reservations_title": "Argomenti riservati",
+    "account_usage_reservations_none": "Non ci sono argomenti riservati per questo account",
+    "signup_form_toggle_password_visibility": "Imposta la visibilità della password",
+    "signup_already_have_account": "Hai già un account? Accedi!",
+    "signup_disabled": "Registrazione disabilitata",
+    "signup_title": "Crea un account ntfy",
+    "signup_form_username": "Nome utente",
+    "signup_form_password": "Password",
+    "signup_form_confirm_password": "Conferma password",
+    "signup_form_button_submit": "Registrazione",
+    "signup_error_username_taken": "Il nome utente {{username}} è già utilizzato",
+    "signup_error_creation_limit_reached": "Il limite per la creazione di account è stato raggiunto",
+    "login_title": "Accedi al tuo account ntfy",
+    "login_form_button_submit": "Accedi",
+    "login_link_signup": "Registrati",
+    "login_disabled": "L'accesso è disabilitato",
+    "action_bar_account": "Account",
+    "action_bar_change_display_name": "Cambia il nome da visualizzare",
+    "action_bar_reservation_limit_reached": "Limite raggiunto",
+    "action_bar_profile_title": "Profilo",
+    "action_bar_profile_settings": "Impostazioni",
+    "action_bar_reservation_add": "Riserva un argomento",
+    "action_bar_reservation_edit": "Modifica l'argomento riservato",
+    "action_bar_reservation_delete": "Rimuovi l'argomento riservato",
+    "action_bar_sign_in": "Accedi",
+    "action_bar_sign_up": "Registrati",
+    "nav_button_account": "Account",
+    "nav_upgrade_banner_description": "Riserva argomenti, più messaggi ed e-mail e allegati più grandi",
+    "display_name_dialog_description": "Imposta un nome alternativo per un argomento che viene visualizzato nell'elenco delle sottoscrizioni. Questo aiuta a identificare più facilmente gli argomenti con nomi complicati.",
+    "display_name_dialog_title": "Cambia il nome visualizzato",
+    "display_name_dialog_placeholder": "Nome visualizzato",
+    "reserve_dialog_checkbox_label": "Riserva un argomento e configura l'accesso",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "Genera un nome",
+    "subscribe_dialog_error_topic_already_reserved": "Argomento già in uso",
+    "account_basics_title": "Account",
+    "account_basics_username_title": "Nome utente",
+    "account_basics_username_admin_tooltip": "Sei Amministratore",
+    "account_basics_password_title": "Password",
+    "account_basics_password_description": "Cambia la password del tuo account",
+    "account_basics_password_dialog_title": "Cambia la password",
+    "account_basics_password_dialog_current_password_label": "Password attuale",
+    "account_basics_password_dialog_confirm_password_label": "Conferma la password",
+    "account_basics_password_dialog_button_submit": "Cambia la password",
+    "account_basics_password_dialog_current_password_incorrect": "Password errata",
+    "account_usage_title": "Utilizzo",
+    "account_usage_of_limit": "di {{limit}}",
+    "account_usage_unlimited": "Illimitato",
+    "account_usage_limits_reset_daily": "I limiti di utilizzo vengono azzerati ogni giorno a mezzanotte (orario UTC)",
+    "account_basics_tier_title": "Tipo di account",
+    "account_basics_tier_description": "Permessi del tuo account",
+    "account_basics_tier_admin": "Amministratore",
+    "account_basics_tier_admin_suffix_with_tier": "(con livello {{tier}})",
+    "account_basics_tier_admin_suffix_no_tier": "(nessun livello)",
+    "account_basics_tier_basic": "Base",
+    "account_basics_tier_free": "Gratuito",
+    "account_usage_emails_title": "Email inviate"
 }

web/public/static/langs/ja.json

@@ -219,5 +219,138 @@
     "nav_upgrade_banner_description": "トピックを予約、より多くのメッセージとメール、より大きい添付ファイル",
     "signup_error_username_taken": "ユーザー名 {{username}} は既に使用されています",
     "action_bar_reservation_delete": "予約を削除する",
-    "display_name_dialog_description": "購読リストに表示されるトピックの別名を設定して、複雑な名前のトピックの識別を容易にします。"
+    "display_name_dialog_description": "購読リストに表示されるトピックの別名を設定して、複雑な名前のトピックの識別を容易にします。",
+    "reserve_dialog_checkbox_label": "トピックを保存してアクセスを編集",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "名前を生成",
+    "subscribe_dialog_error_topic_already_reserved": "このトピックは予約済みです",
+    "account_basics_title": "アカウント",
+    "account_basics_tier_description": "アカウントのパワーレベル",
+    "account_basics_tier_admin": "管理者",
+    "account_basics_tier_admin_suffix_with_tier": "（ティア {{tier}}）",
+    "account_basics_tier_free": "無料",
+    "account_usage_attachment_storage_description": "1ファイルあたり{{filesize}}、{{expiry}}を過ぎると削除",
+    "account_usage_basis_ip_description": "アカウントの使用量統計および制限はあなたのIPアドレスに基づいているため、他のユーザーと共有される可能性があります。上記制限は既存のレート制限に基づく概算値です。",
+    "account_usage_cannot_create_portal_session": "支払いポータルを開けませんでした",
+    "account_delete_title": "アカウントを削除",
+    "account_delete_description": "アカウントを永久的に削除",
+    "account_delete_dialog_description": "サーバーに保存されている全てのデータを含むあなたのアカウント情報を削除します。削除後、あなたのユーザー名は7日間利用できません。もし本当に先に進めたい場合、下の入力欄にパスワードを入力して確認して下さい。",
+    "account_delete_dialog_label": "パスワード",
+    "account_delete_dialog_button_cancel": "キャンセル",
+    "account_delete_dialog_button_submit": "永久的にアカウントを削除",
+    "account_delete_dialog_billing_warning": "アカウントを削除するとサブスクリプション支払いも即時キャンセルされます。支払いダッシュボードにもアクセスできなくなります。",
+    "account_upgrade_dialog_title": "アカウントティアを変更",
+    "account_upgrade_dialog_cancel_warning": "これにより<strong>サブスクリプションをキャンセルし</strong>{{date}}にアカウントをダウングレードします。同日、トピック予約およびサーバーにキャッシュされたメッセージは<strong>削除されます</strong>。",
+    "account_upgrade_dialog_proration_info": "<strong>追記</strong>。有料プランをアップグレードする場合、価格差は<strong>即座に請求されます</strong>。ダウングレードする場合、差額は次の請求期間の支払いに利用されます。",
+    "account_upgrade_dialog_tier_features_reservations_other": "予約のトピック{{reservations}}件",
+    "account_upgrade_dialog_tier_features_emails_other": "日次メール{{emails}}件",
+    "account_upgrade_dialog_tier_features_messages_other": "日次メッセージ{{messages}}件",
+    "account_upgrade_dialog_tier_selected_label": "選択",
+    "account_upgrade_dialog_tier_current_label": "現在",
+    "account_upgrade_dialog_button_cancel": "キャンセル",
+    "account_upgrade_dialog_button_redirect_signup": "サインアップ",
+    "account_upgrade_dialog_button_pay_now": "支払いしてサブスクライブする",
+    "account_upgrade_dialog_button_cancel_subscription": "サブスクリプションをキャンセル",
+    "account_upgrade_dialog_button_update_subscription": "サブスクリプションを更新",
+    "account_tokens_description": "ntfy APIで発行または購読する際にアクセストークンを使うことで、アカウント認証情報を送信する必要がなくなります。詳細は<Link>ドキュメント</Link>を確認して下さい。",
+    "account_tokens_table_token_header": "トークン",
+    "account_tokens_table_label_header": "ラベル",
+    "account_tokens_table_last_access_header": "最終アクセス",
+    "account_tokens_table_expires_header": "期限",
+    "account_tokens_table_never_expires": "無期限",
+    "account_tokens_table_current_session": "現在のブラウザセッション",
+    "account_tokens_table_copy_to_clipboard": "クリップボードにコピー",
+    "account_tokens_table_copied_to_clipboard": "アクセストークンをコピーしました",
+    "account_tokens_table_cannot_delete_or_edit": "現在のセッショントークンは編集または削除できません",
+    "account_tokens_table_create_token_button": "アクセストークンを生成",
+    "account_tokens_table_last_origin_tooltip": "IPアドレス {{ip}} から、クリックして参照",
+    "account_tokens_dialog_title_create": "アクセストークンを生成",
+    "account_tokens_dialog_title_edit": "アクセストークンを編集",
+    "account_tokens_dialog_title_delete": "アクセストークンを削除",
+    "account_tokens_dialog_label": "ラベル、例：Radarr通知",
+    "account_tokens_dialog_button_create": "トークンを生成",
+    "account_tokens_dialog_button_update": "トークンを更新",
+    "account_tokens_dialog_button_cancel": "キャンセル",
+    "account_tokens_dialog_expires_label": "アクセストークン有効期限",
+    "account_tokens_dialog_expires_unchanged": "有効期限を変更しない",
+    "account_tokens_dialog_expires_x_hours": "トークンは {{hours}} 時間後に失効します",
+    "account_tokens_dialog_expires_x_days": "トークンは {{days}} 日後に失効します",
+    "account_tokens_dialog_expires_never": "トークン失効なし",
+    "account_tokens_delete_dialog_title": "アクセストークンを削除",
+    "account_tokens_delete_dialog_submit_button": "トークンを永久削除",
+    "prefs_users_description_no_sync": "ユーザー名とパスワードはアカウントと同期されません。",
+    "prefs_users_table_cannot_delete_or_edit": "ログインしているユーザーは削除または編集できません",
+    "prefs_reservations_title": "予約されたトピック",
+    "prefs_reservations_description": "ここでトピック名を個人利用の為に予約する事ができます。トピックを予約する事でそのトピックの所有権が付与され、他のユーザーにアクセス権を付与する事ができるようになります。",
+    "prefs_reservations_add_button": "予約トピックを追加する",
+    "prefs_reservations_edit_button": "トピックへのアクセスを編集する",
+    "prefs_reservations_delete_button": "トピックへのアクセスをリセットする",
+    "prefs_reservations_table": "予約トピックの一覧",
+    "prefs_reservations_table_topic_header": "トピック",
+    "prefs_reservations_table_everyone_deny_all": "自分のみ発行と購読が可能",
+    "prefs_reservations_table_everyone_read_only": "自分は発行と購読が可能、誰でも購読可能",
+    "prefs_reservations_table_everyone_write_only": "自分は発行と購読可能、誰でも発行可能",
+    "prefs_reservations_table_everyone_read_write": "誰でも発行と購読が可能",
+    "prefs_reservations_table_not_subscribed": "購読されていません",
+    "prefs_reservations_table_click_to_subscribe": "クリックして購読",
+    "prefs_reservations_dialog_title_edit": "予約トピックを編集",
+    "prefs_reservations_dialog_title_delete": "トピック予約を削除",
+    "prefs_reservations_dialog_topic_label": "トピック",
+    "prefs_reservations_dialog_access_label": "アクセス",
+    "reservation_delete_dialog_action_keep_title": "キャッシュされたメッセージと添付ファイルを保持する",
+    "reservation_delete_dialog_action_keep_description": "サーバーにキャッシュされたメッセージと添付ファイルは公開されてトピック名を知っている人が閲覧できるようになります。",
+    "reservation_delete_dialog_action_delete_title": "キャッシュされたメッセージと添付ファイルを削除する",
+    "reservation_delete_dialog_action_delete_description": "キャッシュされたメッセージと添付ファイルは永久的に削除されます。この操作は元に戻せません。",
+    "account_basics_username_admin_tooltip": "あなたは管理者です",
+    "account_basics_password_title": "パスワード",
+    "account_basics_password_dialog_current_password_label": "現在のパスワード",
+    "account_usage_limits_reset_daily": "使用量制限は世界協定時 (UTC) の深夜に毎日リセットされます",
+    "account_basics_tier_basic": "ベーシック",
+    "account_basics_tier_paid_until": "サブスクリプションは{{date}}まで有効で、自動更新されます",
+    "account_basics_username_title": "ユーザー名",
+    "account_basics_username_description": "あなたのお名前です ❤",
+    "account_basics_password_description": "アカウントパスワードを変更",
+    "account_basics_password_dialog_title": "パスワード変更",
+    "account_basics_password_dialog_confirm_password_label": "パスワードを確認",
+    "account_basics_password_dialog_current_password_incorrect": "パスワードが異なります",
+    "account_usage_of_limit": "： {{limit}}",
+    "account_usage_unlimited": "無制限",
+    "account_basics_tier_upgrade_button": "プロにアップグレード",
+    "account_basics_tier_manage_billing_button": "支払い方法を管理",
+    "account_basics_password_dialog_new_password_label": "新しいパスワード",
+    "account_basics_password_dialog_button_submit": "パスワードを変更",
+    "account_usage_title": "使用量",
+    "account_basics_tier_title": "アカウントタイプ",
+    "account_basics_tier_admin_suffix_no_tier": "（ティアなし）",
+    "account_basics_tier_change_button": "変更",
+    "account_basics_tier_payment_overdue": "支払期限を過ぎています。支払い方法を更新しないと、近日中にアカウントはダウングレードされます。",
+    "account_basics_tier_canceled_subscription": "あなたのサブスクリプションはキャンセルされ{{date}}に無料アカウントにダウングレードされます。",
+    "account_usage_messages_title": "発行されたメッセージ",
+    "account_usage_reservations_none": "このアカウントで予約されたトピックはありません",
+    "account_usage_attachment_storage_title": "添付ストレージ",
+    "account_usage_emails_title": "送信済みメール",
+    "account_upgrade_dialog_reservations_warning_one": "選択されたティアは、現在のティアよりも少ない予約トピックを利用できます。ティアを変更する前に、<strong>少なくとも1つの予約を削除してください</strong>。予約の削除は、<Link>設定</Link>で行うことができます。",
+    "account_usage_reservations_title": "予約されたトピック",
+    "account_upgrade_dialog_reservations_warning_other": "選択されたティアは、現在のティアよりも少ない予約トピックを利用できます。ティアを変更する前に、<strong>少なくとも{{count}}個の予約を削除してください</strong>。予約の削除は、<Link>設定</Link>で行うことができます。",
+    "account_tokens_delete_dialog_description": "アクセストークンを削除する前に、アプリやスクリプトが利用中でないか確認して下さい。<strong>この操作は元に戻せません</strong>。",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "1ファイルあたり{{filesize}}",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "総ストレージ{{totalsize}}",
+    "account_tokens_title": "アクセストークン",
+    "prefs_reservations_limit_reached": "予約トピック数の上限に達しました。",
+    "prefs_reservations_table_access_header": "アクセス",
+    "prefs_reservations_dialog_title_add": "トピックを予約",
+    "prefs_reservations_dialog_description": "トピックを予約する事でそのトピックの所有権が付与され、他のユーザーにアクセス権を付与する事ができるようになります。",
+    "reservation_delete_dialog_description": "予約を削除するとトピックの所有権を失い、他の人が予約できるようになります。既存のメッセージや添付ファイルは保持または削除することができます。",
+    "reservation_delete_dialog_submit_button": "予約を削除",
+    "account_basics_tier_interval_monthly": "毎月",
+    "account_upgrade_dialog_interval_monthly": "毎月",
+    "account_upgrade_dialog_interval_yearly": "毎年",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "最大{{discount}}%節約",
+    "account_upgrade_dialog_tier_features_no_reservations": "予約トピックなし",
+    "account_upgrade_dialog_billing_contact_email": "支払いについての問い合わせは、直接<Link>お問い合わせください</Link>。",
+    "account_upgrade_dialog_interval_yearly_discount_save": "{{discount}}%節約",
+    "account_basics_tier_interval_yearly": "毎年",
+    "account_upgrade_dialog_tier_price_per_month": "月",
+    "account_upgrade_dialog_tier_price_billed_monthly": "年間{{price}}。月毎の支払い。",
+    "account_upgrade_dialog_tier_price_billed_yearly": "年間{{price}}の支払い。{{save}}節約。",
+    "account_upgrade_dialog_billing_contact_website": "支払いに関する質問は、<Link>ウェブサイト</Link>を参照して下さい。"
 }

web/public/static/langs/pl.json

@@ -235,5 +235,87 @@
     "account_usage_title": "Użycie",
     "account_usage_of_limit": "z {{limit}}",
     "account_usage_unlimited": "Bez limitu",
-    "account_usage_limits_reset_daily": "Limity są resetowane codziennie o północy (UTC)"
+    "account_usage_limits_reset_daily": "Limity są resetowane codziennie o północy (UTC)",
+    "account_delete_dialog_button_submit": "Nieodwracalnie usuń konto",
+    "account_upgrade_dialog_tier_features_no_reservations": "Brak rezerwacji tematów",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} na plik",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} pamięci łącznie",
+    "account_upgrade_dialog_tier_price_per_month": "miesiąc",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} na rok. Płatne miesięcznie.",
+    "account_upgrade_dialog_billing_contact_email": "W razie pytań dotyczących rozliczeń <Link>skontaktuj się z nami</Link> bezpośrednio.",
+    "account_upgrade_dialog_billing_contact_website": "W razie pytań dotyczących rozliczeń sprawdź naszą <Link>stronę</Link>.",
+    "account_upgrade_dialog_button_cancel_subscription": "Anuluj subskrypcję",
+    "account_upgrade_dialog_button_update_subscription": "Zmień subskrypcję",
+    "account_tokens_title": "Tokeny dostępowe",
+    "account_tokens_table_token_header": "Token",
+    "account_tokens_table_label_header": "Etykieta",
+    "account_tokens_table_last_access_header": "Ostatnie użycie",
+    "account_tokens_table_expires_header": "Termin ważności",
+    "account_tokens_table_never_expires": "Bezterminowy",
+    "account_tokens_table_current_session": "Aktualna sesja przeglądarki",
+    "account_tokens_table_copy_to_clipboard": "Kopiuj do schowka",
+    "account_tokens_table_copied_to_clipboard": "Token został skopiowany",
+    "account_tokens_table_cannot_delete_or_edit": "Nie można edytować ani usunąć tokenu aktualnej sesji",
+    "account_tokens_table_create_token_button": "Utwórz token dostępowy",
+    "account_tokens_dialog_label": "Etykieta, np. Powiadomienia Radarr",
+    "account_tokens_dialog_button_update": "Zmień token",
+    "account_basics_tier_interval_monthly": "miesięcznie",
+    "account_basics_tier_interval_yearly": "rocznie",
+    "account_upgrade_dialog_interval_monthly": "Miesięcznie",
+    "account_upgrade_dialog_title": "Zmień plan konta",
+    "account_delete_dialog_description": "Konto, wraz ze wszystkimi związanymi z nim danymi przechowywanymi na serwerze, będzie nieodwracalnie usunięte. Po usunięciu Twoja nazwa użytkownika będzie niedostępna jeszcze przez 7 dni. Jeśli chcesz kontynuować, potwierdź wpisując swoje hasło w polu poniżej.",
+    "account_delete_dialog_billing_warning": "Usunięcie konta powoduje natychmiastowe anulowanie subskrypcji. Nie będziesz już mieć dostępu do strony z rachunkami.",
+    "account_upgrade_dialog_interval_yearly": "Rocznie",
+    "account_upgrade_dialog_interval_yearly_discount_save": "taniej o {{discount}}%",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "nawet {{discount}}% taniej",
+    "account_upgrade_dialog_button_cancel": "Anuluj",
+    "account_tokens_description": "Używaj tokenów do publikowania wiadomości i subskrybowania tematów przez API ntfy, żeby uniknąć konieczności podawania danych do logowania. Szczegóły znajdziesz w <Link>dokumentacji</Link>.",
+    "account_tokens_dialog_title_create": "Utwórz token dostępowy",
+    "account_tokens_table_last_origin_tooltip": "Z adresu IP {{ip}}, kliknij żeby sprawdzić",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} płatne jednorazowo. Oszczędzasz {{save}}.",
+    "account_tokens_dialog_title_edit": "Edytuj token dostępowy",
+    "account_tokens_dialog_title_delete": "Usuń token dostępowy",
+    "account_tokens_dialog_button_create": "Utwórz token",
+    "nav_upgrade_banner_label": "Przejdź na ntfy Pro",
+    "nav_upgrade_banner_description": "Rezerwuj tematy, więcej powiadomień i maili oraz większe załączniki",
+    "alert_not_supported_context_description": "Powiadomienia działają tylko przez HTTPS. To jest ograniczenie <mdnLink>Notifications API</mdnLink>.",
+    "account_basics_tier_canceled_subscription": "Twoja subskrypcja została anulowana i konto zostanie ograniczone do wersji darmowej w dniu {{date}}.",
+    "account_basics_tier_manage_billing_button": "Zarządzaj rachunkami",
+    "account_usage_messages_title": "Wysłane wiadomości",
+    "account_usage_emails_title": "Wysłane maile",
+    "account_basics_tier_title": "Rodzaj konta",
+    "account_basics_tier_description": "Mocarność Twojego konta",
+    "account_basics_tier_admin": "Administrator",
+    "account_basics_tier_admin_suffix_with_tier": "(plan {{tier}})",
+    "account_basics_tier_admin_suffix_no_tier": "(brak planu)",
+    "account_basics_tier_basic": "Podstawowe",
+    "account_basics_tier_free": "Darmowe",
+    "account_basics_tier_upgrade_button": "Przejdź na Pro",
+    "account_basics_tier_change_button": "Zmień",
+    "account_basics_tier_paid_until": "Subskrypcja opłacona do {{date}} i będzie odnowiona automatycznie",
+    "account_basics_tier_payment_overdue": "Minął termin płatności. Zaktualizuj metodę płatności, w przeciwnym razie Twoje konto wkrótce zostanie ograniczone.",
+    "account_usage_reservations_title": "Zarezerwowane tematy",
+    "account_usage_reservations_none": "Brak zarezerwowanych tematów na tym koncie",
+    "account_usage_attachment_storage_title": "Miejsce na załączniki",
+    "account_usage_attachment_storage_description": "{{filesize}} na każdy plik, przechowywane przez {{expiry}}",
+    "account_usage_basis_ip_description": "Statystyki i limity dla tego konta bazują na Twoim adresie IP, więc mogą być współdzielone z innymi użytkownikami. Limity pokazane powyżej to wartości przybliżone bazujące na rzeczywistych limitach.",
+    "account_usage_cannot_create_portal_session": "Nie można otworzyć portalu z rachunkami",
+    "account_delete_title": "Usuń konto",
+    "account_delete_description": "Usuń swoje konto nieodwracalnie",
+    "account_delete_dialog_label": "Hasło",
+    "account_delete_dialog_button_cancel": "Anuluj",
+    "account_upgrade_dialog_button_redirect_signup": "Załóż konto",
+    "account_upgrade_dialog_button_pay_now": "Zapłać i aktywuj subskrypcję",
+    "account_tokens_dialog_button_cancel": "Anuluj",
+    "account_tokens_dialog_expires_label": "Token dostępowy wygasa po",
+    "account_tokens_dialog_expires_unchanged": "Pozostaw termin ważności bez zmian",
+    "account_upgrade_dialog_tier_features_reservations_one": "{{reservations}} rezerwacja tematu",
+    "account_upgrade_dialog_tier_features_reservations_few": "{{reservations}} rezerwacje tematów",
+    "account_upgrade_dialog_tier_features_reservations_many": "{{reservations}} rezerwacji tematów",
+    "account_upgrade_dialog_tier_features_emails_one": "{{emails}} mail dziennie",
+    "account_upgrade_dialog_tier_features_emails_few": "{{emails}} maile dziennie",
+    "account_upgrade_dialog_tier_features_emails_many": "{{emails}} maili dziennie",
+    "account_upgrade_dialog_tier_features_messages_one": "{{messages}} wiadomość dziennie",
+    "account_upgrade_dialog_tier_features_messages_few": "{{messages}} wiadomości dziennie",
+    "account_upgrade_dialog_tier_features_messages_many": "{{messages}} wiadomości dziennie"
 }

web/public/static/langs/pt.json

@@ -31,7 +31,7 @@
     "notifications_attachment_copy_url_title": "Copiar URL do anexo para a área de transferência",
     "notifications_attachment_copy_url_button": "Copiar URL",
     "notifications_attachment_open_title": "Ir para {{url}}",
-    "notifications_attachment_link_expired": "a ligação de transferência expirou",
+    "notifications_attachment_link_expired": "a ligação de descarga expirou",
     "notifications_attachment_open_button": "Abrir anexo",
     "notifications_attachment_link_expires": "a ligação expira em {{date}}",
     "notifications_attachment_file_image": "ficheiro de imagem",

web/public/static/langs/ru.json

@@ -1,30 +1,30 @@
 {
-    "publish_dialog_priority_min": "Мин. приоритет",
+    "publish_dialog_priority_min": "Минимальный приоритет",
     "action_bar_settings": "Настройки",
     "action_bar_send_test_notification": "Отправить тестовое уведомление",
     "action_bar_clear_notifications": "Удалить все уведомления",
     "action_bar_unsubscribe": "Отписаться",
     "message_bar_type_message": "Введите сообщение здесь",
-    "notifications_none_for_topic_description": "Чтобы отправить уведомление на данную тему, просто отправьте PUT или POST на URL-адрес этой темы.",
-    "notifications_none_for_any_description": "Чтобы отправить уведомления на тему, просто отправьте PUT или POST на URL-адрес темы. Вот пример используя одну из ваших тем.",
-    "notifications_no_subscriptions_title": "Похоже у вас ещё нет подписок.",
+    "notifications_none_for_topic_description": "Чтобы отправить уведомление на данную тему, просто сделаете PUT или POST-запрос на URL-адрес этой темы.",
+    "notifications_none_for_any_description": "Чтобы отправить уведомление на тему, просто сделаете PUT или POST-запрос на её URL-адрес. Вот пример с использованием одной из ваших тем.",
+    "notifications_no_subscriptions_title": "Похоже, что у вас ещё нет подписок.",
     "alert_grant_description": "Разрешите браузеру показывать уведомления.",
-    "notifications_no_subscriptions_description": "Нажмите \"{{linktext}}\" ссылку, чтобы создать или подписаться на тему. После этого вы сможете отправлять сообщения используя PUT или POST, и вы будете получать здесь уведомления.",
+    "notifications_no_subscriptions_description": "Нажмите на ссылку \"{{linktext}}\", чтобы создать или подписаться на тему. После этого Вы сможете отправлять сообщения используя PUT или POST-запросы и получать уведомления здесь.",
     "notifications_example": "Пример",
-    "notifications_more_details": "Дополнительную информацию найдёте на <websiteLink>сайте</websiteLink> или в <docsLink>документации</docsLink>.",
-    "notifications_loading": "Загружаются уведомления …",
+    "notifications_more_details": "Для более подробной информации, посетите <websiteLink>наш сайт</websiteLink> или <docsLink>документацию</docsLink>.",
+    "notifications_loading": "Идет загрузка уведомлений …",
     "publish_dialog_title_topic": "Опубликовать в {{topic}}",
     "publish_dialog_title_no_topic": "Опубликовать уведомление",
-    "publish_dialog_progress_uploading": "Загружается …",
+    "publish_dialog_progress_uploading": "Идет загрузка …",
     "publish_dialog_progress_uploading_detail": "Загружается {{loaded}}/{{total}} ({{percent}}%) …",
     "publish_dialog_message_published": "Уведомление опубликовано",
-    "publish_dialog_attachment_limits_file_and_quota_reached": "превышает {{fileSizeLimit}} размер файла, {{remainingBytes}} осталось",
-    "publish_dialog_attachment_limits_file_reached": "превышает {{fileSizeLimit}} размер файла",
-    "publish_dialog_attachment_limits_quota_reached": "превышает квоту, {{remainingBytes}} осталось",
+    "publish_dialog_attachment_limits_file_and_quota_reached": "превышает максимальный размер файла {{fileSizeLimit}} и квоту, осталось {{remainingBytes}}",
+    "publish_dialog_attachment_limits_file_reached": "превышает максимальный размер файла {{fileSizeLimit}}",
+    "publish_dialog_attachment_limits_quota_reached": "превышает квоту, осталось {{remainingBytes}}",
     "publish_dialog_priority_low": "Низкий приоритет",
-    "publish_dialog_priority_default": "Приоритет по умолчанию",
+    "publish_dialog_priority_default": "Стандартный приоритет",
     "publish_dialog_priority_high": "Высокий приоритет",
-    "publish_dialog_priority_max": "Макс. приоритет",
+    "publish_dialog_priority_max": "Максимальный приоритет",
     "publish_dialog_base_url_label": "URL-адрес сервиса",
     "publish_dialog_base_url_placeholder": "URL-адрес сервиса, например https://example.com",
     "publish_dialog_topic_label": "Название темы",
@@ -32,14 +32,14 @@
     "publish_dialog_title_label": "Заголовок",
     "publish_dialog_title_placeholder": "Заголовок уведомления, например Disk space alert",
     "publish_dialog_message_label": "Сообщение",
-    "publish_dialog_message_placeholder": "Текст сообщения",
+    "publish_dialog_message_placeholder": "Введите сообщение здесь",
     "publish_dialog_tags_label": "Тэги",
-    "publish_dialog_tags_placeholder": "Список тэгов, разделённый запятой, например warning, srv1-backup",
+    "publish_dialog_tags_placeholder": "Список тэгов, разделённый запятой, например: warning, srv1-backup",
     "publish_dialog_priority_label": "Приоритет",
-    "publish_dialog_click_label": "Нажмите на URL-адрес",
-    "publish_dialog_click_placeholder": "URL-адрес который откроется когда будет нажато уведомление",
-    "publish_dialog_email_label": "Эл. почта",
-    "message_bar_error_publishing": "Ошибка отправки уведомления",
+    "publish_dialog_click_label": "Ссылка при открытии",
+    "publish_dialog_click_placeholder": "URL-адрес, который откроется при нажатии на уведомление",
+    "publish_dialog_email_label": "Электронная почта",
+    "message_bar_error_publishing": "Ошибка публикации уведомления",
     "alert_not_supported_title": "Уведомления не поддерживаются",
     "alert_not_supported_description": "Уведомления не поддерживаются вашим браузером.",
     "notifications_copied_to_clipboard": "Скопировано в буфер обмена",
@@ -66,30 +66,30 @@
     "notifications_click_open_button": "Открыть ссылку",
     "subscribe_dialog_subscribe_title": "Подписаться на тему",
     "publish_dialog_button_cancel": "Отмена",
-    "subscribe_dialog_subscribe_description": "Темы могут быть не защищены паролем, поэтому укажите сложное имя. После подписки вы можете размещать/отправлять уведомления.",
+    "subscribe_dialog_subscribe_description": "Темы могут быть не защищены паролем, поэтому укажите сложное имя. После подписки Вы сможете отправлять уведомления используя PUT/POST-запросы.",
     "prefs_users_description": "Добавляйте/удаляйте пользователей для защищенных тем. Обратите внимание, что имя пользователя и пароль хранятся в локальном хранилище браузера.",
-    "error_boundary_description": "Этого, очевидно, не должно происходить. Очень сожалею об этом. <br/>Если у вас есть минутка, пожалуйста <githubLink>сообщить об этом на GitHub</githubLink>, или сообщите нам через <discordLink>Discord</discordLink> или <matrixLink>Matrix</matrixLink>.",
+    "error_boundary_description": "Это не должно было случиться. Нам очень жаль. <br/>Если Вы можете уделить минуту своего времени, пожалуйста <githubLink>сообщите об этом на GitHub</githubLink>, или дайте нам знать через <discordLink>Discord</discordLink> или <matrixLink>Matrix</matrixLink>.",
     "publish_dialog_email_placeholder": "Адрес для пересылки уведомления. Например, phil@example.com",
     "publish_dialog_attach_placeholder": "Прикрепите файл по URL. Например, https://f-droid.org/F-Droid.apk",
     "publish_dialog_filename_label": "Имя файла",
     "publish_dialog_delay_label": "Задержка",
-    "publish_dialog_delay_placeholder": "Задержка доставки. Например, {{unixTimestamp}}, {{relativeTime}}, or \"{{naturalLanguage}}\" (English only)",
-    "publish_dialog_chip_click_label": "Адрес",
+    "publish_dialog_delay_placeholder": "Задержка доставки. Например, {{unixTimestamp}}, {{relativeTime}}, или \"{{naturalLanguage}}\" (только по-английски)",
+    "publish_dialog_chip_click_label": "URL-адрес при нажатии",
     "publish_dialog_chip_email_label": "Переслать на электронную почту",
     "publish_dialog_chip_attach_url_label": "Прикрепить файл по URL",
     "publish_dialog_chip_attach_file_label": "Прикрепить локальный файл",
-    "publish_dialog_chip_delay_label": "Задержка отправки",
+    "publish_dialog_chip_delay_label": "Задержать доставку",
     "publish_dialog_chip_topic_label": "Изменить тему",
-    "publish_dialog_details_examples_description": "Примеры и подробное описание всех функций см. в e <docsLink>документации</docsLink>.",
+    "publish_dialog_details_examples_description": "Примеры и подробное описание всех функций смотрите в <docsLink>документации</docsLink>.",
     "publish_dialog_attach_label": "URL-адрес вложения",
     "publish_dialog_filename_placeholder": "Имя файла вложения",
     "publish_dialog_other_features": "Другие возможности:",
     "publish_dialog_button_cancel_sending": "Отменить отправку",
     "publish_dialog_button_send": "Отправить",
     "publish_dialog_checkbox_publish_another": "Опубликовать еще",
-    "publish_dialog_attached_file_title": "Прикрепленный файл:",
+    "publish_dialog_attached_file_title": "Прикреплённый файл:",
     "publish_dialog_attached_file_filename_placeholder": "Имя прикреплённого файла",
-    "emoji_picker_search_placeholder": "Поиск эмодзи",
+    "emoji_picker_search_placeholder": "Поиск смайликов",
     "subscribe_dialog_subscribe_topic_placeholder": "Название темы. Например, phil_alerts",
     "subscribe_dialog_subscribe_use_another_label": "Использовать другой сервер",
     "subscribe_dialog_subscribe_button_cancel": "Отмена",
@@ -101,23 +101,23 @@
     "subscribe_dialog_login_button_back": "Назад",
     "subscribe_dialog_login_button_login": "Войти",
     "subscribe_dialog_error_user_not_authorized": "Пользователь {{username}} не авторизован",
-    "subscribe_dialog_error_user_anonymous": "аноним",
+    "subscribe_dialog_error_user_anonymous": "анонимный пользователь",
     "prefs_notifications_title": "Уведомления",
     "prefs_notifications_sound_title": "Звук уведомления",
     "prefs_notifications_sound_description_none": "Уведомления не воспроизводят никаких звуков при получении",
     "prefs_notifications_sound_no_sound": "Без звука",
     "prefs_notifications_min_priority_title": "Минимальный приоритет",
-    "prefs_notifications_min_priority_description_any": "Показать все уведомления, независимо от приоритета",
+    "prefs_notifications_min_priority_description_any": "Показывать все уведомления, независимо от приоритета",
     "prefs_notifications_min_priority_description_x_or_higher": "Показывать уведомления, если приоритет {{number}} ({{name}}) или выше",
-    "prefs_notifications_min_priority_description_max": "Показывать уведомления, если приоритет равен 5 (максимум)",
+    "prefs_notifications_min_priority_description_max": "Показывать уведомления, если приоритет равен 5 (максимальный)",
     "prefs_notifications_min_priority_any": "Любой приоритет",
-    "prefs_notifications_min_priority_low_and_higher": "Низкий и высокий приоритет",
+    "prefs_notifications_min_priority_low_and_higher": "Низкий приоритет и выше",
     "prefs_notifications_min_priority_max_only": "Только максимальный приоритет",
     "prefs_notifications_delete_after_title": "Удалить уведомления",
     "prefs_notifications_delete_after_never": "Никогда",
     "prefs_notifications_delete_after_three_hours": "Через три часа",
     "prefs_notifications_sound_description_some": "Уведомления воспроизводят звук {{sound}}",
-    "prefs_notifications_min_priority_default_and_higher": "Приоритет по умолчанию и высокий",
+    "prefs_notifications_min_priority_default_and_higher": "Стандартный приоритет и выше",
     "prefs_notifications_delete_after_one_day": "Через день",
     "prefs_notifications_delete_after_one_week": "Через неделю",
     "prefs_notifications_delete_after_one_month": "Через месяц",
@@ -129,10 +129,10 @@
     "prefs_users_title": "Управление пользователями",
     "prefs_users_add_button": "Добавить пользователя",
     "prefs_users_table_user_header": "Пользователь",
-    "prefs_users_table_base_url_header": "URL службы",
+    "prefs_users_table_base_url_header": "URL сервера",
     "prefs_users_dialog_title_add": "Добавить пользователя",
     "prefs_users_dialog_title_edit": "Редактировать пользователя",
-    "prefs_users_dialog_base_url_label": "URL-адрес службы. Например, https://ntfy.sh",
+    "prefs_users_dialog_base_url_label": "URL-адрес сервера. Например, https://ntfy.sh",
     "prefs_users_dialog_username_label": "Имя пользователя. Например, phil",
     "prefs_users_dialog_password_label": "Пароль",
     "common_cancel": "Отмена",
@@ -140,19 +140,217 @@
     "common_save": "Сохранить",
     "prefs_appearance_title": "Внешний вид",
     "prefs_appearance_language_title": "Язык",
-    "priority_min": "минимум",
+    "priority_min": "минимальный",
     "priority_low": "низкий",
-    "priority_default": "по умолчанию",
+    "priority_default": "стандартный",
     "priority_high": "высокий",
     "priority_max": "максимальный",
-    "error_boundary_title": "О нет, Ntfy сломался",
-    "error_boundary_button_copy_stack_trace": "Копирование трассировки стека",
+    "error_boundary_title": "О нет, ntfy сломался",
+    "error_boundary_button_copy_stack_trace": "Скопировать трассировку стека",
     "error_boundary_stack_trace": "Трассировка стека",
-    "error_boundary_gathering_info": "Соберите больше информации …",
-    "publish_dialog_drop_file_here": "Перетащите файл юда",
+    "error_boundary_gathering_info": "Идет сбор дополнительной информации …",
+    "publish_dialog_drop_file_here": "Перетащите файл сюда",
     "prefs_notifications_min_priority_high_and_higher": "Высокий приоритет и выше",
     "action_bar_toggle_action_menu": "Открыть/закрыть меню",
     "action_bar_show_menu": "Показать меню",
-    "action_bar_logo_alt": "ntfy лого",
-    "emoji_picker_search_clear": "Очистить поиск"
+    "action_bar_logo_alt": "Логотип ntfy",
+    "emoji_picker_search_clear": "Сбросить поиск",
+    "account_upgrade_dialog_cancel_warning": "Это действие <strong>отменит Вашу подписку</strong> и переведет Вашую учетную запись на бесплатное обслуживание {{date}}. При наступлении этой даты, все резервирования и сообщения в кэше <strong>будут удалены</strong>.",
+    "account_tokens_table_create_token_button": "Создать токен доступа",
+    "account_tokens_table_last_origin_tooltip": "с IP-адреса {{ip}}, нажмите для подробностей",
+    "account_tokens_dialog_title_edit": "Изменить токен доступа",
+    "account_delete_dialog_button_cancel": "Отмена",
+    "account_delete_dialog_billing_warning": "Удаление учетной записи также отменяет все платные подписки. У Вас не будет доступа к порталу оплаты.",
+    "account_delete_dialog_description": "Это действие безвозвратно удалит Вашу учетную запись, включая все Ваши данные хранящиеся на сервере. После удаления, Ваше имя пользователя не будет доступно для регистрации в течении 7 дней. Если Вы действительно хотите продолжить, пожалуйста введите Ваш пароль ниже.",
+    "account_delete_dialog_label": "Пароль",
+    "reservation_delete_dialog_action_keep_description": "Сообщения и вложения которые находятся в кэше сервера станут доступны всем, кто знает имя темы.",
+    "prefs_reservations_table": "Список зарезервированных тем",
+    "prefs_reservations_table_access_header": "Доступ",
+    "prefs_reservations_table_everyone_write_only": "Я могу публиковать и подписываться, все остальные могут публиковать",
+    "prefs_reservations_dialog_description": "Резервирование дает Вам возможность управлять темой и настраивать правила доступа к ней для пользователей.",
+    "reservation_delete_dialog_action_delete_title": "Удалить сообщения в кэше и вложения",
+    "reservation_delete_dialog_action_delete_description": "Сообщения в кэше и вложения будут безвозвратно удалены. Это действие невозможно отменить.",
+    "prefs_reservations_table_not_subscribed": "Не подписан",
+    "prefs_reservations_table_everyone_deny_all": "Только я могу публиковать и подписываться",
+    "prefs_reservations_table_everyone_read_write": "Все могут публиковать и подписываться",
+    "prefs_reservations_table_click_to_subscribe": "Нажмите чтобы подписаться",
+    "prefs_reservations_dialog_title_add": "Зарезервировать тему",
+    "prefs_reservations_dialog_title_delete": "Удалить резервирование",
+    "prefs_reservations_dialog_title_edit": "Изменение резервированной темы",
+    "prefs_reservations_table_topic_header": "Тема",
+    "prefs_users_description_no_sync": "Пользователи и пароли не синхронизируются с Вашей учетной записью.",
+    "prefs_users_delete_button": "Удалить пользователя",
+    "prefs_users_table_cannot_delete_or_edit": "Невозможно удалить или редактировать залогиненного пользователя",
+    "account_upgrade_dialog_reservations_warning_one": "Выбранная подписка разрешает меньше зарезервированных тем, чем есть у Вас на данный момент. Перед сменой подписки, <strong>пожалуйста удалите хотя бы одну зарезервированную тему</strong>. Вы можете это сделать в <Link>Настройках</Link>.",
+    "account_upgrade_dialog_proration_info": "<strong>Пересчёт оплаты</strong>: при расширении подписки, разница в цене от текущей <strong>спишется сразу</strong>. При упрощении подписки, неиспользованные средства пойдут в оплату баланса по следующим счетам.",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} на файл",
+    "account_tokens_table_never_expires": "Никогда",
+    "account_tokens_table_copied_to_clipboard": "Токен доступа скопирован",
+    "account_tokens_table_cannot_delete_or_edit": "Невозможно изменить или удалить токен текущего сеанса",
+    "account_tokens_delete_dialog_description": "Перед удалением токена доступа, убедитесь что он не используется приложениями и скриптами. <strong>Это действие невозможно отменить</strong>.",
+    "error_boundary_unsupported_indexeddb_title": "Работа в приватном режиме не поддерживается",
+    "account_tokens_dialog_button_create": "Создать токен",
+    "account_tokens_delete_dialog_submit_button": "Безвозвратно удалить токен",
+    "account_upgrade_dialog_reservations_warning_other": "Выбранная подписка разрешает меньше зарезервированных тем, чем есть у Вас на данный момент. Перед сменой подписки, <strong>пожалуйста удалите хотя бы {{count}} зарезервированных тем</strong>. Вы можете это сделать в <Link>Настройках</Link>.",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} сообщений в день",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} суммарный объем",
+    "account_upgrade_dialog_tier_selected_label": "Выбранная",
+    "account_tokens_table_current_session": "Текущий сеанс браузера",
+    "account_tokens_dialog_button_update": "Изменить токен",
+    "account_tokens_dialog_expires_label": "Токен доступа истекает",
+    "account_tokens_dialog_expires_x_hours": "Токен истекает через {{hours}} часов",
+    "account_tokens_dialog_expires_never": "Токен никогда не истекает",
+    "prefs_notifications_sound_play": "Воспроизводить выбранный звук",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} зарезервированных тем",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} эл. сообщений в день",
+    "account_basics_tier_free": "Бесплатный",
+    "account_tokens_dialog_title_create": "Создать токен доступа",
+    "account_tokens_dialog_title_delete": "Удалить токен доступа",
+    "account_tokens_table_copy_to_clipboard": "Скопировать в буфер обмена",
+    "account_tokens_dialog_button_cancel": "Отмена",
+    "account_tokens_dialog_expires_unchanged": "Оставить срок истечения без изменений",
+    "account_tokens_dialog_expires_x_days": "Токен истекает через {{days}} дней",
+    "account_tokens_delete_dialog_title": "Удалить токен доступа",
+    "prefs_users_table": "Список пользоваетелй",
+    "account_upgrade_dialog_tier_current_label": "Текущая",
+    "account_upgrade_dialog_button_cancel": "Отмена",
+    "prefs_users_edit_button": "Редактировать пользователя",
+    "account_basics_tier_upgrade_button": "Подписаться на Pro",
+    "account_basics_tier_paid_until": "Подписка оплачена до {{date}} и будет продляться автоматически",
+    "account_basics_tier_change_button": "Изменить",
+    "account_delete_dialog_button_submit": "Безвозвратно удалить учетную запись",
+    "account_upgrade_dialog_title": "Изменить уровень учетной записи",
+    "account_usage_basis_ip_description": "Статистика и ограничения на использование учитываются по IP-адресу, поэтому они могут совмещаться с другими пользователями. Уровни, указанные выше, примерно соответствуют текущим ограничениям.",
+    "publish_dialog_topic_reset": "Сбросить тему",
+    "account_basics_tier_admin_suffix_no_tier": "(без подписки)",
+    "prefs_reservations_dialog_topic_label": "Тема",
+    "signup_form_username": "Имя пользователя",
+    "signup_form_password": "Пароль",
+    "signup_form_confirm_password": "Подтвердите пароль",
+    "signup_form_button_submit": "Зарегистрироваться",
+    "signup_form_toggle_password_visibility": "Показать/скрыть пароль",
+    "signup_disabled": "Регистрация недоступна",
+    "signup_error_username_taken": "Имя пользователя {{username}} уже занято",
+    "signup_title": "Создать учетную запись ntfy",
+    "signup_already_have_account": "Уже есть учетная запись? Войдите!",
+    "signup_error_creation_limit_reached": "Лимит на создание учетных записей исчерпан",
+    "login_form_button_submit": "Вход",
+    "login_link_signup": "Регистрация",
+    "login_disabled": "Вход недоступен",
+    "action_bar_reservation_add": "Зарезервировать тему",
+    "action_bar_reservation_edit": "Изменить резервирование",
+    "action_bar_reservation_delete": "Удалить резервирование",
+    "action_bar_profile_title": "Профиль",
+    "action_bar_profile_settings": "Настройки",
+    "action_bar_profile_logout": "Выход",
+    "action_bar_sign_in": "Вход",
+    "action_bar_sign_up": "Регистрация",
+    "action_bar_change_display_name": "Изменить псевдоним",
+    "message_bar_publish": "Опубликовать сообщение",
+    "nav_button_muted": "Уведомления заглушены",
+    "nav_button_connecting": "установка соединения",
+    "action_bar_account": "Учетная запись",
+    "login_title": "Вход в Вашу учетную запись ntfy",
+    "action_bar_reservation_limit_reached": "Лимит исчерпан",
+    "action_bar_toggle_mute": "Заглушить/разрешить уведомления",
+    "nav_button_account": "Учетная запись",
+    "nav_upgrade_banner_label": "Подпишитесь на ntfy Pro",
+    "message_bar_show_dialog": "Открыть диалог публикации",
+    "notifications_list": "Список уведомлений",
+    "notifications_list_item": "Уведомление",
+    "notifications_mark_read": "Пометить как прочтенное",
+    "notifications_priority_x": "Приоритет {{priority}}",
+    "notifications_attachment_image": "Приложенное изображение",
+    "notifications_attachment_file_audio": "звуковой файл",
+    "notifications_attachment_file_video": "видео файл",
+    "notifications_attachment_file_image": "графический файл",
+    "notifications_attachment_file_app": "исполняемый файл Android",
+    "notifications_attachment_file_document": "другой тип файла",
+    "notifications_actions_not_supported": "Действие не поддерживается в веб-приложении",
+    "display_name_dialog_title": "Изменить псевдоним",
+    "display_name_dialog_description": "Создайте псевдоним для темы, который будет отображаться в списке Ваших подписок. Это помогает легче находить темы со сложными именами.",
+    "reserve_dialog_checkbox_label": "Зарезервировать тему и настроить доступ",
+    "publish_dialog_emoji_picker_show": "Выбрать смайлик",
+    "publish_dialog_click_reset": "Удалить ссылку",
+    "publish_dialog_email_reset": "Удалить адрес для пересылки",
+    "publish_dialog_attach_reset": "Удалить URL-адрес вложения",
+    "publish_dialog_delay_reset": "Удалить задержку доставки",
+    "publish_dialog_attached_file_remove": "Удалить прикреплённый файл",
+    "subscribe_dialog_subscribe_base_url_label": "URL-адрес сервера",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "Сгенерировать случайное имя",
+    "subscribe_dialog_error_topic_already_reserved": "Тема уже зарезервирована",
+    "account_basics_title": "Учетная запись",
+    "account_basics_username_title": "Имя пользователя",
+    "account_basics_username_admin_tooltip": "Вы Администратор",
+    "account_basics_password_title": "Пароль",
+    "account_basics_username_description": "Это Вы! :)",
+    "account_basics_password_description": "Смена пароля учетной записи",
+    "account_basics_password_dialog_title": "Смена пароля",
+    "account_basics_password_dialog_current_password_label": "Текущий пароль",
+    "account_basics_password_dialog_current_password_incorrect": "Введен неверный пароль",
+    "account_usage_title": "Использование",
+    "account_usage_of_limit": "из {{limit}}",
+    "account_usage_unlimited": "Неограниченно",
+    "account_usage_limits_reset_daily": "Ограничения сбрасываются ежедневно в полночь (UTC)",
+    "account_basics_tier_description": "Уровень Вашей учетной записи",
+    "account_basics_tier_admin": "Администратор",
+    "account_basics_tier_admin_suffix_with_tier": "(с {{tier}} подпиской)",
+    "account_basics_tier_payment_overdue": "У Вас задолженность по оплате. Пожалуйста проверьте метод оплаты, иначе Вы скоро потеряете преимущества Вашей подписки.",
+    "account_basics_tier_canceled_subscription": "Ваша подписка была отменена; учетная запись перейдет на бесплатное обслуживание {{date}}.",
+    "account_basics_tier_manage_billing_button": "Управление оплатой",
+    "account_usage_messages_title": "Опубликованные сообщения",
+    "account_usage_emails_title": "Отправленные электронные сообщения",
+    "account_usage_reservations_title": "Зарезервированные темы",
+    "account_usage_reservations_none": "Нет зарезервированных тем",
+    "account_usage_attachment_storage_title": "Хранение вложений",
+    "account_usage_attachment_storage_description": "{{filesize}} за файл, удаляются спустя {{expiry}}",
+    "account_usage_cannot_create_portal_session": "Невозможно открыть портал оплаты",
+    "account_delete_title": "Удалить учетную запись",
+    "account_delete_description": "Безвозвратно удалить Вашу учетную запись",
+    "account_upgrade_dialog_button_redirect_signup": "Зарегистрироваться",
+    "account_upgrade_dialog_button_pay_now": "Оплатить и подписаться",
+    "account_upgrade_dialog_button_cancel_subscription": "Отменить подписку",
+    "account_upgrade_dialog_button_update_subscription": "Изменить подписку",
+    "account_tokens_title": "Токены доступа",
+    "account_tokens_description": "Используйте токены доступа для публикации и подписки через ntfy API чтобы не пересылать данные Вашей учетной записи. Смотрите <Link>документацию</Link> чтобы узнать больше.",
+    "account_tokens_table_token_header": "Токен",
+    "account_tokens_table_label_header": "Название",
+    "account_tokens_table_last_access_header": "Последний доступ",
+    "account_tokens_table_expires_header": "Истекает",
+    "account_tokens_dialog_label": "Название, например Radarr notifications",
+    "prefs_reservations_title": "Зарезервированные темы",
+    "prefs_reservations_description": "Здесь Вы можете резервировать темы для личного пользования. Резервирование дает Вам возможность управлять темой и настраивать правила доступа к ней для пользователей.",
+    "prefs_reservations_limit_reached": "Вы исчерпали Ваш лимит на количество зарезервированных тем.",
+    "prefs_reservations_add_button": "Добавить тему",
+    "prefs_reservations_edit_button": "Настройка доступа",
+    "prefs_reservations_delete_button": "Сбросить правила доступа",
+    "prefs_reservations_table_everyone_read_only": "Я могу публиковать и подписываться, все остальные могут подписываться",
+    "prefs_reservations_dialog_access_label": "Доступ",
+    "reservation_delete_dialog_description": "Удаление резервирования дает возможность зарезервировать эту тему другим. Вы можете оставить или удалить существующие сообщения и вложения.",
+    "reservation_delete_dialog_action_keep_title": "Сохранить сообщения в кэше и вложения",
+    "reservation_delete_dialog_submit_button": "Удалить резервирование",
+    "account_basics_tier_basic": "Базовый",
+    "nav_upgrade_banner_description": "Зарезервированные темы, больше сообщений и электронных писем, а также вложения большего размера",
+    "alert_not_supported_context_description": "Уведомления поддерживаются только по протоколу HTTPS. Это ограничение <mdnLink>Notifications API</mdnLink>.",
+    "notifications_delete": "Удалить",
+    "notifications_new_indicator": "Новое уведомление",
+    "notifications_actions_http_request_title": "Сделать HTTP {{method}}-запрос на {{url}}",
+    "display_name_dialog_placeholder": "Псевдоним",
+    "account_basics_password_dialog_new_password_label": "Новый пароль",
+    "account_basics_password_dialog_confirm_password_label": "Подтвердите пароль",
+    "account_basics_password_dialog_button_submit": "Сменить пароль",
+    "account_basics_tier_title": "Тип учетной записи",
+    "error_boundary_unsupported_indexeddb_description": "Веб-приложение ntfy использует IndexedDB, который не поддерживается Вашим браузером в приватном режиме.<br/><br/>Хотя это и не лучший вариант, использовать веб-приложение ntfy в приватном режиме не имеет особого смысла, так как все данные храняться в локальном хранилище браузера. Вы можете узнать больше в <githubLink>этом отчете на GitHub</githubLink> или связавшись с нами через <discordLink>Discord</discordLink> или <matrixLink>Matrix</matrixLink>.",
+    "account_basics_tier_interval_monthly": "ежемесячно",
+    "account_basics_tier_interval_yearly": "ежегодно",
+    "account_upgrade_dialog_interval_yearly": "Ежегодно",
+    "account_upgrade_dialog_interval_yearly_discount_save": "скидка {{discount}}%",
+    "account_upgrade_dialog_interval_monthly": "Ежемесячно",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "скидка до {{discount}}%",
+    "account_upgrade_dialog_tier_features_no_reservations": "Нет зарезервированных тем",
+    "account_upgrade_dialog_tier_price_per_month": "в месяц",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} в год. Оплата помесячно.",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} ежегодно. Сэкономьте {{save}}.",
+    "account_upgrade_dialog_billing_contact_email": "По вопросам оплаты, пожалуйста <Link>свяжитесь с нами</Link>.",
+    "account_upgrade_dialog_billing_contact_website": "По вопросам оплаты, пожалуйста обратитесь к нашему <Link>сайту</Link>."
 }

web/public/static/langs/sv.json

@@ -14,7 +14,7 @@
     "alert_grant_title": "Notiser är avstängda",
     "alert_grant_button": "Bevilja nu",
     "alert_not_supported_title": "Notiser stöds inte",
-    "notifications_list": "Notis-lista",
+    "notifications_list": "Notifieringslista",
     "notifications_list_item": "Notis",
     "notifications_delete": "Radera",
     "notifications_copied_to_clipboard": "Kopierat till urklipp",
@@ -47,5 +47,34 @@
     "notifications_actions_open_url_title": "Gå till {{url}}",
     "notifications_none_for_any_title": "Du har inte fått några notiser.",
     "notifications_example": "Exempel",
-    "notifications_loading": "Laddar notiser …"
+    "notifications_loading": "Laddar notiser …",
+    "signup_title": "Skapa ett nytt konto",
+    "signup_form_confirm_password": "Bekräfta lösenord",
+    "signup_form_button_submit": "Skapa konto",
+    "login_title": "Logga in på ditt konto",
+    "login_form_button_submit": "Logga in",
+    "login_link_signup": "Registrera",
+    "login_disabled": "Inloggning är inaktiverat",
+    "action_bar_account": "Konto",
+    "action_bar_change_display_name": "Ändra visningsnamn",
+    "action_bar_reservation_add": "Reservera ämne",
+    "action_bar_reservation_edit": "Ändra reservation",
+    "action_bar_reservation_delete": "Ta bort reservation",
+    "action_bar_reservation_limit_reached": "Gräns nådd",
+    "action_bar_profile_title": "Profil",
+    "action_bar_profile_settings": "Inställningar",
+    "action_bar_profile_logout": "Logga ut",
+    "action_bar_sign_in": "Logga in",
+    "action_bar_sign_up": "Registrera",
+    "nav_button_account": "Konto",
+    "nav_upgrade_banner_label": "Uppgradera till Pro",
+    "common_add": "Lägg till",
+    "signup_form_password": "Lösenord",
+    "signup_form_toggle_password_visibility": "Visa/dölj lösenord",
+    "common_cancel": "Avbryt",
+    "common_save": "Spara",
+    "signup_form_username": "Användarnamn",
+    "signup_already_have_account": "Har du redan ett konto? Logga in!",
+    "signup_disabled": "Registrering är inaktiverad",
+    "signup_error_username_taken": "Användarnamn [[username]] används redan"
 }

web/public/static/langs/tr.json

@@ -251,11 +251,11 @@
     "account_delete_dialog_button_submit": "Hesabı kalıcı olarak sil",
     "account_delete_dialog_billing_warning": "Hesabınızı silmek, faturalandırma aboneliğinizi de anında iptal eder. Artık faturalandırma sayfasına erişiminiz olmayacak.",
     "account_upgrade_dialog_title": "Hesap seviyesini değiştir",
-    "account_upgrade_dialog_proration_info": "<strong>Ödeme oranı</strong>: Ücretli planlar arasında geçiş yaparken, fiyat farkı bir sonraki faturada tahsil edilecek veya iade edilecektir. Bir sonraki fatura döneminin sonuna kadar başka bir fatura almayacaksınız.",
+    "account_upgrade_dialog_proration_info": "<strong>Fiyatlandırma</strong>: Ücretli planlar arasında yükseltme yaparken, fiyat farkı <strong>hemen tahsil edilecektir</strong>. Daha düşük bir seviyeye inildiğinde, bakiye gelecek faturalandırma dönemleri için ödeme yapmak üzere kullanılacaktır.",
     "account_upgrade_dialog_reservations_warning_other": "Seçilen seviye, geçerli seviyenizden daha az konu ayırtmaya izin veriyor. Seviyenizi değiştirmeden önce <strong>lütfen en az {{count}} ayırtmayı silin</strong>. Ayırtmaları <Link>Ayarlar</Link> sayfasından kaldırabilirsiniz.",
-    "account_upgrade_dialog_tier_features_reservations": "{{reservations}} konu ayırtıldı",
-    "account_upgrade_dialog_tier_features_messages": "{{messages}} günlük mesaj",
-    "account_upgrade_dialog_tier_features_emails": "{{emails}} günlük e-posta",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} konu ayırtıldı",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} günlük mesaj",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} günlük e-posta",
     "account_upgrade_dialog_tier_features_attachment_file_size": "dosya başına {{filesize}}",
     "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} toplam depolama",
     "account_upgrade_dialog_tier_selected_label": "Seçilen",
@@ -340,5 +340,17 @@
     "prefs_reservations_table_everyone_read_only": "Ben yayınlayabilir ve abone olabilirim, herkes abone olabilir",
     "prefs_reservations_table_not_subscribed": "Abone olunmadı",
     "prefs_reservations_table_everyone_read_write": "Herkes yayınlayabilir ve abone olabilir",
-    "reservation_delete_dialog_description": "Ayırtmanın kaldırılması, konu üzerindeki sahiplikten vazgeçer ve başkalarının onu ayırtmasına izin verir. Mevcut mesajları ve ekleri saklayabilir veya silebilirsiniz."
+    "reservation_delete_dialog_description": "Ayırtmanın kaldırılması, konu üzerindeki sahiplikten vazgeçer ve başkalarının onu ayırtmasına izin verir. Mevcut mesajları ve ekleri saklayabilir veya silebilirsiniz.",
+    "account_basics_tier_interval_yearly": "yıllık",
+    "account_upgrade_dialog_tier_features_no_reservations": "Ayırtılan konu yok",
+    "account_upgrade_dialog_tier_price_billed_monthly": "Yıllık {{price}}. Aylık faturalandırılır.",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} yıllık olarak faturalandırılır. {{save}} tasarruf edin.",
+    "account_upgrade_dialog_interval_yearly": "Yıllık",
+    "account_upgrade_dialog_interval_yearly_discount_save": "%{{discount}} tasarruf edin",
+    "account_upgrade_dialog_tier_price_per_month": "ay",
+    "account_upgrade_dialog_billing_contact_email": "Faturalama ile ilgili sorularınız için lütfen doğrudan <Link>bizimle iletişime geçin</Link>.",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "%{{discount}} kadar tasarruf edin",
+    "account_upgrade_dialog_interval_monthly": "Aylık",
+    "account_basics_tier_interval_monthly": "aylık",
+    "account_upgrade_dialog_billing_contact_website": "Faturalama ile ilgili sorularınız için lütfen <Link>web sitemizi ziyaret edin</Link>."
 }

web/public/static/langs/uk.json

@@ -187,5 +187,55 @@
     "priority_low": "низький",
     "error_boundary_stack_trace": "Трасування стека",
     "error_boundary_unsupported_indexeddb_title": "Приватний перегляд не підтримується",
-    "error_boundary_unsupported_indexeddb_description": "Веб-програма ntfy потребує IndexedDB для роботи, а ваш браузер не підтримує IndexedDB у режимі приватного перегляду.<br/><br/>На жаль, використання ntfy web не має сенсу у режимі приватного перегляду, оскільки все зберігається в пам’яті браузера. Ви можете прочитати більше про це <githubLink>у цьому випуску GitHub</githubLink> або поспілкуватися з нами на <discordLink>Discord</discordLink> або <matrixLink>Matrix</matrixLink>."
+    "error_boundary_unsupported_indexeddb_description": "Веб-програма ntfy потребує IndexedDB для роботи, а ваш браузер не підтримує IndexedDB у режимі приватного перегляду.<br/><br/>На жаль, використання ntfy web не має сенсу у режимі приватного перегляду, оскільки все зберігається в пам’яті браузера. Ви можете прочитати більше про це <githubLink>у цьому випуску GitHub</githubLink> або поспілкуватися з нами на <discordLink>Discord</discordLink> або <matrixLink>Matrix</matrixLink>.",
+    "signup_title": "Створення облікового запису ntfy",
+    "signup_form_username": "Ім'я користувача",
+    "signup_form_password": "Пароль",
+    "signup_form_confirm_password": "Підтвердіть пароль",
+    "signup_form_button_submit": "Зареєструватися",
+    "signup_form_toggle_password_visibility": "Перемкнути видимість пароля",
+    "signup_already_have_account": "Вже маєте обліковий запис? Увійдіть!",
+    "signup_disabled": "Реєстрацію вимкнено",
+    "signup_error_username_taken": "Ім'я користувача {{username}} вже зайнято",
+    "signup_error_creation_limit_reached": "Досягнуто обмеження на створення облікового запису",
+    "login_title": "Увійдіть до свого облікового запису ntfy",
+    "login_form_button_submit": "Увійти",
+    "login_link_signup": "Зареєструватися",
+    "login_disabled": "Вхід вимкнено",
+    "action_bar_account": "Обліковий запис",
+    "action_bar_reservation_add": "Зарезервувати тему",
+    "action_bar_reservation_edit": "Змінити резервування",
+    "action_bar_reservation_delete": "Видалити резервування",
+    "action_bar_reservation_limit_reached": "Досягнуто ліміту",
+    "action_bar_change_display_name": "Змінити відображувану назву",
+    "action_bar_profile_title": "Профіль",
+    "action_bar_profile_settings": "Налаштування",
+    "action_bar_sign_up": "Зареєструватися",
+    "nav_button_account": "Обліковий запис",
+    "nav_upgrade_banner_description": "Резервування тем, більше повідомлень та імейлів, більші вкладення",
+    "alert_not_supported_context_description": "Сповіщення підтримуються лише через HTTPS. Це обмеження <mdnLink>Notifications API</mdnLink>.",
+    "display_name_dialog_title": "Змінити відображувану назву",
+    "reserve_dialog_checkbox_label": "Зарезервувати тему та налаштувати доступ",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "Згенерувати назву",
+    "subscribe_dialog_error_topic_already_reserved": "Тема вже зарезервована",
+    "account_basics_title": "Обліковий запис",
+    "account_basics_username_title": "Ім'я користувача",
+    "account_basics_username_description": "Привіт, це ти ❤",
+    "account_basics_password_dialog_title": "Змінити пароль",
+    "account_basics_password_dialog_current_password_label": "Поточний пароль",
+    "account_basics_password_dialog_new_password_label": "Новий пароль",
+    "account_basics_password_dialog_confirm_password_label": "Підтвердіть пароль",
+    "account_basics_password_dialog_button_submit": "Змінити пароль",
+    "account_basics_password_dialog_current_password_incorrect": "Неправильний пароль",
+    "account_usage_title": "Використання",
+    "account_usage_limits_reset_daily": "Ліміти використання скидаються щодня опівночі (UTC)",
+    "account_basics_tier_title": "Тип облікового запису",
+    "account_basics_tier_admin": "Адміністратор",
+    "action_bar_sign_in": "Увійти",
+    "action_bar_profile_logout": "Вийти",
+    "nav_upgrade_banner_label": "Оновлення до ntfy Pro",
+    "display_name_dialog_description": "Задайте альтернативну назву для теми, яка відображатиметься у списку підписок. Це допоможе легше ідентифікувати теми зі складними назвами.",
+    "display_name_dialog_placeholder": "Відображуване ім'я",
+    "account_basics_password_title": "Пароль",
+    "account_basics_username_admin_tooltip": "Ви адміністратор"
 }

web/public/static/langs/zh_Hans.json

@@ -293,12 +293,12 @@
     "account_delete_dialog_billing_warning": "删除您的帐户也会立即取消您的计费订阅。您将无法再访问计费仪表板。",
     "account_upgrade_dialog_title": "更改帐户等级",
     "account_upgrade_dialog_cancel_warning": "这将<strong>取消您的订阅</strong>，并在 {{date}} 降级您的帐户。在那一天，主题保留以及缓存在服务器上的消息<strong>将被删除</strong>。",
-    "account_upgrade_dialog_proration_info": "<strong>按比例分配</strong>：在付费计划之间切换时，差价将在下一次计费时收取或退还。在下一个计费周期结束之前，您不会收到另一张收据。",
+    "account_upgrade_dialog_proration_info": "<strong>按比例分配</strong>：在付费计划之间升级时，差价将被<strong>立刻收取</strong>。在降级到较低级别时，余额将被用于支付未来的账单周期。",
     "account_upgrade_dialog_reservations_warning_one": "所选等级允许的保留主题少于当前等级。在更改您的等级之前，<strong>请至少删除 1 项保留</strong>。您可以在<Link>设置</Link>中删除保留。",
     "account_upgrade_dialog_reservations_warning_other": "所选等级允许的保留主题少于当前等级。在更改您的等级之前，<strong>请至少删除 {{count}} 项保留</strong>。您可以在<Link>设置</Link>中删除保留。",
-    "account_upgrade_dialog_tier_features_reservations": "{{reservations}} 条保留主题",
-    "account_upgrade_dialog_tier_features_messages": "{{messages}} 条每日消息",
-    "account_upgrade_dialog_tier_features_emails": "{{emails}} 条每日邮件",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} 条保留主题",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} 条每日消息",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} 条每日邮件",
     "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} 每个文件",
     "signup_form_confirm_password": "确认密码",
     "signup_form_button_submit": "注册",
@@ -340,5 +340,17 @@
     "account_tokens_table_last_origin_tooltip": "于IP地址 {{ip}}，点击查找",
     "account_tokens_dialog_label": "标签，例如：Radarr 通知",
     "account_tokens_dialog_button_create": "创建令牌",
-    "account_tokens_dialog_button_update": "更新令牌"
+    "account_tokens_dialog_button_update": "更新令牌",
+    "account_basics_tier_interval_monthly": "每月",
+    "account_basics_tier_interval_yearly": "每年",
+    "account_upgrade_dialog_interval_monthly": "每月",
+    "account_upgrade_dialog_interval_yearly": "每年",
+    "account_upgrade_dialog_interval_yearly_discount_save": "节省 {{discount}}%",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "节省高达 {{discount}}%",
+    "account_upgrade_dialog_tier_features_no_reservations": "无保留主题",
+    "account_upgrade_dialog_tier_price_per_month": "月",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} 每年。按月计费。",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{价格}} 按年计费。节省 {{save}}。",
+    "account_upgrade_dialog_billing_contact_email": "有关账单问题，请直接<Link>联系我们 </Link>。",
+    "account_upgrade_dialog_billing_contact_website": "有关账单问题，请参考我们的<Link>网站 </Link>。"
 }

web/src/app/Connection.js

@@ -1,6 +1,6 @@
 import {basicAuth, bearerAuth, encodeBase64Url, topicShortUrl, topicUrlWs} from "./utils";
 
-const retryBackoffSeconds = [5, 10, 15, 20, 30];
+const retryBackoffSeconds = [5, 10, 20, 30, 60, 120];
 
 /**
  * A connection contains a single WebSocket connection for one topic. It handles its connection

web/src/components/UpgradeDialog.js

@@ -297,10 +297,10 @@ const TierCard = (props) => {
                             {monthlyPrice > 0 && <>/ {t("account_upgrade_dialog_tier_price_per_month")}</>}
                         </div>
                         <List dense>
-                            {tier.limits.reservations > 0 && <Feature>{t("account_upgrade_dialog_tier_features_reservations", { reservations: tier.limits.reservations })}</Feature>}
+                            {tier.limits.reservations > 0 && <Feature>{t("account_upgrade_dialog_tier_features_reservations", { reservations: tier.limits.reservations, count: tier.limits.reservations })}</Feature>}
                             {tier.limits.reservations === 0 && <NoFeature>{t("account_upgrade_dialog_tier_features_no_reservations")}</NoFeature>}
-                            <Feature>{t("account_upgrade_dialog_tier_features_messages", { messages: formatNumber(tier.limits.messages) })}</Feature>
-                            <Feature>{t("account_upgrade_dialog_tier_features_emails", { emails: formatNumber(tier.limits.emails) })}</Feature>
+                            <Feature>{t("account_upgrade_dialog_tier_features_messages", { messages: formatNumber(tier.limits.messages), count: tier.limits.messages })}</Feature>
+                            <Feature>{t("account_upgrade_dialog_tier_features_emails", { emails: formatNumber(tier.limits.emails), count: tier.limits.emails })}</Feature>
                             <Feature>{t("account_upgrade_dialog_tier_features_attachment_file_size", { filesize: formatBytes(tier.limits.attachment_file_size, 0) })}</Feature>
                             <Feature>{t("account_upgrade_dialog_tier_features_attachment_total_size", { totalsize: formatBytes(tier.limits.attachment_total_size, 0) })}</Feature>
                         </List>