Add PR link

Add JS WebSocket example to docs

.github/workflows/build.yaml

@@ -11,12 +11,12 @@ jobs:
         name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       -
         name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: './web/package-lock.json'
       -

.github/workflows/release.yaml

@@ -14,12 +14,12 @@ jobs:
         name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       -
         name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: './web/package-lock.json'
       -

.github/workflows/test.yaml

@@ -11,12 +11,12 @@ jobs:
         name: Install Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20.x'
+          go-version: '1.21.x'
       -
         name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: './web/package-lock.json'
       -

.gitignore

@@ -13,4 +13,5 @@ secrets/
 node_modules/
 .DS_Store
 __pycache__
-web/dev-dist/
+web/dev-dist/
+venv/

.goreleaser.yml

@@ -164,14 +164,14 @@ dockers:
   - image_templates:
       - &arm64v8_image "binwiederhier/ntfy:{{ .Tag }}-arm64v8"
     use: buildx
-    dockerfile: Dockerfile
+    dockerfile: Dockerfile-arm
     goarch: arm64
     build_flag_templates:
       - "--platform=linux/arm64/v8"
   - image_templates:
       - &armv7_image "binwiederhier/ntfy:{{ .Tag }}-armv7"
     use: buildx
-    dockerfile: Dockerfile
+    dockerfile: Dockerfile-arm
     goarch: arm
     goarm: 7
     build_flag_templates:
@@ -179,7 +179,7 @@ dockers:
   - image_templates:
       - &armv6_image "binwiederhier/ntfy:{{ .Tag }}-armv6"
     use: buildx
-    dockerfile: Dockerfile
+    dockerfile: Dockerfile-arm
     goarch: arm
     goarm: 6
     build_flag_templates:

Dockerfile

@@ -9,6 +9,7 @@ LABEL org.opencontainers.image.licenses="Apache-2.0, GPL-2.0"
 LABEL org.opencontainers.image.title="ntfy"
 LABEL org.opencontainers.image.description="Send push notifications to your phone or desktop using PUT/POST"
 
+RUN apk add --no-cache tzdata
 COPY ntfy /usr/bin
 
 EXPOSE 80/tcp

Dockerfile-arm

@@ -0,0 +1,18 @@
+FROM alpine
+
+LABEL org.opencontainers.image.authors="philipp.heckel@gmail.com"
+LABEL org.opencontainers.image.url="https://ntfy.sh/"
+LABEL org.opencontainers.image.documentation="https://docs.ntfy.sh/"
+LABEL org.opencontainers.image.source="https://github.com/binwiederhier/ntfy"
+LABEL org.opencontainers.image.vendor="Philipp C. Heckel"
+LABEL org.opencontainers.image.licenses="Apache-2.0, GPL-2.0"
+LABEL org.opencontainers.image.title="ntfy"
+LABEL org.opencontainers.image.description="Send push notifications to your phone or desktop using PUT/POST"
+
+# Alpine does not support adding "tzdata" on ARM anymore, see
+# https://github.com/binwiederhier/ntfy/issues/894
+
+COPY ntfy /usr/bin
+
+EXPOSE 80/tcp
+ENTRYPOINT ["ntfy"]

Dockerfile-build

@@ -1,14 +1,20 @@
-FROM golang:1.19-bullseye as builder
+FROM golang:1.20-bullseye as builder
 
 ARG VERSION=dev
 ARG COMMIT=unknown
+ARG NODE_MAJOR=18
 
-RUN apt-get update
-RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash
-RUN apt-get install -y \
-    build-essential \
-    nodejs \
-    python3-pip
+RUN apt-get update && apt-get install -y \
+       build-essential ca-certificates curl gnupg \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install -y \
+      python3-pip \
+      python3-venv \
+      nodejs \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 ADD Makefile .
@@ -19,7 +25,7 @@ RUN make docs-deps
 ADD ./mkdocs.yml .
 ADD ./docs ./docs
 RUN make docs-build
- 
+
 # web
 ADD ./web/package.json ./web/package-lock.json ./web/
 RUN make web-deps

Makefile

@@ -39,8 +39,8 @@ help:
 	@echo "  make web-deps                   - Install web app dependencies (npm install the universe)"
 	@echo "  make web-build                  - Actually build the web app"
 	@echo "  make web-lint                   - Run eslint on the web app"
-	@echo "  make web-format                 - Run prettier on the web app"
-	@echo "  make web-format-check           - Run prettier on the web app, but don't change anything"
+	@echo "  make web-fmt                    - Run prettier on the web app"
+	@echo "  make web-fmt-check              - Run prettier on the web app, but don't change anything"
 	@echo
 	@echo "Build documentation:"
 	@echo "  make docs                       - Build the documentation"
@@ -95,6 +95,7 @@ docker-dev:
 		--build-arg COMMIT=$(COMMIT) \
 		./
 
+
 # Ubuntu-specific
 
 build-deps-ubuntu:
@@ -103,32 +104,27 @@ build-deps-ubuntu:
 		curl \
 		gcc-aarch64-linux-gnu \
 		gcc-arm-linux-gnueabi \
+		python3 \
+		python3-venv \
 		jq
 	which pip3 || sudo apt-get install -y python3-pip
 
+
 # Documentation
 
 docs: docs-deps docs-build
 
-docs-build: .PHONY
-	@if ! /bin/echo -e "import sys\nif sys.version_info < (3,8):\n exit(1)" | python3; then \
-	  if which python3.8; then \
-	  	echo "python3.8 $(shell which mkdocs) build"; \
-	    python3.8 $(shell which mkdocs) build; \
-	  else \
-	    echo "ERROR: Python version too low. mkdocs-material needs >= 3.8"; \
-	    exit 1; \
-	  fi; \
-	else \
-	  echo "mkdocs build"; \
-	  mkdocs build; \
-	fi
+docs-venv: .PHONY
+	python3 -m venv ./venv
 
-docs-deps: .PHONY
-	pip3 install -r requirements.txt
+docs-build: docs-venv
+	(. venv/bin/activate && mkdocs build)
+
+docs-deps: docs-venv
+	(. venv/bin/activate && pip3 install -r requirements.txt)
 
 docs-deps-update: .PHONY
-	pip3 install -r requirements.txt --upgrade
+	(. venv/bin/activate && pip3 install -r requirements.txt --upgrade)
 
 
 # Web app
@@ -151,10 +147,10 @@ web-deps:
 web-deps-update:
 	cd web && npm update
 
-web-format:
+web-fmt:
 	cd web && npm run format
 
-web-format-check:
+web-fmt-check:
 	cd web && npm run format:check
 
 web-lint:
@@ -248,7 +244,7 @@ cli-build-results:
 
 # Test/check targets
 
-check: test web-format-check fmt-check vet web-lint lint staticcheck
+check: test web-fmt-check fmt-check vet web-lint lint staticcheck
 
 test: .PHONY
 	go test $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
@@ -275,7 +271,7 @@ coverage-upload:
 
 # Lint/formatting targets
 
-fmt:
+fmt: web-fmt
 	gofmt -s -w .
 
 fmt-check:

README.md

@@ -18,7 +18,7 @@ notification service. With ntfy, you can **send notifications to your phone or d
 **without having to sign up or pay any fees**. If you'd like to run your own instance of the service, you can easily do 
 so since ntfy is open source.
 
-You can access the free version of ntfy at **[ntfy.sh](https://ntfy.sh)**. There is also an [open source Android app](https://github.com/binwiederhier/ntfy-android)
+You can access the free version of ntfy at **[ntfy.sh](https://ntfy.sh)**. There is also an [open-source Android app](https://github.com/binwiederhier/ntfy-android)
 available on [Google Play](https://play.google.com/store/apps/details?id=io.heckel.ntfy) or [F-Droid](https://f-droid.org/en/packages/io.heckel.ntfy/),
 as well as an [open source iOS app](https://github.com/binwiederhier/ntfy-ios) available on the [App Store](https://apps.apple.com/us/app/ntfy/id1625396347).
 
@@ -31,7 +31,10 @@ as well as an [open source iOS app](https://github.com/binwiederhier/ntfy-ios) a
 </p>
 
 ## [ntfy Pro](https://ntfy.sh/app) 💸 🎉
-I now offer paid plans for [ntfy.sh](https://ntfy.sh/) if you don't want to self-host, or you want to support the development of ntfy (→ [Purchase via web app](https://ntfy.sh/app)). You can **buy a plan for as low as $3.33/month** (if you use promo code `MYTOPIC`, limited time only). You can also donate via [GitHub Sponsors](https://github.com/sponsors/binwiederhier), and [Liberapay](https://liberapay.com/ntfy). I would be very humbled by your sponsorship. ❤️ 
+I now offer paid plans for [ntfy.sh](https://ntfy.sh/) if you don't want to self-host, or you want to support the development of 
+ntfy (→ [Purchase via web app](https://ntfy.sh/app)). You can **buy a plan for as low as $5/month**.
+You can also donate via [GitHub Sponsors](https://github.com/sponsors/binwiederhier), and [Liberapay](https://liberapay.com/ntfy).
+I would be very humbled by your sponsorship. ❤️ 
 
 ## **[Documentation](https://ntfy.sh/docs/)**
 
@@ -41,7 +44,7 @@ I now offer paid plans for [ntfy.sh](https://ntfy.sh/) if you don't want to self
 [Install / Self-hosting](https://ntfy.sh/docs/install/) |
 [Building](https://ntfy.sh/docs/develop/)
 
-## Chat / forum
+## Chat/forum
 There are a few ways to get in touch with me and/or the rest of the community. Feel free to use any of these methods. Whatever
 works best for you:
 
@@ -50,13 +53,13 @@ works best for you:
 * [Lemmy discussion board](https://discuss.ntfy.sh/c/ntfy) - asynchronous forum (_new as of June 2023_)
 * [GitHub issues](https://github.com/binwiederhier/ntfy/issues) - questions, features, bugs
 
-## Announcements / beta testers
+## Announcements/beta testers
 For announcements of new releases and cutting-edge beta versions, please subscribe to the [ntfy.sh/announcements](https://ntfy.sh/announcements) 
 topic. If you'd like to test the iOS app, join [TestFlight](https://testflight.apple.com/join/P1fFnAm9). For Android betas,
 join Discord/Matrix (I'll eventually make a testing channel in Google Play).
 
 ## Contributing
-I welcome any and all contributions. Just create a PR or an issue. For larger features/ideas, please reach out
+I welcome any contributions. Just create a PR or an issue. For larger features/ideas, please reach out
 on Discord/Matrix first to see if I'd accept them. To contribute code, check out the [build instructions](https://ntfy.sh/docs/develop/) 
 for the server and the Android app. Or, if you'd like to help translate 🇩🇪 🇺🇸 🇧🇬, you can start immediately in
 [Hosted Weblate](https://hosted.weblate.org/projects/ntfy/).
@@ -141,8 +144,29 @@ account costs. Even small donations are very much appreciated. A big fat **Thank
 <a href="https://github.com/darkdragon-001"><img src="https://github.com/darkdragon-001.png" width="40px" /></a>
 <a href="https://github.com/jonathan-kosgei"><img src="https://github.com/jonathan-kosgei.png" width="40px" /></a>
 <a href="https://github.com/KevinWang15"><img src="https://github.com/KevinWang15.png" width="40px" /></a>
+<a href="https://github.com/darkmattercoder"><img src="https://github.com/darkmattercoder.png" width="40px" /></a>
+<a href="https://github.com/bmcgonag"><img src="https://github.com/bmcgonag.png" width="40px" /></a>
+<a href="https://github.com/skorokithakis"><img src="https://github.com/skorokithakis.png" width="40px" /></a>
+<a href="https://github.com/eenturk"><img src="https://github.com/eenturk.png" width="40px" /></a>
+<a href="https://github.com/spirossi"><img src="https://github.com/spirossi.png" width="40px" /></a>
+<a href="https://github.com/teomarcdhio"><img src="https://github.com/teomarcdhio.png" width="40px" /></a>
+<a href="https://github.com/MarcMichalsky"><img src="https://github.com/MarcMichalsky.png" width="40px" /></a>
+<a href="https://github.com/LuckVintage"><img src="https://github.com/LuckVintage.png" width="40px" /></a>
+<a href="https://github.com/spartan"><img src="https://github.com/spartan.png" width="40px" /></a>
+<a href="https://github.com/alexandzors"><img src="https://github.com/alexandzors.png" width="40px" /></a>
+<a href="https://github.com/dkramer95"><img src="https://github.com/dkramer95.png" width="40px" /></a>
+<a href="https://github.com/YezGotIt"><img src="https://github.com/YezGotIt.png" width="40px" /></a>
+<a href="https://github.com/thomasskou"><img src="https://github.com/thomasskou.png" width="40px" /></a>
+<a href="https://github.com/surfernv"><img src="https://github.com/surfernv.png" width="40px" /></a>
+<a href="https://github.com/richardleach"><img src="https://github.com/richardleach.png" width="40px" /></a>
+<a href="https://github.com/bear"><img src="https://github.com/bear.png" width="40px" /></a>
+<a href="https://github.com/cminter"><img src="https://github.com/cminter.png" width="40px" /></a>
+<a href="https://github.com/bahur142"><img src="https://github.com/bahur142.png" width="40px" /></a>
+<a href="https://github.com/pgwiebes"><img src="https://github.com/pgwiebes.png" width="40px" /></a>
+<a href="https://github.com/ralhei"><img src="https://github.com/ralhei.png" width="40px" /></a>
+<a href="https://github.com/TechMDW"><img src="https://github.com/TechMDW.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,
+I'd also like to thank JetBrains for their awesome [IntelliJ IDEA](https://www.jetbrains.com/idea/),
 and [DigitalOcean](https://m.do.co/c/442b929528db) (*referral link*) for supporting the project:
 
 <a href="https://m.do.co/c/442b929528db"><img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px"></a>
@@ -158,7 +182,7 @@ _Please be sure to read the complete [Code of Conduct](CODE_OF_CONDUCT.md)._
 Made with ❤️ by [Philipp C. Heckel](https://heckel.io).   
 The project is dual licensed under the [Apache License 2.0](LICENSE) and the [GPLv2 License](LICENSE.GPLv2).
 
-Third party libraries and resources:
+Third-party libraries and resources:
 * [github.com/urfave/cli](https://github.com/urfave/cli) (MIT) is used to drive the CLI
 * [Mixkit sounds](https://mixkit.co/free-sound-effects/notification/) (Mixkit Free License) are used as notification sounds
 * [Sounds from notificationsounds.com](https://notificationsounds.com) (Creative Commons Attribution) are used as notification sounds

client/client.yml

@@ -7,7 +7,10 @@
 
 # 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 ("")
+# use empty double-quotes ("").
+#
+# To override the default user:password combination or default token for a particular subscription (e.g., to send
+# no Authorization header), set the user:pass/token for the subscription to empty double-quotes ("").
 
 # default-token:
 

client/config.go

@@ -23,9 +23,9 @@ type Config struct {
 // Subscribe is the struct for a Subscription within Config
 type Subscribe struct {
 	Topic    string            `yaml:"topic"`
-	User     string            `yaml:"user"`
+	User     *string           `yaml:"user"`
 	Password *string           `yaml:"password"`
-	Token    string            `yaml:"token"`
+	Token    *string           `yaml:"token"`
 	Command  string            `yaml:"command"`
 	If       map[string]string `yaml:"if"`
 }

client/config_test.go

@@ -37,7 +37,7 @@ subscribe:
 	require.Equal(t, 4, len(conf.Subscribe))
 	require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
 	require.Equal(t, "", conf.Subscribe[0].Command)
-	require.Equal(t, "phil", conf.Subscribe[0].User)
+	require.Equal(t, "phil", *conf.Subscribe[0].User)
 	require.Equal(t, "mypass", *conf.Subscribe[0].Password)
 	require.Equal(t, "echo-this", conf.Subscribe[1].Topic)
 	require.Equal(t, `echo "Message received: $message"`, conf.Subscribe[1].Command)
@@ -67,7 +67,7 @@ subscribe:
 	require.Equal(t, 1, len(conf.Subscribe))
 	require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
 	require.Equal(t, "", conf.Subscribe[0].Command)
-	require.Equal(t, "phil", conf.Subscribe[0].User)
+	require.Equal(t, "phil", *conf.Subscribe[0].User)
 	require.Equal(t, "", *conf.Subscribe[0].Password)
 }
 
@@ -91,7 +91,7 @@ subscribe:
 	require.Equal(t, 1, len(conf.Subscribe))
 	require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
 	require.Equal(t, "", conf.Subscribe[0].Command)
-	require.Equal(t, "phil", conf.Subscribe[0].User)
+	require.Equal(t, "phil", *conf.Subscribe[0].User)
 	require.Nil(t, conf.Subscribe[0].Password)
 }
 
@@ -113,7 +113,7 @@ subscribe:
 	require.Equal(t, 1, len(conf.Subscribe))
 	require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
 	require.Equal(t, "", conf.Subscribe[0].Command)
-	require.Equal(t, "phil", conf.Subscribe[0].User)
+	require.Equal(t, "phil", *conf.Subscribe[0].User)
 	require.Nil(t, conf.Subscribe[0].Password)
 }
 
@@ -134,7 +134,7 @@ subscribe:
 	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].User)
 	require.Nil(t, conf.Subscribe[0].Password)
-	require.Equal(t, "", conf.Subscribe[0].Token)
+	require.Nil(t, conf.Subscribe[0].Token)
 }

client/options.go

@@ -97,6 +97,11 @@ func WithBearerAuth(token string) PublishOption {
 	return WithHeader("Authorization", fmt.Sprintf("Bearer %s", token))
 }
 
+// WithEmptyAuth clears the Authorization header
+func WithEmptyAuth() PublishOption {
+	return RemoveHeader("Authorization")
+}
+
 // WithNoCache instructs the server not to cache the message server-side
 func WithNoCache() PublishOption {
 	return WithHeader("X-Cache", "no")
@@ -187,3 +192,13 @@ func WithQueryParam(param, value string) RequestOption {
 		return nil
 	}
 }
+
+// RemoveHeader is a generic option to remove a header from a request
+func RemoveHeader(header string) RequestOption {
+	return func(r *http.Request) error {
+		if header != "" {
+			delete(r.Header, header)
+		}
+		return nil
+	}
+}

cmd/serve.go

@@ -52,7 +52,6 @@ var flagsServe = append(
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-file", Aliases: []string{"auth_file", "H"}, EnvVars: []string{"NTFY_AUTH_FILE"}, Usage: "auth database file used for access control"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-startup-queries", Aliases: []string{"auth_startup_queries"}, EnvVars: []string{"NTFY_AUTH_STARTUP_QUERIES"}, Usage: "queries run when the auth database is initialized"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-default-access", Aliases: []string{"auth_default_access", "p"}, EnvVars: []string{"NTFY_AUTH_DEFAULT_ACCESS"}, Value: "read-write", Usage: "default permissions if no matching entries in the auth database are found"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "auth-user-header", Aliases: []string{"auth_user_header"}, EnvVars: []string{"NTFY_AUTH_USER_HEADER"}, Usage: "HTTP header that may be used to pass an authenticated user from a proxy, e.g. X-Forwarded-User"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "attachment-cache-dir", Aliases: []string{"attachment_cache_dir"}, EnvVars: []string{"NTFY_ATTACHMENT_CACHE_DIR"}, Usage: "cache directory for attached files"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "attachment-total-size-limit", Aliases: []string{"attachment_total_size_limit", "A"}, EnvVars: []string{"NTFY_ATTACHMENT_TOTAL_SIZE_LIMIT"}, DefaultText: "5G", Usage: "limit of the on-disk attachment cache"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "attachment-file-size-limit", Aliases: []string{"attachment_file_size_limit", "Y"}, EnvVars: []string{"NTFY_ATTACHMENT_FILE_SIZE_LIMIT"}, DefaultText: "15M", Usage: "per-file attachment size limit (e.g. 300k, 2M, 100M)"}),
@@ -148,7 +147,6 @@ func execServe(c *cli.Context) error {
 	authFile := c.String("auth-file")
 	authStartupQueries := c.String("auth-startup-queries")
 	authDefaultAccess := c.String("auth-default-access")
-	authUserHeader := c.String("auth-user-header")
 	attachmentCacheDir := c.String("attachment-cache-dir")
 	attachmentTotalSizeLimitStr := c.String("attachment-total-size-limit")
 	attachmentFileSizeLimitStr := c.String("attachment-file-size-limit")
@@ -229,8 +227,6 @@ func execServe(c *cli.Context) error {
 		return errors.New("base-url and upstream-base-url cannot be identical, you'll likely want to set upstream-base-url to https://ntfy.sh, see https://ntfy.sh/docs/config/#ios-instant-notifications")
 	} else if authFile == "" && (enableSignup || enableLogin || enableReservations || stripeSecretKey != "") {
 		return errors.New("cannot set enable-signup, enable-login, enable-reserve-topics, or stripe-secret-key if auth-file is not set")
-	} else if authUserHeader != "" && !behindProxy {
-		return errors.New("if auth-user-header is set, behind-proxy must also be set; this is a security measure")
 	} else if enableSignup && !enableLogin {
 		return errors.New("cannot set enable-signup without also setting enable-login")
 	} else if stripeSecretKey != "" && (stripeWebhookKey == "" || baseURL == "") {
@@ -320,7 +316,6 @@ func execServe(c *cli.Context) error {
 	conf.AuthFile = authFile
 	conf.AuthStartupQueries = authStartupQueries
 	conf.AuthDefault = authDefault
-	conf.AuthUserHeader = authUserHeader
 	conf.AttachmentCacheDir = attachmentCacheDir
 	conf.AttachmentTotalSizeLimit = attachmentTotalSizeLimit
 	conf.AttachmentFileSizeLimit = attachmentFileSizeLimit

cmd/subscribe.go

@@ -225,12 +225,17 @@ func doSubscribe(c *cli.Context, cl *client.Client, conf *client.Config, topic,
 }
 
 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 an explicit empty token or empty user:pass is given, exit without auth
+	if (s.Token != nil && *s.Token == "") || (s.User != nil && *s.User == "" && s.Password != nil && *s.Password == "") {
+		return client.WithEmptyAuth()
 	}
-	if s.User != "" && s.Password != nil {
-		return client.WithBasicAuth(s.User, *s.Password)
+
+	// check for subscription token then subscription user:pass
+	if s.Token != nil && *s.Token != "" {
+		return client.WithBearerAuth(*s.Token)
+	}
+	if s.User != nil && *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

cmd/subscribe_test.go

@@ -330,7 +330,7 @@ default-token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
 
 	app, _, stdout, _ := newTestApp()
 
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--config=" + filename, "mytopic"}))
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "mytopic"}))
 
 	require.Equal(t, message, strings.TrimSpace(stdout.String()))
 }
@@ -355,7 +355,63 @@ default-password: mypass
 
 	app, _, stdout, _ := newTestApp()
 
-	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--config=" + filename, "mytopic"}))
+	require.Nil(t, app.Run([]string{"ntfy", "subscribe", "--poll", "--from-config", "--config=" + filename, "mytopic"}))
+
+	require.Equal(t, message, strings.TrimSpace(stdout.String()))
+}
+
+func TestCLI_Subscribe_Override_Default_UserPass_With_Empty_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, "", 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
+    user: ""
+    password: ""
+`, 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_Override_Default_Token_With_Empty_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, "", 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
+    token: ""
+`, 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()))
 }

docs/config.md

@@ -44,6 +44,14 @@ Here are a few working sample configs:
     attachment-cache-dir: "/var/cache/ntfy/attachments"
     ```
 
+=== "server.yml (behind proxy, with cache + attachments)"
+    ``` yaml
+    base-url: "http://ntfy.example.com"
+    listen-http: ":2586"
+    cache-file: "/var/cache/ntfy/cache.db"
+    attachment-cache-dir: "/var/cache/ntfy/attachments"
+    ```
+
 === "server.yml (ntfy.sh config)"
     ``` yaml
     # All the things: Behind a proxy, Firebase, cache, attachments, 
@@ -458,6 +466,31 @@ $ dig A mx1.ntfy.sh +short
 3.139.215.220
 ```
 
+### Local-only email
+If you want to send emails from an internal service on the same network as your ntfy instance, you do not need to
+worry about DNS records at all. Define a port for the SMTP server and pick an SMTP server domain (can be
+anything).
+
+=== "/etc/ntfy/server.yml"
+    ``` yaml
+    smtp-server-listen: ":25"
+    smtp-server-domain: "example.com"
+    smtp-server-addr-prefix: "ntfy-"  # optional
+    ```
+
+Then, in the email settings of your internal service, set the SMTP server address to the IP address of your
+ntfy instance. Set the port to the value you defined in `smtp-server-listen`. Leave any username and password
+fields empty. In the "From" address, pick anything (e.g., "alerts@ntfy.sh"); the value doesn't matter.
+In the "To" address, put in an email address that follows this pattern: `[topic]@[smtp-server-domain]` (or
+`[smtp-server-addr-prefix][topic]@[smtp-server-domain]` if you set `smtp-server-addr-prefix`).
+
+So if you used `example.com` as the SMTP server domain, and you want to send a message to the `email-alerts`
+topic, set the "To" address to `email-alerts@example.com`. If the topic has access restrictions, you will need
+to include an access token in the "To" address, such as `email-alerts+tk_AbC123dEf456@example.com`.
+
+If the internal service lets you use define an email "Subject", it will become the title of the notification.
+The body of the email will become the message of the notification.
+
 ## Behind a proxy (TLS, etc.)
 !!! warning
     If you are running ntfy behind a proxy, you must set the `behind-proxy` flag. Otherwise, all visitors are
@@ -649,8 +682,8 @@ or the root domain:
     <VirtualHost *:80>
         ServerName ntfy.sh
 
-        # Proxy connections to ntfy (requires "a2enmod proxy")
-        ProxyPass / http://127.0.0.1:2586/
+        # Proxy connections to ntfy (requires "a2enmod proxy proxy_http")
+        ProxyPass / http://127.0.0.1:2586/ upgrade=websocket
         ProxyPassReverse / http://127.0.0.1:2586/
 
         SetEnv proxy-nokeepalive 1
@@ -658,19 +691,13 @@ or the root domain:
 
         # Higher than the max message size of 4096 bytes
         LimitRequestBody 102400
-
-        # Enable mod_rewrite (requires "a2enmod rewrite")
-        RewriteEngine on
-
-        # WebSockets support (requires "a2enmod rewrite proxy_wstunnel")
-        RewriteCond %{HTTP:Upgrade} websocket [NC]
-        RewriteCond %{HTTP:Connection} upgrade [NC]
-        RewriteRule ^/?(.*) "ws://127.0.0.1:2586/$1" [P,L]
         
         # Redirect HTTP to HTTPS, but only for GET topic addresses, since we want 
-        # it to work with curl without the annoying https:// prefix 
-        RewriteCond %{REQUEST_METHOD} GET
-        RewriteRule ^/([-_A-Za-z0-9]{0,64})$ https://%{SERVER_NAME}/$1 [R,L]
+        # it to work with curl without the annoying https:// prefix (requires "a2enmod alias")
+        <If "%{REQUEST_METHOD} == 'GET'">
+            RedirectMatch permanent "^/([-_A-Za-z0-9]{0,64})$" "https://%{SERVER_NAME}/$1"
+        </If>
+
     </VirtualHost>
     
     <VirtualHost *:443>
@@ -681,8 +708,8 @@ or the root domain:
         SSLCertificateKeyFile /etc/letsencrypt/live/ntfy.sh/privkey.pem
         Include /etc/letsencrypt/options-ssl-apache.conf
 
-        # Proxy connections to ntfy (requires "a2enmod proxy")
-        ProxyPass / http://127.0.0.1:2586/
+        # Proxy connections to ntfy (requires "a2enmod proxy proxy_http")
+        ProxyPass / http://127.0.0.1:2586/ upgrade=websocket
         ProxyPassReverse / http://127.0.0.1:2586/
 
         SetEnv proxy-nokeepalive 1
@@ -690,14 +717,7 @@ or the root domain:
 
         # Higher than the max message size of 4096 bytes 
         LimitRequestBody 102400
-
-        # Enable mod_rewrite (requires "a2enmod rewrite")
-        RewriteEngine on
-
-        # WebSockets support (requires "a2enmod rewrite proxy_wstunnel")
-        RewriteCond %{HTTP:Upgrade} websocket [NC]
-        RewriteCond %{HTTP:Connection} upgrade [NC]
-        RewriteRule ^/?(.*) "ws://127.0.0.1:2586/$1" [P,L] 
+	
     </VirtualHost>
     ```
 
@@ -1160,10 +1180,10 @@ and [here](https://easyengine.io/tutorials/nginx/block-wp-login-php-bruteforce-a
 
 ## Health checks
 A preliminary health check API endpoint is exposed at `/v1/health`. The endpoint returns a `json` response in the format shown below.
-If a non-200 HTTP status code is returned or if the returned `health` field is `false` the ntfy service should be considered as unhealthy.
+If a non-200 HTTP status code is returned or if the returned `healthy` field is `false` the ntfy service should be considered as unhealthy.
 
 ```json
-{"health":true}
+{"healthy":true}
 ```
 
 See [Installation for Docker](install.md#docker) for an example of how this could be used in a `docker-compose` environment.

docs/develop.md

@@ -429,7 +429,7 @@ steps:
 
 ### XCode setup
 
-1. Follow step 4 of [https://firebase.google.com/docs/ios/setup](Add Firebase to your Apple project) to install the 
+1. Follow step 4 of [Add Firebase to your Apple project](https://firebase.google.com/docs/ios/setup) to install the 
    `firebase-ios-sdk` in XCode, if it's not already present - you can select any packages in addition to Firebase Core / Firebase Messaging
 1. Similarly, install the SQLite.swift package dependency in XCode
 1. When running the debug build, ensure XCode is pointed to the connected iOS device - registering for push notifications does not work in the iOS simulators

docs/emojis.md

@@ -2,9 +2,9 @@
 
 <!-- This file was generated by scripts/emoji-convert.sh -->
 
-You can [tag messages](../publish/#tags-emojis) with emojis 🥳 🎉 and other relevant strings. Matching tags are automatically
+You can [tag messages](publish.md#tags-emojis) with emojis 🥳 🎉 and other relevant strings. Matching tags are automatically
 converted to emojis. This is a reference of all supported emojis. To learn more about the feature, please refer to the
-[tagging and emojis page](../publish/#tags-emojis).
+[tagging and emojis page](publish.md#tags-emojis).
 
 <table class="remove-md-box emoji-table"><tr>
 

docs/examples.md

@@ -135,6 +135,21 @@ You can send a message during a workflow run with curl. Here is an example sendi
       ${{ secrets.NTFY_URL }}
 ```
 
+## Changedetection.io
+ntfy is an excellent choice for getting notifications when a website has a change sent to your mobile (or desktop), 
+[changedetection.io](https://changedetection.io) or on GitHub ([dgtlmoon/changedetection.io](https://github.com/dgtlmoon/changedetection.io)) 
+uses [apprise](https://github.com/caronc/apprise) library for notification integrations.
+
+To add any ntfy(s) notification to a website change simply add the [ntfy style URL](https://github.com/caronc/apprise/wiki/Notify_ntfy) 
+to the notification list.
+
+For example `ntfy://{topic}` or `ntfy://{user}:{password}@{host}:{port}/{topics}`
+
+In your changedetection.io installation, click `Edit` > `Notifications` on a single website watch (or group) then add 
+the special ntfy Apprise Notification URL to the Notification List.
+
+![ntfy alerts on website change](static/img/cdio-setup.jpg)
+
 ## Watchtower (shoutrrr)
 You can use [shoutrrr](https://containrrr.dev/shoutrrr/latest/services/ntfy/) to send 
 [Watchtower](https://github.com/containrrr/watchtower/) notifications to your ntfy topic.

docs/faq.md

@@ -76,6 +76,18 @@ However, if you still want to disable it, you can do so with the `web-root: disa
 Think of the ntfy web app like an Android/iOS app. It is freely available and accessible to anyone, yet useless without
 a proper backend. So as long as you secure your backend with ACLs, exposing the ntfy web app to the Internet is harmless.
 
+## If topic names are public, could I not just brute force them?
+If you don't have [ACLs set up](config.md#access-control), the topic name is your password, it says so everywhere. If you
+choose a easy-to-guess/dumb topic name, people will be able to guess it. If you choose a randomly generated topic name,
+the topic is as good as a good password.
+
+As for brute forcing: It's not possible to brute force a ntfy server for very long, as you'll get quickly rate limited.
+In the default configuration, you'll be able to do 60 requests as a burst, and then 1 request per 10 seconds. Assuming you
+choose a random 10 digit topic name using only A-Z, a-z, 0-9, _ and -, there are 64^10 possible topic names. Even if you
+could do hundreds of requests per seconds (which you cannot), it would take many years to brute force a topic name.
+
+For ntfy.sh, there's even a fail2ban in place which will ban your IP pretty quickly.
+
 ## Where can I donate?
 I have just very recently started accepting donations via [GitHub Sponsors](https://github.com/sponsors/binwiederhier).
 I would be humbled if you helped me carry the server and developer account costs. Even small donations are very much

docs/install.md

@@ -14,14 +14,15 @@ We support amd64, armv7 and arm64.
 
 1. Install ntfy using one of the methods described below
 2. Then (optionally) edit `/etc/ntfy/server.yml` for the server (Linux only, see [configuration](config.md) or [sample server.yml](https://github.com/binwiederhier/ntfy/blob/main/server/server.yml))
-3. Or (optionally) create/edit `~/.config/ntfy/client.yml` (for the non-root user) or `/etc/ntfy/client.yml` (for the root user), see [sample client.yml](https://github.com/binwiederhier/ntfy/blob/main/client/client.yml))
+3. Or (optionally) create/edit `~/.config/ntfy/client.yml` (for the non-root user), `~/Library/Application Support/ntfy/client.yml` (for the macOS non-root user), or `/etc/ntfy/client.yml` (for the root user), see [sample client.yml](https://github.com/binwiederhier/ntfy/blob/main/client/client.yml))
 
 To run the ntfy server, then just run `ntfy serve` (or `systemctl start ntfy` when using the deb/rpm).
 To send messages, use `ntfy publish`. To subscribe to topics, use `ntfy subscribe` (see [subscribing via CLI](subscribe/cli.md)
 for details). 
 
-If you like video tutorials, check out :simple-youtube: [Kris Occhipinti's ntfy install guide](https://www.youtube.com/watch?v=bZzqrX05mNU). 
-It's short and to the point. _I am not affiliated with Kris, I just liked the video._
+If you like tutorials, check out :simple-youtube: [Kris Occhipinti's ntfy install guide](https://www.youtube.com/watch?v=bZzqrX05mNU) on YouTube, or
+[Alex's Docker-based setup guide](https://blog.alexsguardian.net/posts/2023/09/12/selfhosting-ntfy/). Both are great
+resources to get started. _I am not affiliated with Kris or Alex, I just liked their video/post._
 
 ## Linux binaries
 Please check out the [releases page](https://github.com/binwiederhier/ntfy/releases) for binaries and
@@ -29,37 +30,37 @@ deb/rpm packages.
 
 === "x86_64/amd64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_amd64.tar.gz
-    tar zxvf ntfy_2.6.2_linux_amd64.tar.gz
-    sudo cp -a ntfy_2.6.2_linux_amd64/ntfy /usr/local/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.6.2_linux_amd64/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_amd64.tar.gz
+    tar zxvf ntfy_2.7.0_linux_amd64.tar.gz
+    sudo cp -a ntfy_2.7.0_linux_amd64/ntfy /usr/local/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.7.0_linux_amd64/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "armv6"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_armv6.tar.gz
-    tar zxvf ntfy_2.6.2_linux_armv6.tar.gz
-    sudo cp -a ntfy_2.6.2_linux_armv6/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.6.2_linux_armv6/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv6.tar.gz
+    tar zxvf ntfy_2.7.0_linux_armv6.tar.gz
+    sudo cp -a ntfy_2.7.0_linux_armv6/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.7.0_linux_armv6/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "armv7/armhf"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_armv7.tar.gz
-    tar zxvf ntfy_2.6.2_linux_armv7.tar.gz
-    sudo cp -a ntfy_2.6.2_linux_armv7/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.6.2_linux_armv7/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv7.tar.gz
+    tar zxvf ntfy_2.7.0_linux_armv7.tar.gz
+    sudo cp -a ntfy_2.7.0_linux_armv7/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.7.0_linux_armv7/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "arm64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_arm64.tar.gz
-    tar zxvf ntfy_2.6.2_linux_arm64.tar.gz
-    sudo cp -a ntfy_2.6.2_linux_arm64/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.6.2_linux_arm64/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_arm64.tar.gz
+    tar zxvf ntfy_2.7.0_linux_arm64.tar.gz
+    sudo cp -a ntfy_2.7.0_linux_arm64/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.7.0_linux_arm64/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
@@ -109,7 +110,7 @@ Manually installing the .deb file:
 
 === "x86_64/amd64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_amd64.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_amd64.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -117,7 +118,7 @@ Manually installing the .deb file:
 
 === "armv6"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_armv6.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv6.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -125,7 +126,7 @@ Manually installing the .deb file:
 
 === "armv7/armhf"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_armv7.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_armv7.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -133,7 +134,7 @@ Manually installing the .deb file:
 
 === "arm64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_arm64.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_arm64.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -143,28 +144,28 @@ Manually installing the .deb file:
 
 === "x86_64/amd64"
     ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.6.2/ntfy_2.6.2_linux_amd64.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.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.6.2/ntfy_2.6.2_linux_armv6.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.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.6.2/ntfy_2.6.2_linux_armv7.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.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.6.2/ntfy_2.6.2_linux_arm64.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_linux_arm64.rpm
     sudo systemctl enable ntfy 
     sudo systemctl start ntfy
     ```
@@ -194,18 +195,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.6.2/ntfy_2.6.2_darwin_all.tar.gz), 
+To install, please [download the tarball](https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_darwin_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.6.2/ntfy_2.6.2_darwin_all.tar.gz > ntfy_2.6.2_darwin_all.tar.gz
-tar zxvf ntfy_2.6.2_darwin_all.tar.gz
-sudo cp -a ntfy_2.6.2_darwin_all/ntfy /usr/local/bin/ntfy
+curl -L https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_darwin_all.tar.gz > ntfy_2.7.0_darwin_all.tar.gz
+tar zxvf ntfy_2.7.0_darwin_all.tar.gz
+sudo cp -a ntfy_2.7.0_darwin_all/ntfy /usr/local/bin/ntfy
 mkdir ~/Library/Application\ Support/ntfy 
-cp ntfy_2.6.2_darwin_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
+cp ntfy_2.7.0_darwin_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
 ntfy --help
 ```
 
@@ -223,7 +224,7 @@ brew install ntfy
 
 ## 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.6.2/ntfy_2.6.2_windows_amd64.zip),
+To install, please [download the latest ZIP](https://github.com/binwiederhier/ntfy/releases/download/v2.7.0/ntfy_2.7.0_windows_amd64.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

@@ -23,6 +23,8 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [Platypush](https://docs.platypush.tech/platypush/plugins/ntfy.html) - Automation platform aimed to run on any device that can run Python
 - [diun](https://crazymax.dev/diun/) - Docker Image Update Notifier
 - [Cloudron](https://www.cloudron.io/store/sh.ntfy.cloudronapp.html) - Platform that makes it easy to manage web apps on your server
+- [Xitoring](https://xitoring.com/docs/notifications/notification-roles/ntfy/) - Server and Uptime monitoring
+- [changedetection.io](https://changedetection.io) ⭐ - Website change detection and notification
 
 ## Integration via HTTP/SMTP/etc.
 
@@ -56,6 +58,8 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [ntfy](https://github.com/ffflorian/ntfy) - Send notifications over ntfy (JS)
 - [ntfy_dart](https://github.com/jr1221/ntfy_dart) - Dart wrapper around the ntfy API (Dart)
 - [gotfy](https://github.com/AnthonyHewins/gotfy) - A Go wrapper for the ntfy API (Go)
+- [symfony/ntfy-notifier](https://symfony.com/components/NtfyNotifier) ⭐ - Symfony Notifier integration for ntfy (PHP)
+- [ntfy-java](https://github.com/MaheshBabu11/ntfy-java/) - A Java package to interact with a ntfy server (Java)
 
 ## CLIs + GUIs
 
@@ -79,7 +83,6 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [backup-projects](https://gist.github.com/anthonyaxenov/826ba65abbabd5b00196bc3e6af76002) - Stupidly simple backup script for own projects (Shell)
 - [grav-plugin-whistleblower](https://github.com/Himmlisch-Studios/grav-plugin-whistleblower) - Grav CMS plugin to get notifications via ntfy (PHP)
 - [ntfy-server-status](https://github.com/filip2cz/ntfy-server-status) -  Checking if server is online and reporting through ntfy (C)
-- [borg-based backup](https://github.com/davidhi7/backup) - Simple borg-based backup script with notifications based on ntfy.sh or Discord webhooks (Python/Shell)
 - [ntfy.sh *arr script](https://github.com/agent-squirrel/nfty-arr-script) - Quick and hacky script to get sonarr/radarr to notify the ntfy.sh service (Shell)
 - [website-watcher](https://github.com/muety/website-watcher) - A small tool to watch websites for changes (with XPath support) (Python)
 - [siteeagle](https://github.com/tpanum/siteeagle) - A small Python script to monitor websites and notify changes (Python)
@@ -126,9 +129,32 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [msgdrop](https://github.com/jbrubake/msgdrop) - Send and receive encrypted messages (Bash)
 - [vigilant](https://github.com/VerifiedJoseph/vigilant) - Monitor RSS/ATOM and JSON feeds, and send push notifications on new entries (PHP)
 - [ansible-role-ntfy-alertmanager](https://github.com/bleetube/ansible-role-ntfy-alertmanager) - Ansible role to install xenrox/ntfy-alertmanager
+- [NtfyMe-Blender](https://github.com/NotNanook/NtfyMe-Blender) - Blender addon to send notifications to NtfyMe (Python)
+- [ntfy-ios-url-share](https://www.icloud.com/shortcuts/be8a7f49530c45f79733cfe3e41887e6) - An iOS shortcut that lets you share URLs easily and quickly.
+- [ntfy-ios-filesharing](https://www.icloud.com/shortcuts/fe948d151b2e4ae08fb2f9d6b27d680b) - An iOS shortcut that lets you share files from your share feed to a topic of your choice.
+- [systemd-ntfy](https://hackage.haskell.org/package/systemd-ntfy) - monitor a set of systemd services an send a notification to ntfy.sh whenever their status changes
+- [RouterOS Scripts](https://git.eworm.de/cgit/routeros-scripts/about/) - a collection of scripts for MikroTik RouterOS
+- [ntfy-android-builder](https://github.com/TheBlusky/ntfy-android-builder) - Script for building ntfy-android with custom Firebase configuration (Docker/Shell)
+- [jetspotter](https://github.com/vvanouytsel/jetspotter) - a tool to send notifications whenever specified types of aircraft are spotted near a specified location
 
 ## Blog + forum posts
 
+- [Installing Self Host NTFY On Linux Using Docker Container](https://www.pinoylinux.org/topicsplus/containers/installing-self-host-ntfy-on-linux-using-docker-container/) - pinoylinux.org - 9/2023
+- [Homelab Notifications with ntfy](https://blog.alexsguardian.net/posts/2023/09/12/selfhosting-ntfy/) ⭐ - alexsguardian.net - 9/2023 
+- [Why NTFY is the Ultimate Push Notification Tool for Your Needs](https://osintph.medium.com/why-ntfy-is-the-ultimate-push-notification-tool-for-your-needs-e767421c84c5) - osintph.medium.com - 9/2023
+- [Supercharge Your Alerts: Ntfy — The Ultimate Push Notification Solution](https://medium.com/spring-boot/supercharge-your-alerts-ntfy-the-ultimate-push-notification-solution-a3dda79651fe) - spring-boot.medium.com - 9/2023
+- [Deploy Ntfy using Docker](https://www.linkedin.com/pulse/deploy-ntfy-mohamed-sharfy/) - linkedin.com - 9/2023
+- [Send Notifications With Ntfy for New WordPress Posts](https://www.activepieces.com/blog/ntfy-notifications-for-wordpress-new-posts) - activepieces.com - 9/2023
+- [Get Ntfy Notifications About New Zendesk Ticket](https://www.activepieces.com/blog/ntfy-notifications-about-new-zendesk-tickets) - activepieces.com - 9/2023
+- [Set reminder for recurring events using ntfy & Cron](https://www.youtube.com/watch?v=J3O4aQ-EcYk) - youtube.com - 9/2023
+- [ntfy - Installation and full configuration setup](https://www.youtube.com/watch?v=QMy14rGmpFI) - youtube.com - 9/2023
+- [How to install Ntfy.sh on Portainer / Docker Compose](https://www.youtube.com/watch?v=utD9GNbAwyg) - youtube.com - 9/2023
+- [ntfy - Push-Benachrichtigungen // Push Notifications](https://www.youtube.com/watch?v=LE3vRPPqZOU) - youtube.com - 9/2023
+- [Podman Update Notifications via Ntfy](https://rair.dev/podman-upadte-notifications-ntfy/) - rair.dev - 9/2023
+- [NetworkChunk - how did I NOT know about this?](https://www.youtube.com/watch?v=poDIT2ruQ9M) ⭐ - youtube.com - 8/2023
+- [NTFY - Command-Line Notifications](https://academy.networkchuck.com/blog/ntfy/) - academy.networkchuck.com - 8/2023
+- [Open Source Push Notifications! Get notified of any event you can imagine. Triggers abound!](https://www.youtube.com/watch?v=WJgwWXt79pE) ⭐ - youtube.com - 8/2023
+- [How to install and self host an Ntfy server on Linux](https://linuxconfig.org/how-to-install-and-self-host-an-ntfy-server-on-linux) - linuxconfig.org - 7/2023
 - [Basic website monitoring using cronjobs and ntfy.sh](https://burkhardt.dev/2023/website-monitoring-cron-ntfy/) - burkhardt.dev - 6/2023 
 - [Pingdom alternative in one line of curl through ntfy.sh](https://piqoni.bearblog.dev/uptime-monitoring-in-one-line-of-curl/) - bearblog.dev - 6/2023 
 - [#OpenSourceDiscovery 78: ntfy.sh](https://opensourcedisc.substack.com/p/opensourcediscovery-78-ntfysh) - opensourcedisc.substack.com - 6/2023 
@@ -155,6 +181,7 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [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
+- [Enabling SSH Login Notifications using Ntfy](https://paramdeo.com/blog/enabling-ssh-login-notifications-using-ntfy) - paramdeo.com - 11/2022
 - [ntfy - Push Notification Service](https://dizzytech.de/posts/ntfy/) - dizzytech.de - 11/2022 
 - [Console #132](https://console.substack.com/p/console-132) ⭐ - console.substack.com - 11/2022
 - [How to make my phone buzz*](https://evbogue.com/howtomakemyphonebuzz) - evbogue.com - 11/2022
@@ -211,6 +238,7 @@ ntfy community. Thanks to everyone running a public server. **You guys rock!**
 | [ntfy.envs.net](https://ntfy.envs.net)            | 🇩🇪 Germany       |
 | [ntfy.mzte.de](https://ntfy.mzte.de/)             | 🇩🇪 Germany       |
 | [ntfy.hostux.net](https://ntfy.hostux.net/)       | 🇫🇷 France        |
+| [ntfy.fossman.de](https://ntfy.fossman.de/)       | 🇩🇪 Germany       |
 
 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**.

docs/known-issues.md

@@ -27,11 +27,12 @@ Be sure that in your selfhosted server:
 * Set `upstream-base-url: "https://ntfy.sh"` (**not your own hostname!**)
 * Ensure that the URL you set in `base-url` **matches exactly** what you set the Default Server in iOS to 
 
-## Firefox on Android not automatically subscribing to web push (see [#789](https://github.com/binwiederhier/ntfy/issues/789))
-ntfy defaults to web-push based subscriptions when installed as a [progressive web app](./subscribe/pwa.md). Firefox
-Android has an [open bug](https://bugzilla.mozilla.org/show_bug.cgi?id=1796434) where it reports the PWA mode incorrectly.
-This causes ntfy to not automatically subscribe to web push, and requires you to go to the ntfy Settings page to enable
-it manually.
+## iOS app seeing "New message", but not real message content
+If you see `New message` notifications on iOS, your iPhone can likely not talk to your self-hosted server. Be sure that
+your iOS device and your ntfy server are either on the same network, or that your phone can actually reach the server.
+
+Turn on tracing/debugging on the server (via `log-level: trace` or `log-level: debug`, see [troubleshooting](troubleshooting.md)),
+and read docs on [iOS instant notifications](https://docs.ntfy.sh/config/#ios-instant-notifications).
 
 ## Safari does not play sounds for web push notifications
 Safari does not support playing sounds for web push notifications, and treats them all as silent. This will be fixed with

docs/publish.md

@@ -457,6 +457,7 @@ You can set the priority with the header `X-Priority` (or any of its aliases: `P
 === "PowerShell"
     ``` powershell
     $Request = @{
+      Method = 'POST'
       URI = "https://ntfy.sh/phil_alerts"
       Headers = @{
         Priority = "5"
@@ -1033,7 +1034,7 @@ is the only required one:
     $Request = @{
       Method = "POST"
       URI = "https://ntfy.sh"
-      Body = @{
+      Body = ConvertTo-JSON @{
         Topic    = "mytopic"
         Title    = "Low disk space alert"
         Message  = "Disk space is low at 5.1 GB"
@@ -1042,7 +1043,7 @@ is the only required one:
         FileName = "diskspace.jpg"
         Tags     = @("warning", "cd")
         Click    = "https://homecamera.lan/xasds1h2xsSsa/"
-        Actions  = ConvertTo-JSON @(
+        Actions  = @(
           @{ 
             Action = "view"
             Label  = "Admin panel"
@@ -1130,7 +1131,7 @@ As of today, the following actions are supported:
   when the action button is tapped (only supported on Android)
 * [`http`](#send-http-request): Sends HTTP POST/GET/PUT request when the action button is tapped
 
-Here's an example of what that a notification with actions can look like:
+Here's an example of what a notification with actions can look like:
 
 <figure markdown>
   ![notification with actions](static/img/android-screenshot-notification-actions.png){ width=500 }
@@ -1919,10 +1920,10 @@ And the same example using [JSON publishing](#publish-as-json):
     $Request = @{
       Method = "POST"
       URI = "https://ntfy.sh"
-      Body = @{
+      Body = ConvertTo-Json -Depth 3 @{
         Topic = "wifey"
         Message = "Your wife requested you send a picture of yourself."
-        Actions = ConvertTo-Json -Depth 3 @(
+        Actions = @(
           @{
             Action = "broadcast"
             Label = "Take picture"
@@ -2072,7 +2073,7 @@ Here's an example using the [`X-Actions` header](#using-a-header):
             'method' => 'POST',
             'header' =>
                 "Content-Type: text/plain\r\n" .
-                "Actions: http, Close door, https://api.mygarage.lan/, method=PUT, headers.Authorization=Bearer zAzsx1sk.., body={\"action\": \"close\"}",
+                'Actions: http, Close door, https://api.mygarage.lan/, method=PUT, headers.Authorization=Bearer zAzsx1sk.., body={\"action\": \"close\"}',
             'content' => 'Garage door has been open for 15 minutes. Close it?'
         ]
     ]));
@@ -2199,10 +2200,10 @@ And the same example using [JSON publishing](#publish-as-json):
     $Request = @{
       Method = "POST"
       URI = "https://ntfy.sh"
-      Body = @{
+      Body = ConvertTo-Json -Depth 3 @{
         Topic   = "myhome"
         Message = "Garage door has been open for 15 minutes. Close it?"
-        Actions = ConvertTo-Json -Depth 3 @(
+        Actions = @(
           @{
             Action  = "http"
             Label   = "Close door"
@@ -2287,7 +2288,7 @@ You can define which URL to open when a notification is clicked. This may be use
 to a Zabbix alert or a transaction that you'd like to provide the deep-link for. Tapping the notification will open
 the web browser (or the app) and open the website.
 
-To define a click action for the notification, pass a URL as the value of the `X-Click` header (or its aliase `Click`).
+To define a click action for the notification, pass a URL as the value of the `X-Click` header (or its alias `Click`).
 If you pass a website URL (`http://` or `https://`) the web browser will open. If you pass another URI that can be handled
 by another app, the responsible app may open. 
 

docs/releases.md

@@ -2,6 +2,38 @@
 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.7.0
+Released August 17, 2023
+
+This release ships Markdown support for the web app (not in the Android app yet), and adds support for 
+right-to-left languages (RTL) in the web app. It also fixes a few issues around date/time formatting, 
+internationalization support, a CLI auth bug.
+
+Furthermore, it fixes a security issue around access tokens getting erroneously deleted for other users
+in a specific scenario. This was a denial-of-service-type security issue, since it **effectively allowed a
+single user to deny access to all other users of a ntfy instance**. Please note that while tokens were
+erroneously deleted, **nobody but the token owner ever had access to it.** Please refer to [the ticket](https://github.com/binwiederhier/ntfy/issues/838)
+for details. **Please upgrade your ntfy instance if you run a multi-user system.**
+
+**Features:**
+
+* Add support for [Markdown formatting](publish.md#markdown-formatting) in web app ([#310](https://github.com/binwiederhier/ntfy/issues/310), thanks to [@nihalgonsalves](https://github.com/nihalgonsalves))
+* Add support for right-to-left languages (RTL) in the web app ([#663](https://github.com/binwiederhier/ntfy/issues/663), thanks to [@nimbleghost](https://github.com/nimbleghost))
+
+**Security:** ⚠️
+
+* Fixes issue with access tokens getting deleted ([#838](https://github.com/binwiederhier/ntfy/issues/838))
+
+**Bug fixes + maintenance:**
+
+* Fix issues with date/time with different locales ([#700](https://github.com/binwiederhier/ntfy/issues/700), thanks to [@nimbleghost](https://github.com/nimbleghost))
+* Re-init i18n on each service worker message to avoid missing translations ([#817](https://github.com/binwiederhier/ntfy/pull/817), thanks to [@nihalgonsalves](https://github.com/nihalgonsalves))
+* You can now unset the default user:pass/token in `client.yml` for an individual subscription to remove the Authorization header ([#829](https://github.com/binwiederhier/ntfy/issues/829), thanks to [@tomeon](https://github.com/tomeon) for reporting and to [@wunter8](https://github.com/wunter8) for fixing)
+
+**Documentation:**
+
+* Update docs for Apache config ([#819](https://github.com/binwiederhier/ntfy/pull/819), thanks to [@nisbet-hubbard](https://github.com/nisbet-hubbard))
+
 ## ntfy server v2.6.2
 Released June 30, 2023
 
@@ -78,7 +110,7 @@ if you use promo code `MYTOPIC`). ntfy will always remain open source.
 ## ntfy server v2.4.0
 Released Apr 26, 2023
 
-This release adds a tiny `v1/stats` endpoint to expose how many messages have been published, and adds suport to encode the `X-Title`,
+This release adds a tiny `v1/stats` endpoint to expose how many messages have been published, and adds support to encode the `X-Title`,
 `X-Message` and `X-Tags` header as RFC 2047. It's a pretty small release, and mainly enables the release of the new ntfy.sh website.
 
 ❤️ If you like ntfy, **please consider sponsoring me** via [GitHub Sponsors](https://github.com/sponsors/binwiederhier)
@@ -1241,7 +1273,7 @@ Released Dec 28, 2021
 
 **Features & bug fixes:**
 
-* [Publish messages via e-mail](ntfy.sh/docs/publish/#e-mail-publishing) #66
+* [Publish messages via e-mail](publish.md#e-mail-publishing) #66
 * Server-side work to support [unifiedpush.org](https://unifiedpush.org) #64
 * Fixing the Santa bug #65
 
@@ -1251,16 +1283,20 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
 
 ## Not released yet
 
-### ntfy server v2.7.0 (UNRELEASED)
-
-**Features:**
-
-* Add support for [Markdown formatting](publish.md#markdown-formatting) in web app ([#310](https://github.com/binwiederhier/ntfy/issues/310), thanks to [@nihalgonsalves](https://github.com/nihalgonsalves))
-* Add support for right-to-left languages (RTL) in the web app ([#663](https://github.com/binwiederhier/ntfy/issues/663), thanks to [@nimbleghost](https://github.com/nimbleghost))
+### ntfy server v2.8.0 (UNRELEASED)
 
 **Bug fixes + maintenance:**
 
-* Fix issues with date/time with different locales ([#700](https://github.com/binwiederhier/ntfy/issues/700), thanks to  [@nimbleghost](https://github.com/nimbleghost))
+* Support for HTML-only emails ([#690](https://github.com/binwiederhier/ntfy/issues/690)/[#693](https://github.com/binwiederhier/ntfy/pull/693), thanks to [@teastrainer](https://github.com/teastrainer) and [@CrazyWolf13](https://github.com/CrazyWolf13) for reporting)
+* Fix ACL issue with topic patterns containing underscores ([#840](https://github.com/binwiederhier/ntfy/issues/840), thanks to [@Joe-0237](https://github.com/Joe-0237) for reporting)
+* Re-add `tzdata` to Docker images for amd64 image ([#894](https://github.com/binwiederhier/ntfy/issues/894), [#307](https://github.com/binwiederhier/ntfy/pull/307))
+* Add special logic to ignore `Priority` header if it resembled a RFC 9218 value ([#851](https://github.com/binwiederhier/ntfy/pull/851)/[#895](https://github.com/binwiederhier/ntfy/pull/895), thanks to [@gusdleon](https://github.com/gusdleon), see also [#351](https://github.com/binwiederhier/ntfy/issues/351), [#353](https://github.com/binwiederhier/ntfy/issues/353), [#461](https://github.com/binwiederhier/ntfy/issues/461))
+* PWA: hide install prompt on macOS 14 Safari ([#899](https://github.com/binwiederhier/ntfy/pull/899), thanks to [@nihalgonsalves](https://github.com/nihalgonsalves))
+* Fix web app crash in Edge for languages with underline in locale ([#922](https://github.com/binwiederhier/ntfy/pull/922)/[#912](https://github.com/binwiederhier/ntfy/issues/912)/[#852](https://github.com/binwiederhier/ntfy/issues/852), thanks to [@imkero](https://github.com/imkero))
+
+**Additional languages:**
+
+* Finnish (thanks to [@Seppo](https://hosted.weblate.org/user/Seppo/)
 
 ### ntfy Android app v1.16.1 (UNRELEASED)
 

docs/subscribe/api.md

@@ -190,9 +190,10 @@ format. Keepalive messages are sent as empty lines.
 
 ## WebSockets
 You may also subscribe to topics via [WebSockets](https://en.wikipedia.org/wiki/WebSocket), which is also widely 
-supported in many languages. Most notably, WebSockets are natively supported in JavaScript. On the command line, 
-I recommend [websocat](https://github.com/vi/websocat), a fantastic tool similar to `socat` or `curl`, but specifically
-for WebSockets.  
+supported in many languages. Most notably, WebSockets are natively supported in JavaScript. You may also want to 
+check out the [full example on GitHub](https://github.com/binwiederhier/ntfy/tree/main/examples/web-example-websocket).
+On the command line, I recommend [websocat](https://github.com/vi/websocat), a fantastic tool similar to `socat` 
+or `curl`, but specifically for WebSockets.
 
 The WebSockets endpoint is available at `<topic>/ws` and returns messages as JSON objects similar to the 
 [JSON stream endpoint](#subscribe-as-json-stream). 

docs/subscribe/cli.md

@@ -10,7 +10,7 @@ to topics via the ntfy CLI. The CLI is included in the same `ntfy` binary that c
 ## Install + configure
 To install the ntfy CLI, simply **follow the steps outlined on the [install page](../install.md)**. The ntfy server and 
 client are the same binary, so it's all very convenient. After installing, you can (optionally) configure the client 
-by creating `~/.config/ntfy/client.yml` (for the non-root user), or `/etc/ntfy/client.yml` (for the root user). You 
+by creating `~/.config/ntfy/client.yml` (for the non-root user), `~/Library/Application Support/ntfy/client.yml` (for the macOS non-root user), or `/etc/ntfy/client.yml` (for the root user). You 
 can find a [skeleton config](https://github.com/binwiederhier/ntfy/blob/main/client/client.yml) on GitHub. 
 
 If you just want to use [ntfy.sh](https://ntfy.sh), you don't have to change anything. If you **self-host your own server**,

docs/subscribe/pwa.md

@@ -26,6 +26,13 @@ app drawer:
     <a href="../../static/img/pwa-badge.png"><img src="../../static/img/pwa-badge.png"/></a>
 </div>
 
+### Safari on macOS
+To install and register the web app via Safari, click on the Share menu and click Add to Dock. You need to be on macOS Sonoma (14) or higher.
+
+<div id="pwa-screenshots-safari-desktop" class="screenshots">
+    <a href="../../static/img/pwa-install-macos-safari-add-to-dock.png"><img src="../../static/img/pwa-install-macos-safari-add-to-dock.png"/></a>
+</div>
+
 ### Chrome/Firefox on Android
 For Chrome on Android, either click the "Add to Home Screen" banner at the bottom of the screen, or select "Install app"
 in the menu, and then click "Install" in the popup menu. After installation, you can find the app in your app drawer, 

examples/web-example-websocket/example-ws.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>ntfy.sh: WebSocket Example</title>
+    <meta name="robots" content="noindex, nofollow" />
+    <style>
+        body { font-size: 1.2em; line-height: 130%; }
+        #events { font-family: monospace; }
+    </style>
+</head>
+<body>
+<h1>ntfy.sh: WebSocket Example</h1>
+<p>
+    This is an example showing how to use <a href="https://ntfy.sh">ntfy.sh</a> with
+    <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket">WebSocket</a>.<br/>
+    This example doesn't need a server. You can just save the HTML page and run it from anywhere.
+</p>
+<button id="publishButton">Send test notification</button>
+<p><b>Log:</b></p>
+<div id="events"></div>
+
+<script type="text/javascript">
+    const publishURL = `https://ntfy.sh/example`;
+    const subscribeURL = `wss://ntfy.sh/example/ws`;
+    const events = document.getElementById('events');
+    const websocket = new WebSocket(subscribeURL);
+
+    // Publish button
+    document.getElementById("publishButton").onclick = () => {
+        fetch(publishURL, {
+            method: 'POST', // works with PUT as well, though that sends an OPTIONS request too!
+            body: `It is ${new Date().toString()}. This is a test.`
+        })
+    };
+
+    // Incoming events
+    websocket.onopen = () => {
+        let event = document.createElement('div');
+        event.innerHTML = `WebSocket connected to ${subscribeURL}`;
+        events.appendChild(event);
+    };
+    websocket.onerror = (e) => {
+        let event = document.createElement('div');
+        event.innerHTML = `WebSocket error: Failed to connect to ${subscribeURL}`;
+        events.appendChild(event);
+    };
+    websocket.onmessage = (e) => {
+        let event = document.createElement('div');
+        event.innerHTML = e.data;
+        events.appendChild(event);
+    };
+</script>
+
+</body>
+</html>

go.mod

@@ -1,78 +1,84 @@
 module heckel.io/ntfy
 
-go 1.18
+go 1.21
+
+toolchain go1.21.3
 
 require (
-	cloud.google.com/go/firestore v1.11.0 // indirect
-	cloud.google.com/go/storage v1.31.0 // indirect
+	cloud.google.com/go/firestore v1.14.0 // indirect
+	cloud.google.com/go/storage v1.35.1 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/emersion/go-smtp v0.17.0
-	github.com/gabriel-vasile/mimetype v1.4.2
-	github.com/gorilla/websocket v1.5.0
-	github.com/mattn/go-sqlite3 v1.14.17
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/emersion/go-smtp v0.18.0
+	github.com/gabriel-vasile/mimetype v1.4.3
+	github.com/gorilla/websocket v1.5.1
+	github.com/mattn/go-sqlite3 v1.14.18
 	github.com/olebedev/when v1.0.0
-	github.com/stretchr/testify v1.8.1
+	github.com/stretchr/testify v1.8.4
 	github.com/urfave/cli/v2 v2.25.7
-	golang.org/x/crypto v0.11.0
-	golang.org/x/oauth2 v0.10.0 // indirect
-	golang.org/x/sync v0.3.0
-	golang.org/x/term v0.10.0
-	golang.org/x/time v0.3.0
-	google.golang.org/api v0.130.0
+	golang.org/x/crypto v0.15.0
+	golang.org/x/oauth2 v0.14.0 // indirect
+	golang.org/x/sync v0.5.0
+	golang.org/x/term v0.14.0
+	golang.org/x/time v0.4.0
+	google.golang.org/api v0.150.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
+replace github.com/emersion/go-smtp => github.com/emersion/go-smtp v0.17.0 // Pin version due to breaking changes, see #839
+
 require github.com/pkg/errors v0.9.1 // indirect
 
 require (
-	firebase.google.com/go/v4 v4.11.0
-	github.com/SherClockHolmes/webpush-go v1.2.0
-	github.com/prometheus/client_golang v1.16.0
-	github.com/stripe/stripe-go/v74 v74.25.0
+	firebase.google.com/go/v4 v4.12.1
+	github.com/SherClockHolmes/webpush-go v1.3.0
+	github.com/microcosm-cc/bluemonday v1.0.26
+	github.com/prometheus/client_golang v1.17.0
+	github.com/stripe/stripe-go/v74 v74.30.0
 )
 
 require (
-	cloud.google.com/go v0.110.4 // indirect
-	cloud.google.com/go/compute v1.20.1 // indirect
+	cloud.google.com/go v0.110.10 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.1.1 // indirect
-	cloud.google.com/go/longrunning v0.5.1 // indirect
+	cloud.google.com/go/iam v1.1.5 // indirect
+	cloud.google.com/go/longrunning v0.5.4 // indirect
 	github.com/AlekSi/pointer v1.2.0 // indirect
 	github.com/MicahParks/keyfunc v1.9.0 // indirect
+	github.com/aymerick/douceur v0.2.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/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // 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.3 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/s2a-go v0.1.4 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/google/uuid v1.4.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+	github.com/gorilla/css v1.0.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.11.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.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.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.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.3 // indirect
-	google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
-	google.golang.org/grpc v1.56.2 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/appengine/v2 v2.0.5 // indirect
+	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,23 +1,22 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.110.3 h1:wwearW+L7sAPSomPIgJ3bVn6Ck00HGQnn5HMLwf0azo=
-cloud.google.com/go v0.110.3/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
-cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk=
-cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
-cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg=
-cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
+cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y=
+cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic=
+cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
+cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 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.11.0 h1:PPgtwcYUOXV2jFe1bV3nda3RCrOa8cvBjTOn2MQVfW8=
-cloud.google.com/go/firestore v1.11.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4=
-cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
-cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
-cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI=
-cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc=
-cloud.google.com/go/storage v1.31.0 h1:+S3LjjEN2zZ+L5hOwj4+1OkGCsLVe0NzpXKQ1pSdTCI=
-cloud.google.com/go/storage v1.31.0/go.mod h1:81ams1PrhW16L4kF7qg+4mTq7SRs5HsbDTM0bWvrwJ0=
-firebase.google.com/go/v4 v4.11.0 h1:szjBoiF33A2FavRLIDZjW1mw+OsW/XAtHoYNIqWOjRk=
-firebase.google.com/go/v4 v4.11.0/go.mod h1:60c36dWLK4+j05Vw5XMllek3b3PCynU3BfI46OSwsUE=
+cloud.google.com/go/firestore v1.14.0 h1:8aLcKnMPoldYU3YHgu4t2exrKhLQkqaXAGqT0ljrFVw=
+cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ=
+cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI=
+cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8=
+cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
+cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
+cloud.google.com/go/storage v1.34.1 h1:H2Af2dU5J0PF7A5B+ECFIce+RqxVnrVilO+cu0TS3MI=
+cloud.google.com/go/storage v1.34.1/go.mod h1:VN1ElqqvR9adg1k9xlkUJ55cMOP1/QjnNNuT5xQL6dY=
+cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w=
+cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
+firebase.google.com/go/v4 v4.12.1 h1:tDNvobifGsx/1HSFLnM0fmNfx/CDZSgsTO2KhZtgpcs=
+firebase.google.com/go/v4 v4.12.1/go.mod h1:60c36dWLK4+j05Vw5XMllek3b3PCynU3BfI46OSwsUE=
 github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w=
 github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -25,24 +24,19 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8
 github.com/BurntSushi/toml v1.3.2/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/SherClockHolmes/webpush-go v1.2.0 h1:sGv0/ZWCvb1HUH+izLqrb2i68HuqD/0Y+AmGQfyqKJA=
-github.com/SherClockHolmes/webpush-go v1.2.0/go.mod h1:w6X47YApe/B9wUz2Wh8xukxlyupaxSSEbu6yKJcHN2w=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/SherClockHolmes/webpush-go v1.3.0 h1:CAu3FvEE9QS4drc3iKNgpBWFfGqNthKlZhp5QpYnu6k=
+github.com/SherClockHolmes/webpush-go v1.3.0/go.mod h1:AxRHmJuYwKGG1PVgYzToik1lphQvDnqFYDqimHvwhIw=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 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.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 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/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-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/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/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=
@@ -50,19 +44,16 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
 github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
 github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
-github.com/emersion/go-smtp v0.16.0 h1:eB9CY9527WdEZSs5sWisTmilDX7gG+Q/2IdRcmubpa8=
-github.com/emersion/go-smtp v0.16.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
+github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 h1:hH4PQfOndHDlpzYfLAAfl63E8Le6F2+EL/cdhlkyRJY=
+github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
 github.com/emersion/go-smtp v0.17.0 h1:tq90evlrcyqRfE6DSXaWVH54oX6OuZOQECEmhWBMEtI=
 github.com/emersion/go-smtp v0.17.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 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/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-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/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
+github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
@@ -74,16 +65,13 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 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.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 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=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 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/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -96,46 +84,48 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
+github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
+github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-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.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM=
-github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
-github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
-github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
+github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
 github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
+github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
+github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
+github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/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.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
-github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
+github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
+github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
+github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
+github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
 github.com/olebedev/when v1.0.0 h1:T2DZCj8HxUhOVxcqaLOmzuTr+iZLtMHsZEim7mjIA2w=
 github.com/olebedev/when v1.0.0/go.mod h1:T0THb4kP9D3NNqlvCwIG4GyUioTAzEhB4RNVzig/43E=
 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.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
-github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
+github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
-github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
-github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
-github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk=
-github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
+github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
+github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -143,16 +133,15 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stripe/stripe-go/v74 v74.24.0 h1:h+hXEI5avC5moAh2YLtphMFTBnp11TfXTcP4suuWDLk=
-github.com/stripe/stripe-go/v74 v74.24.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
-github.com/stripe/stripe-go/v74 v74.25.0 h1:mGJp9L1ymxjFvq5MlmG6ynv/fAGX6LLU8MyMVsiRAMY=
-github.com/stripe/stripe-go/v74 v74.25.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stripe/stripe-go/v74 v74.30.0 h1:0Kf0KkeFnY7iRhOwvTerX0Ia1BRw+eV1CVJ51mGYAUY=
+github.com/stripe/stripe-go/v74 v74.30.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
 github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
 github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
@@ -160,80 +149,80 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsr
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 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.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
-golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
-golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 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=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
-golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.9.0 h1:BPpt2kU7oMRq3kCHAA1tbSEshXRw1LpG2ztgDwrzuAs=
-golang.org/x/oauth2 v0.9.0/go.mod h1:qYgFZaFiu6Wg24azG8bdV52QJXJGbZzIIsRCdVKzbLw=
-golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
-golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
+golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
+golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0=
+golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 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.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 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.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 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.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
-golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
-golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
-golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
+golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-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.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
+golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -241,49 +230,43 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/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.129.0 h1:2XbdjjNfFPXQyufzQVwPf1RRnHH8Den2pfNE2jw7L8w=
-google.golang.org/api v0.129.0/go.mod h1:dFjiXlanKwWE3612X97llhsoI36FAoIiRj3aTl5b/zE=
-google.golang.org/api v0.130.0 h1:A50ujooa1h9iizvfzA4rrJr2B7uRmWexwbekQ2+5FPQ=
-google.golang.org/api v0.130.0/go.mod h1:J/LCJMYSDFvAVREGCbrESb53n4++NMBDetSHGL5I5RY=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
+google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY=
+google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI=
+google.golang.org/api v0.150.0 h1:Z9k22qD289SZ8gCJrk4DrWXkNjtfvKAUo/l1ma8eBYE=
+google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg=
 google.golang.org/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=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine/v2 v2.0.3 h1:AyY/mipuqiyCIAqOevfmu5fMDc5/9P/QggWfCQYdkSA=
-google.golang.org/appengine/v2 v2.0.3/go.mod h1:2Z0TTdcXxnHdXzmp8drrmOExUDM2WQgyT33c6JDUlJM=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
+google.golang.org/appengine/v2 v2.0.5 h1:4C+F3Cd3L2nWEfSmFEZDPjQvDwL8T0YCeZBysZifP3k=
+google.golang.org/appengine/v2 v2.0.5/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI=
 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-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20230629202037-9506855d4529 h1:9JucMWR7sPvCxUFd6UsOUNmA5kCcWOfORaT3tpAsKQs=
-google.golang.org/genproto v0.0.0-20230629202037-9506855d4529/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64=
-google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8=
-google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y=
-google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 h1:s5YSX+ZH5b5vS9rnpGymvIyMpLRJizowqDlOuyjXnTk=
-google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
-google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 h1:XVeBY8d/FaK4848myy41HBqnDwvxeV3zMZhwN1TvAMU=
-google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529 h1:DEH99RbiLZhMxrpEJCZ0A+wdTe0EOgou/poSLx9vWf4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 h1:2FZP5XuJY9zQyGM5N0rtovnoXjiMUEIUMvw0m9wlpLc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:8mL13HKkDa+IuJ8yruA3ci0q+0vsUz4m//+ottjwS5o=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4=
+google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ=
+google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
+google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 h1:HJMDndgxest5n2y77fnErkM62iUsptE/H8p0dC2Huo4=
+google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg=
+google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo=
+google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 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.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
-google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
-google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI=
-google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 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=
@@ -295,12 +278,11 @@ 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.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 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

@@ -64,7 +64,6 @@ markdown_extensions:
   - attr_list
   - md_in_html
   - pymdownx.emoji:
-      emoji_index: !!python/name:materialx.emoji.twemoji
       emoji_generator: !!python/name:materialx.emoji.to_svg
 
 plugins:

scripts/emoji-convert.sh

@@ -25,9 +25,9 @@ elif [[ "$1" == *.md ]]; then
 
 <!-- This file was generated by scripts/emoji-convert.sh -->
 
-You can [tag messages](../publish/#tags-emojis) with emojis 🥳 🎉 and other relevant strings. Matching tags are automatically
+You can [tag messages](publish.md#tags-emojis) with emojis 🥳 🎉 and other relevant strings. Matching tags are automatically
 converted to emojis. This is a reference of all supported emojis. To learn more about the feature, please refer to the
-[tagging and emojis page](../publish/#tags-emojis).
+[tagging and emojis page](publish.md#tags-emojis).
 
 <table class=\"remove-md-box emoji-table\"><tr>
 " > "$1"

server/config.go

@@ -92,7 +92,6 @@ type Config struct {
 	AuthDefault                          user.Permission
 	AuthBcryptCost                       int
 	AuthStatsQueueWriterInterval         time.Duration
-	AuthUserHeader                       string
 	AttachmentCacheDir                   string
 	AttachmentTotalSizeLimit             int64
 	AttachmentFileSizeLimit              int64
@@ -248,6 +247,5 @@ func NewConfig() *Config {
 		WebPushEmailAddress:                  "",
 		WebPushExpiryDuration:                DefaultWebPushExpiryDuration,
 		WebPushExpiryWarningDuration:         DefaultWebPushExpiryWarningDuration,
-		AuthUserHeader:                       "",
 	}
 }

server/server.go

@@ -1858,52 +1858,10 @@ func (s *Server) autorizeTopic(next handleFunc, perm user.Permission) handleFunc
 	}
 }
 
-// maybeAuthenticate delegates between auth based on the Authorization header (Bearer/Basic), and auth
-// based on the user-defined header (as defined in the "auth-user-header" setting). The function prefers
-// the user-defined header, if both are present.
-//
-// This function will ALWAYS return a visitor, even if an error occurs (e.g. unauthorized), so
-// that subsequent logging calls still have a visitor context.
-func (s *Server) maybeAuthenticate(r *http.Request) (*visitor, error) {
-	ip := extractIPAddress(r, s.config.BehindProxy)
-	vip := s.visitor(ip, nil) // IP-based visitor
-	if s.userManager == nil {
-		return vip, nil
-	}
-	if s.config.AuthUserHeader != "" && s.config.BehindProxy {
-		username := r.Header.Get(s.config.AuthUserHeader) // Do not allow a query param, only a header!
-		if username != "" {
-			return s.authenticateViaUserDefinedHeader(r, vip, username)
-		}
-	}
-	return s.authenticateViaAuthHeader(r, vip)
-}
-
-// authenticateViaUserDefinedHeader tries to authenticate the user via the header defined in the "auth-user-header"
-// configuration value if it is set. The value of the passed username is used to lookup the user in the database.
-// If it exists, authentication is successful.
-//
-// This function will ALWAYS return a visitor, even if an error occurs (e.g. unauthorized), so
-// that subsequent logging calls still have a visitor context.
-func (s *Server) authenticateViaUserDefinedHeader(r *http.Request, vip *visitor, username string) (*visitor, error) {
-	// Check the rate limiter first
-	if !vip.AuthAllowed() {
-		return vip, errHTTPTooManyRequestsLimitAuthFailure // Always return visitor, even when error occurs!
-	}
-	// Retrieve user from database; if found, we have a successful authentication
-	u, err := s.userManager.User(username)
-	if err != nil || u.Deleted {
-		vip.AuthFailed()
-		logr(r).Err(err).Debug("Authentication failed")
-		return vip, errHTTPUnauthorized
-	}
-	// User was found, meaning that auth was successful
-	return s.visitor(vip.ip, u), nil
-}
-
-// authenticateViaAuthHeader reads the "Authorization" header and will try to authenticate the user
+// 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),
@@ -1911,8 +1869,13 @@ func (s *Server) authenticateViaUserDefinedHeader(r *http.Request, vip *visitor,
 //
 // This function will ALWAYS return a visitor, even if an error occurs (e.g. unauthorized), so
 // that subsequent logging calls still have a visitor context.
-func (s *Server) authenticateViaAuthHeader(r *http.Request, vip *visitor) (*visitor, error) {
+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
@@ -1930,7 +1893,7 @@ func (s *Server) authenticateViaAuthHeader(r *http.Request, vip *visitor) (*visi
 		return vip, errHTTPUnauthorized // Always return visitor, even when error occurs!
 	}
 	// Authentication with user was successful
-	return s.visitor(vip.ip, u), nil
+	return s.visitor(ip, u), nil
 }
 
 // authenticate a user based on basic auth username/password (Authorization: Basic ...), or token auth (Authorization: Bearer ...).

server/server.yml

@@ -95,20 +95,6 @@
 # auth-default-access: "read-write"
 # auth-startup-queries:
 
-# If set, the value of the defined header will be used as an authenticated user (DANGER DANGER!).
-#
-# For instance, if "auth-user-header: X-Forwarded-User", a request from a client (or reverse proxy)
-# with the header "X-Forwarded-User: myuser" would be authenticated as the user "myuser" without any
-# further password checking.
-#
-# This is useful to integrate ntfy with other authentication systems such as Authelia,
-# or Keycloak. This setting can only be set if "behind-proxy" is also set.
-#
-# WARNING: Be sure that your proxy or auth system manages the defined header, and that attackers
-#          cannot just pass it manually. Otherwise, they can impersonate any user!
-#
-# auth-user-header:
-
 # If set, the X-Forwarded-For header is used to determine the visitor IP address
 # instead of the remote address of the connection.
 #
@@ -356,6 +342,10 @@
 #      - "field -> level" to match any value, e.g. "time_taken_ms -> debug"
 #   Warning: Using log-level-overrides has a performance penalty. Only use it for temporary debugging.
 #
+# Check your permissions:
+#   If you are running ntfy with systemd, make sure this log file is owned by the
+#   ntfy user and group by running: chown ntfy.ntfy <filename>.
+#
 # Example (good for production):
 #   log-level: info
 #   log-format: json

server/server_test.go

@@ -329,6 +329,27 @@ func TestServer_PublishPriority(t *testing.T) {
 	require.Equal(t, 40007, toHTTPError(t, response.Body.String()).Code)
 }
 
+func TestServer_PublishPriority_SpecialHTTPHeader(t *testing.T) {
+	s := newTestServer(t, newTestConfig(t))
+
+	response := request(t, s, "POST", "/mytopic", "test", map[string]string{
+		"Priority":   "u=4",
+		"X-Priority": "5",
+	})
+	require.Equal(t, 5, toMessage(t, response.Body.String()).Priority)
+
+	response = request(t, s, "POST", "/mytopic?priority=4", "test", map[string]string{
+		"Priority": "u=9",
+	})
+	require.Equal(t, 4, toMessage(t, response.Body.String()).Priority)
+
+	response = request(t, s, "POST", "/mytopic", "test", map[string]string{
+		"p":        "2",
+		"priority": "u=9, i",
+	})
+	require.Equal(t, 2, toMessage(t, response.Body.String()).Priority)
+}
+
 func TestServer_PublishGETOnlyOneTopic(t *testing.T) {
 	// This tests a bug that allowed publishing topics with a comma in the name (no ticket)
 
@@ -491,6 +512,8 @@ func TestServer_PublishAtAndPrune(t *testing.T) {
 	messages := toMessages(t, response.Body.String())
 	require.Equal(t, 1, len(messages)) // Not affected by pruning
 	require.Equal(t, "a message", messages[0].Message)
+
+	time.Sleep(time.Second) // FIXME CI failing not sure why
 }
 
 func TestServer_PublishAndMultiPoll(t *testing.T) {

server/smtp_server.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/emersion/go-smtp"
+	"github.com/microcosm-cc/bluemonday"
 	"io"
 	"mime"
 	"mime/multipart"
@@ -14,6 +15,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/mail"
+	"regexp"
 	"strings"
 	"sync"
 )
@@ -27,6 +29,11 @@ var (
 	errUnsupportedContentType = errors.New("unsupported content type")
 )
 
+var (
+	onlySpacesRegex          = regexp.MustCompile(`(?m)^\s+$`)
+	consecutiveNewLinesRegex = regexp.MustCompile(`\n{3,}`)
+)
+
 const (
 	maxMultipartDepth = 2
 )
@@ -232,37 +239,66 @@ func readMailBody(body io.Reader, header mail.Header) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	if strings.ToLower(contentType) == "text/plain" {
-		return readPlainTextMailBody(body, header.Get("Content-Transfer-Encoding"))
-	} else if strings.HasPrefix(strings.ToLower(contentType), "multipart/") {
-		return readMultipartMailBody(body, params, 0)
+	canonicalContentType := strings.ToLower(contentType)
+	if canonicalContentType == "text/plain" || canonicalContentType == "text/html" {
+		return readTextMailBody(body, canonicalContentType, header.Get("Content-Transfer-Encoding"))
+	} else if strings.HasPrefix(canonicalContentType, "multipart/") {
+		return readMultipartMailBody(body, params)
 	}
 	return "", errUnsupportedContentType
 }
 
-func readMultipartMailBody(body io.Reader, params map[string]string, depth int) (string, error) {
+func readMultipartMailBody(body io.Reader, params map[string]string) (string, error) {
+	parts := make(map[string]string)
+	if err := readMultipartMailBodyParts(body, params, 0, parts); err != nil && err != io.EOF {
+		return "", err
+	} else if s, ok := parts["text/plain"]; ok {
+		return s, nil
+	} else if s, ok := parts["text/html"]; ok {
+		return s, nil
+	}
+	return "", io.EOF
+}
+
+func readMultipartMailBodyParts(body io.Reader, params map[string]string, depth int, parts map[string]string) error {
 	if depth >= maxMultipartDepth {
-		return "", errMultipartNestedTooDeep
+		return errMultipartNestedTooDeep
 	}
 	mr := multipart.NewReader(body, params["boundary"])
 	for {
 		part, err := mr.NextPart()
 		if err != nil { // may be io.EOF
-			return "", err
+			return err
 		}
 		partContentType, partParams, err := mime.ParseMediaType(part.Header.Get("Content-Type"))
 		if err != nil {
-			return "", err
+			return err
 		}
-		if strings.ToLower(partContentType) == "text/plain" {
-			return readPlainTextMailBody(part, part.Header.Get("Content-Transfer-Encoding"))
+		canonicalPartContentType := strings.ToLower(partContentType)
+		if canonicalPartContentType == "text/plain" || canonicalPartContentType == "text/html" {
+			s, err := readTextMailBody(part, canonicalPartContentType, part.Header.Get("Content-Transfer-Encoding"))
+			if err != nil {
+				return err
+			}
+			parts[canonicalPartContentType] = s
 		} else if strings.HasPrefix(strings.ToLower(partContentType), "multipart/") {
-			return readMultipartMailBody(part, partParams, depth+1)
+			if err := readMultipartMailBodyParts(part, partParams, depth+1, parts); err != nil {
+				return err
+			}
 		}
 		// Continue with next part
 	}
 }
 
+func readTextMailBody(reader io.Reader, contentType, transferEncoding string) (string, error) {
+	if contentType == "text/plain" {
+		return readPlainTextMailBody(reader, transferEncoding)
+	} else if contentType == "text/html" {
+		return readHTMLMailBody(reader, transferEncoding)
+	}
+	return "", fmt.Errorf("unsupported content type: %s", contentType)
+}
+
 func readPlainTextMailBody(reader io.Reader, transferEncoding string) (string, error) {
 	if strings.ToLower(transferEncoding) == "base64" {
 		reader = base64.NewDecoder(base64.StdEncoding, reader)
@@ -275,3 +311,21 @@ func readPlainTextMailBody(reader io.Reader, transferEncoding string) (string, e
 	}
 	return string(body), nil
 }
+
+func readHTMLMailBody(reader io.Reader, transferEncoding string) (string, error) {
+	body, err := readPlainTextMailBody(reader, transferEncoding)
+	if err != nil {
+		return "", err
+	}
+	stripped := bluemonday.
+		StrictPolicy().
+		AddSpaceWhenStrippingTag(true).
+		Sanitize(body)
+	return removeExtraEmptyLines(stripped), nil
+}
+
+func removeExtraEmptyLines(s string) string {
+	s = onlySpacesRegex.ReplaceAllString(s, "")
+	s = consecutiveNewLinesRegex.ReplaceAllString(s, "\n\n")
+	return s
+}

server/smtp_server_test.go

@@ -568,6 +568,773 @@ L0VOIj4KClRoaXMgaXMgYSB0ZXN0IG1lc3NhZ2UgZnJvbSBUcnVlTkFTIENPUkUuCg==
 	writeAndReadUntilLine(t, email, c, scanner, "554 5.0.0 Error: transaction failed, blame it on the weather: multipart message nested too deep")
 }
 
+func TestSmtpBackend_HTMLEmail(t *testing.T) {
+	email := `EHLO example.com
+MAIL FROM: test@mydomain.me
+RCPT TO: ntfy-mytopic@ntfy.sh
+DATA
+Message-Id: <51610934ss4.mmailer@fritz.box>
+From: <email@email.com>
+To: <email@email.com>,
+	<ntfy-subjectatntfy@ntfy.sh>
+Date: Thu, 30 Mar 2023 02:56:53 +0000
+Subject: A HTML email
+Mime-Version: 1.0
+Content-Type: text/html;
+	charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+<=21DOCTYPE html>
+<html>
+<head>
+<title>Alerttitle</title>
+<meta http-equiv=3D"content-type" content=3D"text/html;charset=3Dutf-8"/>
+</head>
+<body style=3D"color: =23000000; background-color: =23f0eee6;">
+<table width=3D"100%" align=3D"center" style=3D"border:solid 2px =23eeeeee=
+; border-collapse: collapse;">
+<tr>
+<td>
+<table style=3D"border-collapse: collapse;">
+
+
+
+
+
+
+
+<tr>
+<td style=3D"background: =23FFFFFF;">
+<table style=3D"color: =23FFFFFF; background-color: =23006EC0; border-coll=
+apse: collapse;">
+<tr>
+<td style=3D"width: 1000px; text-align: center; font-size: 18pt; font-fami=
+ly: Arial, Helvetica, sans-serif; padding: 10px;">
+
+
+headertext of table
+
+</td>
+</tr>
+</table>
+</td>
+</tr>
+
+
+
+
+
+
+
+<tr>
+<td style=3D"padding: 10px 20px; background: =23FFFFFF;">
+<table style=3D"border-collapse: collapse;">
+<tr>
+<td style=3D"width: 940px; font-size: 13pt; font-family: Arial, Helvetica,=
+ sans-serif; text-align: left;">
+" Very important information about a change in your
+home automation setup 
+
+Now the light is on
+</td>
+</tr>
+</table>
+</td>
+</tr>
+
+
+
+<tr>
+<td style=3D"padding: 10px 20px; background: =23FFFFFF;">
+<table>
+<tr>
+<td style=3D"width: 960px; font-size: 10pt; font-family: Arial, Helvetica,=
+ sans-serif; text-align: left;">
+<hr />
+If you don't want to receive this message anymore, stop the push
+ services in your <a href=3D"https:fritzbox" target=3D"_=
+blank">FRITZ=21Box</a>=2E<br />
+Here you can see the active push services: "System > Push Service"=2E
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table style=3D"color: =23FFFFFF; background-color: =23006EC0;">
+<tr>
+<td style=3D"width: 1000px; font-size: 10pt; font-family: Arial, Helvetica=
+, sans-serif; text-align: center; padding: 10px;">
+This mail has ben sent by your <a style=3D"color: =23FFFFFF;" href=3D"https:=
+//fritzbox" target=3D"_blank">FRITZ=21Box</a=
+> automatically=2E
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</body>
+</html>
+.
+`
+
+	s, c, _, scanner := newTestSMTPServer(t, func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "A HTML email", r.Header.Get("Title"))
+		expected := `headertext of table
+
+&#34; Very important information about a change in your
+home automation setup
+
+Now the light is on
+
+If you don&#39;t want to receive this message anymore, stop the push
+ services in your  FRITZ!Box . 
+Here you can see the active push services: &#34;System &gt; Push Service&#34;.
+
+This mail has ben sent by your  FRITZ!Box  automatically.`
+		require.Equal(t, expected, readAll(t, r.Body))
+	})
+	defer s.Close()
+	defer c.Close()
+	writeAndReadUntilLine(t, email, c, scanner, "250 2.0.0 OK: queued")
+}
+
+const spamEmail = `
+EHLO example.com
+MAIL FROM: test@mydomain.me
+RCPT TO: ntfy-mytopic@ntfy.sh
+DATA
+Delivered-To: somebody@gmail.com
+Received: by 2002:a05:651c:1248:b0:2bf:c263:285 with SMTP id h8csp1096496ljh;
+        Mon, 30 Oct 2023 06:23:08 -0700 (PDT)
+X-Google-Smtp-Source: AGHT+IFsB3WqbwbeefbeefbeefbeefbeefiXRNDHnIy2xBeaYHZCM3EC8DfPv55qDtgq9djTeBCF
+X-Received: by 2002:a05:6808:147:b0:3af:66e5:5d3c with SMTP id h7-20020a056808014700b003af66e55d3cmr11662458oie.26.1698672188132;
+        Mon, 30 Oct 2023 06:23:08 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1698672188; cv=none;
+        d=google.com; s=arc-20160816;
+        b=XM96KvnTbr4h6bqrTPTuuDNXmFCr9Be/HvVhu+UsSQjP9RxPk0wDTPUPZ/HWIJs52y
+         beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef
+         BUmQ==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
+        h=list-unsubscribe-post:list-unsubscribe:mime-version:subject:to
+         :reply-to:from:date:message-id:dkim-signature:dkim-signature;
+        bh=BERwBIp6fBgrZePFKQjyNMmgPkcnq1Zy1jPO8M0T4Ok=;
+        fh=+kTCcNpX22TOI/SVSLygnrDqWeUt4zW7QKiv0TOVSGs=;
+        b=lyIBRuOxPOTY2s36OqP7M7awlBKd4t5PX9mJOEJB0eTnTZqML+cplrXUIg2ZTlAAi9
+         beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef
+         tgVQ==
+ARC-Authentication-Results: i=1; mx.google.com;
+       dkim=pass header.i=@spamspam.com header.s=2020294246 header.b=G8y6xmtK;
+       dkim=pass header.i=@auth.ccsend.com header.s=1000073432 header.b=ht8IksVK;
+       spf=pass (google.com: domain of aigxeklyirlg+dvwkrmsgua==_1133104752381_suqcukvbeeynm/owplvdba==@in.constantcontact.com designates 208.75.123.226 as permitted sender) smtp.mailfrom="AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com";
+       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=spamspam.com
+Return-Path: <AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com>
+Received: from ccm30.constantcontact.com (ccm30.constantcontact.com. [208.75.123.226])
+        by mx.google.com with ESMTPS id h2-20020a05620a21c200b0076eeed38118si5450962qka.131.2023.10.30.06.23.07
+        for <somebody@gmail.com>
+        (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
+        Mon, 30 Oct 2023 06:23:08 -0700 (PDT)
+Received-SPF: pass (google.com: domain of aigxeklyirlg+dvwkrmsgua==_1133104752381_suqcukvbeeynm/owplvdba==@in.constantcontact.com designates 208.75.123.226 as permitted sender) client-ip=208.75.123.226;
+Authentication-Results: mx.google.com;
+       dkim=pass header.i=@spamspam.com header.s=2020294246 header.b=G8y6xmtK;
+       dkim=pass header.i=@auth.ccsend.com header.s=1000073432 header.b=ht8IksVK;
+       spf=pass (google.com: domain of aigxeklyirlg+dvwkrmsgua==_1133104752381_suqcukvbeeynm/owplvdba==@in.constantcontact.com designates 208.75.123.226 as permitted sender) smtp.mailfrom="AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com";
+       dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=spamspam.com
+Return-Path: <AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com>
+Received: from [10.252.0.3] ([10.252.0.3:53254] helo=p2-jbemailsyndicator12.ctct.net) by 10.249.225.20 (envelope-from <AigXeKlyIRLG+DvWkRMsGUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com>) (ecelerity 4.3.1.999 r(:)) with ESMTP id A4/82-60517-B3EAF356; Mon, 30 Oct 2023 09:23:07 -0400
+DKIM-Signature: v=1; q=dns/txt; a=rsa-sha256; c=relaxed/relaxed; s=2020294246; d=spamspam.com; h=date:mime-version:subject:X-Feedback-ID:X-250ok-CID:message-id:from:reply-to:list-unsubscribe:list-unsubscribe-post:to; bh=BERwBIp6fBgrZePFKQjyNMmgPkcnq1Zy1jPO8M0T4Ok=; b=G8y6xmtKv8asfEXA9o8dP+6foQjclo6j5sFREYVIJBbj5YJ5tqoiv5B04/qoRkoTBFDhmjt+BUua7AqDgPSnwbP2iPSA4fTJehnHhut1PyVUp/9vqSYlhxQehfdhma8tPg8ArKfYIKmfKJwKRaQBU0JHCaB1m+5LNQQX3UjkxAg=
+DKIM-Signature: v=1; q=dns/txt; a=rsa-sha256; c=relaxed/relaxed; s=1000073432; d=auth.ccsend.com; h=date:mime-version:subject:X-Feedback-ID:X-250ok-CID:message-id:from:reply-to:list-unsubscribe:list-unsubscribe-post:to; bh=BERwBIp6fBgrZePFKQjyNMmgPkcnq1Zy1jPO8M0T4Ok=; b=ht8IksVKYY/Kb3dUERWoeW4eVdYjKL6F4PEoIZOhfFXor6XAIbPnd3A/CPmbmoqFZjnKh5OdcUy1N5qEoj8w1Q3TmN8/ySQkqrlrmSDSZIHZMY7Qp9/TJrqUe4RMFOO1KKIN6Y0vGP1+dWe98msMAHwvi2qMjG9aEKLfFr2JUTQ=
+Message-ID: <1140728754828.1133104752381.1941549819.0.260913JL.2002@synd.ccsend.com>
+Date: Mon, 30 Oct 2023 09:23:07 -0400 (EDT)
+From: spamspam Loan Servicing <marklake@spamspam.com>
+Reply-To: marklake@spamspam.com
+To: somebody@gmail.com
+Subject: Buying a home? You deserve the confidence of Pre-Approval
+MIME-Version: 1.0
+Content-Type: multipart/alternative; boundary="----=_Part_75055660_144854819.1698672187348"
+List-Unsubscribe: <https://visitor.constantcontact.com/do?p=un&m=beefbeefbeef>
+List-Unsubscribe-Post: List-Unsubscribe=One-Click
+X-Campaign-Activity-ID: 8a05de2a-5c88-44b1-be0e-f5a444cb0650
+X-250ok-CID: 8a05de2a-5c88-44b1-be0e-f5a444cb0650
+X-Channel-ID: b1441c50-a541-11ec-a79b-fa163e5bc304
+X-Return-Path-Hint: AbeefbeefbeefbeefbeefUA==_1133104752381_sUQcUKVBEeynm/oWPlvDBA==@in.constantcontact.com
+X-Roving-Campaignid: 1140728754811
+X-Roving-Id: 1133104752381.1111111111
+X-Feedback-ID: b1441c50-a541-11ec-beef-beefbeefbeefbeef5de2a-5c88-44b1-be0e-f5a444cb0650:1133104752381:CTCT
+X-CTCT-ID: b13a9586-a541-11ec-beef-beefbeefbeef
+
+------=_Part_75055660_144854819.1698672187348
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+When you're buying a home, Pre-Approval gives you confidence you're in the =
+right price range and shows sellers you mean business. xxxxxxxxx SELLING or=
+ BUYING? Call: 844-590-2275 Get Your Homebuying PRE-APPROVAL IN 24-HOURS* G=
+et Pre-Approved When you're buying a home, Pre-Approval gives you confidenc=
+e you're in the right price range and shows sellers you mean business. xxx=
+xxxxxxGet Pre-Approved today! Click or Call to Get Pre-Approved 844-590-227=
+5 Get Pre-Approved nmlsconsumeraccess.org/ *The 24 hour timeframe is for mo=
+st approvals, however if additional information is needed or a request is o=
+n a holiday, the time for preapproval may be greater than 24 hours. This em=
+ail is for informational purposes only and is not an offer, loan approval o=
+r loan commitment. Mortgage rates are subject to change without notice. Som=
+e terms and restrictions may apply to certain loan programs. Refinancing ex=
+isting loans may result in total finance charges being higher over the life=
+ of the loan, reduction in payments may partially reflect a longer loan ter=
+m. This information is provided as guidance and illustrative purposes only =
+and does not constitute legal or financial advice. We are not liable or bou=
+nd legally for any answers provided to any user for our process or position=
+ on an issue. This information may change from time to time and at any time=
+ without notification. The most current information will be updated periodi=
+cally and posted in the online forum. spamspam Loan Servicing, LLC. NMLS#39=
+1521. nmlsconsumeraccess.org. You are receiving this information as a curre=
+nt loan customer with spamspam Loan Servicing, LLC. Not licensed for lendin=
+g activities in any of the U.S. territories. Not authorized to originate lo=
+ans in the State of New York. Licensed by the Dept. of Financial Protection=
+ and Innovation under the California Residential Mortgage .Lending Act #413=
+1216. This email was sent to somebody@gmail.com Version 103023PCHPrAp=
+9 xxxxxxxxx spamspam Loan Servicing | 4425 Ponce de Leon Blvd 5-251, Coral =
+Gables, FL 33146-1837 Unsubscribe somebody@gmail.com Update Profile |=
+ Our Privacy Policy | Constant Contact Data Notice Sent by marklake@spamspa=
+m.com
+------=_Part_75055660_144854819.1698672187348
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML>
+<html lang=3D"en-US"> <head>  <meta http-equiv=3D"Content-Type" content=3D"=
+text/html; charset=3Dutf-8"> <meta name=3D"viewport" content=3D"width=3Ddev=
+ice-width, initial-scale=3D1, maximum-scale=3D1">   <style type=3D"text/css=
+" data-premailer=3D"ignore">=20
+@media only screen and (max-width:480px) { .footer-main-width { width: 100%=
+ !important; }  .footer-mobile-hidden { display: none !important; }  .foote=
+r-mobile-hidden { display: none !important; }  .footer-column { display: bl=
+ock !important; }  .footer-mobile-stack { display: block !important; }  .fo=
+oter-mobile-stack-padding { padding-top: 3px; } }=20
+/* IE: correctly scale images with w/h attbs */ img { -ms-interpolation-mod=
+e: bicubic; }=20
+.layout { min-width: 100%; }=20
+table { table-layout: fixed; } .shell_outer-row { table-layout: auto; }=20
+/* Gmail/Web viewport fix */ u + .body .shell_outer-row { width: 620px; }=
+=20
+/* LIST AND p STYLE OVERRIDES */ .text .text_content-cell p { margin: 0; pa=
+dding: 0; margin-bottom: 0; } .text .text_content-cell ul, .text .text_cont=
+ent-cell ol { padding: 0; margin: 0 0 0 40px; } .text .text_content-cell li=
+ { padding: 0; margin: 0; /* line-height: 1.2; Remove after testing */ } /*=
+ Text Link Style Reset */ a { text-decoration: underline; } /* iOS: Autolin=
+k styles inherited */ a[x-apple-data-detectors] { text-decoration: underlin=
+e !important; font-size: inherit !important; font-family: inherit !importan=
+t; font-weight: inherit !important; line-height: inherit !important; color:=
+ inherit !important; } /* FF/Chrome: Smooth font rendering */ .text .text_c=
+ontent-cell { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing:=
+ grayscale; }=20
+</style> <!--[if gte mso 9]> <style id=3D"ol-styles">=20
+/* OUTLOOK-SPECIFIC STYLES */ li { text-indent: -1em; padding: 0; margin: 0=
+; /* line-height: 1.2; Remove after testing */ } ul, ol { padding: 0; margi=
+n: 0 0 0 40px; } p { margin: 0; padding: 0; margin-bottom: 0; }=20
+</style> <![endif]-->  <style>@media only screen and (max-width:480px) {
+.button_content-cell {
+padding-top: 10px !important; padding-right: 20px !important; padding-botto=
+m: 10px !important; padding-left: 20px !important;
+}
+.button_border-row .button_content-cell {
+padding-top: 10px !important; padding-right: 20px !important; padding-botto=
+m: 10px !important; padding-left: 20px !important;
+}
+.column .content-padding-horizontal {
+padding-left: 20px !important; padding-right: 20px !important;
+}
+.layout .column .content-padding-horizontal .content-padding-horizontal {
+padding-left: 0px !important; padding-right: 0px !important;
+}
+.layout .column .content-padding-horizontal .block-wrapper_border-row .cont=
+ent-padding-horizontal {
+padding-left: 20px !important; padding-right: 20px !important;
+}
+.dataTable {
+overflow: auto !important;
+}
+.dataTable .dataTable_content {
+width: auto !important;
+}
+.image--mobile-scale .image_container img {
+width: auto !important;
+}
+.image--mobile-center .image_container img {
+margin-left: auto !important; margin-right: auto !important;
+}
+.layout-margin .layout-margin_cell {
+padding: 0px 20px !important;
+}
+.layout-margin--uniform .layout-margin_cell {
+padding: 20px 20px !important;
+}
+.scale {
+width: 100% !important;
+}
+.stack {
+display: block !important; box-sizing: border-box;
+}
+.hide {
+display: none !important;
+}
+u + .body .shell_outer-row {
+width: 100% !important;
+}
+.socialFollow_container {
+text-align: center !important;
+}
+.text .text_content-cell {
+font-size: 16px !important;
+}
+.text .text_content-cell h1 {
+font-size: 24px !important;
+}
+.text .text_content-cell h2 {
+font-size: 20px !important;
+}
+.text .text_content-cell h3 {
+font-size: 20px !important;
+}
+.text--sectionHeading .text_content-cell {
+font-size: 26px !important;
+}
+.text--heading .text_content-cell {
+font-size: 26px !important;
+}
+.text--feature .text_content-cell h2 {
+font-size: 20px !important;
+}
+.text--articleHeading .text_content-cell {
+font-size: 20px !important;
+}
+.text--article .text_content-cell h3 {
+font-size: 20px !important;
+}
+.text--featureHeading .text_content-cell {
+font-size: 20px !important;
+}
+.text--feature .text_content-cell h3 {
+font-size: 20px !important;
+}
+.text--dataTable .text_content-cell .dataTable .dataTable_content-cell {
+font-size: 12px !important;
+}
+.text--dataTable .text_content-cell .dataTable th.dataTable_content-cell {
+font-size: px !important;
+}
+}
+</style>
+</head> <body class=3D"body template template--en-US" data-template-version=
+=3D"1.38.0" data-canonical-name=3D"CPE10001" lang=3D"en-US" align=3D"center=
+" style=3D"-ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; min-=
+width: 100%; width: 100%; margin: 0px; padding: 0px;"> <div id=3D"preheader=
+" style=3D"color: transparent; display: none; font-size: 1px; line-height: =
+1px; max-height: 0px; max-width: 0px; opacity: 0; overflow: hidden;"><span =
+data-entity-ref=3D"preheader">When you&#x27;re buying a home, Pre-Approval =
+gives you confidence you&#x27;re in the right price range and shows sellers=
+ you mean business. </span></div> <div id=3D"tracking-image" style=3D"color=
+: transparent; display: none; font-size: 1px; line-height: 1px; max-height:=
+ 0px; max-width: 0px; opacity: 0; overflow: hidden;"><img src=3D"https://r2=
+0.rs6.net/on.jsp?ca=beefbeefbe-beef-44b1-be0e-f5a444cb0650&a=3D113310475238=
+1&c=3Db13a9586-a541-11ec-a79b-fa163e5bc304&ch=3Db1441c50-a541-11ec-a79b-fa1=
+63e5bc304" / alt=3D""></div> <div class=3D"shell" lang=3D"en-US" style=3D"b=
+ackground-color: #015288;">  <table class=3D"shell_panel-row" width=3D"100%=
+" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" style=3D"background-colo=
+r: #015288;" bgcolor=3D"#015288"> <tr class=3D""> <td class=3D"shell_panel-=
+cell" style=3D"" align=3D"center" valign=3D"top"> <table class=3D"shell_wid=
+th-row scale" style=3D"width: 620px;" align=3D"center" border=3D"0" cellpad=
+ding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"shell_width-cell" style=3D"=
+padding: 15px 10px;" align=3D"center" valign=3D"top"> <table class=3D"shell=
+_content-row" width=3D"100%" align=3D"center" border=3D"0" cellpadding=3D"0=
+" cellspacing=3D"0"> <tr> <td class=3D"shell_content-cell" style=3D"border-=
+radius: 0px; background-color: #FFFFFF; padding: 0; border: 0px solid #0096=
+d6;" align=3D"center" valign=3D"top" bgcolor=3D"#FFFFFF"> <table class=3D"l=
+ayout layout--1-column" style=3D"table-layout: fixed;" width=3D"100%" borde=
+r=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column colum=
+n--1 scale stack" style=3D"width: 100%;" align=3D"center" valign=3D"top">
+<table class=3D"divider" width=3D"100%" cellpadding=3D"0" cellspacing=3D"0"=
+ border=3D"0"> <tr> <td class=3D"divider_container" style=3D"padding-top: 0=
+px; padding-bottom: 10px;" width=3D"100%" align=3D"center" valign=3D"top"> =
+<table class=3D"divider_content-row" style=3D"width: 100%; height: 1px;" ce=
+llpadding=3D"0" cellspacing=3D"0" border=3D"0"> <tr> <td class=3D"divider_c=
+ontent-cell" style=3D"padding-bottom: 5px; height: 1px; line-height: 1px; b=
+ackground-color: #0096D6; border-bottom-width: 0px;" height=3D"1" align=3D"=
+center" bgcolor=3D"#0096D6"> <img alt=3D"" width=3D"5" height=3D"1" border=
+=3D"0" hspace=3D"0" vspace=3D"0" src=3D"https://imgssl.constantcontact.com/=
+letters/images/1101116784221/S.gif" style=3D"display: block; height: 1px; w=
+idth: 5px;"> </td> </tr> </table> </td> </tr> </table> </td> </tr> </table>=
+ <table class=3D"layout layout--1-column" style=3D"table-layout: fixed;" wi=
+dth=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td cla=
+ss=3D"column column--1 scale stack" style=3D"width: 100%;" align=3D"center"=
+ valign=3D"top"><div class=3D"spacer" style=3D"line-height: 10px; height: 1=
+0px;">&#x200a;</div></td> </tr> </table> <table class=3D"layout layout--1-c=
+olumn" style=3D"table-layout: fixed;" width=3D"100%" border=3D"0" cellpaddi=
+ng=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column column--1 scale stack"=
+ style=3D"width: 100%;" align=3D"center" valign=3D"top">
+<table class=3D"image image--padding-vertical image--mobile-scale image--mo=
+bile-center" width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0=
+"> <tr> <td class=3D"image_container" align=3D"center" valign=3D"top" style=
+=3D"padding-top: 10px; padding-bottom: 10px;"> <a href=3D"https://r20.rs6.n=
+et/tn.jsp?f=3D001YKO1VR2jLW0SuSLZLfN7qCP9AwEGO0v-Vy-0SCUlMWvTEiCsv-QEMhmJe9=
+ch=3DHu9wLy0fth6D8jxFBWPA_NhdnWcZZPivk0KUTgRJoVIo_si10jiydw=3D=3D" data-tra=
+ckable=3D"true"><img data-image-content class=3D"image_content" width=3D"26=
+2" src=3D"https://files.constantcontact.com/beefbeefbee/057bff2a-bdba-4165-=
+b108-a7baa91c42c6.jpg" alt=3D"" style=3D"display: block; height: auto; max-=
+width: 100%;"></a> </td> </tr> </table> </td> </tr> </table> <table class=
+=3D"layout layout--heading layout--1-column" style=3D"background-color: #00=
+527e; table-layout: fixed;" width=3D"100%" border=3D"0" cellpadding=3D"0" c=
+ellspacing=3D"0" bgcolor=3D"#00527e"> <tr> <td class=3D"column column--1 sc=
+ale stack" style=3D"width: 100%;" align=3D"center" valign=3D"top">
+<table class=3D"text text--padding-vertical" width=3D"100%" border=3D"0" ce=
+llpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <td =
+class=3D"text_content-cell content-padding-horizontal" style=3D"text-align:=
+ center; font-family: Arial,Verdana,Helvetica,sans-serif; color: #000000; f=
+ont-size: 14px; line-height: 1.2; display: block; word-wrap: break-word; pa=
+dding: 10px 20px;" align=3D"center" valign=3D"top">
+<h1 style=3D"font-family: Arial,Verdana,Helvetica,sans-serif; color: #606d7=
+8; font-size: 26px; font-weight: bold; margin: 0;"><span style=3D"color: rg=
+b(0, 150, 214);">SELLING or BUYING?</span></h1>
+<p style=3D"margin: 0;"><span style=3D"font-size: 16px; color: rgb(255, 255=
+, 255); font-weight: bold;">Call: 844-590-2275</span></p>
+</td> </tr> </table> </td> </tr> </table> <table class=3D"layout layout--ar=
+ticle layout--1-column" style=3D"table-layout: fixed;" width=3D"100%" borde=
+r=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column colum=
+n--1 scale stack" style=3D"width: 100%;" align=3D"center" valign=3D"top">
+<table class=3D"text text--heading text--padding-vertical" width=3D"100%" b=
+order=3D"0" cellpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixe=
+d;"> <tr> <td class=3D"text_content-cell content-padding-horizontal" style=
+=3D"text-align: center; font-family: Arial,Verdana,Helvetica,sans-serif; co=
+lor: #606d78; font-size: 26px; line-height: 1.2; display: block; word-wrap:=
+ break-word; font-weight: bold; padding: 10px 20px;" align=3D"center" valig=
+n=3D"top">
+<p style=3D"margin: 0;"><span style=3D"font-size: 30px; color: rgb(0, 150, =
+214);">Get Your Homebuying</span></p>
+<p style=3D"margin: 0;"><span style=3D"font-size: 30px; color: rgb(0, 82, 1=
+26);">PRE-APPROVAL IN 24-HOURS</span><span style=3D"font-size: 30px; color:=
+ rgb(0, 82, 126); font-weight: normal;">*</span></p>
+</td> </tr> </table> <table class=3D"image image--padding-vertical image--m=
+obile-scale image--mobile-center" width=3D"100%" border=3D"0" cellpadding=
+=3D"0" cellspacing=3D"0"> <tr> <td class=3D"image_container content-padding=
+-horizontal" align=3D"center" valign=3D"top" style=3D"padding: 10px 20px;">=
+ <img data-image-content class=3D"image_content" width=3D"548" src=3D"https=
+://files.constantcontact.com/df66e42d701/2092a2d7-0bda-4289-910b-bf50a2398d=
+60.jpg" alt=3D"" style=3D"display: block; height: auto; max-width: 100%;"> =
+</td> </tr> </table>  <table class=3D"button button--padding-vertical" widt=
+h=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" style=3D"table-=
+layout: fixed;"> <tr> <td class=3D"button_container content-padding-horizon=
+tal" align=3D"center" style=3D"padding: 10px 20px;">    <table class=3D"but=
+ton_content-row" style=3D"width: inherit; border-radius: 3px; border-spacin=
+g: 0; background-color: #0096D6; border: none;" border=3D"0" cellpadding=3D=
+"0" cellspacing=3D"0" bgcolor=3D"#0096D6"> <tr> <td class=3D"button_content=
+-cell" style=3D"padding: 10px 40px;" align=3D"center"> <a class=3D"button_l=
+ink" href=3D"https://r20.rs6.net/tn.jsp?f=3D001YKO1VR2jLW0SuSLZLfN7qCP9AwEG=
+O0v-Vy-0SCUlMWvTEiCsv-QEMuu9ZVVi6WGHhCias4f7-QkeggQvxIvbs-6TTaZHHhXLKf88NID=
+dci4Ge7aYN-QihEgqblie1-DQ2Fa1BKLbT3AM8rtrgeYQgVxJ6cG8POsvFzv7JstrGkCkg3a3AE=
+633LfQpAddyVLFkTv6oyS4T2j_YjYIPKDOZktqK_5rOR-Fh8cWGtUD8YPpPNnZ037z6_t9Nkemu=
+hxG&c=3DA65qX-dQJPS0J4afCS7H0Je5N-_6Q8Nh2fNHkb5-5biUYd5B9SY3zA=3D=3D&ch=3DH=
+u9wLy0fth6D8jxFBWPA_NhdnWcZZPivk0KUTgRJoVIo_si10jiydw=3D=3D" data-trackable=
+=3D"true" style=3D"font-size: 16px; font-weight: bold; color: #FFFFFF; font=
+-family: Helvetica,Arial,sans-serif; word-wrap: break-word; text-decoration=
+: none;">Get Pre-Approved</a> </td> </tr> </table>    </td> </tr> </table> =
+  <table class=3D"text text--padding-vertical" width=3D"100%" border=3D"0" =
+cellpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <t=
+d class=3D"text_content-cell content-padding-horizontal" style=3D"line-heig=
+ht: 1; text-align: center; font-family: Arial,Verdana,Helvetica,sans-serif;=
+ color: #000000; font-size: 14px; display: block; word-wrap: break-word; pa=
+dding: 10px 20px;" align=3D"center" valign=3D"top">
+<p style=3D"text-align: left; margin: 0;" align=3D"left"><br></p>
+<p style=3D"margin: 0;"><span style=3D"font-size: 19px;">When you're buying=
+ a home, Pre-Approval gives you confidence you're in the right price range =
+and shows sellers you mean business. </span></p>
+<p style=3D"margin: 0;"><span style=3D"font-size: 19px;">&#xfeff;Get Pre-Ap=
+proved today!</span></p>
+</td> </tr> </table> </td> </tr> </table> <table class=3D"layout layout--1-=
+column" style=3D"table-layout: fixed;" width=3D"100%" border=3D"0" cellpadd=
+ing=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column column--1 scale stack=
+" style=3D"width: 100%;" align=3D"center" valign=3D"top">
+<table class=3D"text text--padding-vertical" width=3D"100%" border=3D"0" ce=
+llpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <td =
+class=3D"text_content-cell content-padding-horizontal" style=3D"text-align:=
+ left; font-family: Arial,Verdana,Helvetica,sans-serif; color: #000000; fon=
+t-size: 14px; line-height: 1.2; display: block; word-wrap: break-word; padd=
+ing: 10px 20px;" align=3D"left" valign=3D"top">
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><br></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
+"font-size: 23px; color: rgb(0, 82, 126); font-weight: bold; font-family: A=
+rial, Verdana, Helvetica, sans-serif;">Click or Call to Get Pre-Approved </=
+span></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
+"font-size: 28px; color: rgb(0, 150, 214); font-weight: bold;">844-590-2275=
+</span></p>
+</td> </tr> </table> </td> </tr> </table> <table class=3D"layout layout--1-=
+column" style=3D"table-layout: fixed;" width=3D"100%" border=3D"0" cellpadd=
+ing=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column column--1 scale stack=
+" style=3D"width: 100%;" align=3D"center" valign=3D"top"> <table class=3D"b=
+utton button--padding-vertical" width=3D"100%" border=3D"0" cellpadding=3D"=
+0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <td class=3D"butt=
+on_container content-padding-horizontal" align=3D"center" style=3D"padding:=
+ 10px 20px;">    <table class=3D"button_content-row" style=3D"background-co=
+lor: #0096D6; width: inherit; border-radius: 3px; border-spacing: 0; border=
+: none;" border=3D"0" cellpadding=3D"0" cellspacing=3D"0" bgcolor=3D"#0096D=
+6"> <tr> <td class=3D"button_content-cell" style=3D"padding: 10px 40px;" al=
+ign=3D"center"> <a class=3D"button_link" href=3D"https://r20.rs6.net/tn.jsp=
+?f=3D001thisisfakethisisfakethisisfakev-Vy-0SCUlMWvTEiCsv-QEMuu9ZVVi6WGHhCi=
+oVIo_si10jiydw=3D=3D" data-trackable=3D"true" style=3D"font-size: 16px; fon=
+t-weight: bold; color: #FFFFFF; font-family: Helvetica,Arial,sans-serif; wo=
+rd-wrap: break-word; text-decoration: none;">Get Pre-Approved</a> </td> </t=
+r> </table>    </td> </tr> </table>   </td> </tr> </table> <table class=3D"=
+layout layout--1-column" style=3D"table-layout: fixed;" width=3D"100%" bord=
+er=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column colu=
+mn--1 scale stack" style=3D"width: 100%;" align=3D"center" valign=3D"top">
+<table class=3D"image image--padding-vertical image--mobile-scale image--mo=
+bile-center" width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0=
+"> <tr> <td class=3D"image_container" align=3D"center" valign=3D"top" style=
+=3D"padding-top: 10px; padding-bottom: 10px;"> <img data-image-content clas=
+s=3D"image_content" width=3D"87" src=3D"https://files.constantcontact.com/d=
+f66e42d701/beefbeef-beef-beef-9a13-2779ab497b8d.png" alt=3D"" style=3D"disp=
+lay: block; height: auto; max-width: 100%;"> </td> </tr> </table> </td> </t=
+r> </table> <table class=3D"layout layout--1-column" style=3D"table-layout:=
+ fixed;" width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <=
+tr> <td class=3D"column column--1 scale stack" style=3D"width: 100%;" align=
+=3D"center" valign=3D"top">
+<table class=3D"text text--padding-vertical" width=3D"100%" border=3D"0" ce=
+llpadding=3D"0" cellspacing=3D"0" style=3D"table-layout: fixed;"> <tr> <td =
+class=3D"text_content-cell content-padding-horizontal" style=3D"text-align:=
+ left; font-family: Arial,Verdana,Helvetica,sans-serif; color: #000000; fon=
+t-size: 14px; line-height: 1.2; display: block; word-wrap: break-word; padd=
+ing: 10px 20px;" align=3D"left" valign=3D"top">
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><br></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><a href=3D"htt=
+ps://r20.rs6.net/tn.jsp?f=3D001YKO1VR2jLW0SuSLZLfN7qCP9AwEGO0v-Vy-0SCUlMWvT=
+EiCsv-QEMgYju54LKeEV1_a2OCyOAfG7VhZpxtOW89WM-s6S5iiXcmnbK-Z6XDc9LL569h6DE4L=
+IRMWiBWHOlFB9TZWQVuX6Ycz3505y1keCrca4QArp&c=3DA65qX-dQJPS0J4afCS7H0Je5N-_6Q=
+8Nh2fNHkb5-5biUYd5B9SY3zA=3D=3D&ch=3DHu9wLy0fth6D8jxFBWPA_NhdnWcZZPivk0KUTg=
+RJoVIo_si10jiydw=3D=3D" target=3D"_blank" style=3D"font-size: 11px; color: =
+rgb(153, 153, 153); text-decoration: underline; font-weight: normal; font-s=
+tyle: normal;">nmlsconsumeraccess.org/</a></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
+"font-size: 11px; color: rgb(153, 153, 153);">*The 24 hour timeframe is for=
+ most approvals, however if additional information is needed or a request i=
+s on a holiday, the time for preapproval may be greater than 24 hours.</spa=
+n></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
+"font-size: 11px; color: rgb(153, 153, 153); background-color: rgb(255, 255=
+, 255);">This email is for informational purposes only and is not an offer,=
+ loan approval or loan commitment. Mortgage rates are subject to change wit=
+hout notice. Some terms and restrictions may apply to certain loan programs=
+. Refinancing existing loans may result in total finance charges being high=
+er over the life of the loan, reduction in payments may partially reflect a=
+ longer loan term. This information is provided as guidance and illustrativ=
+e purposes only and does not constitute legal or financial advice. We are n=
+ot liable or bound legally for any answers provided to any user for our pro=
+cess or position on an issue. This information may change from time to time=
+ and at any time without notification. The most current information will be=
+ updated periodically and posted in the online forum.</span></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
+"font-size: 11px; color: rgb(153, 153, 153); background-color: rgb(255, 255=
+, 255);">spamspam Loan Servicing, LLC. NMLS#391521. nmlsconsumeraccess.org.=
+ You are receiving this information as a current loan customer with spamspa=
+m Loan Servicing, LLC. Not licensed for lending activities in any of the U.=
+S. territories. Not authorized to originate loans in the State of New York.=
+ Licensed by the Dept. of Financial Protection and Innovation under the Cal=
+ifornia Residential Mortgage .Lending Act #4131216.</span></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><br></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
+"font-size: 11px; color: rgb(153, 153, 153);">This email was sent to <span =
+data-id=3D"emailAddress">somebody@gmail.com</span></span></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
+"font-size: 11px; color: rgb(153, 153, 153);">Version 103023PCHPrAp9 </span=
+></p>
+<p style=3D"text-align: center; margin: 0;" align=3D"center"><span style=3D=
+"font-size: 11px; color: rgb(162, 162, 162);">&#xfeff;</span></p>
+</td> </tr> </table> </td> </tr> </table> <table class=3D"layout layout--1-=
+column" style=3D"table-layout: fixed;" width=3D"100%" border=3D"0" cellpadd=
+ing=3D"0" cellspacing=3D"0"> <tr> <td class=3D"column column--1 scale stack=
+" style=3D"width: 100%;" align=3D"center" valign=3D"top">
+<table class=3D"divider" width=3D"100%" cellpadding=3D"0" cellspacing=3D"0"=
+ border=3D"0"> <tr> <td class=3D"divider_container" style=3D"padding-top: 1=
+0px; padding-bottom: 0px;" width=3D"100%" align=3D"center" valign=3D"top"> =
+<table class=3D"divider_content-row" style=3D"width: 100%; height: 1px;" ce=
+llpadding=3D"0" cellspacing=3D"0" border=3D"0"> <tr> <td class=3D"divider_c=
+ontent-cell" style=3D"padding-bottom: 2px; height: 1px; line-height: 1px; b=
+ackground-color: #0096D6; border-bottom-width: 0px;" height=3D"1" align=3D"=
+center" bgcolor=3D"#0096D6"> <img alt=3D"" width=3D"5" height=3D"1" border=
+=3D"0" hspace=3D"0" vspace=3D"0" src=3D"https://imgssl.constantcontact.com/=
+letters/images/1111111111111/S.gif" style=3D"display: block; height: 1px; w=
+idth: 5px;"> </td> </tr> </table> </td> </tr> </table> </td> </tr> </table>=
+  </td> </tr> </table> </td> </tr> </table> </td> </tr> <tr> <td class=3D"s=
+hell_panel-cell shell_panel-cell--systemFooter" style=3D"" align=3D"center"=
+ valign=3D"top"> <table class=3D"shell_width-row scale" style=3D"width: 100=
+%;" align=3D"center" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr>=
+ <td class=3D"shell_width-cell" style=3D"padding: 0px;" align=3D"center" va=
+lign=3D"top"> <table class=3D"shell_content-row" width=3D"100%" align=3D"ce=
+nter" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=3D"s=
+hell_content-cell" style=3D"background-color: #FFFFFF; padding: 0; border: =
+0 solid #0096d6;" align=3D"center" valign=3D"top" bgcolor=3D"#FFFFFF"> <tab=
+le class=3D"layout layout--1-column" style=3D"table-layout: fixed;" width=
+=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0"> <tr> <td class=
+=3D"column column--1 scale stack" style=3D"width: 100%;" align=3D"center" v=
+align=3D"top"> <table class=3D"footer" width=3D"100%" border=3D"0" cellpadd=
+ing=3D"0" cellspacing=3D"0" style=3D"font-family: Verdana,Geneva,sans-serif=
+; color: #5d5d5d; font-size: 12px;"> <tr> <td class=3D"footer_container" al=
+ign=3D"center"> <table class=3D"footer-container" width=3D"100%" cellpaddin=
+g=3D"0" cellspacing=3D"0" border=3D"0" style=3D"background-color: #ffffff; =
+margin-left: auto; margin-right: auto; table-layout: auto !important;" bgco=
+lor=3D"#ffffff">
+<tr>
+<td width=3D"100%" align=3D"center" valign=3D"top" style=3D"width: 100%;">
+<div class=3D"footer-max-main-width" align=3D"center" style=3D"margin-left:=
+ auto; margin-right: auto; max-width: 100%;">
+<table width=3D"100%" cellpadding=3D"0" cellspacing=3D"0" border=3D"0">
+<tr>
+<td class=3D"footer-layout" align=3D"center" valign=3D"top" style=3D"paddin=
+g: 16px 0px;">
+<table class=3D"footer-main-width" style=3D"width: 580px;" border=3D"0" cel=
+lpadding=3D"0" cellspacing=3D"0">
+<tr>
+<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
+5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
+px 0px;">
+<span class=3D"footer-column">spamspam Loan Servicing<span class=3D"footer-=
+mobile-hidden"> | </span></span><span class=3D"footer-column">4425 Ponce de=
+ Leon Blvd 5-251<span class=3D"footer-mobile-hidden">, </span></span><span =
+class=3D"footer-column"></span><span class=3D"footer-column"></span><span c=
+lass=3D"footer-column">Coral Gables, FL 33146-1837</span><span class=3D"foo=
+ter-column"></span>
+</td>
+</tr>
+<tr>
+<td class=3D"footer-row" align=3D"center" valign=3D"top" style=3D"padding: =
+10px 0px;">
+<table cellpadding=3D"0" cellspacing=3D"0" border=3D"0">
+<tr>
+<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
+5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
+px 0px;">
+<a href=3D"https://visitor.constantcontact.com/do?p=3Dun&m=3D001g3dtlqhzM3v=
+-44b1-be0e-f5a444cb0650" data-track=3D"false" style=3D"color: #5d5d5d;">Uns=
+ubscribe somebody@gmail.com<span class=3D"partnerOptOut"></span></a>
+<span class=3D"partnerOptOut"></span>
+</td>
+</tr>
+<tr>
+<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
+5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
+px 0px;">
+<a href=3D"https://visitor.constantcontact.com/do?p=3Doo&m=3D001g3dtlqhzM3v=
+-44b1-be0e-f5a444cb0650" data-track=3D"false" style=3D"color: #5d5d5d;">Upd=
+ate Profile</a> |
+<a href=3D"https://spamspam.com/privacy-notice/" data-track=3D"false" style=
+=3D"color: #5d5d5d;">Our Privacy Policy</a><span class=3D"footer-mobile-hid=
+den"> |</span>
+<a class=3D"footer-about-provider footer-mobile-stack footer-mobile-stack-p=
+adding" href=3D"http://www.constantcontact.com/legal/about-constant-contact=
+" data-track=3D"false" style=3D"color: #5d5d5d;">Constant Contact Data Noti=
+ce</a>
+</td>
+</tr>
+<tr>
+<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
+5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
+px 0px;">
+Sent by
+<a href=3D"mailto:marklake@spamspam.com" style=3D"color: #5d5d5d; text-deco=
+ration: none;">marklake@spamspam.com</a>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td class=3D"footer-text" align=3D"center" valign=3D"top" style=3D"color: #=
+5d5d5d; font-family: Verdana,Geneva,sans-serif; font-size: 12px; padding: 4=
+px 0px;">
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</div>
+</td>
+</tr>
+</table> </td> </tr> </table>   </td> </tr> </table>  </td> </tr> </table> =
+</td> </tr> </table> </td> </tr>  </table> </div>  </body> </html>
+
+------=_Part_75055660_144854819.1698672187348--
+.
+`
+
+func TestSmtpBackend_Spam_Text(t *testing.T) {
+	email := spamEmail
+	s, c, _, scanner := newTestSMTPServer(t, func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "Buying a home? You deserve the confidence of Pre-Approval", r.Header.Get("Title"))
+		actual := readAll(t, r.Body)
+		expected := "When you're buying a home, Pre-Approval gives you confidence you're in the right price range and shows sellers you mean business. xxxxxxxxx SELLING or BUYING? Call: 844-590-2275 Get Your Homebuying PRE-APPROVAL IN 24-HOURS* Get Pre-Approved When you're buying a home, Pre-Approval gives you confidence you're in the right price range and shows sellers you mean business. xxxxxxxxxGet Pre-Approved today! Click or Call to Get Pre-Approved 844-590-2275 Get Pre-Approved nmlsconsumeraccess.org/ *The 24 hour timeframe is for most approvals, however if additional information is needed or a request is on a holiday, the time for preapproval may be greater than 24 hours. This email is for informational purposes only and is not an offer, loan approval or loan commitment. Mortgage rates are subject to change without notice. Some terms and restrictions may apply to certain loan programs. Refinancing existing loans may result in total finance charges being higher over the life of the loan, reduction in payments may partially reflect a longer loan term. This information is provided as guidance and illustrative purposes only and does not constitute legal or financial advice. We are not liable or bound legally for any answers provided to any user for our process or position on an issue. This information may change from time to time and at any time without notification. The most current information will be updated periodically and posted in the online forum. spamspam Loan Servicing, LLC. NMLS#391521. nmlsconsumeraccess.org. You are receiving this information as a current loan customer with spamspam Loan Servicing, LLC. Not licensed for lending activities in any of the U.S. territories. Not authorized to originate loans in the State of New York. Licensed by the Dept. of Financial Protection and Innovation under the California Residential Mortgage .Lending Act #4131216. This email was sent to somebody@gmail.com Version 103023PCHPrAp9 xxxxxxxxx spamspam Loan Servicing | 4425 Ponce de Leon Blvd 5-251, Coral Gables, FL 33146-1837 Unsubscribe somebody@gmail.com Update Profile | Our Privacy Policy | Constant Contact Data Notice Sent by marklake@spamspam.com"
+		require.Equal(t, expected, actual)
+	})
+	defer s.Close()
+	defer c.Close()
+	writeAndReadUntilLine(t, email, c, scanner, "250 2.0.0 OK: queued")
+}
+
+func TestSmtpBackend_Spam_HTML(t *testing.T) {
+	email := strings.ReplaceAll(spamEmail, "text/plain", "text/not-plain-anymore") // We artificially force HTML parsing here
+	s, c, _, scanner := newTestSMTPServer(t, func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/mytopic", r.URL.Path)
+		require.Equal(t, "Buying a home? You deserve the confidence of Pre-Approval", r.Header.Get("Title"))
+		actual := readAll(t, r.Body)
+		expected := `When you&#39;re buying a home, Pre-Approval gives you confidence you&#39;re in the right price range and shows sellers you mean business.                                  
+                                      ` + "\u200a" + `            
+
+  SELLING or BUYING?  
+  Call: 844-590-2275  
+
+  Get Your Homebuying  
+  PRE-APPROVAL IN 24-HOURS  *  
+                                     Get Pre-Approved                        
+
+  When you&#39;re buying a home, Pre-Approval gives you confidence you&#39;re in the right price range and shows sellers you mean business.   
+  ` + "\ufeff" + `Get Pre-Approved today!  
+
+  Click or Call to Get Pre-Approved   
+  844-590-2275  
+                                  Get Pre-Approved                              
+
+  nmlsconsumeraccess.org/  
+  *The 24 hour timeframe is for most approvals, however if additional information is needed or a request is on a holiday, the time for preapproval may be greater than 24 hours.  
+  This email is for informational purposes only and is not an offer, loan approval or loan commitment. Mortgage rates are subject to change without notice. Some terms and restrictions may apply to certain loan programs Refinancing existing loans may result in total finance charges being higher over the life of the loan, reduction in payments may partially reflect a longer loan term. This information is provided as guidance and illustrative purposes only and does not constitute legal or financial advice. We are not liable or bound legally for any answers provided to any user for our process or position on an issue. This information may change from time to time and at any time without notification. The most current information will be updated periodically and posted in the online forum.  
+  spamspam Loan Servicing, LLC. NMLS#391521. nmlsconsumeraccess.org. You are receiving this information as a current loan customer with spamspam Loan Servicing, LLC. Not licensed for lending activities in any of the U.S. territories. Not authorized to originate loans in the State of New York. Licensed by the Dept. of Financial Protection and Innovation under the California Residential Mortgage .Lending Act #4131216.  
+
+  This email was sent to  somebody@gmail.com   
+  Version 103023PCHPrAp9   
+  ` + "\ufeff" + `  
+
+ spamspam Loan Servicing  |    4425 Ponce de Leon Blvd 5-251 ,        Coral Gables, FL 33146-1837   
+
+ Unsubscribe somebody@gmail.com   
+
+ Update Profile  |
+ Our Privacy Policy   | 
+ Constant Contact Data Notice 
+
+Sent by
+ marklake@spamspam.com`
+		require.Equal(t, expected, actual)
+	})
+	defer s.Close()
+	defer c.Close()
+	writeAndReadUntilLine(t, email, c, scanner, "250 2.0.0 OK: queued")
+}
+
 func TestSmtpBackend_PlaintextWithToken(t *testing.T) {
 	email := `EHLO example.com
 MAIL FROM: phil@example.com
@@ -639,7 +1406,6 @@ func readUntilLine(t *testing.T, conn net.Conn, scanner *bufio.Scanner, expected
 			return
 		}
 		output += text + "\n"
-		//fmt.Println(text)
 	}
 	t.Fatalf("Expected line '%s' not found in output:\n%s", expectedLine, output)
 }

server/util.go

@@ -8,10 +8,14 @@ import (
 	"mime"
 	"net/http"
 	"net/netip"
+	"regexp"
 	"strings"
 )
 
-var mimeDecoder mime.WordDecoder
+var (
+	mimeDecoder               mime.WordDecoder
+	priorityHeaderIgnoreRegex = regexp.MustCompile(`^u=\d,\s*(i|\d)$|^u=\d$`)
+)
 
 func readBoolParam(r *http.Request, defaultValue bool, names ...string) bool {
 	value := strings.ToLower(readParam(r, names...))
@@ -50,9 +54,9 @@ func readParam(r *http.Request, names ...string) string {
 
 func readHeaderParam(r *http.Request, names ...string) string {
 	for _, name := range names {
-		value := maybeDecodeHeader(r.Header.Get(name))
+		value := strings.TrimSpace(maybeDecodeHeader(name, r.Header.Get(name)))
 		if value != "" {
-			return strings.TrimSpace(value)
+			return value
 		}
 	}
 	return ""
@@ -126,10 +130,26 @@ func fromContext[T any](r *http.Request, key contextKey) (T, error) {
 	return t, nil
 }
 
-func maybeDecodeHeader(header string) string {
-	decoded, err := mimeDecoder.DecodeHeader(header)
+// maybeDecodeHeader decodes the given header value if it is MIME encoded, e.g. "=?utf-8?q?Hello_World?=",
+// or returns the original header value if it is not MIME encoded. It also calls maybeIgnoreSpecialHeader
+// to ignore new HTTP "Priority" header.
+func maybeDecodeHeader(name, value string) string {
+	decoded, err := mimeDecoder.DecodeHeader(value)
 	if err != nil {
-		return header
+		return maybeIgnoreSpecialHeader(name, value)
 	}
-	return decoded
+	return maybeIgnoreSpecialHeader(name, decoded)
+}
+
+// maybeIgnoreSpecialHeader ignores new HTTP "Priority" header (see https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-priority)
+//
+// Cloudflare (and potentially other providers) add this to requests when forwarding to the backend (ntfy),
+// so we just ignore it. If the "Priority" header is set to "u=*, i" or "u=*" (by Cloudflare), the header will be ignored.
+// Returning an empty string will allow the rest of the logic to continue searching for another header (x-priority, prio, p),
+// or in the Query parameters.
+func maybeIgnoreSpecialHeader(name, value string) string {
+	if strings.ToLower(name) == "priority" && priorityHeaderIgnoreRegex.MatchString(strings.TrimSpace(value)) {
+		return ""
+	}
+	return value
 }

server/util_test.go

@@ -2,9 +2,9 @@ package server
 
 import (
 	"bytes"
+	"crypto/rand"
 	"fmt"
 	"github.com/stretchr/testify/require"
-	"math/rand"
 	"net/http"
 	"strings"
 	"testing"
@@ -75,3 +75,16 @@ Accept: */*
 (peeked bytes not UTF-8, peek limit of 4096 bytes reached, hex: ` + fmt.Sprintf("%x", body[:4096]) + ` ...)`
 	require.Equal(t, expected, renderHTTPRequest(r))
 }
+
+func TestMaybeIgnoreSpecialHeader(t *testing.T) {
+	require.Empty(t, maybeIgnoreSpecialHeader("priority", "u=1"))
+	require.Empty(t, maybeIgnoreSpecialHeader("Priority", "u=1"))
+	require.Empty(t, maybeIgnoreSpecialHeader("Priority", "u=1, i"))
+}
+
+func TestMaybeDecodeHeaders(t *testing.T) {
+	r, _ := http.NewRequest("GET", "http://ntfy.sh/mytopic/json?since=all", nil)
+	r.Header.Set("Priority", "u=1") // Cloudflare priority header
+	r.Header.Set("X-Priority", "5") // ntfy priority header
+	require.Equal(t, "5", readHeaderParam(r, "x-priority", "priority", "p"))
+}

user/manager.go

@@ -160,7 +160,7 @@ const (
 		SELECT read, write
 		FROM user_access a
 		JOIN user u ON u.id = a.user_id
-		WHERE (u.user = ? OR u.user = ?) AND ? LIKE a.topic
+		WHERE (u.user = ? OR u.user = ?) AND ? LIKE a.topic ESCAPE '\'
 		ORDER BY u.user DESC
 	`
 
@@ -235,7 +235,7 @@ const (
 	selectOtherAccessCountQuery = `
 		SELECT COUNT(*)
 		FROM user_access
-		WHERE (topic = ? OR ? LIKE topic)
+		WHERE (topic = ? OR ? LIKE topic ESCAPE '\')
 		  AND (owner_user_id IS NULL OR owner_user_id != (SELECT id FROM user WHERE user = ?))
 	`
 	deleteAllAccessQuery  = `DELETE FROM user_access`
@@ -262,7 +262,8 @@ const (
 	deleteExpiredTokensQuery   = `DELETE FROM user_token WHERE expires > 0 AND expires < ?`
 	deleteExcessTokensQuery    = `
 		DELETE FROM user_token
-		WHERE (user_id, token) NOT IN (
+		WHERE user_id = ?
+		  AND (user_id, token) NOT IN (
 			SELECT user_id, token
 			FROM user_token
 			WHERE user_id = ?
@@ -311,7 +312,7 @@ const (
 
 // Schema management queries
 const (
-	currentSchemaVersion     = 4
+	currentSchemaVersion     = 5
 	insertSchemaVersion      = `INSERT INTO schemaVersion VALUES (1, ?)`
 	updateSchemaVersion      = `UPDATE schemaVersion SET version = ? WHERE id = 1`
 	selectSchemaVersionQuery = `SELECT version FROM schemaVersion WHERE id = 1`
@@ -421,6 +422,11 @@ const (
 			FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE
 		);
 	`
+
+	// 4 -> 5
+	migrate4To5UpdateQueries = `
+		UPDATE user_access SET topic = REPLACE(topic, '_', '\_');
+	`
 )
 
 var (
@@ -428,6 +434,7 @@ var (
 		1: migrateFrom1,
 		2: migrateFrom2,
 		3: migrateFrom3,
+		4: migrateFrom4,
 	}
 )
 
@@ -534,7 +541,7 @@ func (a *Manager) CreateToken(userID, label string, expires time.Time, origin ne
 	if tokenCount >= tokenMaxCount {
 		// This pruning logic is done in two queries for efficiency. The SELECT above is a lookup
 		// on two indices, whereas the query below is a full table scan.
-		if _, err := tx.Exec(deleteExcessTokensQuery, userID, tokenMaxCount); err != nil {
+		if _, err := tx.Exec(deleteExcessTokensQuery, userID, userID, tokenMaxCount); err != nil {
 			return nil, err
 		}
 	}
@@ -1122,7 +1129,7 @@ func (a *Manager) Reservations(username string) ([]Reservation, error) {
 			return nil, err
 		}
 		reservations = append(reservations, Reservation{
-			Topic:    topic,
+			Topic:    unescapeUnderscore(topic),
 			Owner:    NewPermission(ownerRead, ownerWrite),
 			Everyone: NewPermission(everyoneRead.Bool, everyoneWrite.Bool), // false if null
 		})
@@ -1132,7 +1139,7 @@ func (a *Manager) Reservations(username string) ([]Reservation, error) {
 
 // HasReservation returns true if the given topic access is owned by the user
 func (a *Manager) HasReservation(username, topic string) (bool, error) {
-	rows, err := a.db.Query(selectUserHasReservationQuery, username, topic)
+	rows, err := a.db.Query(selectUserHasReservationQuery, username, escapeUnderscore(topic))
 	if err != nil {
 		return false, err
 	}
@@ -1167,7 +1174,7 @@ func (a *Manager) ReservationsCount(username string) (int64, error) {
 // ReservationOwner returns user ID of the user that owns this topic, or an
 // empty string if it's not owned by anyone
 func (a *Manager) ReservationOwner(topic string) (string, error) {
-	rows, err := a.db.Query(selectUserReservationsOwnerQuery, topic)
+	rows, err := a.db.Query(selectUserReservationsOwnerQuery, escapeUnderscore(topic))
 	if err != nil {
 		return "", err
 	}
@@ -1262,7 +1269,7 @@ func (a *Manager) AllowReservation(username string, topic string) error {
 	if (!AllowedUsername(username) && username != Everyone) || !AllowedTopic(topic) {
 		return ErrInvalidArgument
 	}
-	rows, err := a.db.Query(selectOtherAccessCountQuery, topic, topic, username)
+	rows, err := a.db.Query(selectOtherAccessCountQuery, escapeUnderscore(topic), escapeUnderscore(topic), username)
 	if err != nil {
 		return err
 	}
@@ -1327,10 +1334,10 @@ func (a *Manager) AddReservation(username string, topic string, everyone Permiss
 		return err
 	}
 	defer tx.Rollback()
-	if _, err := tx.Exec(upsertUserAccessQuery, username, topic, true, true, username, username); err != nil {
+	if _, err := tx.Exec(upsertUserAccessQuery, username, escapeUnderscore(topic), true, true, username, username); err != nil {
 		return err
 	}
-	if _, err := tx.Exec(upsertUserAccessQuery, Everyone, topic, everyone.IsRead(), everyone.IsWrite(), username, username); err != nil {
+	if _, err := tx.Exec(upsertUserAccessQuery, Everyone, escapeUnderscore(topic), everyone.IsRead(), everyone.IsWrite(), username, username); err != nil {
 		return err
 	}
 	return tx.Commit()
@@ -1353,10 +1360,10 @@ func (a *Manager) RemoveReservations(username string, topics ...string) error {
 	}
 	defer tx.Rollback()
 	for _, topic := range topics {
-		if _, err := tx.Exec(deleteTopicAccessQuery, username, username, topic); err != nil {
+		if _, err := tx.Exec(deleteTopicAccessQuery, username, username, escapeUnderscore(topic)); err != nil {
 			return err
 		}
-		if _, err := tx.Exec(deleteTopicAccessQuery, Everyone, Everyone, topic); err != nil {
+		if _, err := tx.Exec(deleteTopicAccessQuery, Everyone, Everyone, escapeUnderscore(topic)); err != nil {
 			return err
 		}
 	}
@@ -1483,12 +1490,24 @@ func (a *Manager) Close() error {
 	return a.db.Close()
 }
 
+// toSQLWildcard converts a wildcard string to a SQL wildcard string. It only allows '*' as wildcards,
+// and escapes '_', assuming '\' as escape character.
 func toSQLWildcard(s string) string {
-	return strings.ReplaceAll(s, "*", "%")
+	return escapeUnderscore(strings.ReplaceAll(s, "*", "%"))
 }
 
+// fromSQLWildcard converts a SQL wildcard string to a wildcard string. It converts '%' to '*',
+// and removes the '\_' escape character.
 func fromSQLWildcard(s string) string {
-	return strings.ReplaceAll(s, "%", "*")
+	return strings.ReplaceAll(unescapeUnderscore(s), "%", "*")
+}
+
+func escapeUnderscore(s string) string {
+	return strings.ReplaceAll(s, "_", "\\_")
+}
+
+func unescapeUnderscore(s string) string {
+	return strings.ReplaceAll(s, "\\_", "_")
 }
 
 func runStartupQueries(db *sql.DB, startupQueries string) error {
@@ -1626,6 +1645,22 @@ func migrateFrom3(db *sql.DB) error {
 	return tx.Commit()
 }
 
+func migrateFrom4(db *sql.DB) error {
+	log.Tag(tag).Info("Migrating user database schema: from 4 to 5")
+	tx, err := db.Begin()
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+	if _, err := tx.Exec(migrate4To5UpdateQueries); err != nil {
+		return err
+	}
+	if _, err := tx.Exec(updateSchemaVersion, 5); err != nil {
+		return err
+	}
+	return tx.Commit()
+}
+
 func nullString(s string) sql.NullString {
 	if s == "" {
 		return sql.NullString{}

user/manager_test.go

@@ -330,7 +330,7 @@ func TestManager_Reservations(t *testing.T) {
 	a := newTestManager(t, PermissionDenyAll)
 	require.Nil(t, a.AddUser("phil", "phil", RoleUser))
 	require.Nil(t, a.AddUser("ben", "ben", RoleUser))
-	require.Nil(t, a.AddReservation("ben", "ztopic", PermissionDenyAll))
+	require.Nil(t, a.AddReservation("ben", "ztopic_", PermissionDenyAll))
 	require.Nil(t, a.AddReservation("ben", "readme", PermissionRead))
 	require.Nil(t, a.AllowAccess("ben", "something-else", PermissionRead))
 
@@ -343,7 +343,7 @@ func TestManager_Reservations(t *testing.T) {
 		Everyone: PermissionRead,
 	}, reservations[0])
 	require.Equal(t, Reservation{
-		Topic:    "ztopic",
+		Topic:    "ztopic_",
 		Owner:    PermissionReadWrite,
 		Everyone: PermissionDenyAll,
 	}, reservations[1])
@@ -352,6 +352,14 @@ func TestManager_Reservations(t *testing.T) {
 	require.Nil(t, err)
 	require.True(t, b)
 
+	b, err = a.HasReservation("ben", "ztopic_")
+	require.Nil(t, err)
+	require.True(t, b)
+
+	b, err = a.HasReservation("ben", "ztopicX") // _ != X (used to be a SQL wildcard issue)
+	require.Nil(t, err)
+	require.False(t, b)
+
 	b, err = a.HasReservation("notben", "readme")
 	require.Nil(t, err)
 	require.False(t, b)
@@ -371,11 +379,17 @@ func TestManager_Reservations(t *testing.T) {
 	err = a.AllowReservation("phil", "readme")
 	require.Equal(t, errTopicOwnedByOthers, err)
 
+	err = a.AllowReservation("phil", "ztopic_")
+	require.Equal(t, errTopicOwnedByOthers, err)
+
+	err = a.AllowReservation("phil", "ztopicX")
+	require.Nil(t, err)
+
 	err = a.AllowReservation("phil", "not-reserved")
 	require.Nil(t, err)
 
 	// Now remove them again
-	require.Nil(t, a.RemoveReservations("ben", "ztopic", "readme"))
+	require.Nil(t, a.RemoveReservations("ben", "ztopic_", "readme"))
 
 	count, err = a.ReservationsCount("ben")
 	require.Nil(t, err)
@@ -580,46 +594,80 @@ func TestManager_Token_Extend(t *testing.T) {
 }
 
 func TestManager_Token_MaxCount_AutoDelete(t *testing.T) {
+	// Tests that tokens are automatically deleted when the maximum number of tokens is reached
+
 	a := newTestManager(t, PermissionDenyAll)
 	require.Nil(t, a.AddUser("ben", "ben", RoleUser))
+	require.Nil(t, a.AddUser("phil", "phil", RoleUser))
 
-	// Try to extend token for user without token
-	u, err := a.User("ben")
+	ben, err := a.User("ben")
 	require.Nil(t, err)
 
-	// Tokens
+	phil, err := a.User("phil")
+	require.Nil(t, err)
+
+	// Create 2 tokens for phil
+	philTokens := make([]string, 0)
+	token, err := a.CreateToken(phil.ID, "", time.Now().Add(72*time.Hour), netip.IPv4Unspecified())
+	require.Nil(t, err)
+	require.NotEmpty(t, token.Value)
+	philTokens = append(philTokens, token.Value)
+
+	token, err = a.CreateToken(phil.ID, "", time.Unix(0, 0), netip.IPv4Unspecified())
+	require.Nil(t, err)
+	require.NotEmpty(t, token.Value)
+	philTokens = append(philTokens, token.Value)
+
+	// Create 22 tokens for ben (only 20 allowed!)
 	baseTime := time.Now().Add(24 * time.Hour)
-	tokens := make([]string, 0)
-	for i := 0; i < 22; i++ {
-		token, err := a.CreateToken(u.ID, "", time.Now().Add(72*time.Hour), netip.IPv4Unspecified())
+	benTokens := make([]string, 0)
+	for i := 0; i < 22; i++ { //
+		token, err := a.CreateToken(ben.ID, "", time.Now().Add(72*time.Hour), netip.IPv4Unspecified())
 		require.Nil(t, err)
 		require.NotEmpty(t, token.Value)
-		tokens = append(tokens, token.Value)
+		benTokens = append(benTokens, token.Value)
 
 		// Manually modify expiry date to avoid sorting issues (this is a hack)
 		_, err = a.db.Exec(`UPDATE user_token SET expires=? WHERE token=?`, baseTime.Add(time.Duration(i)*time.Minute).Unix(), token.Value)
 		require.Nil(t, err)
 	}
 
-	_, err = a.AuthenticateToken(tokens[0])
+	// Ben: The first 2 tokens should have been wiped and should not work anymore!
+	_, err = a.AuthenticateToken(benTokens[0])
 	require.Equal(t, ErrUnauthenticated, err)
 
-	_, err = a.AuthenticateToken(tokens[1])
+	_, err = a.AuthenticateToken(benTokens[1])
 	require.Equal(t, ErrUnauthenticated, err)
 
+	// Ben: The other tokens should still work
 	for i := 2; i < 22; i++ {
-		userWithToken, err := a.AuthenticateToken(tokens[i])
-		require.Nil(t, err, "token[%d]=%s failed", i, tokens[i])
+		userWithToken, err := a.AuthenticateToken(benTokens[i])
+		require.Nil(t, err, "token[%d]=%s failed", i, benTokens[i])
 		require.Equal(t, "ben", userWithToken.Name)
-		require.Equal(t, tokens[i], userWithToken.Token)
+		require.Equal(t, benTokens[i], userWithToken.Token)
 	}
 
-	var count int
-	rows, err := a.db.Query(`SELECT COUNT(*) FROM user_token`)
+	// Phil: All tokens should still work
+	for i := 0; i < 2; i++ {
+		userWithToken, err := a.AuthenticateToken(philTokens[i])
+		require.Nil(t, err, "token[%d]=%s failed", i, philTokens[i])
+		require.Equal(t, "phil", userWithToken.Name)
+		require.Equal(t, philTokens[i], userWithToken.Token)
+	}
+
+	var benCount int
+	rows, err := a.db.Query(`SELECT COUNT(*) FROM user_token WHERE user_id=?`, ben.ID)
 	require.Nil(t, err)
 	require.True(t, rows.Next())
-	require.Nil(t, rows.Scan(&count))
-	require.Equal(t, 20, count)
+	require.Nil(t, rows.Scan(&benCount))
+	require.Equal(t, 20, benCount)
+
+	var philCount int
+	rows, err = a.db.Query(`SELECT COUNT(*) FROM user_token WHERE user_id=?`, phil.ID)
+	require.Nil(t, err)
+	require.True(t, rows.Next())
+	require.Nil(t, rows.Scan(&philCount))
+	require.Equal(t, 2, philCount)
 }
 
 func TestManager_EnqueueStats_ResetStats(t *testing.T) {
@@ -944,7 +992,44 @@ func TestUser_PhoneNumberAdd_Multiple_Users_Same_Number(t *testing.T) {
 	require.Nil(t, a.AddPhoneNumber(ben.ID, "+1234567890"))
 }
 
-func TestSqliteCache_Migration_From1(t *testing.T) {
+func TestManager_Topic_Wildcard_With_Asterisk_Underscore(t *testing.T) {
+	f := filepath.Join(t.TempDir(), "user.db")
+	a := newTestManagerFromFile(t, f, "", PermissionDenyAll, DefaultUserPasswordBcryptCost, DefaultUserStatsQueueWriterInterval)
+	require.Nil(t, a.AllowAccess(Everyone, "*_", PermissionRead))
+	require.Nil(t, a.AllowAccess(Everyone, "__*_", PermissionRead))
+	require.Nil(t, a.Authorize(nil, "allowed_", PermissionRead))
+	require.Nil(t, a.Authorize(nil, "__allowed_", PermissionRead))
+	require.Nil(t, a.Authorize(nil, "_allowed_", PermissionRead)) // The "%" in "%\_" matches the first "_"
+	require.Equal(t, ErrUnauthorized, a.Authorize(nil, "notallowed", PermissionRead))
+	require.Equal(t, ErrUnauthorized, a.Authorize(nil, "_notallowed", PermissionRead))
+	require.Equal(t, ErrUnauthorized, a.Authorize(nil, "__notallowed", PermissionRead))
+}
+
+func TestManager_Topic_Wildcard_With_Underscore(t *testing.T) {
+	f := filepath.Join(t.TempDir(), "user.db")
+	a := newTestManagerFromFile(t, f, "", PermissionDenyAll, DefaultUserPasswordBcryptCost, DefaultUserStatsQueueWriterInterval)
+	require.Nil(t, a.AllowAccess(Everyone, "mytopic_", PermissionReadWrite))
+	require.Nil(t, a.Authorize(nil, "mytopic_", PermissionRead))
+	require.Nil(t, a.Authorize(nil, "mytopic_", PermissionWrite))
+	require.Equal(t, ErrUnauthorized, a.Authorize(nil, "mytopicX", PermissionRead))
+	require.Equal(t, ErrUnauthorized, a.Authorize(nil, "mytopicX", PermissionWrite))
+}
+
+func TestToFromSQLWildcard(t *testing.T) {
+	require.Equal(t, "up%", toSQLWildcard("up*"))
+	require.Equal(t, "up\\_%", toSQLWildcard("up_*"))
+	require.Equal(t, "foo", toSQLWildcard("foo"))
+
+	require.Equal(t, "up*", fromSQLWildcard("up%"))
+	require.Equal(t, "up_*", fromSQLWildcard("up\\_%"))
+	require.Equal(t, "foo", fromSQLWildcard("foo"))
+
+	require.Equal(t, "up*", fromSQLWildcard(toSQLWildcard("up*")))
+	require.Equal(t, "up_*", fromSQLWildcard(toSQLWildcard("up_*")))
+	require.Equal(t, "foo", fromSQLWildcard(toSQLWildcard("foo")))
+}
+
+func TestMigrationFrom1(t *testing.T) {
 	filename := filepath.Join(t.TempDir(), "user.db")
 	db, err := sql.Open("sqlite3", filename)
 	require.Nil(t, err)
@@ -1029,6 +1114,152 @@ func TestSqliteCache_Migration_From1(t *testing.T) {
 	require.Equal(t, PermissionRead, everyoneGrants[0].Allow)
 }
 
+func TestMigrationFrom4(t *testing.T) {
+	filename := filepath.Join(t.TempDir(), "user.db")
+	db, err := sql.Open("sqlite3", filename)
+	require.Nil(t, err)
+
+	// Create "version 4" schema
+	_, err = db.Exec(`
+		BEGIN;
+		CREATE TABLE IF NOT EXISTS tier (
+			id TEXT PRIMARY KEY,
+			code TEXT NOT NULL,
+			name TEXT NOT NULL,
+			messages_limit INT NOT NULL,
+			messages_expiry_duration INT NOT NULL,
+			emails_limit INT NOT NULL,
+			calls_limit INT NOT NULL,
+			reservations_limit INT NOT NULL,
+			attachment_file_size_limit INT NOT NULL,
+			attachment_total_size_limit INT NOT NULL,
+			attachment_expiry_duration INT NOT NULL,
+			attachment_bandwidth_limit INT NOT NULL,
+			stripe_monthly_price_id TEXT,
+			stripe_yearly_price_id TEXT
+		);
+		CREATE UNIQUE INDEX idx_tier_code ON tier (code);
+		CREATE UNIQUE INDEX idx_tier_stripe_monthly_price_id ON tier (stripe_monthly_price_id);
+		CREATE UNIQUE INDEX idx_tier_stripe_yearly_price_id ON tier (stripe_yearly_price_id);
+		CREATE TABLE IF NOT EXISTS user (
+		    id TEXT PRIMARY KEY,
+			tier_id TEXT,
+			user TEXT NOT NULL,
+			pass TEXT NOT NULL,
+			role TEXT CHECK (role IN ('anonymous', 'admin', 'user')) NOT NULL,
+			prefs JSON NOT NULL DEFAULT '{}',
+			sync_topic TEXT NOT NULL,
+			stats_messages INT NOT NULL DEFAULT (0),
+			stats_emails INT NOT NULL DEFAULT (0),
+			stats_calls INT NOT NULL DEFAULT (0),
+			stripe_customer_id TEXT,
+			stripe_subscription_id TEXT,
+			stripe_subscription_status TEXT,
+			stripe_subscription_interval TEXT,
+			stripe_subscription_paid_until INT,
+			stripe_subscription_cancel_at INT,
+			created INT NOT NULL,
+			deleted INT,
+		    FOREIGN KEY (tier_id) REFERENCES tier (id)
+		);
+		CREATE UNIQUE INDEX idx_user ON user (user);
+		CREATE UNIQUE INDEX idx_user_stripe_customer_id ON user (stripe_customer_id);
+		CREATE UNIQUE INDEX idx_user_stripe_subscription_id ON user (stripe_subscription_id);
+		CREATE TABLE IF NOT EXISTS user_access (
+			user_id TEXT NOT NULL,
+			topic TEXT NOT NULL,
+			read INT NOT NULL,
+			write INT NOT NULL,
+			owner_user_id INT,
+			PRIMARY KEY (user_id, topic),
+			FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE,
+		    FOREIGN KEY (owner_user_id) REFERENCES user (id) ON DELETE CASCADE
+		);
+		CREATE TABLE IF NOT EXISTS user_token (
+			user_id TEXT NOT NULL,
+			token TEXT NOT NULL,
+			label TEXT NOT NULL,
+			last_access INT NOT NULL,
+			last_origin TEXT NOT NULL,
+			expires INT NOT NULL,
+			PRIMARY KEY (user_id, token),
+			FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE
+		);
+		CREATE TABLE IF NOT EXISTS user_phone (
+			user_id TEXT NOT NULL,
+			phone_number TEXT NOT NULL,
+			PRIMARY KEY (user_id, phone_number),
+			FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE
+		);
+		CREATE TABLE IF NOT EXISTS schemaVersion (
+			id INT PRIMARY KEY,
+			version INT NOT NULL
+		);
+		INSERT INTO user (id, user, pass, role, sync_topic, created)
+		VALUES ('u_everyone', '*', '', 'anonymous', '', UNIXEPOCH())
+		ON CONFLICT (id) DO NOTHING;
+		INSERT INTO schemaVersion (id, version) VALUES (1, 4);		
+		COMMIT;
+	`)
+	require.Nil(t, err)
+
+	// Insert a few ACL entries
+	_, err = db.Exec(`
+		BEGIN;
+		INSERT INTO user_access (user_id, topic, read, write) values ('u_everyone', 'mytopic_', 1, 1);
+		INSERT INTO user_access (user_id, topic, read, write) values ('u_everyone', 'up%', 1, 1);
+		INSERT INTO user_access (user_id, topic, read, write) values ('u_everyone', 'down_%', 1, 1);
+		COMMIT;	
+	`)
+	require.Nil(t, err)
+
+	// Create manager to trigger migration
+	a := newTestManagerFromFile(t, filename, "", PermissionDenyAll, bcrypt.MinCost, DefaultUserStatsQueueWriterInterval)
+	checkSchemaVersion(t, a.db)
+
+	// Add another
+	require.Nil(t, a.AllowAccess(Everyone, "left_*", PermissionReadWrite))
+
+	// Check "external view" of grants
+	everyoneGrants, err := a.Grants(Everyone)
+	require.Nil(t, err)
+
+	require.Equal(t, 4, len(everyoneGrants))
+	require.Equal(t, "down_*", everyoneGrants[0].TopicPattern)
+	require.Equal(t, "left_*", everyoneGrants[1].TopicPattern)
+	require.Equal(t, "mytopic_", everyoneGrants[2].TopicPattern)
+	require.Equal(t, "up*", everyoneGrants[3].TopicPattern)
+
+	// Check they are stored correctly in the database
+	rows, err := db.Query(`SELECT topic FROM user_access WHERE user_id = 'u_everyone' ORDER BY topic`)
+	require.Nil(t, err)
+	topicPatterns := make([]string, 0)
+	for rows.Next() {
+		var topicPattern string
+		require.Nil(t, rows.Scan(&topicPattern))
+		topicPatterns = append(topicPatterns, topicPattern)
+	}
+	require.Nil(t, rows.Close())
+	require.Equal(t, 4, len(topicPatterns))
+	require.Equal(t, "down\\_%", topicPatterns[0])
+	require.Equal(t, "left\\_%", topicPatterns[1])
+	require.Equal(t, "mytopic\\_", topicPatterns[2])
+	require.Equal(t, "up%", topicPatterns[3])
+
+	// Check that ACL works as excepted
+	require.Nil(t, a.Authorize(nil, "down_123", PermissionRead))
+	require.Equal(t, ErrUnauthorized, a.Authorize(nil, "downX123", PermissionRead))
+
+	require.Nil(t, a.Authorize(nil, "left_abc", PermissionRead))
+	require.Equal(t, ErrUnauthorized, a.Authorize(nil, "leftX123", PermissionRead))
+
+	require.Nil(t, a.Authorize(nil, "mytopic_", PermissionRead))
+	require.Equal(t, ErrUnauthorized, a.Authorize(nil, "mytopicX", PermissionRead))
+
+	require.Nil(t, a.Authorize(nil, "up123", PermissionRead))
+	require.Nil(t, a.Authorize(nil, "up", PermissionRead)) // % matches 0 or more characters
+}
+
 func checkSchemaVersion(t *testing.T, db *sql.DB) {
 	rows, err := db.Query(`SELECT version FROM schemaVersion`)
 	require.Nil(t, err)

util/util.go

@@ -161,11 +161,6 @@ func ParsePriority(priority string) (int, error) {
 	case "5", "max", "urgent":
 		return 5, nil
 	default:
-		// Ignore new HTTP Priority header (see https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-priority)
-		// Cloudflare adds this to requests when forwarding to the backend (ntfy), so we just ignore it.
-		if strings.HasPrefix(p, "u=") {
-			return 3, nil
-		}
 		return 0, errInvalidPriority
 	}
 }

util/util_test.go

@@ -87,15 +87,6 @@ func TestParsePriority_Invalid(t *testing.T) {
 	}
 }
 
-func TestParsePriority_HTTPSpecPriority(t *testing.T) {
-	priorities := []string{"u=1", "u=3", "u=7, i"} // see https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-priority
-	for _, priority := range priorities {
-		actual, err := ParsePriority(priority)
-		require.Nil(t, err)
-		require.Equal(t, 3, actual) // Always expect 3!
-	}
-}
-
 func TestPriorityString(t *testing.T) {
 	priorities := []int{0, 1, 2, 3, 4, 5}
 	expected := []string{"default", "min", "low", "default", "high", "max"}

web/public/static/langs/ar.json

@@ -152,7 +152,7 @@
     "publish_dialog_chip_delay_label": "تأخير التسليم",
     "subscribe_dialog_login_description": "هذا الموضوع محمي بكلمة مرور. الرجاء إدخال اسم المستخدم وكلمة المرور للاشتراك.",
     "subscribe_dialog_subscribe_button_cancel": "إلغاء",
-    "common_back": "العودة",
+    "common_back": "الرجوع",
     "prefs_notifications_sound_play": "تشغيل الصوت المحدد",
     "prefs_notifications_min_priority_title": "أولوية دنيا",
     "prefs_notifications_min_priority_max_only": "الأولوية القصوى فقط",
@@ -329,5 +329,6 @@
     "publish_dialog_attachment_limits_quota_reached": "يتجاوز الحصة، {{remainingBytes}} متبقية",
     "account_basics_tier_paid_until": "تم دفع مبلغ الاشتراك إلى غاية {{date}}، وسيتم تجديده تِلْقائيًا",
     "account_basics_tier_canceled_subscription": "تم إلغاء اشتراكك وسيتم إعادته إلى مستوى حساب مجاني بداية مِن {{date}}.",
-    "account_delete_dialog_billing_warning": "إلغاء حسابك أيضاً يلغي اشتراكك في الفوترة فوراً ولن تتمكن من الوصول إلى لوح الفوترة بعد الآن."
+    "account_delete_dialog_billing_warning": "إلغاء حسابك أيضاً يلغي اشتراكك في الفوترة فوراً ولن تتمكن من الوصول إلى لوح الفوترة بعد الآن.",
+    "nav_upgrade_banner_description": "حجز المواضيع والمزيد من الرسائل ورسائل البريد الإلكتروني والمرفقات الأكبر حجمًا"
 }

web/public/static/langs/bg.json

@@ -318,5 +318,20 @@
     "account_upgrade_dialog_tier_features_emails_one": "{{emails}} ел. писмо на ден",
     "account_upgrade_dialog_tier_features_emails_other": "{{emails}} ел. писма на ден",
     "account_upgrade_dialog_tier_features_calls_one": "{{calls}} телефонни обаждания на ден",
-    "account_usage_attachment_storage_description": "{{filesize}} на файл, изтриване след {{expiry}}"
+    "account_usage_attachment_storage_description": "{{filesize}} на файл, изтриване след {{expiry}}",
+    "account_upgrade_dialog_billing_contact_email": "За въпроси относно плащанията <Link>се свържете с нас</Link>.",
+    "account_upgrade_dialog_tier_current_label": "Текущо",
+    "account_upgrade_dialog_billing_contact_website": "За въпроси относно плащанията се обърнете към <Link>страницата</Link>.",
+    "account_upgrade_dialog_button_cancel_subscription": "Прекратяване на абонамент",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} на файл",
+    "account_upgrade_dialog_reservations_warning_one": "Избраното ниво разрешава по-малко резервирани теми, от колкото текущото. Преди промяна на нивото <strong>изтрийте най-малко една резервирана тема</strong>. Можете да премахвате теми в <Link>Настройки</Link>.",
+    "account_tokens_title": "Кодове за достъп",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} на година. Плаща се всеки месец.",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} плащане на година. Спестявате {{save}}.",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} общ обем",
+    "account_upgrade_dialog_tier_price_per_month": "на месец",
+    "account_upgrade_dialog_button_pay_now": "Плащане и абониране",
+    "account_upgrade_dialog_tier_selected_label": "Избрано",
+    "account_upgrade_dialog_button_update_subscription": "Премяна на абонамент",
+    "account_upgrade_dialog_reservations_warning_other": "Избраното ниво разрешава по-малко резервирани теми, от колкото текущото. Преди промяна на нивото <strong>изтрийте най-малко {{count}} резервирани теми</strong>. Можете да премахвате теми в <Link>Настройки</Link>."
 }

web/public/static/langs/cy.json

@@ -39,5 +39,10 @@
     "publish_dialog_attach_placeholder": "Atodi ffeil drwy URL, e.e. https://f-droid.org/F-Droid.apk",
     "notifications_click_copy_url_button": "Copio linc",
     "notifications_actions_open_url_title": "Ewch i {{url}}",
-    "publish_dialog_email_label": "Ebost"
+    "publish_dialog_email_label": "Ebost",
+    "signup_form_confirm_password": "Cadarnhau cyfrinair",
+    "signup_form_button_submit": "Cofrestru",
+    "common_back": "Yn ôl",
+    "common_copy_to_clipboard": "Copio i'r clipfwrdd",
+    "signup_already_have_account": "Gyda chyfrif yn barod? Mewngofnodi!"
 }

web/public/static/langs/de.json

@@ -25,7 +25,7 @@
     "notifications_click_copy_url_title": "Link-URL in Zwischenablage kopieren",
     "publish_dialog_priority_low": "Niedrige Priorität",
     "publish_dialog_message_label": "Nachricht",
-    "action_bar_unsubscribe": "Von Thema abmelden",
+    "action_bar_unsubscribe": "Abmelden",
     "notifications_copied_to_clipboard": "In Zwischenablage kopiert",
     "notifications_loading": "Benachrichtigungen werden geladen …",
     "notifications_attachment_open_title": "Gehe zu {{url}}",
@@ -154,7 +154,7 @@
     "notifications_actions_not_supported": "Diese Aktion wird in der Web-App nicht unterstützt",
     "notifications_actions_http_request_title": "Sende HTTP {{method}} an {{url}}",
     "action_bar_show_menu": "Menü anzeigen",
-    "action_bar_toggle_mute": "Stummschaltung der Benachrichtigungen an/aus",
+    "action_bar_toggle_mute": "Stummschaltung an/aus",
     "message_bar_show_dialog": "Dialog zur Veröffentlichung anzeigen",
     "message_bar_publish": "Benachrichtigung veröffentlichen",
     "nav_button_connecting": "verbinde",
@@ -310,7 +310,7 @@
     "prefs_reservations_delete_button": "Zugriff auf Thema zurücksetzen",
     "prefs_reservations_table": "Übersicht reservierter Themen",
     "prefs_reservations_table_topic_header": "Thema",
-    "prefs_reservations_table_everyone_deny_all": "Nur kann veröffentlichen und lesen",
+    "prefs_reservations_table_everyone_deny_all": "Nur ich kann veröffentlichen und lesen",
     "prefs_reservations_table_everyone_write_only": "Ich kann veröffentlichen und lesen, jeder kann veröffentlichen",
     "prefs_reservations_table_not_subscribed": "Nicht abonniert",
     "prefs_reservations_table_click_to_subscribe": "Klicken um zu abonnieren",

web/public/static/langs/fi.json

@@ -0,0 +1,368 @@
+{
+    "publish_dialog_message_placeholder": "Kirjoita viesti tähän",
+    "account_upgrade_dialog_tier_features_no_calls": "Ei puheluita",
+    "account_upgrade_dialog_billing_contact_email": "Laskutukseen liittyvissä kysymyksissä <Link>contact us</Link> suoraan.",
+    "account_tokens_dialog_title_create": "Luo käyttöoikeustunnus",
+    "prefs_reservations_dialog_title_edit": "Muokkaa varattua topikkia",
+    "account_basics_tier_interval_monthly": "Kuukausittain",
+    "publish_dialog_checkbox_publish_another": "Julkaise toinen",
+    "publish_dialog_details_examples_description": "Katso esimerkkejä ja yksityiskohtaisen kuvauksen kaikista lähetysominaisuuksista <docsLink>dokumentaatiosta</docsLink>.",
+    "account_basics_tier_canceled_subscription": "Tilauksesi peruutettiin ja se muutetaan maksuttomaksi tiliksi {{date}}.",
+    "priority_default": "oletus",
+    "prefs_notifications_min_priority_title": "Vähimmäisprioriteetti",
+    "account_upgrade_dialog_tier_features_calls_one": "{{calls}} päivittäisiä puheluja",
+    "account_upgrade_dialog_tier_current_label": "Nykyinen",
+    "action_bar_account": "Kirjautuminen",
+    "publish_dialog_filename_placeholder": "Liitetiedoston nimi",
+    "account_basics_password_dialog_current_password_incorrect": "Salasana virheellinen",
+    "account_tokens_table_token_header": "Token",
+    "prefs_notifications_delete_after_never": "Ei koskaan",
+    "prefs_users_description": "Lisää/poista käyttäjiä suojatuista topikeista täällä. Huomaa, että käyttäjätunnus ja salasana on tallennettu selaimen paikalliseen tallennustilaan.",
+    "account_basics_phone_numbers_dialog_number_label": "Puhelinnumero",
+    "subscribe_dialog_subscribe_description": "Aiheet eivät välttämättä ole salasanasuojattuja, joten valitse nimi, jota ei ole helposti arvatavissa. Kun olet tilannut, voit käyttää PUT/POST ilmoituksia.",
+    "action_bar_logo_alt": "ntfy logo",
+    "account_basics_password_dialog_button_submit": "Vaihda salasana",
+    "publish_dialog_emoji_picker_show": "Valitse emoji",
+    "account_basics_username_title": "Käyttäjätunnus",
+    "login_disabled": "Kirjautuminen poissa käytöstä",
+    "account_basics_phone_numbers_dialog_check_verification_button": "Vahvista koodi",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "säästä jopa {{discount}}%",
+    "account_tokens_dialog_label": "Etiketti, esim. Tutka-ilmoitukset",
+    "common_add": "Lisää",
+    "account_tokens_table_expires_header": "Vanhenee",
+    "account_upgrade_dialog_proration_info": "<strong>Osuus suhde</strong>: Kun päivität maksullisten pakettien välillä, hintaero <strong>veloitetaan välittömästi</strong>. Kun siirryt alemmalle tasolle, saldoa käytetään tulevien laskutuskausien maksamiseen.",
+    "prefs_reservations_dialog_access_label": "Oikeudet",
+    "account_usage_attachment_storage_title": "Liiteiden säilytys",
+    "prefs_users_dialog_username_label": "Username, esim pena",
+    "message_bar_error_publishing": "Virhe ilmoituksen julkaisemisessa",
+    "publish_dialog_chip_delay_label": "Viivästytä toimitusta",
+    "account_usage_messages_title": "Julkaistut viestit",
+    "notifications_attachment_open_button": "Avaa liite",
+    "emoji_picker_search_clear": "Tyhjennä haku",
+    "prefs_reservations_table_not_subscribed": "Ei tilattu",
+    "publish_dialog_topic_placeholder": "Topikin nimi, esim. erkin_hälyt",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} päivittäisiä emaileja",
+    "prefs_notifications_min_priority_max_only": "Vain maksimi prioriteetti",
+    "account_upgrade_dialog_tier_features_calls_other": "{{calls}} päivittäisiä puheluja",
+    "prefs_notifications_sound_description_some": "Ilmoitukset soittavat {{sound}} äänen saapuessaan",
+    "prefs_reservations_edit_button": "Muokkaa topikin oikeuksia",
+    "account_basics_phone_numbers_dialog_verify_button_sms": "Lähetä SMS",
+    "account_basics_tier_change_button": "Vaihda",
+    "account_tokens_dialog_expires_never": "Käyttöoikeus ei vanhene koskaan",
+    "subscribe_dialog_login_title": "Kirjautuminen vaaditaan",
+    "account_tokens_dialog_expires_x_days": "Tunnus vanhenee {{days}} päivän kuluttua",
+    "notifications_new_indicator": "Uusi ilmoitus",
+    "prefs_reservations_table_everyone_read_only": "Minä voin julkaista ja tilata, kaikki voivat tilata",
+    "prefs_reservations_table_everyone_deny_all": "Vain minä voin julkaista ja tilata",
+    "publish_dialog_chip_topic_label": "Vaihda topikkia",
+    "account_basics_phone_numbers_dialog_description": "Jotta voit käyttää puheluilmoitusominaisuutta, sinun on lisättävä ja vahvistettava vähintään yksi puhelinnumero. Vahvistus voidaan tehdä tekstiviestillä tai puhelimitse.",
+    "account_upgrade_dialog_tier_features_reservations_one": "{{reservations}} varatut topikit",
+    "publish_dialog_tags_placeholder": "Pilkuilla eroteltu luettelo tunnisteista, esim. varoitus, srv1-varmuuskopio",
+    "account_delete_title": "Poista tili",
+    "publish_dialog_attached_file_remove": "Poista liitetiedosto",
+    "nav_button_connecting": "yhdistää",
+    "account_delete_dialog_label": "Salasana",
+    "subscribe_dialog_login_button_login": "Kirjaudu",
+    "account_upgrade_dialog_tier_features_no_reservations": "Ei varattuja topikkeja",
+    "message_bar_type_message": "Kirjoita viesti tähän",
+    "publish_dialog_base_url_label": "Palvelun URL",
+    "signup_form_confirm_password": "Vahvista salasana",
+    "prefs_users_table_cannot_delete_or_edit": "Kirjautunutta käyttäjää ei voi poistaa tai muokata",
+    "account_basics_tier_admin_suffix_with_tier": "(mukana {{tier}} tier)",
+    "prefs_notifications_delete_after_three_hours_description": "Ilmoitukset poistetaan automaattisesti kolmen tunnin kuluttua",
+    "publish_dialog_chip_email_label": "Lähetä sähköpostiin",
+    "publish_dialog_attach_label": "Liitteen URL-osoite",
+    "signup_form_username": "Käyttäjätunnus",
+    "prefs_notifications_delete_after_three_hours": "Kolmen tunnin jälkeen",
+    "nav_button_muted": "Ilmoitukset mykistetty",
+    "action_bar_profile_settings": "Asetukset",
+    "signup_error_creation_limit_reached": "Tilin lisäämisraja saavutettu",
+    "notifications_attachment_open_title": "Siirry osoitteeseen {{url}}",
+    "prefs_notifications_min_priority_description_x_or_higher": "Näytä ilmoitukset, jos prioriteetti on {{number}} ({{name}}) tai suurempi",
+    "reservation_delete_dialog_description": "Varauksen poistaminen luopuu topikin omistajuudesta ja antaa muiden varata sen. Voit säilyttää tai poistaa olemassa olevia viestejä ja liitteitä.",
+    "subscribe_dialog_login_username_label": "Käyttäjätunnus, esim. pentti",
+    "subscribe_dialog_error_user_not_authorized": "Käyttäjää {{username}} ei ole valtuutettu",
+    "prefs_reservations_table_everyone_read_write": "Jokainen voi julkaista ja tilata",
+    "prefs_reservations_dialog_title_delete": "Poista topikin varaus",
+    "prefs_users_table": "Käyttäjä taulukko",
+    "prefs_reservations_table_topic_header": "Topikki",
+    "action_bar_toggle_mute": "Hiljennä/poista hiljennys",
+    "reservation_delete_dialog_submit_button": "Poista varaus",
+    "account_basics_title": "Tili",
+    "nav_button_documentation": "Käyttäjä oppaat",
+    "prefs_reservations_limit_reached": "Olet saavuttanut varattujen topikkien rajan.",
+    "account_upgrade_dialog_interval_monthly": "Kuukausittain",
+    "prefs_users_add_button": "Lisää käyttäjä",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} päivittäisiä viestejä",
+    "publish_dialog_delay_reset": "Poista viivästetty toimitus",
+    "account_basics_phone_numbers_no_phone_numbers_yet": "Ei puhelinnumeroita vielä",
+    "action_bar_toggle_action_menu": "Avaa/sulje toiminto valikko",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "Luo nimi",
+    "notifications_list_item": "Ilmoitus",
+    "prefs_appearance_language_title": "Kieli",
+    "notifications_attachment_link_expired": "latauslinkki vanhentunut",
+    "subscribe_dialog_login_password_label": "Salasana",
+    "prefs_notifications_delete_after_one_day_description": "Ilmoitukset poistetaan automaattisesti yhden päivän kuluttua",
+    "subscribe_dialog_subscribe_button_subscribe": "Tilaa",
+    "account_tokens_table_never_expires": "Ei vanhene koskaan",
+    "account_tokens_delete_dialog_title": "Poista käyttöoikeustunnus",
+    "prefs_notifications_delete_after_one_month": "Kuukauden kuluttua",
+    "publish_dialog_chip_call_label": "Puhelu",
+    "account_basics_phone_numbers_dialog_title": "Lisää puhelinnumero",
+    "account_tokens_delete_dialog_description": "Ennen kuin poistat käyttöoikeustunnuksen, varmista, että mikään sovellus tai komentosarja ei käytä sitä aktiivisesti. <strong>Tätä toimintoa ei voi kumota</strong>.",
+    "nav_button_all_notifications": "Kaikki ilmoitukset",
+    "account_upgrade_dialog_button_cancel": "Peruuta",
+    "notifications_attachment_image": "Liitekuva",
+    "account_tokens_table_label_header": "Merkki",
+    "notifications_attachment_file_document": "muu asiakirja",
+    "publish_dialog_button_cancel": "Peruuta",
+    "account_upgrade_dialog_billing_contact_website": "Laskutukseen liittyvissä kysymyksissä käy <Link>website</Link>.",
+    "signup_form_button_submit": "Kirjaudu linkki",
+    "account_basics_username_admin_tooltip": "Olet pääkäyttäjä",
+    "prefs_notifications_delete_after_never_description": "Ilmoituksia eivät koskaan poisteta automaattisesti",
+    "account_delete_dialog_description": "Tämä poistaa pysyvästi tilisi, mukaan lukien kaikki palvelimelle tallennetut tiedot. Poistamisen jälkeen käyttäjätunnuksesi on poissa käytöstä 7 päivään. Jos todella haluat jatkaa, vahvista salasanasi alla olevaan kenttään.",
+    "publish_dialog_email_reset": "Poista sähköpostin edelleenlähetys",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} varatut topikit",
+    "account_usage_reservations_none": "Tälle tilille ei ole varattu topikkeja",
+    "prefs_notifications_sound_description_none": "Ilmoitukset eivät toista ääntä saapuessaan",
+    "account_tokens_description": "Käytä käyttjätunnuksia, kun julkaiset ja tilaat ntfy API:n kautta, jotta sinun ei tarvitse lähettää tilisi tunnistetietoja. Katso lisätietoja <Link>documentation</Link>.",
+    "common_back": "Takaisin",
+    "prefs_reservations_table": "Varattujen topikkien taulukko",
+    "emoji_picker_search_placeholder": "Etsi emoji",
+    "subscribe_dialog_subscribe_topic_placeholder": "Topikin nimi, esim. pentin_hälyt",
+    "account_upgrade_dialog_button_cancel_subscription": "Peruuta tilaus",
+    "notifications_attachment_file_audio": "äänitiedosto",
+    "account_upgrade_dialog_tier_features_emails_one": "{{emails}} päivittäisiä emaileja",
+    "action_bar_sign_up": "Kirjautuminen",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} tiedostokoko",
+    "notifications_mark_read": "Merkitse luetuksi",
+    "prefs_reservations_description": "Voit varata topikien nimiä henkilökohtaiseen käyttöön täältä. Aiheen varaaminen antaa sinulle topikin omistajuuden ja voit määrittää topikkiin liittyviä käyttöoikeuksia muille käyttäjille.",
+    "notifications_attachment_copy_url_title": "Kopioi liitteen URL-osoite leikepöydälle",
+    "account_usage_title": "Käytössä",
+    "account_basics_tier_upgrade_button": "Päivitä Pro versioon",
+    "prefs_users_description_no_sync": "Käyttäjiä ja salasanoja ei ole synkronoitu tiliisi.",
+    "account_tokens_dialog_title_edit": "Muokkaa käyttöoikeustunnusta",
+    "nav_button_publish_message": "Julkaisutiedot",
+    "prefs_users_table_base_url_header": "Palvelin URL",
+    "notifications_click_copy_url_title": "Kopioi linkin URL-osoite leikepöydälle",
+    "publish_dialog_attach_reset": "Poista liitteen URL-osoite",
+    "account_upgrade_dialog_tier_features_messages_one": "{{messages}} päivittäisiä viestejä",
+    "account_upgrade_dialog_reservations_warning_one": "Valittu taso sallii vähemmän varattuja topikeita kuin nykyinen tasosi. Ennen kuin muutat tasosi, <strong>poista vähintään yksi varaus</strong>. Voit poistaa varauksia <Link>Asetuksista</Link>.",
+    "common_copy_to_clipboard": "Kopioi leikkelepöydälle",
+    "alert_not_supported_description": "Selaimesi ei tue ilmoituksia.",
+    "subscribe_dialog_error_topic_already_reserved": "Topikki on jo varattu",
+    "message_bar_publish": "Julkaise viesti",
+    "alert_grant_description": "Myönnä selaimelle lupa näyttää työpöytäilmoituksia.",
+    "prefs_users_table_user_header": "Käyttäjä",
+    "error_boundary_stack_trace": "Pinon jälki",
+    "prefs_users_dialog_password_label": "Salasana",
+    "prefs_notifications_delete_after_one_week": "Viikon kuluttua",
+    "publish_dialog_priority_low": "Matala tärkeys",
+    "publish_dialog_priority_label": "Prioriteetti",
+    "prefs_reservations_delete_button": "Poista topikin oikeudet",
+    "account_basics_tier_admin_suffix_no_tier": "(no tier)",
+    "prefs_notifications_delete_after_one_week_description": "Ilmoitukset poistetaan automaattisesti viikon kuluttua",
+    "error_boundary_unsupported_indexeddb_description": "Ntfy-verkkosovellus tarvitsee IndexedDB:n toimiakseen, eikä selaimesi tue IndexedDB:tä yksityisessä selaustilassa.<br/><br/>Vaikka tämä on valitettavaa, ntfy-verkon käyttäminen ei myöskään ole kovin järkevää yksityisessä selaustilassa, koska kaikki on tallennettu selaimen tallennustilaan. Voit lukea siitä lisää <githubLink>tästä GitHub-numerosta</githubLink> tai puhua meille <discordLink>Discordissa</discordLink> tai <matrixLink>Matrixissa</matrixLink>.",
+    "subscribe_dialog_subscribe_button_cancel": "Peruuta",
+    "notifications_attachment_copy_url_button": "Kopioi URL",
+    "account_basics_tier_payment_overdue": "Maksusi on myöhässä. Päivitä maksutapasi, tai tilisi poistetaan pian.",
+    "publish_dialog_title_placeholder": "Ilmoituksen otsikko, esim. Levytilan hälytys",
+    "account_basics_tier_description": "Tilisi taso",
+    "account_basics_phone_numbers_description": "Puheluilmoituksia varten",
+    "prefs_reservations_dialog_title_add": "Varaa topikki",
+    "account_basics_tier_free": "Vapaa",
+    "account_upgrade_dialog_cancel_warning": "Tämä <strong>peruuttaa tilauksesi</strong> ja alentaa tilisi {{date}}. Tuona päivänä topikit sekä palvelimen välimuistissa olevat viestit <strong>poistetaan</strong>.",
+    "notifications_click_copy_url_button": "Kopioi linkki",
+    "account_basics_tier_admin": "Admin",
+    "subscribe_dialog_subscribe_title": "Tilaa topikki",
+    "nav_topics_title": "Tilatut topikit",
+    "prefs_notifications_sound_title": "Ilmoitusääni",
+    "prefs_notifications_min_priority_default_and_higher": "Oletusprioriteetti ja korkeammat",
+    "prefs_reservations_table_access_header": "Oikeudet",
+    "action_bar_show_menu": "Näytä menu",
+    "action_bar_settings": "Asetukset",
+    "notifications_copied_to_clipboard": "Kopioitu leikepöydälle",
+    "account_delete_dialog_button_cancel": "Peruuta",
+    "publish_dialog_delay_placeholder": "Toimituksen viivästyminen, esim. {{unixTimestamp}}, {{relativeTime}} tai \"{{naturalLanguage}}\" (vain englanti)",
+    "account_tokens_table_copied_to_clipboard": "Käyttöoikeustunnus kopioitu",
+    "alert_grant_title": "Ilmoitukset on poistettu käytöstä",
+    "account_tokens_dialog_expires_x_hours": "Tunnus vanhenee {{hours}} tunnin kuluttua",
+    "prefs_users_edit_button": "Muokkaa käyttäjää",
+    "account_upgrade_dialog_title": "Muuta tilitasoa",
+    "publish_dialog_chip_call_no_verified_numbers_tooltip": "Ei vahvistettuja puhelinnumeroita",
+    "priority_low": "matala",
+    "prefs_reservations_table_click_to_subscribe": "Tilaa napsauttamalla",
+    "account_basics_password_description": "Vaihda tilisi salasana",
+    "publish_dialog_call_label": "Puhelu",
+    "account_usage_calls_title": "Soitetut puhelut",
+    "error_boundary_description": "Näin ei selvästikään pitäisi tapahtua. Pahoittelut tästä.<br/>Jos sinulla on hetki aikaa, <githubLink>ilmoita tästä GitHubissa</githubLink> tai ilmoita meille <discordLink>Discordin</discordLink> tai <matrixLink>Matrix</matrixLink> kautta.",
+    "signup_form_toggle_password_visibility": "Vaihda salasanan näkyvyys",
+    "login_link_signup": "Kirjaudu linkki",
+    "publish_dialog_message_label": "Viesti",
+    "publish_dialog_attached_file_title": "Liitetiedosto:",
+    "priority_min": "min",
+    "action_bar_sign_in": "Kirjaudu sisään",
+    "action_bar_unsubscribe": "Peruuta tilaus",
+    "account_basics_tier_basic": "Perus",
+    "signup_title": "Lisää ntfy tili",
+    "prefs_notifications_min_priority_description_any": "Näytetään kaikki ilmoitukset tärkeydestä riippumatta",
+    "error_boundary_gathering_info": "Kerää lisätietoja…",
+    "publish_dialog_priority_max": "Max. prioriteetti",
+    "error_boundary_unsupported_indexeddb_title": "Yksityistä selaamista ei tueta",
+    "prefs_notifications_delete_after_one_day": "Yhden päivän jälkeen",
+    "error_boundary_title": "Voi ei, ntfy kaatui",
+    "action_bar_change_display_name": "Näyttönimen vaihtaminen",
+    "notifications_attachment_file_app": "Android-sovellustiedosto",
+    "alert_not_supported_context_description": "Ilmoituksia tuetaan vain HTTPS:n kautta. Tämä on <mdnLink>Ilmoitussovellusliittymän</mdnLink> rajoitus.",
+    "reservation_delete_dialog_action_keep_description": "Palvelimelle välimuistiin tallennetut viestit ja liitteet tulevat julkiseksi topikin nimen tietävälle henkilölle.",
+    "prefs_reservations_add_button": "Lisää varattu topik",
+    "prefs_reservations_title": "Varatut topikit",
+    "account_basics_phone_numbers_copied_to_clipboard": "Puhelinnumero kopioitu leikepöydälle",
+    "prefs_reservations_dialog_description": "Topikin varaaminen antaa sinulle aiheen omistajuuden ja voit määrittää aiheeseen liittyviä käyttöoikeuksia muille käyttäjille.",
+    "account_basics_tier_title": "Tilin tyyppi",
+    "account_usage_cannot_create_portal_session": "Laskutusportaalin avaaminen epäonnistui",
+    "account_tokens_delete_dialog_submit_button": "Poista tunnus pysyvästi",
+    "account_delete_description": "Poista tilisi pysyvästi",
+    "account_basics_phone_numbers_dialog_number_placeholder": "esim. +35812345678",
+    "account_basics_phone_numbers_dialog_code_placeholder": "esim. 123456",
+    "prefs_notifications_title": "Ilmoitukset",
+    "account_basics_tier_manage_billing_button": "Hallinnoi laskutusta",
+    "account_tokens_title": "Käyttöoikeudet",
+    "publish_dialog_email_label": "Email",
+    "account_basics_username_description": "Hei, se olet sinä ❤",
+    "prefs_reservations_dialog_topic_label": "Topik",
+    "account_basics_password_dialog_confirm_password_label": "Vahvista salasana",
+    "action_bar_reservation_edit": "Muokkaa varatopikkia",
+    "publish_dialog_base_url_placeholder": "Palvelun URL-osoite, esim. https://example.com",
+    "prefs_users_title": "Hallinnoi käyttäjiä",
+    "account_basics_tier_interval_yearly": "vuosittain",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} Laskutetaan kuukausittain.",
+    "action_bar_clear_notifications": "Poista kaikki ilmoitukset",
+    "account_delete_dialog_button_submit": "Poista tili pysyvästi",
+    "account_basics_phone_numbers_dialog_channel_call": "Soitto",
+    "account_basics_password_title": "Salasana",
+    "account_basics_password_dialog_new_password_label": "Uusi salasana",
+    "nav_upgrade_banner_label": "Päivitä ntfy Prohon",
+    "account_tokens_dialog_expires_unchanged": "Jätä viimeinen käyttöpäivä ennalleen",
+    "publish_dialog_delay_label": "Viive",
+    "error_boundary_button_copy_stack_trace": "Kopioi pinon jälki",
+    "publish_dialog_button_send": "Lähetä",
+    "action_bar_reservation_delete": "Poista varatopikit",
+    "publish_dialog_button_cancel_sending": "Peruuta lähetys",
+    "account_tokens_dialog_title_delete": "Poista käyttöoikeustunnus",
+    "account_usage_of_limit": "limiitistä {{limit}}",
+    "publish_dialog_attach_placeholder": "Liitä tiedosto URL-osoitteen mukaan, esim. https://f-droid.org/F-Droid.apk",
+    "publish_dialog_email_placeholder": "Osoite, johon ilmoitus välitetään, esim. urpo@example.com",
+    "notifications_attachment_link_expires": "linkki vanhenee {{date}}",
+    "action_bar_send_test_notification": "Lähetä testi ilmoitus",
+    "reservation_delete_dialog_action_keep_title": "Säilytä välimuistissa olevat viestit ja liitteet",
+    "prefs_notifications_sound_no_sound": "Ei ääntä",
+    "account_upgrade_dialog_interval_yearly": "Vuosittain",
+    "publish_dialog_tags_label": "Tagit",
+    "signup_form_password": "Salasana",
+    "action_bar_reservation_limit_reached": "Varatopikien raja",
+    "account_upgrade_dialog_button_redirect_signup": "Kirjaudu nyt",
+    "publish_dialog_click_placeholder": "URL-osoite, joka avautuu, kun ilmoitusta napsautetaan",
+    "alert_not_supported_title": "Ilmoituksia ei tueta",
+    "account_tokens_dialog_button_cancel": "Peruuta",
+    "subscribe_dialog_error_user_anonymous": "Anonyymi",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} laskutetaan vuosittain. Tallenna {{save}}.",
+    "prefs_notifications_min_priority_high_and_higher": "Korkea prioriteetti ja korkeammat",
+    "account_usage_basis_ip_description": "Tämän tilin käyttötilastot ja rajoitukset perustuvat IP-osoitteeseesi, joten ne voidaan jakaa muiden käyttäjien kanssa. Yllä esitetyt rajat ovat likimääräisiä perustuen olemassa oleviin rajoituksiin.",
+    "publish_dialog_priority_high": "Korkea prioriteetti",
+    "login_form_button_submit": "Kirjaudu",
+    "account_basics_password_dialog_title": "Vaihda salasana",
+    "priority_max": "max",
+    "notifications_attachment_file_image": "kuvatiedosto",
+    "account_usage_limits_reset_daily": "Käyttörajat nollataan päivittäin keskiyöllä (UTC)",
+    "account_usage_unlimited": "Rajoittamaton",
+    "prefs_users_delete_button": "Poista käyttäjä",
+    "publish_dialog_click_label": "Napsauta URL-osoitetta",
+    "prefs_notifications_min_priority_any": "Kaikki prioriteetit",
+    "account_tokens_dialog_expires_label": "Käyttöoikeustunnus vanhenee",
+    "publish_dialog_filename_label": "Tiedostonimi",
+    "publish_dialog_chip_attach_file_label": "Liitä paikallinen tiedosto",
+    "account_basics_phone_numbers_title": "Puhelinnumerot",
+    "prefs_notifications_delete_after_title": "Poista ilmoitukset",
+    "account_upgrade_dialog_interval_yearly_discount_save": "säästä {{discount}}%",
+    "signup_disabled": "Kirjautuminen estetty",
+    "publish_dialog_drop_file_here": "Pudota tiedosto tähän",
+    "prefs_users_dialog_title_edit": "Muokkaa käyttäjää",
+    "account_basics_password_dialog_current_password_label": "Nykyinen salasana",
+    "prefs_notifications_min_priority_low_and_higher": "Matala prioriteetti ja korkeammat",
+    "action_bar_profile_title": "Profiili",
+    "account_tokens_dialog_button_update": "Päivitä tunnus",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} lopullinen tiedostokoko",
+    "publish_dialog_title_label": "Otsikko",
+    "prefs_reservations_table_everyone_write_only": "Minä voin julkaista ja tilata, kaikki voivat julkaista",
+    "prefs_appearance_title": "Näkymä",
+    "publish_dialog_topic_reset": "Resetoi topikki",
+    "account_tokens_table_cannot_delete_or_edit": "Nykyistä istuntotunnusta ei voi muokata tai poistaa",
+    "notifications_tags": "Tagit",
+    "prefs_notifications_sound_play": "Toista valittu ääni",
+    "account_tokens_table_last_access_header": "Viimeinen käyty",
+    "action_bar_profile_logout": "Kirjaudu ulos",
+    "publish_dialog_attached_file_filename_placeholder": "Liitetiedoston nimi",
+    "publish_dialog_priority_default": "Oletusprioriteetti",
+    "subscribe_dialog_subscribe_base_url_label": "Palvelimen URL",
+    "account_tokens_table_last_origin_tooltip": "Napsauta IP-osoitteesta {{ip}}, etsiäksesi",
+    "account_usage_reservations_title": "Varatut topikit",
+    "account_upgrade_dialog_tier_price_per_month": "Kuukausi",
+    "message_bar_show_dialog": "Näytä julkaisu dialogi",
+    "publish_dialog_chip_attach_url_label": "Liitä tiedosto URL-osoitteen mukaan",
+    "account_usage_calls_none": "Tällä tilillä ei voi soittaa puheluita",
+    "notifications_click_open_button": "Avaa linkki",
+    "account_tokens_table_current_session": "Nykyinen selainistunto",
+    "account_upgrade_dialog_button_pay_now": "Maksa nyt ja tilaa",
+    "nav_upgrade_banner_description": "Varaa aiheita, lisää viestejä ja sähköposteja sekä suurempia liitteitä",
+    "publish_dialog_call_reset": "Poista puhelu",
+    "publish_dialog_other_features": "Muut ominaisuudet:",
+    "subscribe_dialog_subscribe_use_another_label": "Käytä toista palvelinta",
+    "reservation_delete_dialog_action_delete_title": "Poista välimuistissa olevat viestit ja liitteet",
+    "signup_error_username_taken": "Käyttäjätunnus {{username}} on jo varattu",
+    "account_basics_phone_numbers_dialog_code_label": "Vahvistuskoodi",
+    "nav_button_subscribe": "Tilaa topik",
+    "publish_dialog_topic_label": "Topikin nimi",
+    "reservation_delete_dialog_action_delete_description": "Välimuistissa olevat viestit ja liitteet poistetaan pysyvästi. Tätä toimintoa ei voi kumota.",
+    "alert_grant_button": "Myönnä nyt",
+    "account_basics_tier_paid_until": "Tilaus maksettu {{date}} asti, ja se uusitaan automaattisesti",
+    "account_usage_attachment_storage_description": "{{tiedostokoko}} per tiedosto, poistettu {{expiry}} jälkeen",
+    "publish_dialog_chip_click_label": "Napsauta URL-osoitetta",
+    "prefs_notifications_delete_after_one_month_description": "Ilmoitukset poistetaan automaattisesti kuukauden kuluttua",
+    "common_cancel": "Peruuta",
+    "account_basics_phone_numbers_dialog_verify_button_call": "Soita minulle",
+    "signup_already_have_account": "Onko sinulla jo tili ? Kirjaudu sisään !",
+    "publish_dialog_call_item": "Soita puhelinnumeroon {{number}}",
+    "nav_button_account": "Tili",
+    "publish_dialog_click_reset": "Poista napsautettava URL-osoite",
+    "login_title": "Kirjaudu sisään ntfy-tilillesi",
+    "notifications_list": "Ilmoitusluettelo",
+    "common_save": "Tallenna",
+    "prefs_users_dialog_base_url_label": "Palvelin URL, esim. https://ntfy.sh",
+    "account_usage_emails_title": "Sähköpostit lähetetty",
+    "account_basics_phone_numbers_dialog_channel_sms": "SMS",
+    "action_bar_reservation_add": "Varalla oleva topikki",
+    "account_upgrade_dialog_tier_selected_label": "Valittu",
+    "account_upgrade_dialog_button_update_subscription": "Päivitä tilaus",
+    "notifications_attachment_file_video": "videotiedosto",
+    "priority_high": "korkea",
+    "notifications_priority_x": "Prioriteetti {{priority}}",
+    "account_delete_dialog_billing_warning": "Tilin poistaminen peruuttaa myös laskutustilauksesi välittömästi. Et voi enää käyttää laskutuksen hallintapaneelia.",
+    "prefs_notifications_min_priority_description_max": "Näytä ilmoitukset, jos prioriteetti on 5 (max)",
+    "subscribe_dialog_login_description": "Tämä Topikki on suojattu salasanalla. Anna käyttäjätunnus ja salasana.",
+    "account_upgrade_dialog_reservations_warning_other": "Valittu taso sallii vähemmän varattuja topikkeja kuin nykyinen tasosi. Ennen kuin muutat tasosi, <strong>poista vähintään {{count}} varausta</strong>. Voit poistaa varauksia <Link>Asetuksista</Link>.",
+    "prefs_users_dialog_title_add": "Lisää käyttäjä",
+    "account_tokens_dialog_button_create": "Luo tunnus",
+    "nav_button_settings": "Asetukset",
+    "publish_dialog_priority_min": "Min. etusijalla",
+    "account_tokens_table_create_token_button": "Luo käyttöoikeustunnus",
+    "notifications_delete": "Poista",
+    "notifications_actions_not_supported": "Toimintoa ei tueta verkkosovelluksessa",
+    "notifications_actions_open_url_title": "Siirry osoitteeseen {{url}}",
+    "notifications_none_for_any_title": "Et ole saanut ilmoituksia.",
+    "notifications_none_for_topic_description": "Jos haluat lähettää ilmoituksia tähän topikkiin, PUT tai POST topikin URL-osoitteeseen.",
+    "notifications_none_for_any_description": "Jos haluat lähettää ilmoituksia topikkiin, PUT tai POST topikin URL-osoitteeseen. Tässä on esimerkki yhden topikin käyttämisestä.",
+    "notifications_no_subscriptions_title": "Näyttää siltä, että sinulla ei ole vielä tilauksia.",
+    "notifications_none_for_topic_title": "Et ole vielä saanut ilmoituksia tästä topikista.",
+    "notifications_actions_http_request_title": "Lähetä HTTP {{method}} to {{url}}"
+}

web/public/static/langs/fr.json

@@ -272,7 +272,7 @@
     "account_delete_dialog_button_submit": "Supprimer définitivement le compte",
     "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_proration_info": "<strong>Facturation</strong> : Lors d'un changement vers un tiers payant, la différence de prix sera débitée <strong>immédiatement</strong>. En passant d'un tiers payant a gratuit, votre solde sera utilisé pour payer de futur factures.",
     "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",
@@ -368,8 +368,17 @@
     "account_basics_phone_numbers_dialog_code_placeholder": "Ex : 123456",
     "account_basics_phone_numbers_dialog_check_verification_button": "Code de confirmarion",
     "account_basics_phone_numbers_dialog_channel_sms": "SMS",
-    "account_basics_phone_numbers_dialog_channel_call": "Appel",
+    "account_basics_phone_numbers_dialog_channel_call": "Appeler",
     "account_usage_calls_none": "Aucun appels téléphoniques ne peut être fait avec ce compte",
     "publish_dialog_call_reset": "Supprimer les appels téléphoniques",
-    "publish_dialog_chip_call_label": "Appel téléphonique"
+    "publish_dialog_chip_call_label": "Appel téléphonique",
+    "account_upgrade_dialog_tier_features_messages_one": "{{messages}} message journalier",
+    "account_upgrade_dialog_tier_features_emails_one": "{{emails}} mail journalier",
+    "account_upgrade_dialog_tier_features_calls_other": "{{calls}} appels journaliers",
+    "account_upgrade_dialog_tier_features_no_calls": "Aucun appel",
+    "publish_dialog_call_item": "Appeler le numéro {{number}}",
+    "publish_dialog_chip_call_no_verified_numbers_tooltip": "Aucun numéro de téléphone vérifié",
+    "account_upgrade_dialog_tier_features_reservations_one": "{{reservations}} sujet réservé",
+    "account_upgrade_dialog_tier_features_calls_one": "{{calls}} appels journaliers",
+    "account_usage_calls_title": "Appels téléphoniques passés"
 }

web/public/static/langs/gl.json

@@ -1 +1,384 @@
-{}
+{
+    "common_cancel": "Cancelar",
+    "common_save": "Gardar",
+    "common_add": "Engadir",
+    "signup_disabled": "O rexistro está desactivado",
+    "signup_error_username_taken": "O identificador {{username}} xa está collido",
+    "login_title": "Accede á túa conta ntfy",
+    "action_bar_send_test_notification": "Enviar notificación de proba",
+    "action_bar_clear_notifications": "Limpar todas as notificacións",
+    "action_bar_unsubscribe": "Retirar subscrición",
+    "action_bar_profile_settings": "Axustes",
+    "message_bar_type_message": "Escribe aquí a mensaxe",
+    "notifications_copied_to_clipboard": "Copiada ao portapapeis",
+    "notifications_attachment_image": "Imaxe anexa",
+    "notifications_attachment_copy_url_title": "Copiar URL do anexo ao portapapeis",
+    "notifications_attachment_copy_url_button": "Copiar URL",
+    "notifications_attachment_open_title": "Ir a {{url}}",
+    "notifications_attachment_file_audio": "ficheiro de audio",
+    "notifications_attachment_file_app": "ficheiro de app Android",
+    "notifications_attachment_file_document": "outro documento",
+    "notifications_click_copy_url_title": "Copiar URL da ligazón ao portapapeis",
+    "notifications_click_copy_url_button": "Copiar ligazón",
+    "notifications_actions_open_url_title": "Ir a {{url}}",
+    "notifications_none_for_topic_description": "Para enviar notificacións a este tema, simplemente usa PUT ou POST co URL do tema.",
+    "notifications_no_subscriptions_description": "Preme en \"{{linktext}} para crear ou subscribirte a un tema. Após, podes enviar mensaxes vía PUT ou POST e recibirás aquí as notificacións.",
+    "display_name_dialog_description": "Establecer un nome alternativo para o tema que será mostrado na lista de subscrición. Isto axudará a identificar os temas que teñan nomes complicados.",
+    "publish_dialog_tags_label": "Etiquetas",
+    "publish_dialog_tags_placeholder": "Lista de etiquetas separadas por vírgulas, ex. aviso, tarefa1",
+    "publish_dialog_priority_label": "Prioridade",
+    "publish_dialog_click_label": "URL a premer",
+    "publish_dialog_click_placeholder": "URL que se abre ao premer na notificación",
+    "publish_dialog_click_reset": "Desbotar o URL a premer",
+    "common_back": "Atrás",
+    "common_copy_to_clipboard": "Copiar ao portapapeis",
+    "signup_title": "Crear unha conta ntfy",
+    "signup_form_username": "Identificador",
+    "signup_form_password": "Contrasinal",
+    "signup_form_confirm_password": "Confirmar contrasinal",
+    "signup_form_button_submit": "Crear conta",
+    "login_form_button_submit": "Acceder",
+    "login_link_signup": "Crear conta",
+    "login_disabled": "O acceso está desactivado",
+    "action_bar_show_menu": "Mostrar menú",
+    "action_bar_toggle_mute": "Acalar/Reactivar as notificacións",
+    "message_bar_error_publishing": "Erro ao publicar a notificación",
+    "message_bar_publish": "Publicar mensaxe",
+    "nav_topics_title": "Temas subscritos",
+    "nav_button_documentation": "Documentación",
+    "nav_button_publish_message": "Publicar notificación",
+    "nav_button_subscribe": "Subscribirse ao tema",
+    "nav_button_muted": "Notificacións acaladas",
+    "nav_button_connecting": "conectando",
+    "nav_upgrade_banner_label": "Mellorar a ntfy Pro",
+    "alert_not_supported_description": "O teu navegador non ten soporte para notificacións.",
+    "notifications_priority_x": "Prioridade {{priority}}",
+    "notifications_attachment_link_expires": "a ligazón caduca o {{date}}",
+    "notifications_attachment_link_expired": "a ligazón de descarga caducou",
+    "notifications_attachment_file_image": "ficheiro de imaxe",
+    "notifications_attachment_file_video": "ficheiro de vídeo",
+    "notifications_actions_not_supported": "Acción non soportada na aplicación web",
+    "notifications_actions_http_request_title": "Enviar HTTP {{method}} a {{url}}",
+    "notifications_none_for_topic_title": "Aínda non recibiches ningunha notificación para este tema.",
+    "reserve_dialog_checkbox_label": "Reservar tema e configurar acceso",
+    "notifications_loading": "Cargando notificacións…",
+    "publish_dialog_base_url_placeholder": "URL de servizo, ex. https://exemplo.com",
+    "publish_dialog_topic_label": "Nome do tema",
+    "publish_dialog_topic_placeholder": "Nome do tema, ex. alertas_equipo",
+    "publish_dialog_topic_reset": "Restablecer tema",
+    "publish_dialog_title_label": "Título",
+    "publish_dialog_title_placeholder": "Título das notificacións, ex. Alerta de reunión",
+    "publish_dialog_message_label": "Mensaxe",
+    "publish_dialog_message_placeholder": "Escribe aquí a mensaxe",
+    "publish_dialog_email_label": "Correo electrónico",
+    "signup_form_toggle_password_visibility": "Cambiar visibilidade do contrasinal",
+    "signup_already_have_account": "Xa tes unha conta? Accede!",
+    "signup_error_creation_limit_reached": "Acadouse o límite de creación de contas",
+    "action_bar_logo_alt": "logo ntfy",
+    "action_bar_settings": "Axustes",
+    "action_bar_account": "Conta",
+    "action_bar_change_display_name": "Cambiar nome público",
+    "action_bar_reservation_add": "Reservar tema",
+    "action_bar_reservation_edit": "Cambiar a reserva",
+    "action_bar_reservation_delete": "Desbotar a reserva",
+    "action_bar_reservation_limit_reached": "Acadouse o límite",
+    "action_bar_toggle_action_menu": "Abrir/Pechar menú de accións",
+    "action_bar_profile_title": "Perfil",
+    "action_bar_profile_logout": "Pechar sesión",
+    "action_bar_sign_in": "Acceder",
+    "action_bar_sign_up": "Crear conta",
+    "message_bar_show_dialog": "Mostrar diálogo para publicar",
+    "nav_button_all_notifications": "Todas as notificacións",
+    "nav_button_account": "Conta",
+    "nav_button_settings": "Axustes",
+    "nav_upgrade_banner_description": "Reserva temas, máis mensaxes e correos electrónicos así como anexos máis grandes",
+    "alert_grant_title": "As notificacións están desactivadas",
+    "alert_grant_description": "Concede permiso no navegador para mostrar notificacións de escritorio.",
+    "alert_grant_button": "Conceder agora",
+    "alert_not_supported_title": "Non hai soporte para notificacións",
+    "alert_not_supported_context_description": "Só hai soporte para notificacións ao usar HTTPS. Esta é unha limitación da <mdnLink>API de Notificacións</mdnLink>.",
+    "notifications_list": "Lista de notificacións",
+    "notifications_list_item": "Notificación",
+    "notifications_mark_read": "Marcar como lida",
+    "notifications_delete": "Eliminar",
+    "notifications_tags": "Etiquetas",
+    "notifications_new_indicator": "Nova notificación",
+    "notifications_attachment_open_button": "Abrir anexo",
+    "notifications_click_open_button": "Abrir ligazón",
+    "notifications_none_for_any_title": "Non recibiches ningunha notificación.",
+    "notifications_none_for_any_description": "Para enviar notificacións ao tema, simplemente usa PUT ou POST ao URL do tema. Aquí tes un exemplo usando un dos teus temas.",
+    "notifications_no_subscriptions_title": "Semella que aínda non tes subscricións.",
+    "notifications_example": "Exemplo",
+    "display_name_dialog_title": "Cambiar nonme público",
+    "display_name_dialog_placeholder": "Nome público",
+    "publish_dialog_title_topic": "Publicar en {{topic}}",
+    "publish_dialog_title_no_topic": "Publicar notificación",
+    "publish_dialog_progress_uploading": "Enviando…",
+    "publish_dialog_progress_uploading_detail": "Enviando {{loaded}}/{{total}} ({{percent}}%) …",
+    "publish_dialog_message_published": "Notificación publicada",
+    "publish_dialog_attachment_limits_file_and_quota_reached": "supera o límite de ficheiros e cota {{fileSizeLimit}}, quedan {{remainingBytes}}",
+    "publish_dialog_attachment_limits_file_reached": "supera o límite para ficheiros {{fileSizeLimit}}",
+    "publish_dialog_attachment_limits_quota_reached": "supera a cota, quedan {{remainingBytes}}",
+    "publish_dialog_emoji_picker_show": "Elixe emoji",
+    "publish_dialog_priority_min": "Prioridade Mínima",
+    "publish_dialog_priority_low": "Prioridade baixa",
+    "publish_dialog_priority_default": "Prioridade por defecto",
+    "publish_dialog_priority_high": "Prioridade alta",
+    "publish_dialog_priority_max": "Prioridade Máxima",
+    "publish_dialog_base_url_label": "URL do servizo",
+    "notifications_more_details": "Para máis información, visita o <websiteLink>sitio web</websiteLink> ou le a <docsLink>documentación</docsLink>.",
+    "publish_dialog_call_label": "Chamada de teléfono",
+    "publish_dialog_call_reset": "Retirar chamada de teléfono",
+    "publish_dialog_delay_placeholder": "Adiar a entrega, ex. {{unixTimestamp}}, {{relativeTime}}, ou \"{{naturalLanguage}}\" (Só en inglés)",
+    "publish_dialog_other_features": "Outras características:",
+    "publish_dialog_chip_click_label": "Premer en URL",
+    "publish_dialog_chip_email_label": "Reenvío por correo",
+    "publish_dialog_chip_call_label": "Chamada de teléfono",
+    "publish_dialog_chip_attach_url_label": "Anexar ficheiro por URL",
+    "publish_dialog_button_cancel_sending": "Cancelar o envío",
+    "publish_dialog_button_cancel": "Cancelar",
+    "publish_dialog_button_send": "Enviar",
+    "publish_dialog_attached_file_title": "Ficheiro anexo:",
+    "publish_dialog_attached_file_filename_placeholder": "Nome do ficheiro anexo",
+    "publish_dialog_drop_file_here": "Soltar aquí o ficheiro",
+    "emoji_picker_search_placeholder": "Buscar emoji",
+    "subscribe_dialog_subscribe_title": "Subscribirse a un tema",
+    "publish_dialog_call_item": "Número de teléfono {{number}}",
+    "publish_dialog_email_placeholder": "Enderezo ao que reenviar a notificación, ex. xoana@exemplo.com",
+    "publish_dialog_email_reset": "Retirar reenvío ao correo",
+    "publish_dialog_attach_label": "URL do anexo",
+    "publish_dialog_attach_placeholder": "Anexa un ficheiro por URL, ex. https://f-droid.org/F-Droid.apk",
+    "publish_dialog_attach_reset": "Retirar URL do anexo",
+    "publish_dialog_filename_placeholder": "Nome do ficheiro anexo",
+    "publish_dialog_filename_label": "Nome do ficheiro",
+    "publish_dialog_delay_label": "Adiar",
+    "publish_dialog_delay_reset": "Retirar o adiadamento da entrega",
+    "publish_dialog_chip_attach_file_label": "Anexar ficheiro local",
+    "publish_dialog_chip_delay_label": "Entrega adiada",
+    "publish_dialog_chip_topic_label": "Cambiar tema",
+    "publish_dialog_details_examples_description": "Para ver exemplos e unha descrición polo miúdo das ferramentas de envío, le a <docsLink>documentación</docsLink>.",
+    "publish_dialog_checkbox_publish_another": "Publicar outra",
+    "emoji_picker_search_clear": "Limpar busca",
+    "publish_dialog_chip_call_no_verified_numbers_tooltip": "Números de teléfono non verificados",
+    "publish_dialog_attached_file_remove": "Retirar ficheiro anexo",
+    "account_upgrade_dialog_tier_features_no_calls": "Sen chamadas",
+    "account_upgrade_dialog_billing_contact_email": "Para preguntas sobre pagamentos, <Link>contacta con nós</Link> directamente.",
+    "account_tokens_dialog_title_create": "Crear token de acceso",
+    "prefs_reservations_dialog_title_edit": "Editar tema reservado",
+    "priority_default": "por defecto",
+    "prefs_notifications_min_priority_title": "Prioridade mínima",
+    "account_upgrade_dialog_tier_features_calls_one": "{{calls}} chamadas de teléfono diarias",
+    "account_upgrade_dialog_tier_current_label": "Actual",
+    "account_tokens_table_token_header": "Token",
+    "prefs_notifications_delete_after_never": "Nunca",
+    "prefs_users_description": "Engadir/eliminar usuarias dos temas protexidos. Ten en conta que as credenciais gárdanse na almacenaxe local do navegador.",
+    "subscribe_dialog_subscribe_description": "Os temas poderían non estar proxetidos con contrasinal, así que elixe un nome complicado de adiviñar. Unha vez subscrita, podes PUT/POST notificacións.",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "aforro ata un {{discount}}%",
+    "account_tokens_dialog_label": "Etiqueta, ex. notificación de Radarr",
+    "account_tokens_table_expires_header": "Caducidade",
+    "account_upgrade_dialog_proration_info": "<strong>Axuste</strong>: ao mellorar a un plan de pagamento superior, a diferencia vaise <strong>cobrar inmediatamente</strong>. Se degradas a conta a un plan inferior a diferencia usarase para pagar futuros períodos de pagamento.",
+    "prefs_reservations_dialog_access_label": "Acceso",
+    "account_usage_attachment_storage_title": "Almacenaxe dos anexos",
+    "prefs_users_dialog_username_label": "Identificador, ex. xoana",
+    "prefs_reservations_table_not_subscribed": "Non subscrita",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} correos diarios",
+    "prefs_notifications_min_priority_max_only": "Só prioridade máxima",
+    "account_upgrade_dialog_tier_features_calls_other": "{{calls}} chamadas de teléfono diarias",
+    "prefs_notifications_sound_description_some": "As notificacións sonan co ton {{sound}} ao chegar",
+    "prefs_reservations_edit_button": "Editar acceso ao tema",
+    "account_tokens_dialog_expires_never": "O token non caduca",
+    "subscribe_dialog_login_title": "Require inciar sesión",
+    "account_tokens_dialog_expires_x_days": "O token caduca en {{days}} días",
+    "prefs_reservations_table_everyone_read_only": "Podo publicar e subscribirme, calquera pode subscribirse",
+    "prefs_reservations_table_everyone_deny_all": "Só eu podo publicar e subscribirme",
+    "account_upgrade_dialog_tier_features_reservations_one": "{{reservations}} tema reservado",
+    "subscribe_dialog_login_button_login": "Acceder",
+    "account_upgrade_dialog_tier_features_no_reservations": "Sen temas reservados",
+    "prefs_users_table_cannot_delete_or_edit": "Non se pode eliminar ou editar unha usuaria coa sesión iniciada",
+    "prefs_notifications_delete_after_three_hours_description": "As notificacións autoelimínanse após tres horas",
+    "prefs_notifications_delete_after_three_hours": "Após tres horas",
+    "prefs_notifications_min_priority_description_x_or_higher": "Mostrar as notificacións se a prioridade é {{number}} {{name}} ou superior",
+    "reservation_delete_dialog_description": "Ao eliminar a reserva cedes a propiedade do tema, e permites que outras persoas poidan reservalo. Podes manter ou eliminar as mensaxes e anexos existentes.",
+    "prefs_reservations_table_everyone_read_write": "Calquera pode publicar e subscribirse",
+    "prefs_reservations_dialog_title_delete": "Eliminar a reserva do tema",
+    "prefs_users_table": "Táboa de usuarias",
+    "prefs_reservations_table_topic_header": "Tema",
+    "reservation_delete_dialog_submit_button": "Eliminar a reserva",
+    "prefs_reservations_limit_reached": "Acadaches o límite de temas que podes reservar.",
+    "account_upgrade_dialog_interval_monthly": "Mensual",
+    "prefs_users_add_button": "Engadir usuaria",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} mensaxes diarias",
+    "prefs_appearance_language_title": "Idioma",
+    "prefs_notifications_delete_after_one_day_description": "As notificacións autoelimínanse após un día",
+    "account_tokens_table_never_expires": "Non caduca",
+    "account_tokens_delete_dialog_title": "Desbotar token de acceso",
+    "prefs_notifications_delete_after_one_month": "Após un mes",
+    "account_tokens_delete_dialog_description": "Antes de borrar o token de acceso mira que ningunha aplicación ou programa o está usando. <strong>Esta acción non pode desfacerse</strong>.",
+    "account_upgrade_dialog_button_cancel": "Cancelar",
+    "account_tokens_table_label_header": "Etiqueta",
+    "account_upgrade_dialog_billing_contact_website": "Para preguntas sobre pagamentos, vai ao noso <Link>sitiio web</Link>.",
+    "prefs_notifications_delete_after_never_description": "As notificacións non se eliminarán nunca automáticamente",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} temas reservados",
+    "prefs_notifications_sound_description_none": "As notificacións non reproducen un ton ao chegar",
+    "account_tokens_description": "Usar tokens de acceso ao publicar e subscribirte a través da API de ntfy, así non tes que enviar as credenciais. Le a <Link>documentación</Link> para saber máis.",
+    "prefs_reservations_table": "Táboa cos temas reservados",
+    "account_upgrade_dialog_button_cancel_subscription": "Cancelar subscrición",
+    "account_upgrade_dialog_tier_features_emails_one": "{{emails}} correo diario",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} por ficheiro",
+    "prefs_reservations_description": "Podes reservar nomes de temas para uso personal. Ao reservar un tema tes a propiedade sobre del, e permíteche definir os permisos de acceso para outras usuarias sobre o tema.",
+    "prefs_users_description_no_sync": "Usuarias e contrasinais non están sincronizados coa túa conta.",
+    "account_tokens_dialog_title_edit": "Editar token de acceso",
+    "prefs_users_table_base_url_header": "URL do servizo",
+    "account_upgrade_dialog_tier_features_messages_one": "{{mensaxes}} mensaxe diaria",
+    "account_upgrade_dialog_reservations_warning_one": "O nivel seleccionado permite reservar menos temas que o nivel actual. Antes de cambiar de nivel, <strong>elimina unha reserva polo menos</strong>. Podes eliminar as reservas nos <Link>Axustes</Link>.",
+    "prefs_users_table_user_header": "Usuaria",
+    "error_boundary_stack_trace": "Trazas do problema",
+    "prefs_users_dialog_password_label": "Contrasinal",
+    "prefs_notifications_delete_after_one_week": "Após unha semana",
+    "prefs_reservations_delete_button": "Restablecer acceso ao tema",
+    "prefs_notifications_delete_after_one_week_description": "As notificacións autoelimínanse após unha semana",
+    "error_boundary_unsupported_indexeddb_description": "A app ntfy web precisa a función IndexedDB, e o teu navegador non ten soporte para IndexedDB no modo privado.<br/><br/>Aínda que é unha mágoa, tampouco ten moito senso usar a app ntfy web en modo privado, porque todo se garda na almacenaxe do navegador. Podes aprender máis sobre isto <githubLink>neste tema de GitHub</githubLink>, ou comentarnos o que che parece en <discordLink>Discord</discordLink> ou <matrixLink>Matrix</matrixLink>.",
+    "subscribe_dialog_subscribe_button_cancel": "Cancelar",
+    "account_basics_tier_description": "O nivel da túa conta",
+    "prefs_reservations_dialog_title_add": "Reservar tema",
+    "account_upgrade_dialog_cancel_warning": "Isto vai <strong>cancelar a túa subscrición</strong>, e degradar a túa conta o {{date}}. Nesa data, as reservas de temas así como as mensaxes na caché do servidor <strong>van ser eliminadas</strong>.",
+    "prefs_notifications_sound_title": "Ton da notificación",
+    "prefs_notifications_min_priority_default_and_higher": "Prioridade por defecto e superior",
+    "prefs_reservations_table_access_header": "Acceso",
+    "account_tokens_table_copied_to_clipboard": "Copiouse o token de acceso",
+    "account_tokens_dialog_expires_x_hours": "O token caduca en {{hours}} horas",
+    "prefs_users_edit_button": "Editar usuaria",
+    "account_upgrade_dialog_title": "Cambiar facturación da conta",
+    "priority_low": "baixa",
+    "prefs_reservations_table_click_to_subscribe": "Preme para subscribirte",
+    "error_boundary_description": "Isto non debería pasar. Lamentámolo. <br/>Se tes un minuto, <githubLink>informa en GitHub</githubLink>, ou fáinolo saber en <discordLink>Discord</discordLink> ou <matrixLink>Matrix</matrixLink>.",
+    "priority_min": "min",
+    "prefs_notifications_min_priority_description_any": "Mostrar todas as notificacións, obviando a prioridade",
+    "error_boundary_gathering_info": "Obter máis info…",
+    "error_boundary_unsupported_indexeddb_title": "Non hai soporte para a navegación privada",
+    "prefs_notifications_delete_after_one_day": "Após un día",
+    "error_boundary_title": "vaite!, ntfy fallou",
+    "reservation_delete_dialog_action_keep_description": "As mensaxes e anexos que están no servidor serán visibles públicamente para quen saiba o nome do tema.",
+    "prefs_reservations_add_button": "Engadir tema reservado",
+    "prefs_reservations_title": "Temas reservados",
+    "prefs_reservations_dialog_description": "Ao reservar un tema tes a propiedade sobre el, e permíteche definir os permisos de acceso para outras usuarias.",
+    "account_tokens_delete_dialog_submit_button": "Eliminar definitivamente o token",
+    "prefs_notifications_title": "Notificacións",
+    "account_tokens_title": "Tokens de acceso",
+    "prefs_reservations_dialog_topic_label": "Tema",
+    "prefs_users_title": "Xestionar usuarias",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} anual. Pagamento mensual.",
+    "account_tokens_dialog_expires_unchanged": "Deixar a data de caducidade sen cambiar",
+    "error_boundary_button_copy_stack_trace": "Copiar trazas do problema",
+    "account_tokens_dialog_title_delete": "Eliminar token de acceso",
+    "reservation_delete_dialog_action_keep_title": "Manter as mensaxes e anexos gardados",
+    "prefs_notifications_sound_no_sound": "Sen ton",
+    "account_upgrade_dialog_interval_yearly": "Anual",
+    "account_upgrade_dialog_button_redirect_signup": "Crea unha conta",
+    "account_tokens_dialog_button_cancel": "Cancelar",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} cobrado anualmente. Aforro {{save}}.",
+    "prefs_notifications_min_priority_high_and_higher": "Prioridade alta e superior",
+    "priority_max": "máx",
+    "prefs_users_delete_button": "Eliminar usuaria",
+    "prefs_notifications_min_priority_any": "Calquera prioridade",
+    "account_tokens_dialog_expires_label": "O token caduca o",
+    "prefs_notifications_delete_after_title": "Desbotar notificacións",
+    "account_upgrade_dialog_interval_yearly_discount_save": "aforro {{discount}}%",
+    "prefs_users_dialog_title_edit": "Editar usuaria",
+    "prefs_notifications_min_priority_low_and_higher": "Prioridade baixa e superior",
+    "account_tokens_dialog_button_update": "Actualizar token",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} almacenaxe total",
+    "prefs_reservations_table_everyone_write_only": "Podo publicar e subscribirme, calquera pode publicar",
+    "prefs_appearance_title": "Aparencia",
+    "account_tokens_table_cannot_delete_or_edit": "Non se pode editar ou desbotar o token da sesión actual",
+    "prefs_notifications_sound_play": "Reproducir ton seleccionado",
+    "account_tokens_table_last_access_header": "Último acceso",
+    "account_tokens_table_last_origin_tooltip": "Desde o enderezo IP {{ip}}, preme para detalles",
+    "account_upgrade_dialog_tier_price_per_month": "mes",
+    "account_tokens_table_current_session": "Sesión do navegador actual",
+    "account_upgrade_dialog_button_pay_now": "Paga e subscríbete",
+    "reservation_delete_dialog_action_delete_title": "Eliminar mensaxes e anexos gardados",
+    "reservation_delete_dialog_action_delete_description": "As mensaxes e anexos vanse borrar definitivamente. Esta acción non ten volta.",
+    "prefs_notifications_delete_after_one_month_description": "As notificacións autoelimínanse após un mes",
+    "prefs_users_dialog_base_url_label": "URL do servizo, ex. https://ntfy.sh",
+    "account_upgrade_dialog_tier_selected_label": "Seleccionado",
+    "account_upgrade_dialog_button_update_subscription": "Actualizar subscrición",
+    "priority_high": "alta",
+    "account_delete_dialog_billing_warning": "Ao eliminar a conta tamén cancelas o pagamento das subscricións. Non poderás volver acceder ao taboleiro de pagamentos.",
+    "prefs_notifications_min_priority_description_max": "Mostrar notificacións se a prioridade é 5 (máx)",
+    "account_upgrade_dialog_reservations_warning_other": "O nivel seleccionado permite reservar menos temas que o nivel actual. Antes de cambiar de nivel, <strong>elimina {{count}} reservas polo menos</strong>. Podes eliminar as reservas nos <Link>Axustes</Link>.",
+    "prefs_users_dialog_title_add": "Engadir usuaria",
+    "account_tokens_dialog_button_create": "Crear token",
+    "account_tokens_table_create_token_button": "Crear token de acceso",
+    "account_basics_tier_interval_monthly": "mensual",
+    "account_basics_tier_canceled_subscription": "A sua suscripción foi cancelada e vostede será degradado a unha conta gratuita o {{date}}.",
+    "account_basics_password_dialog_current_password_incorrect": "Contrasinal incorrecto",
+    "account_basics_phone_numbers_dialog_number_label": "Número de teléfono",
+    "account_basics_password_dialog_button_submit": "Modificar contrasinal",
+    "account_basics_username_title": "Usuario",
+    "account_basics_phone_numbers_dialog_check_verification_button": "Código de confirmación",
+    "account_usage_messages_title": "Mesaxes publicados",
+    "account_basics_phone_numbers_dialog_verify_button_sms": "Enviar SMS",
+    "account_basics_tier_change_button": "Cambiar",
+    "account_basics_phone_numbers_dialog_description": "Para usar a característica de chamadas de teléfono, vostede debe engadir e verificar ao menos un número de teléfono. A verificación pode ser realizada vía SMS ou a través de chamada.",
+    "account_delete_title": "Borrar conta",
+    "account_delete_dialog_label": "Contrasinal",
+    "account_basics_tier_admin_suffix_with_tier": "(con tier {{tier}})",
+    "subscribe_dialog_login_username_label": "Nome de usuario, ex. phil",
+    "subscribe_dialog_error_user_not_authorized": "Usuario {{username}} non autorizado",
+    "account_basics_title": "Conta",
+    "account_basics_phone_numbers_no_phone_numbers_yet": "Aínda non hay números de teléfono",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "Xerar nome",
+    "subscribe_dialog_login_password_label": "Contrasinal",
+    "subscribe_dialog_subscribe_button_subscribe": "Subscribirse",
+    "account_basics_phone_numbers_dialog_title": "Engadir número de teléfono",
+    "account_basics_username_admin_tooltip": "É vostede Admin",
+    "account_delete_dialog_description": "Isto borrará permanentemente a túa conta, incluido todos os datos almacenados no servidor. Despois do borrado, o teu nome de usuario non estará dispoñible durante 7 días. Se realmente queres proceder, por favor confirme co seu contrasinal na caixa inferior.",
+    "account_usage_reservations_none": "Non hai temas reservados para esta conta",
+    "subscribe_dialog_subscribe_topic_placeholder": "Nome do tema, ex. phil_alertas",
+    "account_usage_title": "Uso",
+    "account_basics_tier_upgrade_button": "Mexorar a Pro",
+    "subscribe_dialog_error_topic_already_reserved": "Tema xa reservado",
+    "account_basics_tier_admin_suffix_no_tier": "(sen tier)",
+    "account_basics_tier_payment_overdue": "O pago está retrasado. Por favor, revise o seu método de pago o a súa conta será degradada pronto.",
+    "account_basics_phone_numbers_description": "Para notificacións telefónicas",
+    "account_basics_tier_free": "De balde",
+    "account_basics_tier_admin": "Admin",
+    "account_delete_dialog_button_cancel": "Cancelar",
+    "account_basics_password_description": "Modificar o contrasinal da conta",
+    "account_usage_calls_title": "Chamadas realizadas",
+    "account_basics_tier_basic": "Básico",
+    "account_basics_phone_numbers_copied_to_clipboard": "Número de teléfono copiado no portapapeis",
+    "account_basics_tier_title": "Tipo de conta",
+    "account_usage_cannot_create_portal_session": "Non foi posible abrir o portal de pagos",
+    "account_delete_description": "Borrar permanentemente a túa conta",
+    "account_basics_phone_numbers_dialog_number_placeholder": "ex. +1222333444",
+    "account_basics_phone_numbers_dialog_code_placeholder": "ex. 123456",
+    "account_basics_tier_manage_billing_button": "Xestionar pagos",
+    "account_basics_username_description": "Ei, ese eres ti ❤",
+    "account_basics_password_dialog_confirm_password_label": "Confirmar contrasinal",
+    "account_basics_tier_interval_yearly": "anual",
+    "account_delete_dialog_button_submit": "Borrar permanentemente a conta",
+    "account_basics_phone_numbers_dialog_channel_call": "Chamada",
+    "account_basics_password_title": "Contrasinal",
+    "account_basics_password_dialog_new_password_label": "Novo contrasinal",
+    "account_usage_of_limit": "de {{limit}}",
+    "subscribe_dialog_error_user_anonymous": "anónimo",
+    "account_usage_basis_ip_description": "Estadísticas de uso e límites para esta conta están basados na sua IP, polo que poden estar compartidos con outros usuarios. Os limites mostrados son aproximados, basados nos ratios de limite existentes.",
+    "account_basics_password_dialog_title": "Modificar contrasinal",
+    "account_usage_limits_reset_daily": "Límite de uso é reiniciado diariamente a medianoite (UTC(",
+    "account_usage_unlimited": "Sen límites",
+    "account_basics_phone_numbers_title": "Números de teléfono",
+    "account_basics_password_dialog_current_password_label": "Contrasinal actual",
+    "subscribe_dialog_subscribe_base_url_label": "URL do servizo",
+    "account_usage_reservations_title": "Temas reservados",
+    "account_usage_calls_none": "Non se poden realizar chamadas con esta conta",
+    "subscribe_dialog_subscribe_use_another_label": "Usar outro servidor",
+    "account_basics_phone_numbers_dialog_code_label": "Código de verificación",
+    "account_basics_tier_paid_until": "Suscripción pagada ata {{date}}, e vaise auto-renovar",
+    "account_usage_attachment_storage_description": "{{filesize}} por arquivo, borrado despois de {{expiry}}",
+    "account_basics_phone_numbers_dialog_verify_button_call": "Chámame",
+    "account_usage_emails_title": "Emails enviados",
+    "account_basics_phone_numbers_dialog_channel_sms": "SMS",
+    "subscribe_dialog_login_description": "Este tema está protexido por contrasinal. Por favor, introduza o usuario e contrasinal para subscribirse."
+}

web/public/static/langs/it.json

@@ -267,5 +267,45 @@
     "publish_dialog_chip_call_label": "Chiamata telefonica",
     "publish_dialog_chip_call_no_verified_numbers_tooltip": "Nessun numero verificato",
     "account_basics_phone_numbers_title": "Numeri di telefono",
-    "account_basics_phone_numbers_dialog_description": "Per usare la funzionalità di notifica tramite chiamata telefonica, devi aggiungere e verificare almeno un numero di telefono. La verifica può essere fatta tramite SMS o chiamata telefonica."
+    "account_basics_phone_numbers_dialog_description": "Per usare la funzionalità di notifica tramite chiamata telefonica, devi aggiungere e verificare almeno un numero di telefono. La verifica può essere fatta tramite SMS o chiamata telefonica.",
+    "account_upgrade_dialog_tier_features_reservations_one": "{{reservations}} topic riservato",
+    "account_upgrade_dialog_billing_contact_email": "Per domande di fatturazione, <Link>contattaci</Link> direttamente.",
+    "account_upgrade_dialog_tier_current_label": "Attuale",
+    "account_basics_phone_numbers_dialog_number_label": "Numero di telefono",
+    "account_basics_phone_numbers_dialog_check_verification_button": "Conferma codice",
+    "account_basics_phone_numbers_dialog_verify_button_sms": "Invia SMS",
+    "account_basics_phone_numbers_no_phone_numbers_yet": "Ancora nessun numero di telefono",
+    "account_basics_phone_numbers_dialog_title": "Aggiungi un numero di telefono",
+    "account_upgrade_dialog_button_cancel": "Cancella",
+    "account_upgrade_dialog_billing_contact_website": "Per domande di fatturazione, visita per favore in nostro <Link>sito</Link>.",
+    "account_upgrade_dialog_button_cancel_subscription": "Cancella iscrizione",
+    "account_basics_phone_numbers_description": "Per notifiche via chiamata",
+    "account_basics_phone_numbers_copied_to_clipboard": "Numero di telefono copiato negli appunti",
+    "account_basics_phone_numbers_dialog_number_placeholder": "p. e. +391234567890",
+    "account_basics_phone_numbers_dialog_code_placeholder": "p. e. 123456",
+    "account_tokens_title": "Token d'accesso",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} all'anno. Addebitato annualmente.",
+    "account_basics_phone_numbers_dialog_channel_call": "Chiama",
+    "account_upgrade_dialog_button_redirect_signup": "Iscriviti ora",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} addebitato annualmente. Risparmia {{save}}.",
+    "account_upgrade_dialog_tier_price_per_month": "mese",
+    "account_upgrade_dialog_button_pay_now": "Paga ora e isciviti",
+    "account_basics_phone_numbers_dialog_code_label": "Codice di verifica",
+    "account_basics_phone_numbers_dialog_verify_button_call": "Chiamami",
+    "account_basics_phone_numbers_dialog_channel_sms": "SMS",
+    "account_upgrade_dialog_tier_selected_label": "Selezionato",
+    "account_upgrade_dialog_button_update_subscription": "Aggiorna iscrizione",
+    "account_usage_attachment_storage_title": "Archivio allegati",
+    "account_delete_dialog_description": "Il tuo account sarà permanentemente cancellato assieme a tutti i tuoi dati presenti sul server. Dopo la cancellazione, la tua username non sarà disponibile per 7 giorni. Se desideri davvero procedere, inserisci la tua password nella seguente casella.",
+    "account_delete_dialog_button_cancel": "Annulla",
+    "account_usage_calls_title": "Chiamate effettuate",
+    "account_delete_description": "Elimina permanentemente il tuo account",
+    "account_delete_dialog_button_submit": "Elimina il tuo account permanentemente",
+    "account_usage_basis_ip_description": "Le statistiche di utilizzo e i limiti per questo account sono basati sul tuo indirizzo IP, quindi potrebbero essere in condivisione con altri utenti. I limiti mostrati sopra sono approssimazioni basate sui limiti esistenti.",
+    "account_usage_calls_none": "Questo account non può effettuare chiamate",
+    "account_delete_dialog_billing_warning": "Eliminando il tuo account perderai immediatamente il tuo abbonamento. Non potrai più accedere alla dashboard di fatturazione.",
+    "account_delete_dialog_label": "Password",
+    "account_upgrade_dialog_tier_features_no_reservations": "Nessun argomento riservato",
+    "account_upgrade_dialog_tier_features_messages_one": "{{messages}} messaggi giornalieri",
+    "account_upgrade_dialog_reservations_warning_one": "Il livello selezionato consente meno argomenti riservati rispetto al livello corrente. Prima di cambiare il livello, <strong> si prega di eliminare almeno una prenotazione</strong>. È possibile rimuovere le prenotazioni nel <Link>Impostazioni</Link>."
 }

web/public/static/langs/nb_NO.json

@@ -190,5 +190,10 @@
     "error_boundary_unsupported_indexeddb_title": "Privat surfing støttes ikke",
     "action_bar_account": "Konto",
     "action_bar_profile_settings": "Innstillinger",
-    "nav_button_account": "Konto"
+    "nav_button_account": "Konto",
+    "signup_title": "Opprett en ntfy konto",
+    "signup_form_username": "Brukernavn",
+    "signup_form_password": "Passord",
+    "signup_form_button_submit": "Meld deg på",
+    "signup_form_confirm_password": "Bekreft passord"
 }

web/public/static/langs/pt_BR.json

@@ -191,10 +191,33 @@
     "error_boundary_unsupported_indexeddb_description": "O ntfy web app precisa do IndexedDB para funcionar, e seu navegador não suporta IndexedDB no modo de navegação privada.<br/><br/>Embora isso seja lamentável, também não faz muito sentido usar o ntfy web app no modo de navegação privada de qualquer maneira, porque tudo é armazenado no armazenamento do navegador. Você pode ler mais sobre isso <githubLink>nesta edição do GitHub</githubLink>, ou falar conosco em <discordLink>Discord</discordLink> ou <matrixLink>Matrix</matrixLink>.",
     "action_bar_reservation_add": "Reserve topic",
     "action_bar_reservation_edit": "Change reservation",
-    "signup_disabled": "Signup is disabled",
-    "signup_error_username_taken": "Username {{username}} is already taken",
-    "signup_error_creation_limit_reached": "Account creation limit reached",
-    "action_bar_reservation_delete": "N",
-    "action_bar_account": "Account",
-    "action_bar_change_display_name": "Change display name"
+    "signup_disabled": "Registrar está desativado",
+    "signup_error_username_taken": "Usuário {{username}} já existe",
+    "signup_error_creation_limit_reached": "Limite de criação de contas atingido",
+    "action_bar_reservation_delete": "Remover reserva",
+    "action_bar_account": "Conta",
+    "action_bar_change_display_name": "Change display name",
+    "common_copy_to_clipboard": "Copiar para área de transferência",
+    "login_link_signup": "Registrar",
+    "login_title": "Entrar na sua conta ntfy",
+    "login_form_button_submit": "Entrar",
+    "login_disabled": "Login está desabilitado",
+    "action_bar_reservation_limit_reached": "Limite atingido",
+    "action_bar_profile_title": "Perfil",
+    "action_bar_profile_settings": "Configurações",
+    "action_bar_profile_logout": "Sair",
+    "action_bar_sign_in": "Entrar",
+    "action_bar_sign_up": "Registrar",
+    "nav_button_account": "Conta",
+    "signup_title": "Criar uma conta ntfy",
+    "signup_form_username": "Usuário",
+    "signup_form_password": "Senha",
+    "signup_form_confirm_password": "Confirmar senha",
+    "signup_form_button_submit": "Registrar",
+    "account_basics_phone_numbers_title": "Telefones",
+    "signup_form_toggle_password_visibility": "Ativar visibilidade de senha",
+    "signup_already_have_account": "Já possui uma conta? Entrar!",
+    "nav_upgrade_banner_label": "Atualizar para ntfy Pro",
+    "account_basics_phone_numbers_dialog_description": "Para usar o recurso de notificação de chamada, é necessários adicionar e verificar pelo menos um número de telefone. A verificação pode ser feita por SMS ou chamada telefônica.",
+    "account_basics_phone_numbers_description": "Para notificações de chamada telefônica"
 }

web/public/static/langs/ru.json

@@ -352,5 +352,33 @@
     "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>."
+    "account_upgrade_dialog_billing_contact_website": "По вопросам оплаты, пожалуйста обратитесь к нашему <Link>сайту</Link>.",
+    "publish_dialog_call_reset": "Удалить вызов",
+    "account_basics_phone_numbers_dialog_description": "Для того что бы использовать возможность уведомлений о вызовах, нужно добавить и проверить хотя бы один номер телефона. Проверить можно используя SMS или звонок.",
+    "account_basics_phone_numbers_dialog_title": "Добавить номер телефона",
+    "account_basics_phone_numbers_dialog_number_placeholder": "например +1222333444",
+    "account_basics_phone_numbers_dialog_code_placeholder": "например 123456",
+    "account_basics_phone_numbers_dialog_verify_button_sms": "Отправить SMS",
+    "account_usage_calls_title": "Совершённые вызовы",
+    "account_usage_calls_none": "Невозможно совершать вызовы с этим аккаунтом",
+    "publish_dialog_chip_call_no_verified_numbers_tooltip": "Нет проверенных номеров",
+    "account_basics_phone_numbers_copied_to_clipboard": "Номер телефона скопирован в буфер обмена",
+    "account_upgrade_dialog_tier_features_no_calls": "Нет вызовов",
+    "account_upgrade_dialog_tier_features_calls_one": "{{calls}} ежедневный звонок",
+    "account_basics_phone_numbers_dialog_number_label": "Номер телефона",
+    "account_basics_phone_numbers_dialog_check_verification_button": "Подтвердить код",
+    "account_upgrade_dialog_tier_features_calls_other": "{{calls}} ежедневных звонков",
+    "account_upgrade_dialog_tier_features_reservations_one": "{{reservations}} зарезервированная тема",
+    "account_basics_phone_numbers_no_phone_numbers_yet": "Телефонных номеров пока нет",
+    "publish_dialog_chip_call_label": "Звонок",
+    "account_upgrade_dialog_tier_features_emails_one": "{{emails}} ежедневное письмо",
+    "account_upgrade_dialog_tier_features_messages_one": "{{messages}} ежедневное сообщения",
+    "account_basics_phone_numbers_description": "Для уведомлений о телефонных звонках",
+    "publish_dialog_call_label": "Звонок",
+    "account_basics_phone_numbers_dialog_channel_call": "Позвонить",
+    "account_basics_phone_numbers_title": "Номера телефонов",
+    "account_basics_phone_numbers_dialog_code_label": "Проверочный код",
+    "account_basics_phone_numbers_dialog_verify_button_call": "Позвонить мне",
+    "publish_dialog_call_item": "Вызов телефонного номера {{number}}",
+    "account_basics_phone_numbers_dialog_channel_sms": "SMS"
 }

web/public/static/langs/sk.json

@@ -0,0 +1,384 @@
+{
+    "common_save": "Uložiť",
+    "common_back": "Späť",
+    "common_copy_to_clipboard": "Kopírovať do schránky",
+    "signup_title": "Vytvoriť ntfy účet",
+    "signup_form_username": "Používateľské meno",
+    "signup_form_confirm_password": "Potvrdenie hesla",
+    "signup_form_button_submit": "Zaregistrovať sa",
+    "signup_form_toggle_password_visibility": "Prepnúť viditeľnosť hesla",
+    "signup_error_username_taken": "Používateľské meno {{username}} je už obsadené",
+    "login_form_button_submit": "Prihlásiť sa",
+    "login_disabled": "Prihlásenie je zakázané",
+    "action_bar_logo_alt": "ntfy logo",
+    "action_bar_settings": "Nastavenia",
+    "action_bar_account": "Účet",
+    "action_bar_sign_in": "Prihlásiť sa",
+    "action_bar_profile_settings": "Nastavenia",
+    "action_bar_reservation_edit": "Zmeniť rezerváciu",
+    "action_bar_unsubscribe": "Odhlásiť odber",
+    "action_bar_toggle_mute": "Stlmiť/zrušiť stlmenie upozornení",
+    "action_bar_toggle_action_menu": "Otvoriť/zavrieť akčné menu",
+    "action_bar_profile_title": "Profil",
+    "nav_button_settings": "Nastavenia",
+    "nav_button_account": "Účet",
+    "message_bar_show_dialog": "Zobraziť okno pre odosielanie oznámení",
+    "message_bar_publish": "Zverejniť správu",
+    "nav_topics_title": "Odoberané témy",
+    "nav_button_all_notifications": "Všetky oznámenia",
+    "alert_grant_description": "Udeliť prehliadaču povolenie na zobrazovanie oznámení na ploche.",
+    "alert_not_supported_context_description": "Oznámenia sú podporované len cez HTTPS. Ide o obmedzenie rozhrania <mdnLink>Notifications API</mdnLink>.",
+    "notifications_list": "Zoznam oznámení",
+    "notifications_list_item": "Oznámenie",
+    "notifications_mark_read": "Označiť ako prečítané",
+    "notifications_delete": "Zmazať",
+    "notifications_copied_to_clipboard": "Skopírované do schránky",
+    "notifications_tags": "Štítky",
+    "notifications_priority_x": "Priorita {{priority}}",
+    "notifications_new_indicator": "Nové oznámenie",
+    "notifications_attachment_image": "Obrázok prílohy",
+    "notifications_attachment_link_expired": "odkaz na stiahnutie vypršal",
+    "notifications_attachment_file_image": "súbor s obrázkom",
+    "notifications_attachment_file_video": "video súbor",
+    "notifications_attachment_file_audio": "zvukový súbor",
+    "notifications_attachment_file_app": "Súbor aplikácie pre Android",
+    "notifications_attachment_file_document": "iný dokument",
+    "notifications_click_copy_url_title": "Skopírovať URL adresu odkazu do schránky",
+    "notifications_click_copy_url_button": "Kopírovať odkaz",
+    "notifications_click_open_button": "Otvoriť odkaz",
+    "notifications_actions_not_supported": "Akcia nie je podporovaná vo webovej aplikácii",
+    "notifications_none_for_topic_title": "K tejto téme ste zatiaľ nedostali žiadne upozornenia.",
+    "notifications_none_for_any_title": "Nedostali ste žiadne upozornenia.",
+    "notifications_none_for_any_description": "Ak chcete posielať oznámenia do témy, jednoducho zadajte adresu PUT alebo POST na adresu URL témy. Tu je príklad s použitím jednej z vašich tém.",
+    "notifications_no_subscriptions_title": "Zdá sa, že zatiaľ nemáte žiadne prihlásenia na odber.",
+    "display_name_dialog_title": "Zmeniť zobrazovaný názov",
+    "notifications_no_subscriptions_description": "Kliknutím na odkaz \"{{text odkazu}}\" vytvoríte tému alebo sa na ňu prihlásite. Potom môžete posielať správy prostredníctvom PUT alebo POST a budete tu dostávať oznámenia.",
+    "notifications_example": "Príklad",
+    "notifications_more_details": "Ďalšie informácie nájdete na <websiteLink>webovej stránke</websiteLink> alebo v <docsLink>dokumentácií</docsLink>.",
+    "display_name_dialog_placeholder": "Zobrazený názov",
+    "reserve_dialog_checkbox_label": "Rezervovať tému a nakonfigurovať prístup",
+    "notifications_loading": "Načítavanie oznámení …",
+    "publish_dialog_title_no_topic": "Zverejniť oznámenie",
+    "publish_dialog_title_topic": "Zverejniť v {{topic}}",
+    "publish_dialog_progress_uploading": "Nahrávanie…",
+    "publish_dialog_progress_uploading_detail": "Nahrávanie {{loaded}}/{{total}} ({{percent}}%) …",
+    "publish_dialog_message_published": "Oznámenie zverejnené",
+    "publish_dialog_attachment_limits_file_and_quota_reached": "prekročí {{fileSizeLimit}} limit súboru a kvótu, {{remainingBytes}} zostáva",
+    "publish_dialog_attachment_limits_file_reached": "prekračuje {{fileSizeLimit}} limit súboru",
+    "publish_dialog_attachment_limits_quota_reached": "prekračuje kvótu, {{remainingBytes}} zostáva",
+    "publish_dialog_emoji_picker_show": "Vyberte emoji",
+    "publish_dialog_priority_min": "Min. priorita",
+    "publish_dialog_priority_low": "Nízka priorita",
+    "publish_dialog_priority_default": "Predvolená priorita",
+    "publish_dialog_priority_high": "Vysoká priorita",
+    "publish_dialog_priority_max": "Max. priorita",
+    "publish_dialog_base_url_label": "URL Adresa služby",
+    "publish_dialog_base_url_placeholder": "URL adresa služby, napr. https://example.com",
+    "publish_dialog_topic_label": "Názov témy",
+    "publish_dialog_topic_placeholder": "Názov témy, napr. phil_alerts",
+    "publish_dialog_topic_reset": "Resetovať tému",
+    "publish_dialog_title_label": "Názov",
+    "publish_dialog_title_placeholder": "Názov oznámenia, napr. Upozornenie na miesto na disku",
+    "publish_dialog_tags_label": "Štítky",
+    "publish_dialog_message_label": "Správa",
+    "publish_dialog_priority_label": "Priorita",
+    "publish_dialog_click_label": "Kliknite na URL",
+    "publish_dialog_click_placeholder": "URL adresa sa otvorí po kliknutí na oznámenie",
+    "publish_dialog_email_label": "Email",
+    "publish_dialog_email_placeholder": "Emailová adresa, na ktorú sa má oznámenie zaslať, napr. phil@example.com",
+    "publish_dialog_call_label": "Telefonovať",
+    "publish_dialog_call_item": "Zavolať na telefónne číslo {{number}}",
+    "publish_dialog_call_reset": "Odstrániť telefón",
+    "publish_dialog_attach_label": "URL prílohy",
+    "publish_dialog_attach_reset": "Odstrániť URL prílohy",
+    "publish_dialog_filename_label": "Názov súboru",
+    "publish_dialog_filename_placeholder": "Názov súboru prílohy",
+    "publish_dialog_delay_label": "Oneskorenie",
+    "publish_dialog_delay_placeholder": "Oneskorenie doručenia, napr. {{unixTimestamp}}, {{relativeTime}} alebo \"{{naturalLanguage}}\" (len v angličtine)",
+    "publish_dialog_delay_reset": "Odstrániť oneskorené doručenie",
+    "publish_dialog_chip_call_label": "Telefonovať",
+    "publish_dialog_other_features": "Ďalšie funkcie:",
+    "publish_dialog_chip_call_no_verified_numbers_tooltip": "Žiadne overené telefónne čísla",
+    "publish_dialog_chip_attach_url_label": "Pripojiť súbor pomocou adresy URL",
+    "publish_dialog_chip_delay_label": "Oneskoriť doručenie",
+    "publish_dialog_chip_topic_label": "Zmeniť tému",
+    "publish_dialog_button_cancel_sending": "Zrušiť odosielanie",
+    "publish_dialog_button_send": "Odoslať",
+    "publish_dialog_checkbox_publish_another": "Zverejniť ďalšie",
+    "publish_dialog_attached_file_title": "Priložený súbor:",
+    "subscribe_dialog_subscribe_button_cancel": "Zrušiť",
+    "subscribe_dialog_subscribe_title": "Odoberať tému",
+    "subscribe_dialog_subscribe_base_url_label": "URL Adresa služby",
+    "subscribe_dialog_subscribe_topic_placeholder": "Názov témy, napr. phil_alerts",
+    "publish_dialog_attached_file_filename_placeholder": "Názov súboru prílohy",
+    "publish_dialog_attached_file_remove": "Odstrániť priložený súbor",
+    "publish_dialog_drop_file_here": "Vložiť súbor",
+    "subscribe_dialog_login_password_label": "Heslo",
+    "account_basics_password_dialog_confirm_password_label": "Potvrdenie hesla",
+    "account_basics_title": "Účet",
+    "account_delete_dialog_button_cancel": "Zrušiť",
+    "account_delete_dialog_label": "Heslo",
+    "prefs_reservations_dialog_title_add": "Rezervovať tému",
+    "publish_dialog_button_cancel": "Zrušiť",
+    "account_upgrade_dialog_button_cancel": "Zrušiť",
+    "account_tokens_dialog_button_cancel": "Zrušiť",
+    "common_cancel": "Zrušiť",
+    "common_add": "Pridať",
+    "account_basics_username_title": "Používateľské meno",
+    "signup_form_password": "Heslo",
+    "signup_error_creation_limit_reached": "Dosiahnutý limit na vytvorenie konta",
+    "account_basics_password_title": "Heslo",
+    "action_bar_change_display_name": "Zmeniť zobrazovaný názov",
+    "prefs_users_dialog_password_label": "Heslo",
+    "action_bar_sign_up": "Zaregistrovať sa",
+    "login_link_signup": "Zaregistrovať sa",
+    "signup_already_have_account": "Už máte účet? Prihláste sa!",
+    "signup_disabled": "Registrácia je vypnutá",
+    "login_title": "Prihláste sa do svojho konta ntfy",
+    "action_bar_show_menu": "Zobraziť menu",
+    "action_bar_reservation_add": "Rezervovať tému",
+    "action_bar_reservation_delete": "Odstrániť rezerváciu",
+    "action_bar_reservation_limit_reached": "Dosiahnutý limit",
+    "action_bar_send_test_notification": "Odoslať testovacie oznámenie",
+    "action_bar_clear_notifications": "Vymazať všetky oznámenia",
+    "publish_dialog_message_placeholder": "Sem napíšte správu",
+    "action_bar_profile_logout": "Odhlásiť sa",
+    "message_bar_type_message": "Sem napíšte správu",
+    "message_bar_error_publishing": "Chyba pri zverejňovaní oznámenia",
+    "nav_button_documentation": "Dokumentácia",
+    "nav_button_publish_message": "Zverejniť oznámenie",
+    "nav_button_subscribe": "Odoberať tému",
+    "nav_button_muted": "Oznámenia stlmené",
+    "nav_button_connecting": "pripájanie",
+    "nav_upgrade_banner_description": "Rezervovať témy, viac správ a e-mailov a väčšie prílohy",
+    "nav_upgrade_banner_label": "Vylepšiť na ntfy Pro",
+    "alert_grant_title": "Oznámenia sú vypnuté",
+    "alert_grant_button": "Prideliť teraz",
+    "alert_not_supported_title": "Oznámenia nie sú podporované",
+    "alert_not_supported_description": "Oznámenia nie sú vo vašom prehliadači podporované.",
+    "notifications_attachment_copy_url_title": "Kopírovať URL adresu prílohy do schránky",
+    "notifications_attachment_copy_url_button": "Kopírovať adresu URL",
+    "notifications_attachment_open_title": "Prejsť na {{url}}",
+    "notifications_actions_open_url_title": "Prejsť na {{url}}",
+    "notifications_attachment_open_button": "Otvoriť prílohu",
+    "notifications_attachment_link_expires": "platnosť odkazu vyprší {{date}}",
+    "notifications_none_for_topic_description": "Ak chcete posielať oznámenia do tejto témy, jednoducho zadajte adresu PUT alebo POST na URL adresu témy.",
+    "notifications_actions_http_request_title": "Odoslať HTTP {{method}} na {{url}}",
+    "display_name_dialog_description": "Nastavenie alternatívneho názvu témy, ktorá sa zobrazuje v zozname odberov. Pomáha to ľahšie identifikovať témy so zložitými názvami.",
+    "prefs_users_table_base_url_header": "URL Adresa služby",
+    "publish_dialog_tags_placeholder": "Zoznam štítkov oddelených čiarkou, napr. varovanie, srv1-backup",
+    "publish_dialog_chip_click_label": "Kliknite na URL",
+    "publish_dialog_email_reset": "Odstrániť email na preposielanie",
+    "publish_dialog_click_reset": "Odobrať URL kliknutím",
+    "publish_dialog_attach_placeholder": "Pripojiť súbor pomocou URL adresy, napr. https://f-droid.org/F-Droid.apk",
+    "publish_dialog_chip_email_label": "Preposlanie na email",
+    "publish_dialog_chip_attach_file_label": "Pripojiť miestny súbor",
+    "publish_dialog_details_examples_description": "Príklady a podrobný opis všetkých funkcií odosielania nájdete v <docsLink>dokumentácii</docsLink>.",
+    "account_upgrade_dialog_tier_features_no_calls": "Žiadne telefonáty",
+    "account_upgrade_dialog_billing_contact_email": "V prípade otázok týkajúcich sa fakturácie nás prosím <Link>kontaktujte tu</Link>.",
+    "account_tokens_dialog_title_create": "Vytvoriť prístupový token",
+    "prefs_reservations_dialog_title_edit": "Upraviť rezervovanú tému",
+    "account_basics_tier_interval_monthly": "mesačne",
+    "account_basics_tier_canceled_subscription": "Vaše predplatné bolo zrušené a bude preradené na bezplatné konto k dátumu {{date}}.",
+    "priority_default": "predvolená",
+    "prefs_notifications_min_priority_title": "Najnižšia priorita",
+    "account_upgrade_dialog_tier_features_calls_one": "{{calls}} denný telefonát",
+    "account_upgrade_dialog_tier_current_label": "Aktuálne",
+    "account_basics_password_dialog_current_password_incorrect": "Nesprávne heslo",
+    "account_tokens_table_token_header": "Token",
+    "prefs_notifications_delete_after_never": "Nikdy",
+    "prefs_users_description": "Tu môžete pridávať/odstraňovať používateľov pre svoje chránené témy. Upozorňujeme, že používateľské meno a heslo sú uložené v lokálnom úložisku prehliadača.",
+    "account_basics_phone_numbers_dialog_number_label": "Telefónne číslo",
+    "subscribe_dialog_subscribe_description": "Témy nemusia byť chránené heslom, preto vyberte názov, ktorý nie je ľahké uhádnuť. Po prihlásení sa na odber môžete PUT/POST oznámenia.",
+    "account_basics_password_dialog_button_submit": "Zmeniť heslo",
+    "account_basics_phone_numbers_dialog_check_verification_button": "Potvrdiť kód",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "ušetrite až {{discount}}%",
+    "account_tokens_dialog_label": "Označenie, napr. Radarr notifications",
+    "account_tokens_table_expires_header": "Vyprší",
+    "account_upgrade_dialog_proration_info": "<strong>Vyhlásenie</strong>: Pri prechode medzi platenými plánmi sa rozdiel v cene <strong>účtuje okamžite</strong>. Pri prechode na nižšiu úroveň sa zostatok použije na platbu za budúce fakturačné obdobia.",
+    "prefs_reservations_dialog_access_label": "Prístup",
+    "account_usage_attachment_storage_title": "Ukladanie príloh",
+    "prefs_users_dialog_username_label": "Používateľské meno, napr. phil",
+    "account_usage_messages_title": "Zverejnené správy",
+    "emoji_picker_search_clear": "Vymazať vyhľadávanie",
+    "prefs_reservations_table_not_subscribed": "Odber nie je prihlásený",
+    "account_upgrade_dialog_tier_features_emails_other": "{{emails}} denné emaily",
+    "prefs_notifications_min_priority_max_only": "Iba najvyššia priorita",
+    "account_upgrade_dialog_tier_features_calls_other": "{{calls}} denné telefonáty",
+    "prefs_notifications_sound_description_some": "Oznámenia pri príchode prehrávajú zvuk {{sound}}",
+    "prefs_reservations_edit_button": "Upraviť prístup k téme",
+    "account_basics_phone_numbers_dialog_verify_button_sms": "Poslať SMS",
+    "account_basics_tier_change_button": "Zmeniť",
+    "account_tokens_dialog_expires_never": "Platnosť tokenu nikdy nevyprší",
+    "subscribe_dialog_login_title": "Vyžaduje sa prihlásenie",
+    "account_tokens_dialog_expires_x_days": "Token vyprší za {{days}} dní",
+    "prefs_reservations_table_everyone_read_only": "Môžem publikovať a odoberať, každý môže odoberať",
+    "prefs_reservations_table_everyone_deny_all": "Iba ja môžem publikovať a odoberať",
+    "account_basics_phone_numbers_dialog_description": "Ak chcete používať funkciu oznamovanie hovorom, musíte pridať a overiť aspoň jedno telefónne číslo. Overenie je možné vykonať prostredníctvom SMS alebo telefonického hovoru.",
+    "account_upgrade_dialog_tier_features_reservations_one": "{{reservations}} rezervovaná téma",
+    "account_delete_title": "Odstrániť účet",
+    "subscribe_dialog_login_button_login": "Prihlásenie",
+    "account_upgrade_dialog_tier_features_no_reservations": "Žiadne rezervované témy",
+    "prefs_users_table_cannot_delete_or_edit": "Nie je možné odstrániť alebo upraviť prihláseného používateľa",
+    "account_basics_tier_admin_suffix_with_tier": "(s úrovňou {{tier}})",
+    "prefs_notifications_delete_after_three_hours_description": "Oznámenia sa automaticky odstránia po troch hodinách",
+    "prefs_notifications_delete_after_three_hours": "Po troch hodinách",
+    "prefs_notifications_min_priority_description_x_or_higher": "Zobraziť oznámenia, ak je priorita {{number}} ({{name}}) alebo vyššia",
+    "reservation_delete_dialog_description": "Odstránením rezervácie sa vzdáte vlastníctva témy a umožníte ostatným, aby si ju rezervovali. Existujúce správy a prílohy si môžete ponechať alebo odstrániť.",
+    "subscribe_dialog_login_username_label": "Používateľské meno, napr. phil",
+    "subscribe_dialog_error_user_not_authorized": "Používateľ {{username}} nie je autorizovaný",
+    "prefs_reservations_table_everyone_read_write": "Každý môže publikovať a odoberať",
+    "prefs_reservations_dialog_title_delete": "Odstrániť rezervovanú tému",
+    "prefs_users_table": "Tabuľka používateľov",
+    "prefs_reservations_table_topic_header": "Téma",
+    "reservation_delete_dialog_submit_button": "Vymazať rezerváciu",
+    "prefs_reservations_limit_reached": "Dosiahli ste limit rezervovaných tém.",
+    "account_upgrade_dialog_interval_monthly": "Mesačne",
+    "prefs_users_add_button": "Pridať používateľa",
+    "account_upgrade_dialog_tier_features_messages_other": "{{messages}} denné správy",
+    "account_basics_phone_numbers_no_phone_numbers_yet": "Zatiaľ žiadne telefónne čísla",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "Vygenerovať názov",
+    "prefs_appearance_language_title": "Jazyk",
+    "prefs_notifications_delete_after_one_day_description": "Oznámenia sa automaticky odstránia po jednom dni",
+    "subscribe_dialog_subscribe_button_subscribe": "Odoberať",
+    "account_tokens_table_never_expires": "Nikdy nevyprší",
+    "account_tokens_delete_dialog_title": "Odstrániť prístupový token",
+    "prefs_notifications_delete_after_one_month": "Po jednom mesiaci",
+    "account_basics_phone_numbers_dialog_title": "Pridať telefónne číslo",
+    "account_tokens_delete_dialog_description": "Pred odstránením prístupového tokenu sa uistite, že ho aktívne nepoužívajú žiadne aplikácie ani skripty. <strong>Túto akciu nie je možné vrátiť späť</strong>.",
+    "account_tokens_table_label_header": "Označenie",
+    "account_upgrade_dialog_billing_contact_website": "Otázky týkajúce sa fakturácie nájdete na našej <Link>webovej stránke</Link>.",
+    "account_basics_username_admin_tooltip": "Ste Admin",
+    "prefs_notifications_delete_after_never_description": "Oznámenia sa nikdy automaticky neodstránia",
+    "account_delete_dialog_description": "Tým sa vaše konto natrvalo odstráni vrátane všetkých údajov uložených na serveri. Po vymazaní bude vaše používateľské meno 7 dní nedostupné. Ak naozaj chcete pokračovať, potvrďte svoje heslo v poli nižšie.",
+    "account_upgrade_dialog_tier_features_reservations_other": "{{reservations}} rezervované témy",
+    "account_usage_reservations_none": "Žiadne rezervované témy pre toto konto",
+    "prefs_notifications_sound_description_none": "Pri príchode oznámení sa neprehráva žiadny zvuk",
+    "account_tokens_description": "Pri publikovaní a prihlasovaní prostredníctvom rozhrania ntfy API používajte prístupové tokeny, aby ste nemuseli posielať prihlasovacie údaje k účtu. Viacej informácií nájdete v <Link>dokumentácií</Link>.",
+    "prefs_reservations_table": "Tabuľka rezervovaných tém",
+    "emoji_picker_search_placeholder": "Vyhľadať emoji",
+    "account_upgrade_dialog_button_cancel_subscription": "Zrušiť predplatné",
+    "account_upgrade_dialog_tier_features_emails_one": "{{emails}} denný email",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "{{filesize}} na jeden súbor",
+    "prefs_reservations_description": "Tu si môžete rezervovať názvy tém na osobné použitie. Rezervovaním témy získate vlastníctvo nad témou a môžete definovať prístupové práva pre ostatných používateľov k téme.",
+    "account_usage_title": "Používanie",
+    "account_basics_tier_upgrade_button": "Vylepšiť na PRO verziu",
+    "prefs_users_description_no_sync": "Používatelia a heslá nie sú synchronizované s vaším účtom.",
+    "account_tokens_dialog_title_edit": "Upraviť prístupový token",
+    "account_upgrade_dialog_tier_features_messages_one": "{{messages}} denná správa",
+    "account_upgrade_dialog_reservations_warning_one": "Vybraná úroveň umožňuje menej rezervovaných tém ako vaša aktuálna úroveň. Pred zmenou úrovne <strong>vymažte aspoň jednu rezerváciu</strong>. Rezervácie môžete odstrániť v <Link>Nastaveniach</Link>.",
+    "subscribe_dialog_error_topic_already_reserved": "Téma je už rezervovaná",
+    "prefs_users_table_user_header": "Používateľ",
+    "error_boundary_stack_trace": "Výpis zásobníka",
+    "prefs_notifications_delete_after_one_week": "Po jednom týždni",
+    "prefs_reservations_delete_button": "Resetovať prístup k téme",
+    "account_basics_tier_admin_suffix_no_tier": "(bez úrovne)",
+    "prefs_notifications_delete_after_one_week_description": "Oznámenia sa automaticky odstránia po jednom týždni",
+    "error_boundary_unsupported_indexeddb_description": "Webová aplikácia ntfy potrebuje na fungovanie IndexedDB a váš prehliadač nepodporuje IndexedDB v režime súkromného prehliadania.<br/><br/>Je to síce nešťastné, ale aj tak nemá veľký zmysel používať webovú aplikáciu ntfy v režime súkromného prehliadania, pretože všetko je uložené v úložisku prehliadača. Viac informácií si môžete prečítať <githubLink>v tomto probléme GitHubu</githubLink> alebo sa s nami porozprávať na <discordLink>Discord</discordLink> alebo <matrixLink>Matrix</matrixLink>.",
+    "account_basics_tier_payment_overdue": "Vaša platba je po termíne splatnosti. Aktualizujte prosím svoj spôsob platby, inak bude váš účet preradený do nižšej kategórie.",
+    "account_basics_tier_description": "Úroveň výkonu vášho účtu",
+    "account_basics_phone_numbers_description": "Pre oznamovanie hovorom",
+    "account_basics_tier_free": "Zadarmo",
+    "account_upgrade_dialog_cancel_warning": "Týmto <strong>zrušíte svoje predplatné</strong> a {{date}} prejdete na nižšiu úroveň svojho účtu. V tento deň <strong>budú odstránené</strong> rezervácie tém, ako aj správy uložené vo vyrovnávacej pamäti servera.",
+    "account_basics_tier_admin": "Admin",
+    "prefs_notifications_sound_title": "Zvuk oznámenia",
+    "prefs_notifications_min_priority_default_and_higher": "Predvolená priorita a vyššia",
+    "prefs_reservations_table_access_header": "Prístup",
+    "account_tokens_table_copied_to_clipboard": "Prístupový token skopírovaný",
+    "account_tokens_dialog_expires_x_hours": "Token vyprší za {{hours}} hodín",
+    "prefs_users_edit_button": "Upraviť používateľa",
+    "account_upgrade_dialog_title": "Zmeniť úroveň účtu",
+    "priority_low": "nízka",
+    "prefs_reservations_table_click_to_subscribe": "Kliknutím sa prihlásite na odber",
+    "account_basics_password_description": "Zmeniť heslo účtu",
+    "account_usage_calls_title": "Uskutočnené telefonické hovory",
+    "error_boundary_description": "Toto samozrejme nemalo nastať. Je mi to veľmi ľúto.<br/>Ak máte chvíľu, <githubLink>nahláste to na GitHub</githubLink> alebo nám dajte vedieť cez <discordLink>Discord</discordLink> alebo <matrixLink>Matrix</matrixLink>.",
+    "priority_min": "najnižšia",
+    "account_basics_tier_basic": "Základný",
+    "prefs_notifications_min_priority_description_any": "Zobraziť všetky oznámenia bez ohľadu na prioritu",
+    "error_boundary_gathering_info": "Získajte viac informácií…",
+    "error_boundary_unsupported_indexeddb_title": "Súkromné prehliadanie nie je podporované",
+    "prefs_notifications_delete_after_one_day": "Po jednom dni",
+    "error_boundary_title": "Ale nie, ntfy prestalo fungovať",
+    "reservation_delete_dialog_action_keep_description": "Správy a prílohy, ktoré sú uložené v medzipamäti na serveri, budú verejne viditeľné pre ľudí, ktorí poznajú názov témy.",
+    "prefs_reservations_add_button": "Pridať rezervovanú tému",
+    "prefs_reservations_title": "Rezervované témy",
+    "account_basics_phone_numbers_copied_to_clipboard": "Telefónne číslo skopírované do schránky",
+    "prefs_reservations_dialog_description": "Rezervovaním témy získate vlastníctvo nad témou a môžete definovať prístupové práva pre ostatných používateľov k téme.",
+    "account_basics_tier_title": "Typ účtu",
+    "account_usage_cannot_create_portal_session": "Nemožnosť otvoriť fakturačný portál",
+    "account_tokens_delete_dialog_submit_button": "Trvalo odstrániť token",
+    "account_delete_description": "Natrvalo odstrániť vaše konto",
+    "account_basics_phone_numbers_dialog_number_placeholder": "napr. +1222333444",
+    "account_basics_phone_numbers_dialog_code_placeholder": "napr. 123456",
+    "prefs_notifications_title": "Oznámenia",
+    "account_basics_tier_manage_billing_button": "Spravovať fakturáciu",
+    "account_tokens_title": "Prístupové tokeny",
+    "account_basics_username_description": "Hej, to si ty ❤",
+    "prefs_reservations_dialog_topic_label": "Téma",
+    "prefs_users_title": "Správa používateľov",
+    "account_basics_tier_interval_yearly": "ročne",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} za rok. Účtuje sa mesačne.",
+    "account_delete_dialog_button_submit": "Natrvalo odstrániť konto",
+    "account_basics_phone_numbers_dialog_channel_call": "Hovor",
+    "account_basics_password_dialog_new_password_label": "Nové heslo",
+    "account_tokens_dialog_expires_unchanged": "Ponechať dátum skončenia platnosti nezmenený",
+    "error_boundary_button_copy_stack_trace": "Kopírovať výpis zásobníka",
+    "account_tokens_dialog_title_delete": "Odstrániť prístupový token",
+    "account_usage_of_limit": "z {{limit}}",
+    "reservation_delete_dialog_action_keep_title": "Ponechať správy a prílohy uložené v medzipamäti",
+    "prefs_notifications_sound_no_sound": "Bez zvuku",
+    "account_upgrade_dialog_interval_yearly": "Ročne",
+    "account_upgrade_dialog_button_redirect_signup": "Zaregistrujte sa teraz",
+    "subscribe_dialog_error_user_anonymous": "anonymný",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{price}} účtovaná ročne. Uložiť {{save}}.",
+    "prefs_notifications_min_priority_high_and_higher": "Vysoká priorita a vyššia",
+    "account_usage_basis_ip_description": "Štatistiky a limity používania tohto účtu sú založené na vašej IP adrese, takže môžu byť zdieľané s ostatnými používateľmi. Vyššie uvedené limity sú približné hodnoty založené na existujúcich rýchlostných limitoch.",
+    "account_basics_password_dialog_title": "Zmeniť heslo",
+    "priority_max": "najvyššia",
+    "account_usage_limits_reset_daily": "Limity používania sa obnovujú denne o polnoci (UTC)",
+    "account_usage_unlimited": "Nekonečné",
+    "prefs_users_delete_button": "Odstrániť používateľa",
+    "prefs_notifications_min_priority_any": "Akákoľvek priorita",
+    "account_tokens_dialog_expires_label": "Platnosť prístupového tokenu vyprší za",
+    "account_basics_phone_numbers_title": "Telefónne čísla",
+    "prefs_notifications_delete_after_title": "Odstrániť oznámenia",
+    "account_upgrade_dialog_interval_yearly_discount_save": "ušetríte {{discount}}%",
+    "prefs_users_dialog_title_edit": "Upraviť používateľa",
+    "account_basics_password_dialog_current_password_label": "Aktuálne heslo",
+    "prefs_notifications_min_priority_low_and_higher": "Nízka priorita a vyššia",
+    "account_tokens_dialog_button_update": "Aktualizovať token",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} celkový úložný priestor",
+    "prefs_reservations_table_everyone_write_only": "Môžem publikovať a odoberať, každý môže publikovať",
+    "prefs_appearance_title": "Vzhlad",
+    "account_tokens_table_cannot_delete_or_edit": "Nie je možné upraviť alebo odstrániť aktuálny token relácie",
+    "prefs_notifications_sound_play": "Prehrať vybraný zvuk",
+    "account_tokens_table_last_access_header": "Posledný prístup",
+    "account_tokens_table_last_origin_tooltip": "Z IP adresy {{ip}}, kliknite na vyhľadávanie",
+    "account_usage_reservations_title": "Rezervované témy",
+    "account_upgrade_dialog_tier_price_per_month": "mesiac",
+    "account_usage_calls_none": "S týmto účtom nie je možné uskutočňovať žiadne telefonické hovory",
+    "account_tokens_table_current_session": "Aktuálna relácia prehliadača",
+    "account_upgrade_dialog_button_pay_now": "Zaplatiť a predplatiť si",
+    "subscribe_dialog_subscribe_use_another_label": "Použiť iný server",
+    "reservation_delete_dialog_action_delete_title": "Odstrániť správy a prílohy uložené v medzipamäti",
+    "account_basics_phone_numbers_dialog_code_label": "Overovací kód",
+    "reservation_delete_dialog_action_delete_description": "Správy a prílohy uložené v medzipamäti sa natrvalo vymažú. Túto akciu nemožno vrátiť späť.",
+    "account_basics_tier_paid_until": "Predplatné zaplatené do {{date}} s automatickou obnovou",
+    "account_usage_attachment_storage_description": "{{filesize}} na súbor, vymazaný po {{expiry}}",
+    "prefs_notifications_delete_after_one_month_description": "Oznámenia sa automaticky odstránia po jednom mesiaci",
+    "account_basics_phone_numbers_dialog_verify_button_call": "Zavolajte mi",
+    "prefs_users_dialog_base_url_label": "URL adresa služby, napr. https://ntfy.sh",
+    "account_usage_emails_title": "Odoslané emaily",
+    "account_basics_phone_numbers_dialog_channel_sms": "SMS",
+    "account_upgrade_dialog_tier_selected_label": "Vybrané",
+    "account_upgrade_dialog_button_update_subscription": "Aktualizovať predplatné",
+    "priority_high": "vysoká",
+    "account_delete_dialog_billing_warning": "Odstránením konta sa okamžite zruší aj vaše fakturačné predplatné. Už nebudete mať prístup k fakturačnému panelu.",
+    "prefs_notifications_min_priority_description_max": "Zobraziť oznámenia, ak je priorita 5 (max)",
+    "subscribe_dialog_login_description": "Táto téma je chránená heslom. Ak sa chcete prihlásiť na odber témy, zadajte používateľské meno a heslo.",
+    "account_upgrade_dialog_reservations_warning_other": "Vybraná úroveň umožňuje menej rezervovaných tém ako vaša aktuálna úroveň. Pred zmenou úrovne <strong>vymažte aspoň {{count}} rezervácií</strong>. Rezervácie môžete odstrániť v <Link>Nastaveniach</Link>.",
+    "prefs_users_dialog_title_add": "Pridať používateľa",
+    "account_tokens_dialog_button_create": "Vytvoriť token",
+    "account_tokens_table_create_token_button": "Vytvoriť prístupový token"
+}

web/public/static/langs/sv.json

@@ -277,7 +277,7 @@
     "publish_dialog_priority_low": "Låg prioritet",
     "publish_dialog_priority_default": "Standard prioritet",
     "publish_dialog_priority_high": "Hög prioritet",
-    "publish_dialog_priority_max": "Högsta prioritet",
+    "publish_dialog_priority_max": "Max. prioritet",
     "publish_dialog_base_url_label": "Service-URL",
     "publish_dialog_email_label": "E-post",
     "publish_dialog_attach_reset": "Ta bort URL för bifogade filer",

web/public/static/langs/tr.json

@@ -77,7 +77,7 @@
     "notifications_example": "Örnek",
     "notifications_more_details": "Daha fazla bilgi için <websiteLink>web sitesine</websiteLink> veya <docsLink>belgelendirmeye</docsLink> bakın.",
     "publish_dialog_chip_attach_url_label": "URL ile dosya ekle",
-    "prefs_notifications_min_priority_default_and_higher": "Öntanımlı öncelik ve üstü",
+    "prefs_notifications_min_priority_default_and_higher": "Varsayılan öncelik ve üstü",
     "prefs_notifications_delete_after_three_hours": "Üç saat sonra",
     "notifications_none_for_any_description": "Bir konuya bildirim göndermek için konu URL'sine PUT veya POST göndermeniz yeterlidir. İşte konularınızdan birini kullanan bir örnek.",
     "notifications_no_subscriptions_title": "Henüz aboneliğiniz yok gibi görünüyor.",

web/public/static/langs/vi.json

@@ -0,0 +1,21 @@
+{
+    "common_add": "Thêm",
+    "common_back": "Quay lại",
+    "signup_title": "Tạo tài khoản ntfy",
+    "signup_form_toggle_password_visibility": "Hiện mật khẩu",
+    "login_form_button_submit": "Đăng nhập",
+    "common_copy_to_clipboard": "Lưu vào clipboard",
+    "signup_form_username": "Tên user",
+    "signup_already_have_account": "Đã có tài khoản? Đăng nhập!",
+    "signup_disabled": "Đăng kí bị đóng",
+    "signup_error_username_taken": "Tên {{username}} đã được sử dụng",
+    "signup_error_creation_limit_reached": "Đã bị giới hạn tạo tài khoản",
+    "login_title": "Đăng nhập vào tài khoản ntfy",
+    "login_link_signup": "Đăng kí",
+    "login_disabled": "Đăng nhập bị đóng",
+    "action_bar_show_menu": "Hiện menu",
+    "signup_form_password": "Mật khẩu",
+    "action_bar_settings": "Cài đặt",
+    "signup_form_confirm_password": "Xác nhận mật khẩu",
+    "signup_form_button_submit": "Đăng kí"
+}

web/public/static/langs/zh_Hans.json

@@ -1,11 +1,13 @@
 {
     "action_bar_show_menu": "显示菜单",
     "action_bar_logo_alt": "ntfy图标",
+    "action_bar_mute_notifications": "静音",
     "action_bar_settings": "设置",
     "action_bar_send_test_notification": "发送测试通知",
     "action_bar_clear_notifications": "清除所有通知",
     "action_bar_unsubscribe": "取消订阅",
     "action_bar_toggle_action_menu": "开启或关闭操作菜单",
+    "action_bar_unmute_notifications": "取消静音",
     "message_bar_type_message": "在此处输入消息",
     "message_bar_show_dialog": "显示发布对话框",
     "message_bar_publish": "发布消息",
@@ -20,6 +22,10 @@
     "alert_notification_permission_required_button": "现在授予",
     "alert_not_supported_title": "不支持通知",
     "alert_not_supported_description": "您的浏览器不支持通知。",
+    "alert_notification_ios_install_required_description": "要接收通知，请在iOS上点击分享图标，然后添加到主屏幕。",
+    "alert_notification_ios_install_required_title": "需要安装iOS应用程序",
+    "alert_notification_permission_denied_description": "你已禁用通知。要重新启用通知，请在浏览器设置中启用通知。",
+    "alert_notification_permission_denied_title": "已禁用通知",
     "notifications_list": "通知列表",
     "notifications_list_item": "通知",
     "notifications_mark_read": "标记为已读",
@@ -117,9 +123,9 @@
     "prefs_notifications_min_priority_description_x_or_higher": "仅显示优先级为{{number}}（{{name}}）或以上的通知",
     "prefs_notifications_min_priority_description_max": "仅显示最高优先级的通知",
     "prefs_notifications_min_priority_any": "任意优先级",
-    "prefs_notifications_min_priority_low_and_higher": "低优先级和更高优先级",
-    "prefs_notifications_min_priority_default_and_higher": "默认优先级和更高优先级",
-    "prefs_notifications_min_priority_high_and_higher": "高优先级和更高优先级",
+    "prefs_notifications_min_priority_low_and_higher": "低优先级或更高",
+    "prefs_notifications_min_priority_default_and_higher": "默认优先级或更高",
+    "prefs_notifications_min_priority_high_and_higher": "高优先级或更高",
     "prefs_notifications_min_priority_max_only": "仅最高优先级",
     "prefs_notifications_delete_after_never": "从不",
     "prefs_notifications_delete_after_one_month": "一月后",
@@ -129,6 +135,11 @@
     "prefs_notifications_delete_after_one_day_description": "一天后自动删除通知",
     "prefs_notifications_delete_after_one_week_description": "一周后自动删除通知",
     "prefs_notifications_delete_after_one_month_description": "一月后后自动删除通知",
+    "prefs_notifications_web_push_disabled": "已暂用",
+    "prefs_notifications_web_push_disabled_description": "当网页程序在运行时将会收到通知 (透过 WebSocket)",
+    "prefs_notifications_web_push_enabled": "已为 {{server}} 启用",
+    "prefs_notifications_web_push_enabled_description": "即使网页程序未有运行亦会收到通知 (via Web Push)",
+    "prefs_notifications_web_push_title": "背景通知",
     "prefs_users_title": "管理用户",
     "prefs_users_description": "在此处添加/删除受保护主题的用户。请注意，用户名和密码存储在浏览器的本地存储中。",
     "prefs_users_add_button": "添加用户",
@@ -140,6 +151,10 @@
     "common_save": "保存",
     "prefs_appearance_title": "外观",
     "prefs_appearance_language_title": "语言",
+    "prefs_appearance_theme_title": "主題",
+    "prefs_appearance_theme_system": "系統 (預設)",
+    "prefs_appearance_theme_dark": "黑暗模式",
+    "prefs_appearance_theme_light": "光亮模式",
     "priority_min": "最低",
     "priority_low": "低",
     "priority_default": "默认",
@@ -149,6 +164,7 @@
     "prefs_users_table_base_url_header": "服务链接地址",
     "prefs_users_dialog_base_url_label": "服务链接地址，例如 https://ntfy.sh",
     "error_boundary_button_copy_stack_trace": "复制堆栈跟踪",
+    "error_boundary_button_reload_ntfy": "重新加载 ntfy",
     "error_boundary_stack_trace": "堆栈跟踪",
     "error_boundary_gathering_info": "收集更多信息……",
     "error_boundary_unsupported_indexeddb_title": "不支持隐私浏览",
@@ -160,6 +176,7 @@
     "notifications_attachment_copy_url_button": "复制链接地址",
     "notifications_attachment_open_title": "转到 {{url}}",
     "notifications_actions_http_request_title": "发送 HTTP {{method}} 到 {{url}}",
+    "notifications_actions_failed_notification": "通知失败",
     "notifications_actions_open_url_title": "转到 {{url}}",
     "notifications_none_for_topic_description": "要向此主题发送通知，只需使用 PUT 或 POST 到主题链接即可。",
     "subscribe_dialog_subscribe_topic_placeholder": "主题名，例如 phil_alerts",
@@ -168,12 +185,14 @@
     "publish_dialog_title_placeholder": "主题标题，例如 磁盘空间告警",
     "publish_dialog_email_label": "电子邮件",
     "publish_dialog_button_send": "发送",
+    "publish_dialog_checkbox_markdown": "格式化为 Markdown",
     "publish_dialog_attachment_limits_quota_reached": "超过配额，剩余 {{remainingBytes}}",
     "publish_dialog_attach_label": "附件链接地址",
     "publish_dialog_click_reset": "移除点击连接地址",
     "publish_dialog_button_cancel": "取消",
     "subscribe_dialog_subscribe_button_cancel": "取消",
     "subscribe_dialog_subscribe_base_url_label": "服务地址地址",
+    "subscribe_dialog_subscribe_use_another_background_info": "当网页程序未开启， 将不会收到来自其他服务器的通知",
     "prefs_notifications_min_priority_description_any": "显示所有通知，无论优先级如何",
     "prefs_notifications_delete_after_title": "删除通知",
     "prefs_notifications_delete_after_three_hours": "三小时后",
@@ -359,5 +378,30 @@
     "publish_dialog_chip_call_no_verified_numbers_tooltip": "未验证的手机号",
     "account_basics_phone_numbers_title": "电话号码",
     "account_basics_phone_numbers_description": "电话通知",
-    "account_basics_phone_numbers_dialog_description": "要使用来电通知功能，您需要添加并验证至少一个电话号码。可以通过短信或电话进行验证。"
+    "account_basics_phone_numbers_dialog_description": "要使用来电通知功能，您需要添加并验证至少一个电话号码。可以通过短信或电话进行验证。",
+    "account_basics_phone_numbers_dialog_code_label": "验证码",
+    "account_basics_phone_numbers_dialog_code_placeholder": "例如：123456",
+    "account_basics_phone_numbers_dialog_check_verification_button": "确认码",
+    "account_basics_phone_numbers_dialog_channel_sms": "短信",
+    "account_basics_phone_numbers_dialog_channel_call": "拨打",
+    "publish_dialog_call_reset": "清空拨号",
+    "account_basics_phone_numbers_no_phone_numbers_yet": "无可执行的电话号码",
+    "account_basics_phone_numbers_dialog_title": "添加电话号码",
+    "account_basics_phone_numbers_copied_to_clipboard": "电话号码已复制到剪贴板",
+    "account_basics_phone_numbers_dialog_number_label": "电话号码",
+    "account_basics_phone_numbers_dialog_number_placeholder": "例如：+1222333444",
+    "account_usage_calls_title": "已拨打电话",
+    "account_usage_calls_none": "此帐号无法拨打电话",
+    "account_upgrade_dialog_tier_features_reservations_one": "一条保留主题",
+    "account_upgrade_dialog_tier_features_emails_one": "一封每日邮件",
+    "account_upgrade_dialog_tier_features_calls_one": "一通每日电话",
+    "account_basics_phone_numbers_dialog_verify_button_sms": "发送信息",
+    "account_basics_phone_numbers_dialog_verify_button_call": "拨打电话",
+    "account_upgrade_dialog_tier_features_messages_one": "一条每日消息",
+    "account_upgrade_dialog_tier_features_calls_other": "{{calls}} 通每日电话",
+    "account_upgrade_dialog_tier_features_no_calls": "无电话呼叫",
+    "web_push_subscription_expiring_title": "通知将被暂停",
+    "web_push_subscription_expiring_body": "打开ntfy以继续接收通知",
+    "web_push_unknown_notification_title": "接收到未知通知",
+    "web_push_unknown_notification_body": "你可能需要打开网页来更新ntfy"
 }

web/public/static/langs/zh_Hant.json

@@ -1,220 +1,407 @@
 {
-    "action_bar_logo_alt": "ntfy 標識",
-    "action_bar_unsubscribe": "取消訂閱",
-    "action_bar_toggle_mute": "通知靜音/解除通知靜音",
-    "action_bar_toggle_action_menu": "開啟/關閉操作選單",
-    "message_bar_type_message": "在這輸入訊息",
-    "alert_notification_permission_required_description": "允許瀏覽器權限以顯示桌面通知。",
-    "alert_notification_permission_required_button": "允許",
-    "notifications_list": "通知清單",
-    "notifications_list_item": "通知",
-    "notifications_mark_read": "標示已讀",
-    "notifications_attachment_image": "附加圖片",
-    "notifications_attachment_copy_url_title": "複製附件 URL 到剪貼簿",
-    "notifications_attachment_copy_url_button": "複製 URL",
-    "notifications_attachment_open_title": "前往 {{url}}",
-    "notifications_attachment_open_button": "開啟附件",
-    "notifications_attachment_link_expired": "下載連結已過期",
-    "notifications_attachment_file_video": "影片檔案",
-    "notifications_attachment_file_app": "Android 應用程式檔案",
-    "notifications_attachment_file_document": "其他文件",
-    "notifications_click_copy_url_title": "複製連結 URL 到剪貼板",
-    "notifications_click_copy_url_button": "複製連結",
-    "notifications_click_open_button": "開啟連結",
-    "notifications_actions_not_supported": "網頁程式無法支援該動作",
-    "notifications_actions_http_request_title": "傳送 HTTP {{method}} 到 {{url}}",
-    "notifications_none_for_topic_title": "尚未收到任何此主題的通知。",
-    "notifications_none_for_topic_description": "如要寄送通知到此主題，請使用 PUT 或 POST 到此主題URL。",
-    "notifications_none_for_any_title": "尚未收到任何通知。",
-    "action_bar_settings": "設定",
-    "action_bar_send_test_notification": "發送測試通知",
+    "account_basics_password_description": "更改你的帳戶密碼",
+    "account_basics_password_dialog_button_submit": "更改密碼",
+    "account_basics_password_dialog_confirm_password_label": "確認密碼",
+    "account_basics_password_dialog_current_password_incorrect": "密碼錯誤",
+    "account_basics_password_dialog_current_password_label": "當前密碼",
+    "account_basics_password_dialog_new_password_label": "新密碼",
+    "account_basics_password_dialog_title": "更改密碼",
+    "account_basics_password_title": "密碼",
+    "account_basics_phone_numbers_copied_to_clipboard": "電話號碼已複製到剪貼板",
+    "account_basics_phone_numbers_description": "電話通知",
+    "account_basics_phone_numbers_dialog_channel_call": "撥打",
+    "account_basics_phone_numbers_dialog_channel_sms": "短信",
+    "account_basics_phone_numbers_dialog_check_verification_button": "確認碼",
+    "account_basics_phone_numbers_dialog_code_label": "驗證碼",
+    "account_basics_phone_numbers_dialog_code_placeholder": "例如：123456",
+    "account_basics_phone_numbers_dialog_description": "要使用來電通知功能，你需要新增並驗證至少一個電話號碼。可以通過短信或電話驗證。",
+    "account_basics_phone_numbers_dialog_number_label": "電話號碼",
+    "account_basics_phone_numbers_dialog_number_placeholder": "例如：+1222333444",
+    "account_basics_phone_numbers_dialog_title": "新增電話號碼",
+    "account_basics_phone_numbers_dialog_verify_button_call": "撥打電話",
+    "account_basics_phone_numbers_dialog_verify_button_sms": "發送資訊",
+    "account_basics_phone_numbers_no_phone_numbers_yet": "無可執行的電話號碼",
+    "account_basics_phone_numbers_title": "電話號碼",
+    "account_basics_tier_admin_suffix_no_tier": "（無等級）",
+    "account_basics_tier_admin_suffix_with_tier": "（有 {{tier}} 等級）",
+    "account_basics_tier_admin": "管理員",
+    "account_basics_tier_basic": "基礎版",
+    "account_basics_tier_canceled_subscription": "你的訂閱已取消，並將在 {{date}} 降級為免費帳戶。",
+    "account_basics_tier_change_button": "改變",
+    "account_basics_tier_description": "你帳戶的權限級別",
+    "account_basics_tier_free": "免費",
+    "account_basics_tier_interval_monthly": "每月",
+    "account_basics_tier_interval_yearly": "每年",
+    "account_basics_tier_manage_billing_button": "管理計費",
+    "account_basics_tier_paid_until": "訂閱已支付至 {{date}}，並將自動續訂",
+    "account_basics_tier_payment_overdue": "你的付款已逾期。請更新你的付款方式，否則你的帳戶將很快被降級。",
+    "account_basics_tier_title": "帳戶類型",
+    "account_basics_tier_upgrade_button": "升級到專業版",
+    "account_basics_title": "帳戶",
+    "account_basics_username_admin_tooltip": "你是管理員",
+    "account_basics_username_description": "嘿，那是你 ❤",
+    "account_basics_username_title": "用戶名",
+    "account_delete_description": "永久刪除你的帳戶",
+    "account_delete_dialog_billing_warning": "刪除你的帳戶也會立即取消你的計費訂閱。你將無法再訪問計費儀錶板。",
+    "account_delete_dialog_button_cancel": "取消",
+    "account_delete_dialog_button_submit": "永久刪除帳戶",
+    "account_delete_dialog_description": "這將永久刪除你的帳戶，包括存儲在伺服器上的所有數據。刪除後，你的用戶名將在 7 天內不可用。如果你真的想繼續，請在下面的框中使用你的密碼作確認。",
+    "account_delete_dialog_label": "密碼",
+    "account_delete_title": "刪除帳戶",
+    "account_tokens_delete_dialog_description": "在刪除訪問令牌之前，請確保沒有應用程序或腳本正在活躍使用它。 <strong>此操作無法撤銷</strong>。",
+    "account_tokens_delete_dialog_submit_button": "永久删除令牌",
+    "account_tokens_delete_dialog_title": "刪除訪問令牌",
+    "account_tokens_description": "通過 ntfy API 發布和訂閱時使用訪問令牌，因此你不必發送你的帳戶憑證。查看<Link>文檔</Link>以了解更多資訊。",
+    "account_tokens_dialog_button_cancel": "取消",
+    "account_tokens_dialog_button_create": "創建令牌",
+    "account_tokens_dialog_button_update": "更新令牌",
+    "account_tokens_dialog_expires_label": "訪問令牌過期於",
+    "account_tokens_dialog_expires_never": "令牌永不過期",
+    "account_tokens_dialog_expires_unchanged": "保持過期日期不變",
+    "account_tokens_dialog_expires_x_days": "令牌在 {{days}} 天後過期",
+    "account_tokens_dialog_expires_x_hours": "令牌在 {{hours}} 小時後過期",
+    "account_tokens_dialog_label": "標籤，例如：Radarr 通知",
+    "account_tokens_dialog_title_create": "創建訪問令牌",
+    "account_tokens_dialog_title_delete": "刪除訪問令牌",
+    "account_tokens_dialog_title_edit": "編輯訪問令牌",
+    "account_tokens_table_cannot_delete_or_edit": "無法編輯或刪除當前會話令牌",
+    "account_tokens_table_copied_to_clipboard": "已複製訪問令牌",
+    "account_tokens_table_create_token_button": "創建訪問令牌",
+    "account_tokens_table_current_session": "當前瀏覽器會話",
+    "account_tokens_table_expires_header": "過期",
+    "account_tokens_table_label_header": "標籤",
+    "account_tokens_table_last_access_header": "最後訪問",
+    "account_tokens_table_last_origin_tooltip": "於IP地址 {{ip}}，點擊查找",
+    "account_tokens_table_never_expires": "永不過期",
+    "account_tokens_table_token_header": "令牌",
+    "account_tokens_title": "訪問令牌",
+    "account_upgrade_dialog_billing_contact_email": "有關賬單問題，請直接<Link>聯繫我們 </Link>。",
+    "account_upgrade_dialog_billing_contact_website": "有關賬單問題，請參考我們的<Link>網站 </Link>。",
+    "account_upgrade_dialog_button_cancel_subscription": "取消訂閱",
+    "account_upgrade_dialog_button_cancel": "取消",
+    "account_upgrade_dialog_button_pay_now": "立即付款並訂閱",
+    "account_upgrade_dialog_button_redirect_signup": "立即註冊",
+    "account_upgrade_dialog_button_update_subscription": "更新訂閱",
+    "account_upgrade_dialog_cancel_warning": "這將<strong>取消你的訂閱</strong>，並在 {{date}} 降級你的帳戶。在那一天，主題保留以及緩存在伺服器上的訊息<strong>將被刪除</strong>。",
+    "account_upgrade_dialog_interval_monthly": "每月",
+    "account_upgrade_dialog_interval_yearly_discount_save_up_to": "節省高達 {{discount}}%",
+    "account_upgrade_dialog_interval_yearly_discount_save": "節省 {{discount}}%",
+    "account_upgrade_dialog_interval_yearly": "每年",
+    "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_current_label": "當前",
+    "account_upgrade_dialog_tier_features_attachment_file_size": "每個文件 {{filesize}} ",
+    "account_upgrade_dialog_tier_features_attachment_total_size": "{{totalsize}} 總存儲空間",
+    "account_upgrade_dialog_tier_features_calls_one": "每日一通電話",
+    "account_upgrade_dialog_tier_features_calls_other": "每日{{calls}} 通電話",
+    "account_upgrade_dialog_tier_features_emails_one": "每日一封郵件",
+    "account_upgrade_dialog_tier_features_emails_other": "每日 {{emails}} 條郵件",
+    "account_upgrade_dialog_tier_features_messages_one": "每日一條訊息",
+    "account_upgrade_dialog_tier_features_messages_other": "每日 {{messages}} 條訊息",
+    "account_upgrade_dialog_tier_features_no_calls": "沒有電話",
+    "account_upgrade_dialog_tier_features_no_reservations": "無保留主題",
+    "account_upgrade_dialog_tier_features_reservations_one": "保留一條主題",
+    "account_upgrade_dialog_tier_features_reservations_other": "保留 {{reservations}} 條主題",
+    "account_upgrade_dialog_tier_price_billed_monthly": "{{price}} 每年。按月計費。",
+    "account_upgrade_dialog_tier_price_billed_yearly": "{{價格}} 按年計費。節省 {{save}}。",
+    "account_upgrade_dialog_tier_price_per_month": "月",
+    "account_upgrade_dialog_tier_selected_label": "已選",
+    "account_upgrade_dialog_title": "更改帳戶等級",
+    "account_usage_attachment_storage_description": "每個文件 {{filesize}}，在 {{expiry}} 後刪除",
+    "account_usage_attachment_storage_title": "附件存儲",
+    "account_usage_basis_ip_description": "此帳戶的使用統計資訊和限制基於你的 IP 地址，因此可能會與其他用戶共享。上面顯示的限制是基於現有速率限制的近似值。",
+    "account_usage_calls_none": "此帳號無法撥打電話",
+    "account_usage_calls_title": "已撥打電話",
+    "account_usage_cannot_create_portal_session": "無法打開計費門戶",
+    "account_usage_emails_title": "已發送電子郵件",
+    "account_usage_limits_reset_daily": "使用限制每天午夜 (UTC) 重置",
+    "account_usage_messages_title": "已發布訊息",
+    "account_usage_of_limit": "{{limit}} 的",
+    "account_usage_reservations_none": "此帳戶沒有保留主題",
+    "account_usage_reservations_title": "保留主題",
+    "account_usage_title": "使用量",
+    "account_usage_unlimited": "無限",
+    "action_bar_account": "帳戶",
+    "action_bar_change_display_name": "更改顯示名稱",
     "action_bar_clear_notifications": "清除所有通知",
+    "action_bar_logo_alt": "ntfy 標識",
+    "action_bar_mute_notifications": "靜音",
+    "action_bar_profile_logout": "登出",
+    "action_bar_profile_settings": "設定",
+    "action_bar_profile_title": "個人資料",
+    "action_bar_reservation_add": "保留主題",
+    "action_bar_reservation_delete": "移除保留",
+    "action_bar_reservation_edit": "更改保留",
+    "action_bar_reservation_limit_reached": "達到限制",
+    "action_bar_send_test_notification": "發送測試通知",
+    "action_bar_settings": "設定",
     "action_bar_show_menu": "顯示選單",
-    "nav_button_documentation": "文件",
-    "nav_button_publish_message": "發佈通知",
-    "nav_button_muted": "通知已靜音",
-    "notifications_copied_to_clipboard": "已複製到剪貼簿",
-    "message_bar_publish": "發佈訊息",
-    "message_bar_show_dialog": "顯示發佈對話框",
-    "message_bar_error_publishing": "發佈通知時發生錯誤",
-    "nav_topics_title": "訂閱主題",
-    "nav_button_all_notifications": "所有通知",
+    "action_bar_sign_in": "登錄",
+    "action_bar_sign_up": "註冊",
+    "action_bar_toggle_action_menu": "開啟或關閉操作選單",
+    "action_bar_toggle_mute": "通知靜音/解除通知靜音",
+    "action_bar_unmute_notifications": "取消靜音",
+    "action_bar_unsubscribe": "取消訂閱",
+    "alert_notification_ios_install_required_description": "要接收通知，請在 iOS 上點擊共享，然後添加到主屏幕",
+    "alert_notification_ios_install_required_title": "需要安裝 iOS 應用程式",
+    "alert_notification_permission_denied_description": "你已禁用通知。要重新啟用通知，請在瀏覽器設置中啟用通知。",
+    "alert_notification_permission_denied_title": "已禁用通知",
+    "alert_notification_permission_required_button": "現在授予",
+    "alert_notification_permission_required_description": "授予瀏覽器顯示桌面通知的權限。",
+    "alert_notification_permission_required_title": "已禁用通知",
+    "alert_not_supported_context_description": "通知僅支援 HTTPS。這是 <mdnLink>Notifications API</mdnLink> 的限制。",
+    "alert_not_supported_description": "你的瀏覽器不支援通知。",
+    "alert_not_supported_title": "不支援通知",
+    "common_add": "新增",
+    "common_back": "返回",
+    "common_cancel": "取消",
+    "common_copy_to_clipboard": "複製到剪貼板",
+    "common_save": "保存",
+    "display_name_dialog_description": "為訂閱列表中顯示的主題設置一個替代名稱。這有助於更輕鬆地識別名稱複雜的主題。",
+    "display_name_dialog_placeholder": "顯示名稱",
+    "display_name_dialog_title": "更改顯示名稱",
+    "emoji_picker_search_clear": "清除搜索",
+    "emoji_picker_search_placeholder": "查找表情符號",
+    "error_boundary_button_copy_stack_trace": "複製堆疊追踪",
+    "error_boundary_button_reload_ntfy": "重新加載 ntfy",
+    "error_boundary_description": "這顯然不應該發生。對此非常抱歉。<br/>如果你有時間，請<githubLink>在GitHub</githubLink>上報告，或通過<discordLink>Discord</discordLink>或<matrixLink>Matrix</matrixLink>告訴我們。",
+    "error_boundary_gathering_info": "收集更多資訊……",
+    "error_boundary_stack_trace": "堆疊追踪",
+    "error_boundary_title": "天啊，ntfy 崩潰了",
+    "error_boundary_unsupported_indexeddb_description": "Ntfy Web應用程式需要IndexedDB才能運行，且你的瀏覽器在隱私瀏覽模式下不支援IndexedDB。<br/><br/>儘管這很不幸，但在隱私瀏覽模式下使用ntfy Web應用程式也沒有多大意義，因為所有東西都存儲在瀏覽器存儲中。你可以在<githubLink>本GitHub問題</githubLink>中閱讀有關它的更多資訊，或者在<discordLink>Discord</discordLink>或<matrixLink>Matrix</matrixLink>上與我們交談。",
+    "error_boundary_unsupported_indexeddb_title": "不支援隱私瀏覽",
+    "login_disabled": "登錄已禁用",
+    "login_form_button_submit": "登錄",
+    "login_link_signup": "註冊",
+    "login_title": "請登錄你的 ntfy 帳戶",
+    "message_bar_error_publishing": "發佈通知時出錯",
+    "message_bar_publish": "發布訊息",
+    "message_bar_show_dialog": "顯示發布對話框",
+    "message_bar_type_message": "在此處輸入訊息",
+    "nav_button_account": "帳戶",
+    "nav_button_all_notifications": "全部通知",
+    "nav_button_connecting": "正在連接",
+    "nav_button_documentation": "文檔",
+    "nav_button_muted": "已暫停通知",
+    "nav_button_publish_message": "發布通知",
     "nav_button_settings": "設定",
     "nav_button_subscribe": "訂閱主題",
-    "nav_button_connecting": "連線中",
-    "alert_notification_permission_required_title": "通知已關閉",
-    "alert_not_supported_title": "不支援通知",
-    "alert_not_supported_description": "瀏覽器不支援通知。",
-    "notifications_tags": "標籤",
-    "notifications_priority_x": "優先度 {{priority}}",
-    "notifications_new_indicator": "新通知",
-    "notifications_attachment_file_audio": "聲音檔案",
-    "notifications_delete": "刪除",
+    "nav_topics_title": "訂閱主題",
+    "nav_upgrade_banner_description": "保留主題，更多訊息和郵件，以及更大的附件",
+    "nav_upgrade_banner_label": "升級到 ntfy Pro",
+    "notifications_actions_failed_notification": "通知失敗",
+    "notifications_actions_http_request_title": "發送 HTTP {{method}} 到 {{url}}",
+    "notifications_actions_not_supported": "網頁應用程序不支援此操作",
+    "notifications_actions_open_url_title": "轉到 {{url}}",
+    "notifications_attachment_copy_url_button": "複製連結地址",
+    "notifications_attachment_copy_url_title": "將附件中連結地址複製到剪貼板",
+    "notifications_attachment_file_app": "安卓應用程式",
+    "notifications_attachment_file_audio": "聲音文件",
+    "notifications_attachment_file_document": "其他文件",
+    "notifications_attachment_file_image": "圖片文件",
+    "notifications_attachment_file_video": "影片文件",
+    "notifications_attachment_image": "附件圖片",
+    "notifications_attachment_link_expired": "下載連結已過期",
     "notifications_attachment_link_expires": "連結在 {{date}} 過期",
-    "notifications_attachment_file_image": "圖片檔案",
-    "notifications_actions_open_url_title": "前往 {{url}}",
-    "notifications_no_subscriptions_title": "你尚未有任何訂閱。",
-    "notifications_example": "範例",
-    "notifications_more_details": "你可以在 <websiteLink>ntfy 網站</websiteLink>或者<docsLink>技術文件</docsLink>中查看更多資訊。",
-    "notifications_loading": "載入中…",
-    "publish_dialog_title_topic": "發佈到 {{topic}}",
-    "publish_dialog_title_no_topic": "發佈通知",
-    "publish_dialog_progress_uploading": "上傳中…",
-    "publish_dialog_priority_label": "優先度",
-    "publish_dialog_email_label": "電郵地址",
-    "publish_dialog_filename_label": "檔案名稱",
-    "publish_dialog_button_cancel": "取消",
-    "publish_dialog_button_send": "傳送",
-    "publish_dialog_button_cancel_sending": "取消傳送",
-    "subscribe_dialog_subscribe_button_cancel": "取消",
-    "subscribe_dialog_subscribe_button_subscribe": "訂閱",
-    "emoji_picker_search_clear": "清除",
-    "subscribe_dialog_login_password_label": "密碼",
-    "common_back": "返回",
-    "subscribe_dialog_login_button_login": "登入",
+    "notifications_attachment_open_button": "打開附件",
+    "notifications_attachment_open_title": "轉到 {{url}}",
+    "notifications_click_copy_url_button": "複製鏈結",
+    "notifications_click_copy_url_title": "複製鏈結地址到剪貼板",
+    "notifications_click_open_button": "打開鏈結",
+    "notifications_copied_to_clipboard": "複製到剪貼板",
+    "notifications_delete": "刪除",
+    "notifications_example": "示例",
+    "notifications_list_item": "通知",
+    "notifications_list": "通知列表",
+    "notifications_loading": "正在加載通知……",
+    "notifications_mark_read": "標記為已讀",
+    "notifications_more_details": "有關更多資訊，請查看<websiteLink>網站</websiteLink>或<docsLink>文檔</docsLink>。",
+    "notifications_new_indicator": "新通知",
+    "notifications_none_for_any_description": "要向此主題發送通知，只需使用 PUT 或 POST 到主題鏈結即可。以下是使用你的主題的示例。",
+    "notifications_none_for_any_title": "你尚未收到任何通知。",
+    "notifications_none_for_topic_description": "要向此主題發送通知，只需使用 PUT 或 POST 到主題連結即可。",
+    "notifications_none_for_topic_title": "你尚未收到有關此主題的任何通知。",
+    "notifications_no_subscriptions_description": "點擊 \"{{linktext}}\" 連結以建立或訂閱主題。之後，你可以使用 PUT 或 POST 發送訊息，你將在這裡收到通知。",
+    "notifications_no_subscriptions_title": "看起來你還未有任何訂閱",
+    "notifications_priority_x": "優先級 {{priority}}",
+    "notifications_tags": "標記",
+    "prefs_appearance_language_title": "語言",
+    "prefs_appearance_theme_dark": "黑暗模式",
+    "prefs_appearance_theme_light": "光亮模式",
+    "prefs_appearance_theme_system": "系統 (預設)",
+    "prefs_appearance_theme_title": "主題",
+    "prefs_appearance_title": "外觀",
+    "prefs_notifications_delete_after_never_description": "永不自動刪除通知",
     "prefs_notifications_delete_after_never": "從不",
+    "prefs_notifications_delete_after_one_day_description": "一天後自動刪除通知",
+    "prefs_notifications_delete_after_one_day": "一天後",
+    "prefs_notifications_delete_after_one_month_description": "一個月後自動刪除通知",
+    "prefs_notifications_delete_after_one_month": "一個月後",
+    "prefs_notifications_delete_after_one_week_description": "一周後自動刪除通知",
+    "prefs_notifications_delete_after_one_week": "一周後",
+    "prefs_notifications_delete_after_three_hours_description": "三小時後自動刪除通知",
+    "prefs_notifications_delete_after_three_hours": "三小時後",
+    "prefs_notifications_delete_after_title": "刪除通知",
+    "prefs_notifications_min_priority_any": "任意優先級",
+    "prefs_notifications_min_priority_default_and_higher": "默認優先級或更高",
+    "prefs_notifications_min_priority_description_any": "顯示所有通知，無論優先級如何",
+    "prefs_notifications_min_priority_description_max": "僅顯示最高優先級的通知",
+    "prefs_notifications_min_priority_description_x_or_higher": "僅顯示優先級為{{number}}（{{name}}）或以上的通知",
+    "prefs_notifications_min_priority_high_and_higher": "高優先級或更高",
+    "prefs_notifications_min_priority_low_and_higher": "低優先級或更高",
+    "prefs_notifications_min_priority_max_only": "僅最高優先級",
+    "prefs_notifications_min_priority_title": "最低優先級",
+    "prefs_notifications_sound_description_none": "收到通知時不播放任何聲音",
+    "prefs_notifications_sound_description_some": "收到通知時播放 {{sound}} 聲音",
+    "prefs_notifications_sound_no_sound": "靜音",
+    "prefs_notifications_sound_play": "播放選中聲音",
+    "prefs_notifications_sound_title": "通知提示音",
+    "prefs_notifications_title": "通知",
+    "prefs_notifications_web_push_disabled_description": "當網頁程式在運行時將會收到通知 (透過 WebSocket)",
+    "prefs_notifications_web_push_disabled": "己暫用",
+    "prefs_notifications_web_push_enabled_description": "即使網頁程式未有運街亦會收到通知 (via Web Push)",
+    "prefs_notifications_web_push_enabled": "己為 {{server}}  啟用",
+    "prefs_notifications_web_push_title": "背景通知",
+    "prefs_reservations_add_button": "新增保留主題",
+    "prefs_reservations_delete_button": "重置主題訪問",
+    "prefs_reservations_description": "你可以在此處保留主題名稱供個人使用。保留主題使你擁有該主題的所有權，並允許你為其他用戶定義對該主題的訪問權限。",
+    "prefs_reservations_dialog_access_label": "訪問",
+    "prefs_reservations_dialog_description": "保留主題使你擁有該主題的所有權，並允許你為其他用戶定義對該主題的訪問權限。",
+    "prefs_reservations_dialog_title_add": "保留主題",
+    "prefs_reservations_dialog_title_delete": "刪除主題保留",
+    "prefs_reservations_dialog_title_edit": "編輯保留主題",
+    "prefs_reservations_dialog_topic_label": "主題",
+    "prefs_reservations_edit_button": "編輯主題訪問",
+    "prefs_reservations_limit_reached": "你已達到保留主題限制。",
+    "prefs_reservations_table_access_header": "訪問",
+    "prefs_reservations_table_click_to_subscribe": "點擊以訂閱",
+    "prefs_reservations_table_everyone_deny_all": "只有我可以發佈和訂閱",
+    "prefs_reservations_table_everyone_read_only": "我可以發佈和訂閱，每個人都可以訂閱",
+    "prefs_reservations_table_everyone_read_write": "每個人都可以發佈和訂閱",
+    "prefs_reservations_table_everyone_write_only": "我可以發佈和訂閱，每個人都可以發佈",
+    "prefs_reservations_table_not_subscribed": "未訂閱",
+    "prefs_reservations_table_topic_header": "主題",
+    "prefs_reservations_table": "保留主題表格",
+    "prefs_reservations_title": "保留主題",
     "prefs_users_add_button": "新增使用者",
+    "prefs_users_delete_button": "刪除用戶",
+    "prefs_users_description_no_sync": "用戶和密碼不會同步到你的賬戶。",
+    "prefs_users_description": "在此處新增/刪除受保護主題的使用者。請注意，使用者名和密碼將存儲在瀏覽器的本地存儲中。",
+    "prefs_users_dialog_base_url_label": "服務連結地址，例如 https://ntfy.sh",
     "prefs_users_dialog_password_label": "密碼",
     "prefs_users_dialog_title_add": "新增使用者",
-    "common_save": "儲存",
-    "common_cancel": "取消",
-    "error_boundary_title": "歐買尬，ntfy 壞掉了",
-    "notifications_none_for_any_description": "要開始發送通知到一個主題，只需要對主題 URL 發送 HTTP PUT 或者 POST，例如：",
-    "notifications_no_subscriptions_description": "點選 「{{linktext}}」 連結以建立或訂閱主題。完成後，你就可以使用 HTTP PUT 或者 POST 發送通知到這裡了！",
-    "error_boundary_description": "很抱歉 ntfy 發生錯誤了。<br/>如果你有時間，煩請到<githubLink> Github </githubLink>回報錯誤，或者到<discordLink> Discord </discordLink>或者<matrixLink> Matrix 聊天室</matrixLink>裡面告訴我們。",
-    "publish_dialog_tags_placeholder": "逗號分隔的標籤，例如 e.g. warning, srv1-backup",
-    "publish_dialog_click_label": "點擊網址",
-    "publish_dialog_attach_placeholder": "從網址新增附件，例如 https://f-droid.org/F-Droid.apk",
-    "publish_dialog_attach_reset": "移除附件網址",
-    "publish_dialog_attach_label": "附件網址",
-    "publish_dialog_delay_reset": "移除延遲傳送",
-    "publish_dialog_delay_label": "延遲",
-    "publish_dialog_other_features": "其他功能：",
-    "publish_dialog_filename_placeholder": "附件檔案名稱",
-    "publish_dialog_delay_placeholder": "延遲傳送，例如 {{unixTimestamp}}, {{relativeTime}} 或 \"{{naturalLanguage}}\" （僅限英文）",
-    "publish_dialog_chip_click_label": "點擊網址",
-    "publish_dialog_chip_email_label": "轉發到電郵",
-    "publish_dialog_chip_attach_url_label": "從網址新增附件",
-    "emoji_picker_search_placeholder": "搜尋 emoji",
-    "subscribe_dialog_subscribe_title": "訂閱主題",
-    "subscribe_dialog_error_user_not_authorized": "用戶 {{username}} 沒有權限",
-    "subscribe_dialog_error_user_anonymous": "匿名",
-    "login_title": "登入 ntfy 帳戶",
-    "action_bar_reservation_add": "保留主題",
-    "action_bar_profile_logout": "登出",
-    "alert_not_supported_context_description": "訊息只支援 HTTPS. 這是受 <mdnLink>Notifications API</mdnLink> 的限制",
-    "publish_dialog_base_url_placeholder": "服務網址，例如 https://example.com",
-    "signup_title": "創建 ntfy 賬戶",
-    "signup_form_username": "用戶名稱",
-    "signup_form_password": "密碼",
-    "signup_form_button_submit": "註冊",
-    "signup_form_toggle_password_visibility": "顯示/隱藏密碼",
-    "signup_disabled": "註冊已停止",
-    "signup_error_username_taken": "用戶名稱 {{username}} 已被取用",
-    "signup_error_creation_limit_reached": "註冊賬戶限制",
-    "login_form_button_submit": "登入",
-    "login_link_signup": "註冊",
-    "signup_already_have_account": "已有帳戶？ 立即登入！",
-    "login_disabled": "登入已停止",
-    "action_bar_account": "帳戶",
-    "action_bar_change_display_name": "改變顯示名稱",
-    "action_bar_reservation_edit": "改變已保留",
-    "action_bar_reservation_delete": "移除保留",
-    "action_bar_reservation_limit_reached": "達到限制",
-    "action_bar_profile_title": "簡介",
-    "action_bar_profile_settings": "設置",
-    "action_bar_sign_in": "登入",
-    "action_bar_sign_up": "註冊",
-    "nav_button_account": "帳戶",
-    "nav_upgrade_banner_label": "升級到 ntfy 專業版",
-    "nav_upgrade_banner_description": "保留主題，更多信息電郵及附件",
-    "display_name_dialog_title": "改變顯示名稱",
-    "display_name_dialog_description": "為主題新增在訂閱清單顯示的第二名稱， 這會令尋找複雜主題時更方便。",
-    "display_name_dialog_placeholder": "顯示名稱",
-    "reserve_dialog_checkbox_label": "保留主題及設置權限",
-    "publish_dialog_progress_uploading_detail": "上載中 {{loaded}}/{{total}} ({{percent}}%) …",
-    "publish_dialog_message_published": "已公佈通訊",
-    "publish_dialog_attachment_limits_file_reached": "超出檔案限制 {fileSizeLimit}}",
-    "publish_dialog_attachment_limits_quota_reached": "超出限制， 尚餘 {{remainingBytes}}",
-    "publish_dialog_emoji_picker_show": "選擇 emoji",
-    "publish_dialog_priority_min": "最低優先",
-    "publish_dialog_priority_low": "較低優先",
-    "publish_dialog_priority_default": "正常優先",
-    "publish_dialog_priority_high": "高度優先",
-    "publish_dialog_priority_max": "最高優先",
-    "publish_dialog_base_url_label": "服務網址",
+    "prefs_users_dialog_title_edit": "編輯使用者",
+    "prefs_users_dialog_username_label": "使用者名，例如 phil",
+    "prefs_users_edit_button": "編輯用戶",
+    "prefs_users_table_base_url_header": "服務連結地址",
+    "prefs_users_table_cannot_delete_or_edit": "無法刪除或編輯已登錄用戶",
+    "prefs_users_table_user_header": "用戶",
+    "prefs_users_table": "用戶表",
+    "prefs_users_title": "管理使用者",
+    "priority_default": "預設",
+    "priority_high": "高",
+    "priority_low": "低",
+    "priority_max": "最高",
+    "priority_min": "最低",
+    "publish_dialog_attached_file_filename_placeholder": "附件文件名",
+    "publish_dialog_attached_file_remove": "刪除附件文件",
+    "publish_dialog_attached_file_title": "附件文件：",
+    "publish_dialog_attach_label": "附件連結地址",
+    "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_attach_placeholder": "使用鏈結地址附加文件，例如 https://f-droid.org/F-Droid.apk",
+    "publish_dialog_attach_reset": "移除附件鏈結地址",
+    "publish_dialog_base_url_label": "服務鏈結地址",
+    "publish_dialog_base_url_placeholder": "服務鏈結地址，例如 https://example.com",
+    "publish_dialog_button_cancel_sending": "取消發送",
+    "publish_dialog_button_cancel": "取消",
+    "publish_dialog_button_send": "發送",
+    "publish_dialog_call_item": "撥打電話 {{number}}",
+    "publish_dialog_call_label": "撥號",
+    "publish_dialog_call_reset": "清空撥號",
+    "publish_dialog_checkbox_markdown": "格式化為 Markdown",
+    "publish_dialog_checkbox_publish_another": "發布另一個",
+    "publish_dialog_chip_attach_file_label": "本地文件附件",
+    "publish_dialog_chip_attach_url_label": "鏈結附件地址",
+    "publish_dialog_chip_call_label": "撥號",
+    "publish_dialog_chip_call_no_verified_numbers_tooltip": "未驗證的電話號碼",
+    "publish_dialog_chip_click_label": "點擊鏈結地址",
+    "publish_dialog_chip_delay_label": "延期投遞",
+    "publish_dialog_chip_email_label": "轉發郵件",
+    "publish_dialog_chip_topic_label": "變更主題",
+    "publish_dialog_click_label": "點擊鏈結地址",
+    "publish_dialog_click_placeholder": "點擊通知時打開鏈結地址",
+    "publish_dialog_click_reset": "移除點擊連結地址",
+    "publish_dialog_delay_label": "延期",
+    "publish_dialog_delay_placeholder": "延期投遞，例如 {{unixTimestamp}}、{{relativeTime}}或「{{naturalLanguage}}」（僅限英語）",
+    "publish_dialog_delay_reset": "刪除延期投遞",
+    "publish_dialog_details_examples_description": "有關所有發送功能的範例和詳細說明，請參閱<docsLink>文檔</docsLink>。",
+    "publish_dialog_drop_file_here": "將文件拖拽至此",
+    "publish_dialog_email_label": "電子郵件",
+    "publish_dialog_email_placeholder": "將通知轉發到的地址，例如 phil@example.com",
+    "publish_dialog_email_reset": "移除電子郵件轉發",
+    "publish_dialog_emoji_picker_show": "選擇表情符號",
+    "publish_dialog_filename_label": "文件名",
+    "publish_dialog_filename_placeholder": "附件文件名",
+    "publish_dialog_message_label": "訊息",
+    "publish_dialog_message_placeholder": "在此輸入訊息",
+    "publish_dialog_message_published": "已發布通知",
+    "publish_dialog_other_features": "其它功能：",
+    "publish_dialog_priority_default": "默認優先級",
+    "publish_dialog_priority_high": "高優先級",
+    "publish_dialog_priority_label": "優先級",
+    "publish_dialog_priority_low": "低優先級",
+    "publish_dialog_priority_max": "最高優先級",
+    "publish_dialog_priority_min": "最低優先級",
+    "publish_dialog_progress_uploading_detail": "正在上傳 {{loaded}}/{{total}} ({{percent}}%) ……",
+    "publish_dialog_progress_uploading": "正在上傳……",
+    "publish_dialog_tags_label": "標記",
+    "publish_dialog_tags_placeholder": "英文逗號分隔標記列表，例如 warning, srv1-backup",
+    "publish_dialog_title_label": "主題",
+    "publish_dialog_title_no_topic": "發布通知",
+    "publish_dialog_title_placeholder": "主題標題，例如 磁碟空間警告",
+    "publish_dialog_title_topic": "發布到 {{topic}}",
     "publish_dialog_topic_label": "主題名稱",
     "publish_dialog_topic_placeholder": "主題名稱，例如 phil_alerts",
     "publish_dialog_topic_reset": "重置主題",
-    "publish_dialog_title_label": "標題",
-    "publish_dialog_title_placeholder": "通訊標題，例如 Disk space alert",
-    "publish_dialog_message_label": "訊息",
-    "publish_dialog_message_placeholder": "這裏輸入訊息",
-    "publish_dialog_tags_label": "標籤",
-    "publish_dialog_click_placeholder": "通訊被點擊時到訪的網址",
-    "publish_dialog_click_reset": "移除點擊網址",
-    "publish_dialog_email_reset": "移除電郵轉發",
-    "publish_dialog_chip_attach_file_label": "上載檔案",
-    "publish_dialog_chip_delay_label": "延遲傳送",
-    "publish_dialog_chip_topic_label": "更變主題",
-    "publish_dialog_details_examples_description": "可以在 <docsLink>documentation</docsLink> 找到詳細的功能說明及例子。",
-    "publish_dialog_checkbox_publish_another": "公佈更多",
-    "publish_dialog_attached_file_title": "附件：",
-    "publish_dialog_attached_file_filename_placeholder": "附件名稱",
-    "subscribe_dialog_subscribe_use_another_label": "使用另一個伺服器",
-    "subscribe_dialog_subscribe_base_url_label": "服務網址",
-    "subscribe_dialog_subscribe_button_generate_topic_name": "生成名稱",
-    "subscribe_dialog_login_title": "需要登入",
-    "subscribe_dialog_login_username_label": "用戶名稱，例如 phil",
-    "subscribe_dialog_error_topic_already_reserved": "主題已被保留",
-    "account_basics_title": "帳戶",
-    "account_basics_username_title": "用戶名稱",
-    "account_basics_username_description": "這就是你了❤",
-    "account_basics_username_admin_tooltip": "你是管理員",
-    "account_basics_password_title": "密碼",
-    "account_basics_password_description": "更變你的密碼",
-    "account_basics_password_dialog_title": "更變密碼",
-    "account_basics_password_dialog_new_password_label": "新的密碼",
-    "account_basics_password_dialog_confirm_password_label": "確認密碼",
-    "account_basics_password_dialog_button_submit": "更變密碼",
-    "account_usage_unlimited": "無限制",
-    "account_usage_title": "已經使用",
-    "account_usage_limits_reset_daily": "使用限制每天午夜重置",
-    "account_basics_tier_title": "帳戶類型",
-    "account_basics_tier_description": "你的能量值",
-    "account_basics_tier_admin": "管理員",
-    "account_basics_tier_admin_suffix_with_tier": "(擁有 {{tier}})",
-    "account_basics_tier_admin_suffix_no_tier": "(無層)",
-    "account_basics_tier_basic": "基礎",
-    "account_basics_tier_free": "免費",
-    "account_basics_tier_upgrade_button": "升級至專業版",
-    "publish_dialog_email_placeholder": "轉發到電郵，例如 phil@example.com",
-    "subscribe_dialog_subscribe_topic_placeholder": "主題名稱，例如 phil_alerts",
-    "publish_dialog_attached_file_remove": "移除附件",
-    "subscribe_dialog_subscribe_description": "主題可能不受到密碼保護， 所以盡量選擇一個不會容易被猜中的主題名稱。 一旦已訂閱，你能夠 PUT/POST 通訊。",
-    "subscribe_dialog_login_description": "這個主題受密碼保護，請輸入用戶名稱及密碼以訂閱主題。",
-    "account_basics_password_dialog_current_password_label": "現在的密碼",
-    "account_basics_password_dialog_current_password_incorrect": "密碼不正確",
-    "account_basics_tier_change_button": "更變",
-    "common_add": "新增",
+    "reservation_delete_dialog_action_delete_description": "緩存的郵件和附件將被永久刪除。此操作無法撤銷。",
+    "reservation_delete_dialog_action_delete_title": "刪除緩存的郵件和附件",
+    "reservation_delete_dialog_action_keep_description": "緩存在伺服器上的訊息和附件將對知道主題名稱的人公開可見。",
+    "reservation_delete_dialog_action_keep_title": "保留緩存的郵件和附件",
+    "reservation_delete_dialog_description": "刪除保留會放棄對該主題的所有權，並允許其他人保留它。你可以保留或刪除現有郵件和附件。",
+    "reservation_delete_dialog_submit_button": "刪除保留",
+    "reserve_dialog_checkbox_label": "保留主題並配置訪問",
+    "signup_already_have_account": "已有帳戶？登錄！",
+    "signup_disabled": "註冊已禁用",
+    "signup_error_creation_limit_reached": "已達到帳戶創建限制",
+    "signup_error_username_taken": "用戶名 {{username}} 已被取用",
+    "signup_form_button_submit": "註冊",
     "signup_form_confirm_password": "確認密碼",
-    "publish_dialog_drop_file_here": "拖曳檔案到此",
-    "account_basics_tier_interval_monthly": "每月",
-    "common_copy_to_clipboard": "複製到剪貼簿",
-    "publish_dialog_call_label": "電話",
-    "publish_dialog_call_reset": "移除電話",
-    "publish_dialog_chip_call_label": "電話",
-    "account_usage_reservations_none": "此帳戶沒有預留主題",
-    "account_usage_attachment_storage_title": "附件容量",
-    "account_basics_tier_canceled_subscription": "你的付費訂閱已取消，並於 {{date}} 下調為免費帳戶。",
-    "account_usage_messages_title": "已發佈的信息",
-    "publish_dialog_chip_call_no_verified_numbers_tooltip": "沒有已驗證的電話號碼",
-    "account_basics_tier_interval_yearly": "每年",
-    "account_usage_emails_title": "已發送電郵",
-    "account_usage_attachment_storage_description": "每個檔案約 {{filesize}}，將於 {{expiry}} 後刪除",
-    "publish_dialog_attachment_limits_file_and_quota_reached": "已超過 {{fileSizeLimit}} 檔案上限，尚餘 {{remainingBytes}}",
-    "account_basics_tier_paid_until": "已付費訂閱至 {{date}} 並自動續期",
-    "account_basics_tier_payment_overdue": "你的費用已逾期。請更新付款方法，否則你的戶口等級將會下調。",
-    "publish_dialog_call_item": "致電 {{number}}",
-    "account_basics_tier_manage_billing_button": "管理付款方式"
+    "signup_form_password": "密碼",
+    "signup_form_toggle_password_visibility": "切換密碼可見性",
+    "signup_form_username": "用戶名",
+    "signup_title": "創建一個 ntfy 帳戶",
+    "subscribe_dialog_error_topic_already_reserved": "主題已保留",
+    "subscribe_dialog_error_user_anonymous": "匿名",
+    "subscribe_dialog_error_user_not_authorized": "未授權 {{username}} 使用者",
+    "subscribe_dialog_login_button_login": "登入",
+    "subscribe_dialog_login_description": "本主題受密碼保護，請輸入用戶名和密碼以訂閱。",
+    "subscribe_dialog_login_password_label": "密碼",
+    "subscribe_dialog_login_title": "請登錄",
+    "subscribe_dialog_login_username_label": "用戶名，例如 phil",
+    "subscribe_dialog_subscribe_base_url_label": "服務地址地址",
+    "subscribe_dialog_subscribe_button_cancel": "取消",
+    "subscribe_dialog_subscribe_button_generate_topic_name": "生成名稱",
+    "subscribe_dialog_subscribe_button_subscribe": "訂閱",
+    "subscribe_dialog_subscribe_description": "主題可能不受密碼保護，因此請選擇一個不容易被猜中的名字。訂閱後，你可以使用 PUT/POST 通知。",
+    "subscribe_dialog_subscribe_title": "訂閱主題",
+    "subscribe_dialog_subscribe_topic_placeholder": "主題名，例如 phil_alerts",
+    "subscribe_dialog_subscribe_use_another_background_info": "當網頁程式未開啟， 將不會收到來自其他伺服器的通知",
+    "subscribe_dialog_subscribe_use_another_label": "使用其他伺服器",
+    "web_push_subscription_expiring_body": "開啟ntfy以繼續接收通知",
+    "web_push_subscription_expiring_title": "通知會被暫停",
+    "web_push_unknown_notification_body": "你可能需要開啟網頁來更新ntfy",
+    "web_push_unknown_notification_title": "接收到不明通知"
 }

web/public/sw.js

@@ -7,8 +7,7 @@ import { clientsClaim } from "workbox-core";
 import { dbAsync } from "../src/app/db";
 
 import { toNotificationParams, icon, badge } from "../src/app/notificationUtils";
-
-import i18n from "../src/app/i18n";
+import initI18n from "../src/app/i18n";
 
 /**
  * General docs for service workers and PWAs:
@@ -67,8 +66,10 @@ const handlePushMessage = async (data) => {
  * Handle a received web push subscription expiring.
  */
 const handlePushSubscriptionExpiring = async (data) => {
-  await self.registration.showNotification(i18n.t("web_push_subscription_expiring_title"), {
-    body: i18n.t("web_push_subscription_expiring_body"),
+  const t = await initI18n();
+
+  await self.registration.showNotification(t("web_push_subscription_expiring_title"), {
+    body: t("web_push_subscription_expiring_body"),
     icon,
     data,
     badge,
@@ -80,8 +81,10 @@ const handlePushSubscriptionExpiring = async (data) => {
  * permission can be revoked by the browser.
  */
 const handlePushUnknown = async (data) => {
-  await self.registration.showNotification(i18n.t("web_push_unknown_notification_title"), {
-    body: i18n.t("web_push_unknown_notification_body"),
+  const t = await initI18n();
+
+  await self.registration.showNotification(t("web_push_unknown_notification_title"), {
+    body: t("web_push_unknown_notification_body"),
     icon,
     data,
     badge,
@@ -107,6 +110,8 @@ const handlePush = async (data) => {
  * This is also called when the user clicks on an action button.
  */
 const handleClick = async (event) => {
+  const t = await initI18n();
+
   const clients = await self.clients.matchAll({ type: "window" });
 
   const rootUrl = new URL(self.location.origin);
@@ -147,7 +152,7 @@ const handleClick = async (event) => {
           }
         } catch (e) {
           console.error("[ServiceWorker] Error performing http action", e);
-          self.registration.showNotification(`${i18n.t("notifications_actions_failed_notification")}: ${action.label} (${action.action})`, {
+          self.registration.showNotification(`${t("notifications_actions_failed_notification")}: ${action.label} (${action.action})`, {
             body: e.message,
             icon,
             badge,

web/src/app/Notifier.js

@@ -124,9 +124,17 @@ class Notifier {
     return window.location.protocol === "https:" || window.location.hostname.match("^127.") || window.location.hostname === "localhost";
   }
 
+  // no PushManager when not installed, but it _is_ supported.
   iosSupportedButInstallRequired() {
-    // no PushManager when not installed, but it _is_ supported.
-    return config.enable_web_push && "serviceWorker" in navigator && window.navigator.standalone === false;
+    return (
+      config.enable_web_push &&
+      // a service worker exists
+      "serviceWorker" in navigator &&
+      // but the pushmanager API is missing, which implies we're on an iOS device without installing
+      !("PushManager" in window) &&
+      // check that this is the case by checking for `standalone`, which only exists on Safari
+      window.navigator.standalone === false
+    );
   }
 }
 

web/src/app/i18n.js

@@ -1,4 +1,4 @@
-import i18n from "i18next";
+import i18next from "i18next";
 import Backend from "i18next-http-backend";
 import LanguageDetector from "i18next-browser-languagedetector";
 import { initReactI18next } from "react-i18next";
@@ -11,19 +11,20 @@ import { initReactI18next } from "react-i18next";
 // See example project here:
 // https://github.com/i18next/react-i18next/tree/master/example/react
 
-i18n
-  .use(Backend)
-  .use(LanguageDetector)
-  .use(initReactI18next)
-  .init({
-    fallbackLng: "en",
-    debug: true,
-    interpolation: {
-      escapeValue: false, // not needed for react as it escapes by default
-    },
-    backend: {
-      loadPath: "/static/langs/{{lng}}.json",
-    },
-  });
+const initI18n = () =>
+  i18next
+    .use(Backend)
+    .use(LanguageDetector)
+    .use(initReactI18next)
+    .init({
+      fallbackLng: "en",
+      debug: true,
+      interpolation: {
+        escapeValue: false, // not needed for react as it escapes by default
+      },
+      backend: {
+        loadPath: "/static/langs/{{lng}}.json",
+      },
+    });
 
-export default i18n;
+export default initI18n;

web/src/app/notificationUtils.js

@@ -35,7 +35,7 @@ export const formatMessage = (m) => {
 };
 
 const imageRegex = /\.(png|jpe?g|gif|webp)$/i;
-const isImage = (attachment) => {
+export const isImage = (attachment) => {
   if (!attachment) return false;
 
   // if there's a type, only take that into account

web/src/app/utils.js

@@ -130,14 +130,20 @@ export const hashCode = (s) => {
   return hash;
 };
 
+/**
+ * convert `i18n.language` style str (e.g.: `en_US`) to kebab-case (e.g.: `en-US`),
+ * which is expected by `<html lang>` and `Intl.DateTimeFormat`
+ */
+export const getKebabCaseLangStr = (language) => language.replace(/_/g, "-");
+
 export const formatShortDateTime = (timestamp, language) =>
-  new Intl.DateTimeFormat(language, {
+  new Intl.DateTimeFormat(getKebabCaseLangStr(language), {
     dateStyle: "short",
     timeStyle: "short",
   }).format(new Date(timestamp * 1000));
 
 export const formatShortDate = (timestamp, language) =>
-  new Intl.DateTimeFormat(language, { dateStyle: "short" }).format(new Date(timestamp * 1000));
+  new Intl.DateTimeFormat(getKebabCaseLangStr(language), { dateStyle: "short" }).format(new Date(timestamp * 1000));
 
 export const formatBytes = (bytes, decimals = 2) => {
   if (bytes === 0) return "0 bytes";

web/src/components/App.jsx

@@ -11,7 +11,7 @@ import ActionBar from "./ActionBar";
 import Preferences from "./Preferences";
 import subscriptionManager from "../app/SubscriptionManager";
 import userManager from "../app/UserManager";
-import { expandUrl } from "../app/utils";
+import { expandUrl, getKebabCaseLangStr } from "../app/utils";
 import ErrorBoundary from "./ErrorBoundary";
 import routes from "./routes";
 import { useAccountListener, useBackgroundProcesses, useConnectionListeners, useWebPushTopics } from "./hooks";
@@ -20,10 +20,12 @@ import Messaging from "./Messaging";
 import Login from "./Login";
 import Signup from "./Signup";
 import Account from "./Account";
-import "../app/i18n"; // Translations!
+import initI18n from "../app/i18n"; // Translations!
 import prefs, { THEME } from "../app/Prefs";
 import RTLCacheProvider from "./RTLCacheProvider";
 
+initI18n();
+
 export const AccountContext = createContext(null);
 
 const darkModeEnabled = (prefersDarkMode, themePreference) => {
@@ -54,7 +56,7 @@ const App = () => {
   );
 
   useEffect(() => {
-    document.documentElement.setAttribute("lang", i18n.language);
+    document.documentElement.setAttribute("lang", getKebabCaseLangStr(i18n.language));
     document.dir = languageDir;
   }, [i18n.language, languageDir]);
 

web/src/components/Notifications.jsx

@@ -27,7 +27,7 @@ import { useOutletContext } from "react-router-dom";
 import { useRemark } from "react-remark";
 import styled from "@emotion/styled";
 import { formatBytes, formatShortDateTime, maybeActionErrors, openUrl, shortUrl, topicShortUrl, unmatchedTags } from "../app/utils";
-import { formatMessage, formatTitle } from "../app/notificationUtils";
+import { formatMessage, formatTitle, isImage } from "../app/notificationUtils";
 import { LightboxBackdrop, Paragraph, VerticallyCenteredContainer } from "./styles";
 import subscriptionManager from "../app/SubscriptionManager";
 import priority1 from "../img/priority-1.svg";
@@ -346,7 +346,7 @@ const Attachment = (props) => {
   const { attachment } = props;
   const expired = attachment.expires && attachment.expires < Date.now() / 1000;
   const expires = attachment.expires && attachment.expires > Date.now() / 1000;
-  const displayableImage = !expired && attachment.type && attachment.type.startsWith("image/");
+  const displayableImage = !expired && isImage(attachment);
 
   // Unexpired image
   if (displayableImage) {

web/src/components/Preferences.jsx

@@ -544,6 +544,7 @@ const Language = () => {
     "🇯🇵",
     "🇷🇺",
     "🇹🇷",
+    "🇫🇮",
   ]).slice(0, 3);
   const showFlags = !navigator.userAgent.includes("Windows");
   let title = t("prefs_appearance_language_title");
@@ -571,7 +572,8 @@ const Language = () => {
           <MenuItem value="id">Bahasa Indonesia</MenuItem>
           <MenuItem value="bg">Български</MenuItem>
           <MenuItem value="cs">Čeština</MenuItem>
-          <MenuItem value="zh_Hans">中文</MenuItem>
+          <MenuItem value="zh_Hant">繁體中文</MenuItem>
+          <MenuItem value="zh_Hans">简体中文</MenuItem>
           <MenuItem value="da">Dansk</MenuItem>
           <MenuItem value="de">Deutsch</MenuItem>
           <MenuItem value="es">Español</MenuItem>
@@ -587,6 +589,7 @@ const Language = () => {
           <MenuItem value="pt_BR">Português (Brasil)</MenuItem>
           <MenuItem value="pl">Polski</MenuItem>
           <MenuItem value="ru">Русский</MenuItem>
+          <MenuItem value="fi">Suomi</MenuItem>
           <MenuItem value="sv">Svenska</MenuItem>
           <MenuItem value="tr">Türkçe</MenuItem>
         </Select>