Derp

.github/dependabot.yml

@@ -1,26 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/web"
-    schedule:
-      interval: "weekly"
-    cooldown:
-      default-days: 7
-
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    cooldown:
-      default-days: 7
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    cooldown:
-      default-days: 7
-    groups:
-      all:
-        patterns:
-          - "*"

.github/workflows/build.yaml

@@ -1,22 +1,19 @@
 name: build
-on:
-  push:
-    branches: [ main ]
-  pull_request:
+on: [ push, pull_request ]
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
+        uses: actions/setup-go@v4
         with:
-          go-version-file: '.go-version'
+          go-version: '1.24.x'
       - name: Install node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@v3
         with:
-          node-version: '24'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: './web/package-lock.json'
       - name: Install dependencies

.github/workflows/docs.yaml

@@ -9,10 +9,10 @@ jobs:
     steps:
       -
         name: Checkout ntfy code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@v3
       -
         name: Checkout docs pages code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@v3
         with:
           repository: binwiederhier/ntfy-docs.github.io
           path: build/ntfy-docs.github.io

.github/workflows/release.yaml

@@ -6,38 +6,21 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:17
-        env:
-          POSTGRES_USER: ntfy
-          POSTGRES_PASSWORD: ntfy
-          POSTGRES_DB: ntfy_test
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd "pg_isready -U ntfy"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      NTFY_TEST_DATABASE_URL: "postgres://ntfy:ntfy@localhost:5432/ntfy_test?sslmode=disable"
-      NTFY_TEST_S3_URL: ${{ secrets.NTFY_TEST_S3_URL }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
+        uses: actions/setup-go@v4
         with:
-          go-version-file: '.go-version'
+          go-version: '1.24.x'
       - name: Install node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@v3
         with:
-          node-version: '24'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: './web/package-lock.json'
       - name: Docker login
-        uses: docker/login-action@371161bbe7024a29a25c5e19bfcbc0804fe9ad2c # v4.5.2
+        uses: docker/login-action@v2
         with:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}

.github/workflows/test.yaml

@@ -1,39 +1,19 @@
 name: test
-on:
-  push:
-    branches: [ main ]
-  pull_request:
+on: [ push, pull_request ]
 jobs:
   test:
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:17
-        env:
-          POSTGRES_USER: ntfy
-          POSTGRES_PASSWORD: ntfy
-          POSTGRES_DB: ntfy_test
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd "pg_isready -U ntfy"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      NTFY_TEST_DATABASE_URL: "postgres://ntfy:ntfy@localhost:5432/ntfy_test?sslmode=disable"
-      NTFY_TEST_S3_URL: ${{ secrets.NTFY_TEST_S3_URL }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
+        uses: actions/setup-go@v4
         with:
-          go-version-file: '.go-version'
+          go-version: '1.24.x'
       - name: Install node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@v3
         with:
-          node-version: '24'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: './web/package-lock.json'
       - name: Install dependencies
@@ -43,6 +23,8 @@ jobs:
       - name: Build web app (required for tests)
         run: make web
       - name: Run tests, formatting, vetting and linting
-        run: make checkv
+        run: make check
       - name: Run coverage
         run: make coverage
+      - name: Upload coverage to codecov.io
+        run: make coverage-upload

.gitignore

@@ -7,9 +7,6 @@ build/
 server/docs/
 server/site/
 tools/fbsend/fbsend
-tools/pgimport/pgimport
-tools/loadtest/loadtest
-tools/s3cli/s3cli
 playground/
 secrets/
 *.iml

.go-version

@@ -1 +0,0 @@
-1.26.5

.goreleaser.yml

@@ -48,15 +48,13 @@ builds:
   - id: ntfy_windows_amd64
     binary: ntfy
     env:
-      - CGO_ENABLED=1 # required for go-sqlite3
-      - CC=x86_64-w64-mingw32-gcc # apt install gcc-mingw-w64-x86-64
-    tags: [ sqlite_omit_load_extension,osusergo,netgo ]
+      - CGO_ENABLED=0 # explicitly disable, since we don't need go-sqlite3
+    tags: [ noserver ] # don't include server files
     ldflags:
-      - "-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
+      - "-X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
     goos: [ windows ]
-    goarch: [amd64 ]
-  -
-    id: ntfy_darwin_all
+    goarch: [ amd64 ]
+  - id: ntfy_darwin_all
     binary: ntfy
     env:
       - CGO_ENABLED=0 # explicitly disable, since we don't need go-sqlite3
@@ -203,4 +201,4 @@ docker_manifests:
       - *amd64_image
       - *arm64v8_image
       - *armv7_image
-      - *armv6_image
+      - *armv6_image

CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement via Discord/Matrix (binwiederhier),
-or email (contact@mail.ntfy.sh). All complaints will be reviewed and investigated promptly 
+or email (ntfy@heckel.io). All complaints will be reviewed and investigated promptly 
 and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

Dockerfile-build

@@ -1,8 +1,8 @@
-FROM golang:1.25-bookworm AS builder
+FROM golang:1.24-bullseye as builder
 
 ARG VERSION=dev
 ARG COMMIT=unknown
-ARG NODE_MAJOR=24
+ARG NODE_MAJOR=18
 
 RUN apt-get update && apt-get install -y \
        build-essential ca-certificates curl gnupg \
@@ -21,14 +21,14 @@ ADD Makefile .
 
 # docs
 ADD ./requirements.txt .
-RUN --mount=type=cache,target=/root/.cache/pip make docs-deps
+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 --mount=type=cache,target=/root/.npm make web-deps
+RUN make web-deps
 ADD ./web ./web
 RUN make web-build
 
@@ -40,18 +40,7 @@ ADD ./log ./log
 ADD ./server ./server
 ADD ./user ./user
 ADD ./util ./util
-ADD ./payments ./payments
-ADD ./db ./db
-ADD ./message ./message
-ADD ./model ./model
-ADD ./webpush ./webpush
-ADD ./attachment ./attachment
-ADD ./mail ./mail
-ADD ./s3 ./s3
-ADD ./action ./action
-ADD ./template/gotext ./template/gotext
-
-RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make VERSION=$VERSION COMMIT=$COMMIT cli-linux-server
+RUN make VERSION=$VERSION COMMIT=$COMMIT cli-linux-server
 
 FROM alpine
 

Makefile

@@ -1,13 +1,10 @@
 MAKEFLAGS := --jobs=1
-NPM := npm
 PYTHON := python3
 PIP := pip3
 VERSION := $(shell git describe --tag)
 COMMIT := $(shell git rev-parse --short HEAD)
 
-# FORCE is an always-out-of-date target with no recipe; listing it as a prerequisite
-# forces that target's recipe to run every time (the classic "FORCE target" idiom).
-FORCE:
+.PHONY:
 
 help:
 	@echo "Typical commands (more see below):"
@@ -34,7 +31,6 @@ help:
 	@echo "Build server & client (without GoReleaser):"
 	@echo "  make cli-linux-server           - Build client & server (no GoReleaser, current arch, Linux)"
 	@echo "  make cli-darwin-server          - Build client & server (no GoReleaser, current arch, macOS)"
-	@echo "  make cli-windows-server         - Build client & server (no GoReleaser, amd64 only, Windows)"
 	@echo "  make cli-client                 - Build client only (no GoReleaser, current arch, Linux/macOS/Windows)"
 	@echo
 	@echo "Build dev Docker:"
@@ -45,7 +41,6 @@ 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-test                   - Run vitest unit tests for the web app"
 	@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
@@ -55,9 +50,7 @@ help:
 	@echo "  make docs-build                 - Actually build the documentation"
 	@echo
 	@echo "Test/check:"
-	@echo "  make test                       - Run all tests (Go + web)"
-	@echo "  make cli-test                   - Run Go tests only"
-	@echo "  make web-test                   - Run web app tests only"
+	@echo "  make test                       - Run tests"
 	@echo "  make race                       - Run tests with -race flag"
 	@echo "  make coverage                   - Run tests and show coverage"
 	@echo "  make coverage-html              - Run tests and show coverage (as HTML)"
@@ -87,12 +80,12 @@ help:
 
 # Building everything
 
-clean: FORCE
+clean: .PHONY
 	rm -rf dist build server/docs server/site
 
 build: web docs cli
 
-update: web-deps-update cli-deps-update docs-deps-update go-check
+update: web-deps-update cli-deps-update docs-deps-update
 	docker pull alpine
 
 docker-dev:
@@ -113,7 +106,6 @@ build-deps-ubuntu:
 		curl \
 		gcc-aarch64-linux-gnu \
 		gcc-arm-linux-gnueabi \
-		gcc-mingw-w64-x86-64 \
 		python3 \
 		python3-venv \
 		jq
@@ -124,7 +116,7 @@ build-deps-ubuntu:
 
 docs: docs-deps docs-build
 
-docs-venv: FORCE
+docs-venv: .PHONY
 	$(PYTHON) -m venv ./venv
 
 docs-build: docs-venv
@@ -133,7 +125,7 @@ docs-build: docs-venv
 docs-deps: docs-venv
 	(. venv/bin/activate && $(PIP) install -r requirements.txt)
 
-docs-deps-update: FORCE
+docs-deps-update: .PHONY
 	(. venv/bin/activate && $(PIP) install -r requirements.txt --upgrade)
 
 
@@ -143,7 +135,7 @@ web: web-deps web-build
 
 web-build:
 	cd web \
-		&& $(NPM) run build \
+		&& npm run build \
 		&& mv build/index.html build/app.html \
 		&& rm -rf ../server/site \
 		&& mv build ../server/site \
@@ -151,25 +143,20 @@ web-build:
 			../server/site/config.js
 
 web-deps:
-	cd web && $(NPM) ci
-	# Use "npm ci" so that we don't change the package lock file
+	cd web && npm install
 	# If this fails for .svg files, optimize them with svgo
 
 web-deps-update:
-	cd web && $(NPM) update --before="$(shell date -d '7 days ago' +%Y-%m-%d)"
-	cd web && $(NPM) install
+	cd web && npm update
 
 web-fmt:
-	cd web && $(NPM) run format
+	cd web && npm run format
 
 web-fmt-check:
-	cd web && $(NPM) run format:check
+	cd web && npm run format:check
 
 web-lint:
-	cd web && $(NPM) run lint
-
-web-test:
-	cd web && $(NPM) run test
+	cd web && npm run lint
 
 # Main server/client build
 
@@ -214,16 +201,6 @@ cli-darwin-server: cli-deps-static-sites
 		-ldflags \
 		"-linkmode=external -s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
 
-cli-windows-server: cli-deps-static-sites
-	# This is a target to build the CLI (including the server) for Windows.
-	# Use this for Windows development, if you really don't want to install GoReleaser ...
-	mkdir -p dist/ntfy_windows_server server/docs
-	CC=x86_64-w64-mingw32-gcc GOOS=windows GOARCH=amd64 CGO_ENABLED=1 go build \
-		-o dist/ntfy_windows_server/ntfy.exe \
-		-tags sqlite_omit_load_extension,osusergo,netgo \
-		-ldflags \
-		"-s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
-
 cli-client: cli-deps-static-sites
 	# This is a target to build the CLI (excluding the server) manually. This should work on Linux/macOS/Windows.
 	# Use this for development, if you really don't want to install GoReleaser ...
@@ -236,7 +213,7 @@ cli-client: cli-deps-static-sites
 
 cli-deps: cli-deps-static-sites cli-deps-all cli-deps-gcc
 
-cli-deps-gcc: cli-deps-gcc-armv6-armv7 cli-deps-gcc-arm64 cli-deps-gcc-windows
+cli-deps-gcc: cli-deps-gcc-armv6-armv7 cli-deps-gcc-arm64
 
 cli-deps-static-sites:
 	mkdir -p server/docs server/site
@@ -251,12 +228,8 @@ cli-deps-gcc-armv6-armv7:
 cli-deps-gcc-arm64:
 	which aarch64-linux-gnu-gcc || { echo "ERROR: ARM64 cross compiler not installed. On Ubuntu, run: apt install gcc-aarch64-linux-gnu"; exit 1; }
 
-cli-deps-gcc-windows:
-	which x86_64-w64-mingw32-gcc || { echo "ERROR: Windows cross compiler not installed. On Ubuntu, run: apt install gcc-mingw-w64-x86-64"; exit 1; }
-
 cli-deps-update:
 	go get -u
-	go mod tidy
 	go install honnef.co/go/tools/cmd/staticcheck@latest
 	go install golang.org/x/lint/golint@latest
 	go install github.com/goreleaser/goreleaser/v2@latest
@@ -273,31 +246,25 @@ cli-build-results:
 
 # Test/check targets
 
-check: test web-fmt-check fmt-check vet web-lint lint staticcheck template-check go-check
+check: test web-fmt-check fmt-check vet web-lint lint staticcheck
 
-checkv: testv web-fmt-check fmt-check vet web-lint lint staticcheck template-check go-check
+test: .PHONY
+	go test $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
 
-test: cli-test web-test
+testv: .PHONY
+	go test -v $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
 
-testv: cli-testv web-test
-
-cli-test: FORCE
-	go test $(shell go list -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' ./... | grep -vE 'ntfy/v2/(test|examples|tools)')
-
-cli-testv: FORCE
-	go test -v $(shell go list -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' ./... | grep -vE 'ntfy/v2/(test|examples|tools)')
-
-race: FORCE
-	go test -v -race $(shell go list -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' ./... | grep -vE 'ntfy/v2/(test|examples|tools)')
+race: .PHONY
+	go test -v -race $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
 
 coverage:
 	mkdir -p build/coverage
-	go test -v -race -coverprofile=build/coverage/coverage.txt -covermode=atomic $(shell go list -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' ./... | grep -vE 'ntfy/v2/(test|examples|tools|web)')
+	go test -v -race -coverprofile=build/coverage/coverage.txt -covermode=atomic $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
 	go tool cover -func build/coverage/coverage.txt
 
 coverage-html:
 	mkdir -p build/coverage
-	go test -race -coverprofile=build/coverage/coverage.txt -covermode=atomic $(shell go list -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' ./... | grep -vE 'ntfy/v2/(test|examples|tools)')
+	go test -race -coverprofile=build/coverage/coverage.txt -covermode=atomic $(shell go list ./... | grep -vE 'ntfy/(test|examples|tools)')
 	go tool cover -html build/coverage/coverage.txt
 
 coverage-upload:
@@ -317,73 +284,17 @@ vet:
 
 lint:
 	which golint || go install golang.org/x/lint/golint@latest
-	go list ./... | grep -v /vendor/ | grep -vE 'ntfy/v2/template/gotext' | xargs -L1 golint -set_exit_status
+	go list ./... | grep -v /vendor/ | xargs -L1 golint -set_exit_status
 
-staticcheck: FORCE
+staticcheck: .PHONY
 	rm -rf build/staticcheck
 	which staticcheck || go install honnef.co/go/tools/cmd/staticcheck@latest
 	mkdir -p build/staticcheck
 	ln -s "go" build/staticcheck/go
-	PATH="$(PWD)/build/staticcheck:$(PATH)" staticcheck $$(go list ./... | grep -vE 'ntfy/v2/template/gotext')
+	PATH="$(PWD)/build/staticcheck:$(PATH)" staticcheck ./...
 	rm -rf build/staticcheck
 
 
-# Vendored template targets (see template/README.md)
-
-TEMPLATE_GO_VERSION := go$(shell cat .go-version 2>/dev/null)
-
-update-template:
-	@if [ "$$(go env GOVERSION)" != "$(TEMPLATE_GO_VERSION)" ]; then \
-		echo "ERROR: local Go $$(go env GOVERSION) != $(TEMPLATE_GO_VERSION) pinned in .go-version."; \
-		echo "Bump .go-version and install that toolchain first: go install golang.org/dl/$(TEMPLATE_GO_VERSION)@latest && $(TEMPLATE_GO_VERSION) download"; \
-		exit 1; \
-	fi
-	src="$$(go env GOROOT)/src"; \
-	rm -f template/gotext/*.go template/gotext/fmtsort/*.go; \
-	for f in $$(go list -f '{{range .GoFiles}}{{.}} {{end}}' text/template); do cp "$$src/text/template/$$f" template/gotext/; done; \
-	for f in $$(go list -f '{{range .GoFiles}}{{.}} {{end}}' internal/fmtsort); do cp "$$src/internal/fmtsort/$$f" template/gotext/fmtsort/; done; \
-	sed -i 's/^package template$$/package gotext/' template/gotext/*.go; \
-	sed -i 's#"internal/fmtsort"#"heckel.io/ntfy/v2/template/gotext/fmtsort"#' template/gotext/*.go; \
-	( cd template/gotext && for p in patches/*.patch; do echo "Applying $$p"; git apply "$$p" || exit 1; done )
-	go env GOVERSION > template/gotext/GENERATED_FROM
-	@echo "Regenerated template/gotext/ from $(TEMPLATE_GO_VERSION) (files enumerated via 'go list'); review with 'git diff'."
-
-template-check: FORCE
-	@if [ "$$(cat template/gotext/GENERATED_FROM)" != "$(TEMPLATE_GO_VERSION)" ]; then \
-		echo "ERROR: template/gotext was generated from $$(cat template/gotext/GENERATED_FROM), but .go-version pins $(TEMPLATE_GO_VERSION). Run 'make update-template' on the pinned Go."; \
-		exit 1; \
-	fi
-	@if [ "$$(go env GOVERSION)" != "$(TEMPLATE_GO_VERSION)" ]; then \
-		echo "SKIP: local Go $$(go env GOVERSION) != pinned $(TEMPLATE_GO_VERSION); skipping vendored template content check (version marker already verified)."; \
-		exit 0; \
-	fi
-	@tmp=$$(mktemp -d); src="$$(go env GOROOT)/src"; \
-	mkdir -p "$$tmp/gotext/fmtsort"; \
-	for f in $$(go list -f '{{range .GoFiles}}{{.}} {{end}}' text/template); do cp "$$src/text/template/$$f" "$$tmp/gotext/"; done; \
-	for f in $$(go list -f '{{range .GoFiles}}{{.}} {{end}}' internal/fmtsort); do cp "$$src/internal/fmtsort/$$f" "$$tmp/gotext/fmtsort/"; done; \
-	sed -i 's/^package template$$/package gotext/' "$$tmp/gotext/"*.go; \
-	sed -i 's#"internal/fmtsort"#"heckel.io/ntfy/v2/template/gotext/fmtsort"#' "$$tmp/gotext/"*.go; \
-	cp template/gotext/patches/*.patch "$$tmp/"; \
-	( cd "$$tmp/gotext" && for p in "$$tmp"/*.patch; do git apply "$$p" || exit 1; done ); \
-	if diff -rq -x 'README.md' -x 'GENERATED_FROM' -x 'patches' "$$tmp/gotext" template/gotext >/dev/null 2>&1; then \
-		rm -rf "$$tmp"; \
-	else \
-		echo "ERROR: template/gotext/ drifted from GOROOT+patches (or its file set changed). Run 'make update-template' on Go $(TEMPLATE_GO_VERSION):"; \
-		diff -rq -x 'README.md' -x 'GENERATED_FROM' -x 'patches' "$$tmp/gotext" template/gotext; \
-		rm -rf "$$tmp"; exit 1; \
-	fi
-
-# go-check is advisory only (never fails): it warns when the pinned Go (.go-version) is behind the
-# latest upstream release, so template/gotext doesn't silently fall behind on text/template fixes.
-go-check: FORCE
-	@latest=$$(curl -s --max-time 10 'https://go.dev/VERSION?m=text' 2>/dev/null | head -1); \
-	if [ -n "$$latest" ] && [ "$$latest" != "$(TEMPLATE_GO_VERSION)" ]; then \
-		echo ""; \
-		echo "note: latest Go is $$latest, but template/gotext is pinned to $(TEMPLATE_GO_VERSION) (.go-version)."; \
-		echo "      to bump: install $$latest, set .go-version to $${latest#go}, then run 'make update-template'."; \
-	fi
-
-
 # Releasing targets
 
 release: clean cli-deps release-checks docs web check
@@ -394,10 +305,6 @@ release-snapshot: clean cli-deps docs web check
 
 release-checks:
 	$(eval LATEST_TAG := $(shell git describe --abbrev=0 --tags | cut -c2-))
-	if [ "$$(go env GOVERSION)" != "go$$(cat .go-version)" ]; then\
-		echo "ERROR: releases must use the pinned Go toolchain (go$$(cat .go-version) from .go-version), but this is $$(go env GOVERSION). This also ensures 'make check' enforces (not skips) the template/gotext drift check.";\
-		exit 1;\
-	fi
 	if ! grep -q $(LATEST_TAG) docs/install.md; then\
 	 	echo "ERROR: Must update docs/install.md with latest tag first.";\
 	 	exit 1;\

README.md

@@ -34,12 +34,6 @@ You can access the free version of ntfy at **[ntfy.sh](https://ntfy.sh)**. There
 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).
 
-<p>
-  <a href="https://play.google.com/store/apps/details?id=io.heckel.ntfy"><img height="50" src="docs/static/img/badge-googleplay.png"></a>
-  <a href="https://f-droid.org/en/packages/io.heckel.ntfy/"><img width="170" src="docs/static/img/badge-fdroid.svg"></a>
-  <a href="https://apps.apple.com/us/app/ntfy/id1625396347"><img height="50" src="docs/static/img/badge-appstore.png"></a>
-</p>
-
 <p>
   <img src=".github/images/screenshot-curl.png" height="180">
   <img src=".github/images/screenshot-web-detail.png" height="180">
@@ -84,6 +78,8 @@ Thank you to our commercial sponsors, who help keep the service running and the
 
 <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>
 
+<a href="https://www.magicbell.com/?utm_source=ntfy"><img src="assets/sponsors/magicbell.png" width="180px"></a>
+
 <a href="https://go.warp.dev/ntfy"><img src="https://raw.githubusercontent.com/warpdotdev/brand-assets/refs/heads/main/Logos/Warp-Wordmark-Black.png" width="160px"></a>
 
 And a big fat **Thank You** to the individuals who have sponsored ntfy in the past, or are still sponsoring ntfy:
@@ -266,7 +262,6 @@ Third-party libraries and resources:
 * [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3) (MIT) is used to provide the persistent message cache
 * [Firebase Admin SDK](https://github.com/firebase/firebase-admin-go) (Apache 2.0) is used to send FCM messages
 * [github/gemoji](https://github.com/github/gemoji) (MIT) is used for emoji support (specifically the [emoji.json](https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json) file)
-* Go's [text/template](https://pkg.go.dev/text/template) (BSD-3-Clause) is vendored under [template/gotext/](template/gotext/) with a small patch adding an execution deadline (see [template/gotext/README.md](template/gotext/README.md))
 * [Lightbox with vanilla JS](https://yossiabramov.com/blog/vanilla-js-lightbox) as a lightbox on the landing page 
 * [HTTP middleware for gzip compression](https://gist.github.com/CJEnright/bc2d8b8dc0c1389a9feeddb110f822d7) (MIT) is used for serving static files
 * [Regex for auto-linking](https://github.com/bryanwoods/autolink-js) (MIT) is used to highlight links (the library is not used)

SECURITY.md

@@ -6,7 +6,5 @@ As of today, I only support the latest version of ntfy. Please make sure you sta
 
 ## Reporting a Vulnerability
 
-Please report security vulnerabilities privately via email to [security@mail.ntfy.sh](mailto:security@mail.ntfy.sh).
-
-You can also reach me on [Discord](https://discord.gg/cT7ECsZj9w) or [Matrix](https://matrix.to/#/#ntfy:matrix.org) 
-(my username is `binwiederhier`).
+Please report severe security issues privately via ntfy@heckel.io, [Discord](https://discord.gg/cT7ECsZj9w),
+or [Matrix](https://matrix.to/#/#ntfy:matrix.org) (my username is `binwiederhier`).

attachment/backend.go

@@ -1,23 +0,0 @@
-package attachment
-
-import (
-	"io"
-	"time"
-)
-
-// backendObject represents an object stored in a backend.
-type object struct {
-	ID           string
-	Size         int64
-	LastModified time.Time
-}
-
-// backend is a minimal I/O interface for storing and retrieving attachment files.
-// It has no knowledge of size tracking, limiting, or ID validation.
-type backend interface {
-	Put(id string, reader io.Reader, untrustedLength int64) error
-	Get(id string) (io.ReadCloser, int64, error)
-	List() ([]object, error)
-	Delete(ids ...string) error
-	DeleteIncomplete(cutoff time.Time) error
-}

attachment/backend_file.go

@@ -1,94 +0,0 @@
-package attachment
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-type fileBackend struct {
-	dir string
-}
-
-var _ backend = (*fileBackend)(nil)
-
-func newFileBackend(dir string) (*fileBackend, error) {
-	if err := os.MkdirAll(dir, 0700); err != nil {
-		return nil, err
-	}
-	return &fileBackend{dir: dir}, nil
-}
-
-func (b *fileBackend) Put(id string, reader io.Reader, untrustedLength int64) error {
-	if untrustedLength > 0 {
-		reader = io.LimitReader(reader, untrustedLength)
-	}
-	file := filepath.Join(b.dir, id)
-	f, err := os.OpenFile(file, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	n, err := io.Copy(f, reader)
-	if err != nil {
-		os.Remove(file)
-		return err
-	} else if untrustedLength > 0 && n != untrustedLength {
-		os.Remove(file)
-		return fmt.Errorf("content length mismatch: claimed %d, got %d", untrustedLength, n)
-	}
-	if err := f.Close(); err != nil {
-		os.Remove(file)
-		return err
-	}
-	return nil
-}
-
-func (b *fileBackend) List() ([]object, error) {
-	entries, err := os.ReadDir(b.dir)
-	if err != nil {
-		return nil, err
-	}
-	objects := make([]object, 0, len(entries))
-	for _, e := range entries {
-		info, err := e.Info()
-		if err != nil {
-			return nil, err
-		}
-		objects = append(objects, object{
-			ID:           e.Name(),
-			Size:         info.Size(),
-			LastModified: info.ModTime(),
-		})
-	}
-	return objects, nil
-}
-
-func (b *fileBackend) Get(id string) (io.ReadCloser, int64, error) {
-	file := filepath.Join(b.dir, id)
-	stat, err := os.Stat(file)
-	if err != nil {
-		return nil, 0, err
-	}
-	f, err := os.Open(file)
-	if err != nil {
-		return nil, 0, err
-	}
-	return f, stat.Size(), nil
-}
-
-func (b *fileBackend) Delete(ids ...string) error {
-	for _, id := range ids {
-		file := filepath.Join(b.dir, id)
-		if err := os.Remove(file); err != nil && !os.IsNotExist(err) {
-			return err
-		}
-	}
-	return nil
-}
-
-func (b *fileBackend) DeleteIncomplete(_ time.Time) error {
-	return nil
-}

attachment/backend_s3.go

@@ -1,51 +0,0 @@
-package attachment
-
-import (
-	"context"
-	"io"
-	"time"
-
-	"heckel.io/ntfy/v2/s3"
-)
-
-type s3Backend struct {
-	client *s3.Client
-}
-
-var _ backend = (*s3Backend)(nil)
-
-func newS3Backend(client *s3.Client) *s3Backend {
-	return &s3Backend{client: client}
-}
-
-func (b *s3Backend) Put(id string, reader io.Reader, untrustedLength int64) error {
-	return b.client.PutObject(context.Background(), id, reader, untrustedLength)
-}
-
-func (b *s3Backend) Get(id string) (io.ReadCloser, int64, error) {
-	return b.client.GetObject(context.Background(), id)
-}
-
-func (b *s3Backend) List() ([]object, error) {
-	objects, err := b.client.ListObjectsV2(context.Background())
-	if err != nil {
-		return nil, err
-	}
-	result := make([]object, 0, len(objects))
-	for _, obj := range objects {
-		result = append(result, object{
-			ID:           obj.Key,
-			Size:         obj.Size,
-			LastModified: obj.LastModified,
-		})
-	}
-	return result, nil
-}
-
-func (b *s3Backend) Delete(ids ...string) error {
-	return b.client.DeleteObjects(context.Background(), ids)
-}
-
-func (b *s3Backend) DeleteIncomplete(cutoff time.Time) error {
-	return b.client.AbortIncompleteUploads(context.Background(), cutoff)
-}

attachment/store.go

@@ -1,246 +0,0 @@
-package attachment
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"sync"
-	"time"
-
-	"heckel.io/ntfy/v2/log"
-	"heckel.io/ntfy/v2/model"
-	"heckel.io/ntfy/v2/s3"
-	"heckel.io/ntfy/v2/util"
-)
-
-const (
-	tagStore     = "attachment_store"
-	syncInterval = 15 * time.Minute // How often to run the background sync loop
-)
-
-var errInvalidFileID = errors.New("invalid file ID")
-
-// Store manages attachment storage with shared logic for size tracking, limiting,
-// ID validation, and background sync to reconcile storage with the database.
-type Store struct {
-	backend              backend
-	limit                int64                            // Defined limit of the store in bytes
-	size                 int64                            // Current size of the store in bytes
-	sizes                map[string]int64                 // File ID -> size, for subtracting on Remove
-	attachmentsWithSizes func() (map[string]int64, error) // Returns file ID -> size for active attachments
-	orphanGracePeriod    time.Duration                    // Don't delete orphaned objects younger than this
-	closeChan            chan struct{}
-	doneChan             chan struct{}
-	mu                   sync.RWMutex // Protects size and sizes
-}
-
-// NewFileStore creates a new file-system backed attachment cache
-func NewFileStore(dir string, totalSizeLimit int64, orphanGracePeriod time.Duration, attachmentsWithSizes func() (map[string]int64, error)) (*Store, error) {
-	b, err := newFileBackend(dir)
-	if err != nil {
-		return nil, err
-	}
-	return newStore(b, totalSizeLimit, orphanGracePeriod, attachmentsWithSizes)
-}
-
-// NewS3Store creates a new S3-backed attachment cache. The s3URL must be in the format:
-//
-//	s3://ACCESS_KEY:SECRET_KEY@BUCKET[/PREFIX]?region=REGION[&endpoint=ENDPOINT][&disable_http2=true]
-func NewS3Store(s3URL string, totalSizeLimit int64, orphanGracePeriod time.Duration, attachmentsWithSizes func() (map[string]int64, error)) (*Store, error) {
-	config, err := s3.ParseURL(s3URL)
-	if err != nil {
-		return nil, err
-	}
-	return newStore(newS3Backend(s3.New(config)), totalSizeLimit, orphanGracePeriod, attachmentsWithSizes)
-}
-
-func newStore(backend backend, totalSizeLimit int64, orphanGracePeriod time.Duration, attachmentsWithSizes func() (map[string]int64, error)) (*Store, error) {
-	c := &Store{
-		backend:              backend,
-		limit:                totalSizeLimit,
-		sizes:                make(map[string]int64),
-		attachmentsWithSizes: attachmentsWithSizes,
-		orphanGracePeriod:    orphanGracePeriod,
-		closeChan:            make(chan struct{}),
-		doneChan:             make(chan struct{}),
-	}
-	// Hydrate sizes from the database immediately so that Size()/Remaining()/Remove()
-	// are accurate from the start, without waiting for the first sync() call.
-	if attachmentsWithSizes != nil {
-		attachments, err := attachmentsWithSizes()
-		if err != nil {
-			return nil, fmt.Errorf("attachment store: failed to load existing attachments: %w", err)
-		}
-		for id, size := range attachments {
-			c.sizes[id] = size
-			c.size += size
-		}
-		go c.syncLoop()
-	} else {
-		close(c.doneChan)
-	}
-	return c, nil
-}
-
-// Write stores an attachment file. The id is validated, and the write is subject to
-// the total size limit and any additional limiters. The untrustedLength is a hint
-// from the client's Content-Length header; backends may use it to optimize uploads (e.g.
-// streaming directly to S3 without buffering).
-func (c *Store) Write(id string, reader io.Reader, untrustedLength int64, limiters ...util.Limiter) (int64, error) {
-	if !model.ValidMessageID(id) {
-		return 0, errInvalidFileID
-	}
-	log.Tag(tagStore).Field("message_id", id).Debug("Writing attachment")
-	limiters = append(limiters, util.NewFixedLimiter(c.Remaining()))
-	countingReader := util.NewCountingReader(reader)
-	limitReader := util.NewLimitReader(countingReader, limiters...)
-	if err := c.backend.Put(id, limitReader, untrustedLength); err != nil {
-		c.backend.Delete(id) //nolint:errcheck
-		return 0, err
-	}
-	size := countingReader.Total()
-	c.mu.Lock()
-	c.size += size
-	c.sizes[id] = size
-	c.mu.Unlock()
-	return size, nil
-}
-
-// Read retrieves an attachment file by ID
-func (c *Store) Read(id string) (io.ReadCloser, int64, error) {
-	if !model.ValidMessageID(id) {
-		return nil, 0, errInvalidFileID
-	}
-	return c.backend.Get(id)
-}
-
-// Remove deletes attachment files by ID and subtracts their known sizes from
-// the total. Sizes for objects not tracked (e.g. written before this process
-// started and before the first sync) are corrected by the next sync() call.
-func (c *Store) Remove(ids ...string) error {
-	for _, id := range ids {
-		if !model.ValidMessageID(id) {
-			return errInvalidFileID
-		}
-	}
-	// Remove from backend
-	for _, id := range ids {
-		log.Tag(tagStore).Field("message_id", id).Debug("Removing attachment")
-	}
-	if err := c.backend.Delete(ids...); err != nil {
-		return err
-	}
-	// Update total cache size
-	c.mu.Lock()
-	for _, id := range ids {
-		if size, ok := c.sizes[id]; ok {
-			c.size -= size
-			delete(c.sizes, id)
-		}
-	}
-	if c.size < 0 {
-		c.size = 0
-	}
-	c.mu.Unlock()
-	return nil
-}
-
-// Sync triggers an immediate reconciliation of storage with the database.
-func (c *Store) Sync() error {
-	return c.sync()
-}
-
-// sync reconciles the backend storage with the database. It lists all objects,
-// deletes orphans (not in the valid ID set and older than the grace period), and
-// recomputes the total size from the existing attachments in the database.
-func (c *Store) sync() error {
-	if c.attachmentsWithSizes == nil {
-		return nil
-	}
-	attachmentsWithSizes, err := c.attachmentsWithSizes()
-	if err != nil {
-		return fmt.Errorf("attachment sync: failed to get existing attachments: %w", err)
-	}
-	remoteObjects, err := c.backend.List()
-	if err != nil {
-		return fmt.Errorf("attachment sync: failed to list objects: %w", err)
-	}
-	// Calculate total cache size and collect orphaned attachments, excluding objects younger
-	// than the grace period to account for races, and skipping objects with invalid IDs.
-	cutoff := time.Now().Add(-c.orphanGracePeriod)
-	var orphanIDs []string
-	var count, totalSize int64
-	sizes := make(map[string]int64, len(remoteObjects))
-	for _, obj := range remoteObjects {
-		if !model.ValidMessageID(obj.ID) {
-			continue
-		}
-		if _, ok := attachmentsWithSizes[obj.ID]; !ok && obj.LastModified.Before(cutoff) {
-			orphanIDs = append(orphanIDs, obj.ID)
-		} else {
-			count++
-			totalSize += attachmentsWithSizes[obj.ID]
-			sizes[obj.ID] = attachmentsWithSizes[obj.ID]
-		}
-	}
-	log.Tag(tagStore).Debug("Attachment store updated: %d attachment(s), %s", count, util.FormatSizeHuman(totalSize))
-	c.mu.Lock()
-	c.size = totalSize
-	c.sizes = sizes
-	c.mu.Unlock()
-	// Delete orphaned attachments
-	if len(orphanIDs) > 0 {
-		log.Tag(tagStore).Debug("Deleting %d orphaned attachment(s)", len(orphanIDs))
-		if err := c.backend.Delete(orphanIDs...); err != nil {
-			return fmt.Errorf("attachment sync: failed to delete orphaned objects: %w", err)
-		}
-	}
-	// Clean up incomplete uploads (S3 only)
-	if err := c.backend.DeleteIncomplete(cutoff); err != nil {
-		log.Tag(tagStore).Err(err).Warn("Failed to abort incomplete uploads from attachment cache")
-	}
-	return nil
-}
-
-// Size returns the current total size of all attachments
-func (c *Store) Size() int64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	return c.size
-}
-
-// Remaining returns the remaining capacity for attachments
-func (c *Store) Remaining() int64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	remaining := c.limit - c.size
-	if remaining < 0 {
-		return 0
-	}
-	return remaining
-}
-
-// Close stops the background sync goroutine and waits for it to finish
-func (c *Store) Close() {
-	close(c.closeChan)
-	<-c.doneChan
-}
-
-func (c *Store) syncLoop() {
-	defer close(c.doneChan)
-	if err := c.sync(); err != nil {
-		log.Tag(tagStore).Err(err).Warn("Attachment sync failed")
-	}
-	ticker := time.NewTicker(syncInterval)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-ticker.C:
-			if err := c.sync(); err != nil {
-				log.Tag(tagStore).Err(err).Warn("Attachment sync failed")
-			}
-		case <-c.closeChan:
-			return
-		}
-	}
-}

attachment/store_file_test.go

@@ -1,17 +0,0 @@
-package attachment
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func newTestFileStore(t *testing.T, totalSizeLimit int64) (dir string, cache *Store) {
-	t.Helper()
-	dir = t.TempDir()
-	cache, err := NewFileStore(dir, totalSizeLimit, time.Hour, nil)
-	require.Nil(t, err)
-	t.Cleanup(func() { cache.Close() })
-	return dir, cache
-}

attachment/store_s3_test.go

@@ -1,120 +0,0 @@
-package attachment
-
-import (
-	"context"
-	"io"
-	"os"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/v2/s3"
-)
-
-func TestS3Store_WriteWithPrefix(t *testing.T) {
-	s3URL := os.Getenv("NTFY_TEST_S3_URL")
-	if s3URL == "" {
-		t.Skip("NTFY_TEST_S3_URL not set")
-	}
-	cfg, err := s3.ParseURL(s3URL)
-	require.Nil(t, err)
-	cfg.Prefix = "test-prefix"
-	client := s3.New(cfg)
-	deleteAllObjects(t, client)
-	backend := newS3Backend(client)
-	cache, err := newStore(backend, 10*1024, time.Hour, nil)
-	require.Nil(t, err)
-	t.Cleanup(func() {
-		deleteAllObjects(t, client)
-		cache.Close()
-	})
-
-	size, err := cache.Write("abcdefghijkl", strings.NewReader("test"), 0)
-	require.Nil(t, err)
-	require.Equal(t, int64(4), size)
-
-	reader, _, err := cache.Read("abcdefghijkl")
-	require.Nil(t, err)
-	data, err := io.ReadAll(reader)
-	reader.Close()
-	require.Nil(t, err)
-	require.Equal(t, "test", string(data))
-}
-
-// --- Helpers ---
-
-func newTestRealS3Store(t *testing.T, totalSizeLimit int64) (*Store, *modTimeOverrideBackend) {
-	t.Helper()
-	s3URL := os.Getenv("NTFY_TEST_S3_URL")
-	if s3URL == "" {
-		t.Skip("NTFY_TEST_S3_URL not set")
-	}
-	cfg, err := s3.ParseURL(s3URL)
-	require.Nil(t, err)
-	if cfg.Prefix != "" {
-		cfg.Prefix = cfg.Prefix + "/testpkg-attachment"
-	} else {
-		cfg.Prefix = "testpkg-attachment"
-	}
-	client := s3.New(cfg)
-	inner := newS3Backend(client)
-	wrapper := &modTimeOverrideBackend{backend: inner, modTimes: make(map[string]time.Time)}
-	deleteAllObjects(t, client)
-	store, err := newStore(wrapper, totalSizeLimit, time.Hour, nil)
-	require.Nil(t, err)
-	t.Cleanup(func() {
-		deleteAllObjects(t, client)
-		store.Close()
-	})
-	return store, wrapper
-}
-
-func deleteAllObjects(t *testing.T, client *s3.Client) {
-	t.Helper()
-	for i := 0; i < 20; i++ {
-		objects, err := client.ListObjectsV2(context.Background())
-		require.Nil(t, err)
-		if len(objects) == 0 {
-			return
-		}
-		keys := make([]string, len(objects))
-		for j, obj := range objects {
-			keys[j] = obj.Key
-		}
-		require.Nil(t, client.DeleteObjects(context.Background(), keys))
-		time.Sleep(200 * time.Millisecond)
-	}
-	t.Fatal("timed out waiting for bucket to be empty")
-}
-
-// modTimeOverrideBackend wraps a backend and allows overriding LastModified times returned by List().
-// This is used in tests to simulate old objects on backends (like real S3) where
-// LastModified cannot be set directly.
-type modTimeOverrideBackend struct {
-	backend
-	mu       sync.Mutex
-	modTimes map[string]time.Time // object ID -> override time
-}
-
-func (b *modTimeOverrideBackend) List() ([]object, error) {
-	objects, err := b.backend.List()
-	if err != nil {
-		return nil, err
-	}
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	for i, obj := range objects {
-		if t, ok := b.modTimes[obj.ID]; ok {
-			objects[i].LastModified = t
-		}
-	}
-	return objects, nil
-}
-
-func (b *modTimeOverrideBackend) setModTime(id string, t time.Time) {
-	b.mu.Lock()
-	b.modTimes[id] = t
-	b.mu.Unlock()
-}

attachment/store_test.go

@@ -1,352 +0,0 @@
-package attachment
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/v2/util"
-)
-
-const testSizeLimit = 10 * 1024
-
-func TestStore_WriteReadRemove(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		// Write
-		size, err := s.Write("abcdefghijkl", strings.NewReader("hello world"), 0)
-		require.Nil(t, err)
-		require.Equal(t, int64(11), size)
-		require.Equal(t, int64(11), s.Size())
-
-		// Read back
-		reader, readSize, err := s.Read("abcdefghijkl")
-		require.Nil(t, err)
-		require.Equal(t, int64(11), readSize)
-		data, err := io.ReadAll(reader)
-		reader.Close()
-		require.Nil(t, err)
-		require.Equal(t, "hello world", string(data))
-
-		// Remove
-		require.Nil(t, s.Remove("abcdefghijkl"))
-		require.Equal(t, int64(0), s.Size())
-
-		// Read after remove should fail
-		_, _, err = s.Read("abcdefghijkl")
-		require.Error(t, err)
-	})
-}
-
-func TestStore_WriteRemoveMultiple(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		for i := 0; i < 5; i++ {
-			_, err := s.Write(fmt.Sprintf("abcdefghijk%d", i), bytes.NewReader(make([]byte, 100)), 0)
-			require.Nil(t, err)
-		}
-		require.Equal(t, int64(500), s.Size())
-
-		require.Nil(t, s.Remove("abcdefghijk1", "abcdefghijk3"))
-		require.Equal(t, int64(300), s.Size())
-
-		// Removed files should not be readable
-		_, _, err := s.Read("abcdefghijk1")
-		require.Error(t, err)
-		_, _, err = s.Read("abcdefghijk3")
-		require.Error(t, err)
-
-		// Remaining files should still be readable
-		for _, id := range []string{"abcdefghijk0", "abcdefghijk2", "abcdefghijk4"} {
-			reader, _, err := s.Read(id)
-			require.Nil(t, err)
-			reader.Close()
-		}
-	})
-}
-
-func TestStore_WriteTotalSizeLimit(t *testing.T) {
-	forEachBackend(t, 100, func(t *testing.T, s *Store, _ func(string)) {
-		// First write fits
-		_, err := s.Write("abcdefghijk0", bytes.NewReader(make([]byte, 80)), 0)
-		require.Nil(t, err)
-		require.Equal(t, int64(80), s.Size())
-		require.Equal(t, int64(20), s.Remaining())
-
-		// Second write exceeds total limit
-		_, err = s.Write("abcdefghijk1", bytes.NewReader(make([]byte, 50)), 0)
-		require.ErrorIs(t, err, util.ErrLimitReached)
-	})
-}
-
-func TestStore_WriteAdditionalLimiter(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		_, err := s.Write("abcdefghijkl", bytes.NewReader(make([]byte, 200)), 0, util.NewFixedLimiter(100))
-		require.ErrorIs(t, err, util.ErrLimitReached)
-
-		// File should not be readable (was cleaned up)
-		_, _, err = s.Read("abcdefghijkl")
-		require.Error(t, err)
-	})
-}
-
-func TestStore_WriteWithLimiter(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		size, err := s.Write("abcdefghijkl", strings.NewReader("normal file"), 0, util.NewFixedLimiter(999))
-		require.Nil(t, err)
-		require.Equal(t, int64(11), size)
-		require.Equal(t, int64(11), s.Size())
-	})
-}
-
-func TestStore_WriteOverwriteSameID(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		// Write 100 bytes
-		_, err := s.Write("abcdefghijkl", bytes.NewReader(make([]byte, 100)), 0)
-		require.Nil(t, err)
-		require.Equal(t, int64(100), s.Size())
-
-		// Overwrite with 50 bytes
-		_, err = s.Write("abcdefghijkl", bytes.NewReader(make([]byte, 50)), 0)
-		require.Nil(t, err)
-		require.Equal(t, int64(150), s.Size()) // Store tracks both writes
-
-		// Read back should return the latest content
-		reader, readSize, err := s.Read("abcdefghijkl")
-		require.Nil(t, err)
-		require.Equal(t, int64(50), readSize)
-		reader.Close()
-	})
-}
-
-func TestStore_WriteAfterFailure(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		// Failed write: limiter rejects it
-		_, err := s.Write("abcdefghijkl", bytes.NewReader(make([]byte, 200)), 0, util.NewFixedLimiter(100))
-		require.ErrorIs(t, err, util.ErrLimitReached)
-		require.Equal(t, int64(0), s.Size())
-
-		// Subsequent write with a different ID should succeed
-		size, err := s.Write("abcdefghijk2", strings.NewReader("hello"), 0)
-		require.Nil(t, err)
-		require.Equal(t, int64(5), size)
-		require.Equal(t, int64(5), s.Size())
-
-		// The failed ID should not be readable
-		_, _, err = s.Read("abcdefghijkl")
-		require.Error(t, err)
-
-		// The successful ID should be readable
-		reader, _, err := s.Read("abcdefghijk2")
-		require.Nil(t, err)
-		reader.Close()
-	})
-}
-
-func TestStore_SyncRecomputesSize(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, makeOld func(string)) {
-		// Write two files
-		_, err := s.Write("abcdefghijk0", bytes.NewReader(make([]byte, 100)), 0)
-		require.Nil(t, err)
-		_, err = s.Write("abcdefghijk1", bytes.NewReader(make([]byte, 200)), 0)
-		require.Nil(t, err)
-		require.Equal(t, int64(300), s.Size())
-
-		// Corrupt the in-memory size tracking
-		s.mu.Lock()
-		s.size = 999
-		s.mu.Unlock()
-		require.Equal(t, int64(999), s.Size())
-
-		// Set attachmentsWithSizes to include both files so nothing gets deleted
-		s.attachmentsWithSizes = func() (map[string]int64, error) {
-			return map[string]int64{"abcdefghijk0": 100, "abcdefghijk1": 200}, nil
-		}
-
-		// Sync should recompute size from the backend
-		require.Nil(t, s.sync())
-		require.Equal(t, int64(300), s.Size())
-	})
-}
-
-func TestStore_ReadNotFound(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		_, _, err := s.Read("abcdefghijkl")
-		require.Error(t, err)
-	})
-}
-
-func TestStore_InvalidID(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		_, err := s.Write("bad", strings.NewReader("x"), 0)
-		require.Equal(t, errInvalidFileID, err)
-
-		_, _, err = s.Read("bad")
-		require.Equal(t, errInvalidFileID, err)
-
-		err = s.Remove("bad")
-		require.Equal(t, errInvalidFileID, err)
-	})
-}
-
-func TestStore_WriteLargeObjects(t *testing.T) {
-	sizes := map[string]int64{
-		"100B": 100,
-		"6MB":  6 * 1024 * 1024,
-		"12MB": 12 * 1024 * 1024,
-	}
-	for name, sz := range sizes {
-		t.Run(name, func(t *testing.T) {
-			forEachBackend(t, sz+1024, func(t *testing.T, s *Store, _ func(string)) {
-				data := make([]byte, sz)
-				for i := range data {
-					data[i] = byte(i % 251)
-				}
-
-				size, err := s.Write("abcdefghijkl", bytes.NewReader(data), 0)
-				require.Nil(t, err)
-				require.Equal(t, sz, size)
-				require.Equal(t, sz, s.Size())
-
-				reader, readSize, err := s.Read("abcdefghijkl")
-				require.Nil(t, err)
-				require.Equal(t, sz, readSize)
-				got, err := io.ReadAll(reader)
-				reader.Close()
-				require.Nil(t, err)
-				require.Equal(t, data, got)
-			})
-		})
-	}
-}
-
-func TestStore_WriteUntrustedLengthExact(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		size, err := s.Write("abcdefghijkl", strings.NewReader("hello world"), 11)
-		require.Nil(t, err)
-		require.Equal(t, int64(11), size)
-
-		reader, _, err := s.Read("abcdefghijkl")
-		require.Nil(t, err)
-		data, err := io.ReadAll(reader)
-		reader.Close()
-		require.Nil(t, err)
-		require.Equal(t, "hello world", string(data))
-	})
-}
-
-func TestStore_WriteUntrustedLengthBodyLonger(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		// Body has 11 bytes, but we claim 5 — only first 5 bytes should be stored
-		size, err := s.Write("abcdefghijkl", strings.NewReader("hello world"), 5)
-		require.Nil(t, err)
-		require.Equal(t, int64(5), size)
-
-		reader, _, err := s.Read("abcdefghijkl")
-		require.Nil(t, err)
-		data, err := io.ReadAll(reader)
-		reader.Close()
-		require.Nil(t, err)
-		require.Equal(t, "hello", string(data))
-	})
-}
-
-func TestStore_WriteUntrustedLengthBodyShorter(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		// Body has 5 bytes, but we claim 100 — should fail
-		_, err := s.Write("abcdefghijkl", strings.NewReader("hello"), 100)
-		require.Error(t, err)
-
-		// File should not be readable (was cleaned up)
-		_, _, err = s.Read("abcdefghijkl")
-		require.Error(t, err)
-	})
-}
-
-func TestStore_Sync(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, makeOld func(string)) {
-		// Write some files
-		_, err := s.Write("abcdefghijk0", strings.NewReader("file0"), 0)
-		require.Nil(t, err)
-		_, err = s.Write("abcdefghijk1", strings.NewReader("file1"), 0)
-		require.Nil(t, err)
-		_, err = s.Write("abcdefghijk2", strings.NewReader("file2"), 0)
-		require.Nil(t, err)
-
-		require.Equal(t, int64(15), s.Size())
-
-		// Set the ID provider to only know about file 0 and 2
-		s.attachmentsWithSizes = func() (map[string]int64, error) {
-			return map[string]int64{"abcdefghijk0": 5, "abcdefghijk2": 5}, nil
-		}
-
-		// Make file 1 old enough to be cleaned up
-		makeOld("abcdefghijk1")
-
-		// Run sync
-		require.Nil(t, s.sync())
-
-		// File 1 should be deleted (orphan, old enough)
-		_, _, err = s.Read("abcdefghijk1")
-		require.Error(t, err)
-
-		// Files 0 and 2 should still be readable
-		r, _, err := s.Read("abcdefghijk0")
-		require.Nil(t, err)
-		r.Close()
-		r, _, err = s.Read("abcdefghijk2")
-		require.Nil(t, err)
-		r.Close()
-
-		// Size should be updated
-		require.Equal(t, int64(10), s.Size())
-	})
-}
-
-func TestStore_Sync_SkipsRecentFiles(t *testing.T) {
-	forEachBackend(t, testSizeLimit, func(t *testing.T, s *Store, _ func(string)) {
-		// Write a file
-		_, err := s.Write("abcdefghijk0", strings.NewReader("file0"), 0)
-		require.Nil(t, err)
-
-		// Set the ID provider to return empty (no valid IDs)
-		s.attachmentsWithSizes = func() (map[string]int64, error) {
-			return map[string]int64{}, nil
-		}
-
-		// File was just created, so it should NOT be deleted (< 1 hour old)
-		require.Nil(t, s.sync())
-
-		// File should still exist
-		reader, _, err := s.Read("abcdefghijk0")
-		require.Nil(t, err)
-		reader.Close()
-	})
-}
-
-// forEachBackend runs f against both the file and S3 backends. It also provides a makeOld
-// callback that makes a specific object's timestamp old enough for orphan cleanup (> 1 hour).
-// For the file backend, this uses os.Chtimes; for the S3 backend, it overrides the object's
-// LastModified time via a modTimeOverrideBackend wrapper. Objects start with recent timestamps
-// by default. The S3 subtest is skipped if NTFY_TEST_S3_URL is not set.
-func forEachBackend(t *testing.T, totalSizeLimit int64, f func(t *testing.T, s *Store, makeOld func(string))) {
-	t.Run("file", func(t *testing.T) {
-		dir, s := newTestFileStore(t, totalSizeLimit)
-		makeOld := func(id string) {
-			oldTime := time.Unix(1, 0)
-			os.Chtimes(filepath.Join(dir, id), oldTime, oldTime)
-		}
-		f(t, s, makeOld)
-	})
-	t.Run("s3", func(t *testing.T) {
-		s, wrapper := newTestRealS3Store(t, totalSizeLimit)
-		makeOld := func(id string) {
-			wrapper.setModTime(id, time.Unix(1, 0))
-		}
-		f(t, s, makeOld)
-	})
-}

ban/service.go

@@ -1,185 +0,0 @@
-// Package ban implements the abuse ban-feed: it tracks per-prefix weighted "strikes" from rejected
-// requests and appends breaching prefixes to a ban file that fail2ban tails. Keying by prefix (not
-// by visitor) makes the accounting match the unit fail2ban bans, even for shared account visitors.
-package ban
-
-import (
-	"fmt"
-	"net/netip"
-	"os"
-	"sync"
-	"time"
-
-	"golang.org/x/time/rate"
-	"heckel.io/ntfy/v2/log"
-)
-
-const (
-	tag           = "ban"
-	pruneInterval = 10 * time.Minute
-	writeInterval = 3 * time.Second
-)
-
-// Config is the Service's config, kept separate from server.Config to avoid an import cycle.
-type Config struct {
-	File           string        // Ban file that fail2ban tails (must be non-empty; the caller decides whether the feature is enabled)
-	Window         time.Duration // Rolling window over which weighted strikes are counted
-	Threshold      int           // Weighted strikes per Window before a prefix is banned
-	Weights        Weights       // Code matcher -> strike weight (0 = exempt)
-	PrefixBitsIPv4 int           // Mask width for the ban unit, e.g. 32 (matches rate-limiting granularity)
-	PrefixBitsIPv6 int           // Mask width for the ban unit, e.g. 64
-}
-
-// tracker is the per-prefix strike state: a weighted breach detector plus timestamps for pruning and throttling.
-type tracker struct {
-	limiter *rate.Limiter
-	seen    time.Time // Last strike, for pruning idle prefixes
-	emitted time.Time // Last ban-line write for this prefix, throttles re-emits to once per Window
-}
-
-// Service owns the ban-feed: per-prefix strike accounting, buffered file writes, and idle-prefix
-// pruning. The caller owns the enable/disable decision -- only construct a Service when the feature
-// is on (see server.New, which builds one only when a ban file is configured).
-type Service struct {
-	conf      *Config
-	mu        sync.Mutex // Guards trackers and pending
-	trackers  map[netip.Prefix]*tracker
-	pending   []string      // Formatted ban lines buffered by Record, flushed to the ban file by runWriteLoop
-	writeDone chan struct{} // Closed when runWriteLoop exits after its final flush
-	closeChan chan struct{}
-	closeOnce sync.Once
-}
-
-// NewService builds a Service and starts its background loops. The caller must only call it when the
-// feature is enabled (conf non-nil, File non-empty); the Service does not model a disabled state.
-func NewService(conf *Config) *Service {
-	s := &Service{
-		conf:      conf,
-		trackers:  make(map[netip.Prefix]*tracker),
-		closeChan: make(chan struct{}),
-		writeDone: make(chan struct{}),
-	}
-	go s.runPruneLoop()
-	go s.runWriteLoop()
-	return s
-}
-
-// Record counts one rejection against the IP's prefix bucket and, on breach, buffers a ban line
-// (throttled to once per Window per prefix). No-ops for a non-4xx/5xx status or a zero-weight code.
-func (s *Service) Record(ip netip.Addr, httpCode, errorCode int) {
-	if httpCode < 400 {
-		return
-	}
-	weight := s.conf.Weights.WeightFor(errorCode)
-	if weight == 0 {
-		return // Weight 0: exempt, no strike
-	}
-	prefix := s.prefix(ip)
-	now := time.Now()
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	t := s.trackers[prefix]
-	if t == nil {
-		t = &tracker{limiter: rate.NewLimiter(rate.Limit(float64(s.conf.Threshold)/s.conf.Window.Seconds()), s.conf.Threshold)}
-		s.trackers[prefix] = t
-	}
-	t.seen = now
-	if t.limiter.AllowN(now, weight) {
-		return // Within the strike budget, no breach
-	}
-	if !t.emitted.IsZero() && now.Sub(t.emitted) < s.conf.Window {
-		return // Already emitted this prefix within the window (one ban line per prefix per window)
-	}
-	t.emitted = now
-	s.pending = append(s.pending, formatBanLine(now, ip, prefix, httpCode, errorCode))
-}
-
-// prefix masks ip to the ban unit (PrefixBitsIPv4/IPv6) -- what fail2ban bans, e.g. a whole /64.
-func (s *Service) prefix(ip netip.Addr) netip.Prefix {
-	if ip.Is4() {
-		return netip.PrefixFrom(ip, s.conf.PrefixBitsIPv4).Masked()
-	}
-	return netip.PrefixFrom(ip, s.conf.PrefixBitsIPv6).Masked()
-}
-
-// formatBanLine builds the "<RFC3339-UTC> <ip> <prefix> <http> <ntfy>" line the fail2ban filter
-// parses. The timestamp is captured at breach time, not flush time.
-func formatBanLine(t time.Time, ip netip.Addr, prefix netip.Prefix, httpCode, errorCode int) string {
-	return fmt.Sprintf("%s %s %s %d %d\n", t.UTC().Format(time.RFC3339), ip.String(), prefix.String(), httpCode, errorCode)
-}
-
-// runPruneLoop prunes idle prefixes until Close.
-func (s *Service) runPruneLoop() {
-	ticker := time.NewTicker(pruneInterval)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-ticker.C:
-			s.prune()
-		case <-s.closeChan:
-			return
-		}
-	}
-}
-
-// runWriteLoop flushes buffered ban lines every writeInterval, plus a final flush on Close.
-func (s *Service) runWriteLoop() {
-	defer close(s.writeDone)
-	ticker := time.NewTicker(writeInterval)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-ticker.C:
-			s.flush()
-		case <-s.closeChan:
-			s.flush()
-			return
-		}
-	}
-}
-
-// flush appends the buffered lines to the file in one open/write. Best-effort: a batch is dropped on
-// error. Concurrent calls are safe -- pending is drained under mu, so only one flush writes a batch.
-func (s *Service) flush() {
-	s.mu.Lock()
-	lines := s.pending
-	s.pending = nil
-	s.mu.Unlock()
-	if len(lines) == 0 {
-		return
-	}
-	f, err := os.OpenFile(s.conf.File, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		log.Tag(tag).Err(err).Warn("Cannot open ban file %s, dropped %d ban(s)", s.conf.File, len(lines))
-		return
-	}
-	defer f.Close()
-	for i, line := range lines {
-		if _, err := f.WriteString(line); err != nil {
-			log.Tag(tag).Err(err).Warn("Cannot write to ban file %s, dropped %d ban(s)", s.conf.File, len(lines)-i)
-			return
-		}
-	}
-}
-
-// prune drops prefixes idle for a full Window -- their bucket has refilled, so forgetting them is a
-// no-op that bounds memory under a flood of distinct IPs.
-func (s *Service) prune() {
-	now := time.Now()
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	for prefix, t := range s.trackers {
-		if now.Sub(t.seen) >= s.conf.Window {
-			delete(s.trackers, prefix)
-		}
-	}
-}
-
-// Close stops the loops and blocks until the final flush completes. Idempotent.
-func (s *Service) Close() {
-	s.closeOnce.Do(func() {
-		close(s.closeChan)
-		<-s.writeDone
-	})
-}

ban/service_test.go

@@ -1,253 +0,0 @@
-package ban
-
-import (
-	"net/netip"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-var testIP = netip.MustParseAddr("1.2.3.4")
-
-// newTestService creates a Service wired for testing, with the given ban file, weighted-bucket
-// threshold, and weights, plus a 1-minute window (so the emit throttle only fires once per test).
-func newTestService(t *testing.T, banFile string, threshold int, weights map[string]int) *Service {
-	t.Helper()
-	s := NewService(&Config{
-		File:           banFile,
-		Window:         time.Minute,
-		Threshold:      threshold,
-		Weights:        weights,
-		PrefixBitsIPv4: 32,
-		PrefixBitsIPv6: 64,
-	})
-	t.Cleanup(s.Close)
-	return s
-}
-
-// flushAndRead forces a synchronous flush of the buffered bans (writes are otherwise async, on the
-// runWriteLoop ticker) and returns the ban file's lines.
-func flushAndRead(t *testing.T, s *Service, path string) []string {
-	t.Helper()
-	s.flush()
-	data, err := os.ReadFile(path)
-	require.NoError(t, err)
-	return strings.Split(strings.TrimRight(string(data), "\n"), "\n")
-}
-
-func TestService_Record_Weight2BansAtHalfThreshold(t *testing.T) {
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	// Threshold 10, code weight 2 -> the budget covers exactly 5 hits, so the 6th breaches.
-	s := newTestService(t, banFile, 10, map[string]int{"*": 2})
-	for i := 0; i < 5; i++ {
-		s.Record(testIP, 400, 40001)
-	}
-	s.flush()
-	require.NoFileExists(t, banFile) // 5 hits * weight 2 = 10 == budget, exactly at the limit, not over
-	s.Record(testIP, 400, 40001)     // 6th hit cannot be covered -> breach
-	lines := flushAndRead(t, s, banFile)
-	require.Len(t, lines, 1)
-	require.True(t, strings.HasSuffix(lines[0], " 1.2.3.4 1.2.3.4/32 400 40001")) // <ip> <prefix> <http> <ntfy-code>
-}
-
-func TestService_Record_Weight10BansFast(t *testing.T) {
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	// Threshold 10, code weight 10 -> a single hit drains the whole budget, so the 2nd breaches.
-	s := newTestService(t, banFile, 10, map[string]int{"42909": 10, "*": 1})
-	s.Record(testIP, 429, 42909)
-	s.flush()
-	require.NoFileExists(t, banFile)
-	s.Record(testIP, 429, 42909) // 2nd hit cannot be covered -> breach
-	lines := flushAndRead(t, s, banFile)
-	require.Len(t, lines, 1)
-	require.True(t, strings.HasSuffix(lines[0], " 1.2.3.4 1.2.3.4/32 429 42909"))
-}
-
-func TestService_Record_Weight0NeverBans(t *testing.T) {
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	// The legit-quota code is exempt (weight 0), so no number of hits ever bans.
-	s := newTestService(t, banFile, 10, map[string]int{"42908": 0, "*": 1})
-	for i := 0; i < 100; i++ {
-		s.Record(testIP, 429, 42908)
-	}
-	s.flush()
-	require.NoFileExists(t, banFile)
-}
-
-func TestService_Record_SingleBucketNoRelaxation(t *testing.T) {
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	// One shared bucket per prefix: different codes draw down the SAME budget, so mixing them creates
-	// no extra headroom (unlike per-code buckets, which would relax the effective limit for a mixed
-	// offender).
-	s := newTestService(t, banFile, 10, map[string]int{"403*": 2, "*": 1})
-	s.Record(testIP, 403, 40301) // weight 2 -> 8 left
-	s.Record(testIP, 403, 40301) // weight 2 -> 6 left
-	s.Record(testIP, 403, 40301) // weight 2 -> 4 left
-	s.flush()
-	require.NoFileExists(t, banFile)
-	for i := 0; i < 4; i++ {
-		s.Record(testIP, 400, 40001) // weight 1 each -> drains the remaining 4 -> 0 left
-	}
-	s.flush()
-	require.NoFileExists(t, banFile) // 6 + 4 = 10 == budget exactly, still not over
-	s.Record(testIP, 400, 40001)     // one more cannot be covered -> breach
-	lines := flushAndRead(t, s, banFile)
-	require.Len(t, lines, 1)
-}
-
-func TestService_Record_ExactLineFormat(t *testing.T) {
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := newTestService(t, banFile, 1, map[string]int{"*": 1})
-	before := time.Now().UTC().Truncate(time.Second)
-	for i := 0; i < 3; i++ {
-		s.Record(testIP, 429, 42901)
-	}
-	after := time.Now().UTC()
-	lines := flushAndRead(t, s, banFile)
-	require.Len(t, lines, 1)
-	parts := strings.Split(lines[0], " ")
-	require.Len(t, parts, 5) // "<timestamp> <ip> <prefix> <http-code> <ntfy-code>"
-	ts, err := time.Parse(time.RFC3339, parts[0])
-	require.NoError(t, err)
-	require.Equal(t, time.UTC, ts.Location())
-	require.False(t, ts.Before(before))
-	require.False(t, ts.After(after.Add(time.Second)))
-	require.Equal(t, "1.2.3.4", parts[1])    // full IP
-	require.Equal(t, "1.2.3.4/32", parts[2]) // masked to the default IPv4 prefix (/32)
-	require.Equal(t, "429", parts[3])        // HTTP status
-	require.Equal(t, "42901", parts[4])      // ntfy code
-}
-
-func TestService_Record_IPv6MaskedToPrefix(t *testing.T) {
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := newTestService(t, banFile, 1, map[string]int{"*": 1})
-	ip := netip.MustParseAddr("2001:db8::abcd")
-	for i := 0; i < 3; i++ {
-		s.Record(ip, 429, 42901)
-	}
-	parts := strings.Split(flushAndRead(t, s, banFile)[0], " ")
-	require.Len(t, parts, 5)
-	require.Equal(t, "2001:db8::abcd", parts[1]) // full IPv6 address
-	require.Equal(t, "2001:db8::/64", parts[2])  // masked to the default IPv6 prefix (/64)
-}
-
-func TestService_Record_PerPrefixIsolation(t *testing.T) {
-	// Each source prefix gets its own bucket: one IP hammering to a breach must not push a different,
-	// quiet IP over the edge. This is the whole point of keying by prefix instead of by visitor.
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := newTestService(t, banFile, 2, map[string]int{"*": 1})
-	noisy := netip.MustParseAddr("1.1.1.1")
-	quiet := netip.MustParseAddr("2.2.2.2")
-	for i := 0; i < 5; i++ {
-		s.Record(noisy, 429, 42901) // breaches its own bucket
-	}
-	s.Record(quiet, 429, 42901) // single hit, well under threshold
-	lines := flushAndRead(t, s, banFile)
-	require.Len(t, lines, 1) // only the noisy prefix is written
-	require.True(t, strings.HasSuffix(lines[0], " 1.1.1.1 1.1.1.1/32 429 42901"))
-}
-
-func TestService_Record_OncePerWindowThrottle(t *testing.T) {
-	// Once a prefix has been written, further breaches within the window must not re-append it, so a
-	// persistent offender produces exactly one line per window (mirrors the old per-visitor banEmit).
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := newTestService(t, banFile, 1, map[string]int{"*": 1})
-	for i := 0; i < 50; i++ {
-		s.Record(testIP, 429, 42901)
-	}
-	lines := flushAndRead(t, s, banFile)
-	require.Len(t, lines, 1)
-}
-
-func TestService_Record_BansPassedIP(t *testing.T) {
-	// The Service bans the exact IP passed to Record -- the caller passes the offending request's IP,
-	// which for an account-keyed visitor is not the visitor's stored IP.
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := newTestService(t, banFile, 1, map[string]int{"*": 1})
-	offender := netip.MustParseAddr("5.6.7.8")
-	for i := 0; i < 3; i++ {
-		s.Record(offender, 429, 42901)
-	}
-	parts := strings.Split(flushAndRead(t, s, banFile)[0], " ")
-	require.Equal(t, "5.6.7.8", parts[1])    // the IP passed to Record
-	require.Equal(t, "5.6.7.8/32", parts[2]) // its prefix
-}
-
-func TestService_Record_Ignores2xx3xx(t *testing.T) {
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := newTestService(t, banFile, 3, map[string]int{"*": 1})
-	// Success and redirects must never count toward a ban, even over the threshold -- otherwise a
-	// legit high-volume publisher (lots of 200s) would get banned.
-	for i := 0; i < 20; i++ {
-		s.Record(testIP, 200, 20000)
-		s.Record(testIP, 302, 30000)
-	}
-	s.flush()
-	require.NoFileExists(t, banFile)
-	// A 4xx over the same budget still gets written.
-	for i := 0; i < 5; i++ {
-		s.Record(testIP, 400, 40001)
-	}
-	lines := flushAndRead(t, s, banFile)
-	require.Len(t, lines, 1)
-	require.True(t, strings.HasSuffix(lines[0], " 1.2.3.4 1.2.3.4/32 400 40001"))
-}
-
-func TestService_Record_BuffersUntilFlush(t *testing.T) {
-	// Writes are async: a breach buffers the ban line rather than writing it synchronously on the
-	// request path. The line only reaches the file when runWriteLoop (or an explicit flush) runs.
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := newTestService(t, banFile, 1, map[string]int{"*": 1})
-	for i := 0; i < 3; i++ {
-		s.Record(testIP, 429, 42901)
-	}
-	require.NoFileExists(t, banFile) // not written synchronously
-	s.mu.Lock()
-	require.Len(t, s.pending, 1) // one line buffered (throttled to once per window)
-	s.mu.Unlock()
-	lines := flushAndRead(t, s, banFile)
-	require.Len(t, lines, 1)
-	require.True(t, strings.HasSuffix(lines[0], " 1.2.3.4 1.2.3.4/32 429 42901"))
-}
-
-func TestService_Close_FlushesPending(t *testing.T) {
-	// Close must flush buffered bans so nothing is lost on shutdown, and must block until it has.
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := NewService(&Config{File: banFile, Window: time.Minute, Threshold: 1, Weights: Weights{"*": 1}, PrefixBitsIPv4: 32, PrefixBitsIPv6: 64})
-	for i := 0; i < 3; i++ {
-		s.Record(testIP, 429, 42901)
-	}
-	require.NoFileExists(t, banFile) // still buffered
-	s.Close()                        // blocks until the final flush completes
-	data, err := os.ReadFile(banFile)
-	require.NoError(t, err)
-	require.Len(t, strings.Split(strings.TrimRight(string(data), "\n"), "\n"), 1)
-}
-
-func TestService_Prune_DropsIdlePrefixes(t *testing.T) {
-	// A prefix idle for a full window has a refilled bucket, so prune drops it to bound memory. An
-	// active prefix (seen within the window) is kept.
-	banFile := filepath.Join(t.TempDir(), "ban.log")
-	s := newTestService(t, banFile, 10, map[string]int{"*": 1})
-	idle := netip.MustParseAddr("9.9.9.9")
-	s.Record(idle, 400, 40001)
-	s.Record(testIP, 400, 40001)
-	require.Len(t, s.trackers, 2)
-
-	// Backdate the idle prefix past the window, then prune.
-	idlePrefix := s.prefix(idle)
-	s.mu.Lock()
-	s.trackers[idlePrefix].seen = time.Now().Add(-2 * time.Minute)
-	s.mu.Unlock()
-	s.prune()
-
-	require.Len(t, s.trackers, 1)
-	_, ok := s.trackers[idlePrefix]
-	require.False(t, ok) // idle prefix dropped
-	_, ok = s.trackers[s.prefix(testIP)]
-	require.True(t, ok) // active prefix kept
-}

ban/weights.go

@@ -1,83 +0,0 @@
-package ban
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// Weights maps a matcher key to a strike weight for the abuse ban-feed (see ParseWeights, WeightFor).
-type Weights map[string]int
-
-// ParseWeights normalizes a list like ["42909:10","403:2","*:1"] into a Weights map. A key is an
-// exact ntfy code, a family ("429*"), a bare HTTP status ("403" -> "403*"), or "*"; weights are ints
-// >= 0 (0 = exempt). Malformed entries are rejected so misconfiguration fails at startup.
-func ParseWeights(entries []string) (Weights, error) {
-	out := make(Weights, len(entries))
-	for _, entry := range entries {
-		key, weightStr, ok := strings.Cut(entry, ":")
-		if !ok {
-			return nil, fmt.Errorf("invalid ban-weight %q, want KEY:WEIGHT", entry)
-		}
-		weight, err := strconv.Atoi(strings.TrimSpace(weightStr))
-		if err != nil || weight < 0 {
-			return nil, fmt.Errorf("invalid ban-weight value in %q, want a non-negative integer", entry)
-		}
-		key = strings.TrimSpace(key)
-		if !validWeightKey(key) {
-			return nil, fmt.Errorf("invalid ban-weight key in %q, want %q, an ntfy code, an HTTP status, or a PREFIX*", entry, "*")
-		}
-		// A bare 3-digit HTTP status is shorthand for the whole family (e.g. "403" -> "403*").
-		if len(key) == 3 && isAllDigits(key) {
-			key += "*"
-		}
-		out[key] = weight
-	}
-	return out, nil
-}
-
-// WeightFor returns the strike weight for an ntfy error code, longest-match-wins (exact > family > "*").
-// If nothing matches (no "*" catch-all) it returns the implied default 1, so a forgotten "*" still
-// bans; use "*:0" to exempt everything not explicitly weighted.
-func (w Weights) WeightFor(errorCode int) int {
-	code := strconv.Itoa(errorCode)
-	weight, bestLen, matched := 0, -1, false
-	for key, wt := range w {
-		matchLen := -1
-		switch {
-		case key == "*":
-			matchLen = 0
-		case strings.HasSuffix(key, "*"):
-			if prefix := strings.TrimSuffix(key, "*"); strings.HasPrefix(code, prefix) {
-				matchLen = len(prefix)
-			}
-		case key == code:
-			matchLen = len(code)
-		}
-		if matchLen > bestLen {
-			weight, bestLen, matched = wt, matchLen, true
-		}
-	}
-	if !matched {
-		return 1
-	}
-	return weight
-}
-
-// validWeightKey reports whether key is a legal matcher: "*", an all-digits code, or DIGITS*.
-func validWeightKey(key string) bool {
-	if key == "*" {
-		return true
-	}
-	digits := strings.TrimSuffix(key, "*")
-	return digits != "" && isAllDigits(digits)
-}
-
-func isAllDigits(s string) bool {
-	for _, r := range s {
-		if r < '0' || r > '9' {
-			return false
-		}
-	}
-	return s != ""
-}

ban/weights_test.go

@@ -1,73 +0,0 @@
-package ban
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestParseWeights(t *testing.T) {
-	// Exact codes, a bare 3-digit HTTP status (normalized to a family), an exempt code, and "*".
-	weights, err := ParseWeights([]string{"42909:10", "403:2", "42908:0", "*:1"})
-	require.NoError(t, err)
-	require.Equal(t, Weights{"42909": 10, "403*": 2, "42908": 0, "*": 1}, weights)
-
-	// A bare 3-digit HTTP status normalizes to its family.
-	weights, err = ParseWeights([]string{"429:5"})
-	require.NoError(t, err)
-	require.Equal(t, Weights{"429*": 5}, weights)
-
-	// An explicit family key stays as-is.
-	weights, err = ParseWeights([]string{"429*:5"})
-	require.NoError(t, err)
-	require.Equal(t, Weights{"429*": 5}, weights)
-
-	// Weight 0 is valid and means exempt.
-	weights, err = ParseWeights([]string{"42908:0"})
-	require.NoError(t, err)
-	require.Equal(t, Weights{"42908": 0}, weights)
-
-	_, err = ParseWeights([]string{"401"}) // Missing weight
-	require.Error(t, err)
-	_, err = ParseWeights([]string{"401:-1"}) // Negative weight
-	require.Error(t, err)
-	_, err = ParseWeights([]string{"401:abc"}) // Non-integer weight
-	require.Error(t, err)
-	_, err = ParseWeights([]string{"abc:10"}) // Non-numeric key
-	require.Error(t, err)
-	_, err = ParseWeights([]string{"4*3:10"}) // Star not at the end
-	require.Error(t, err)
-}
-
-func TestWeights_WeightFor(t *testing.T) {
-	weights, err := ParseWeights([]string{"42908:0", "42903:0", "42905:0", "42910:0", "42909:10", "429*:1", "403*:2", "4*:1", "5*:1"})
-	require.NoError(t, err)
-	// Longest-match-wins: exact 5-digit beats "429*" beats "4*" beats "*".
-	require.Equal(t, 0, weights.WeightFor(42908))
-	require.Equal(t, 10, weights.WeightFor(42909))
-	require.Equal(t, 1, weights.WeightFor(42901))
-	require.Equal(t, 2, weights.WeightFor(40311))
-	require.Equal(t, 1, weights.WeightFor(40011))
-	require.Equal(t, 1, weights.WeightFor(50312))
-	// No rule matches (this config has 4*/5* but no "*"), so the implied default weight 1 applies.
-	require.Equal(t, 1, weights.WeightFor(30012))
-}
-
-func TestWeights_WeightFor_NoStarRuleImpliesWeight1(t *testing.T) {
-	// With no "*" rule, a code that matches nothing defaults to weight 1 (can be banned), so the
-	// feature can't be silently turned into a no-op by forgetting "*". Explicit codes still win.
-	weights, err := ParseWeights([]string{"42908:0", "42909:10"})
-	require.NoError(t, err)
-	require.Equal(t, 0, weights.WeightFor(42908))  // explicitly exempt
-	require.Equal(t, 10, weights.WeightFor(42909)) // explicit
-	require.Equal(t, 1, weights.WeightFor(42901))  // unmatched -> implied 1
-	require.Equal(t, 1, weights.WeightFor(40001))  // unmatched -> implied 1
-}
-
-func TestWeights_WeightFor_ExplicitStarZeroExemptsAll(t *testing.T) {
-	// An explicit "*:0" is the opt-out: exempt everything not otherwise weighted.
-	weights, err := ParseWeights([]string{"42909:10", "*:0"})
-	require.NoError(t, err)
-	require.Equal(t, 10, weights.WeightFor(42909)) // explicit
-	require.Equal(t, 0, weights.WeightFor(42901))  // *:0 -> exempt everything else
-}

client/config.go

@@ -11,9 +11,6 @@ const (
 	DefaultBaseURL = "https://ntfy.sh"
 )
 
-// DefaultConfigFile is the default path to the client config file (set in config_*.go)
-var DefaultConfigFile string
-
 // Config is the config struct for a Client
 type Config struct {
 	DefaultHost     string      `yaml:"default-host"`

client/config_darwin.go

@@ -1,18 +0,0 @@
-//go:build darwin
-
-package client
-
-import (
-	"os"
-	"os/user"
-	"path/filepath"
-)
-
-func init() {
-	u, err := user.Current()
-	if err == nil && u.Uid == "0" {
-		DefaultConfigFile = "/etc/ntfy/client.yml"
-	} else if configDir, err := os.UserConfigDir(); err == nil {
-		DefaultConfigFile = filepath.Join(configDir, "ntfy", "client.yml")
-	}
-}

client/config_unix.go

@@ -1,18 +0,0 @@
-//go:build linux || dragonfly || freebsd || netbsd || openbsd
-
-package client
-
-import (
-	"os"
-	"os/user"
-	"path/filepath"
-)
-
-func init() {
-	u, err := user.Current()
-	if err == nil && u.Uid == "0" {
-		DefaultConfigFile = "/etc/ntfy/client.yml"
-	} else if configDir, err := os.UserConfigDir(); err == nil {
-		DefaultConfigFile = filepath.Join(configDir, "ntfy", "client.yml")
-	}
-}

client/config_windows.go

@@ -1,14 +0,0 @@
-//go:build windows
-
-package client
-
-import (
-	"os"
-	"path/filepath"
-)
-
-func init() {
-	if configDir, err := os.UserConfigDir(); err == nil {
-		DefaultConfigFile = filepath.Join(configDir, "ntfy", "client.yml")
-	}
-}

client/options.go

@@ -88,11 +88,6 @@ func WithFilename(filename string) PublishOption {
 	return WithHeader("X-Filename", filename)
 }
 
-// WithSequenceID sets a sequence ID for the message, allowing updates to existing notifications
-func WithSequenceID(sequenceID string) PublishOption {
-	return WithHeader("X-Sequence-ID", sequenceID)
-}
-
 // WithEmail instructs the server to also send the message to the given e-mail address
 func WithEmail(email string) PublishOption {
 	return WithHeader("X-Email", email)

cmd/app.go

@@ -3,12 +3,11 @@ package cmd
 
 import (
 	"fmt"
-	"os"
-	"regexp"
-
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
 	"heckel.io/ntfy/v2/log"
+	"os"
+	"regexp"
 )
 
 const (
@@ -16,12 +15,6 @@ const (
 	categoryServer = "Server commands"
 )
 
-// Build metadata keys for app.Metadata
-const (
-	MetadataKeyCommit = "commit"
-	MetadataKeyDate   = "date"
-)
-
 var commands = make([]*cli.Command, 0)
 
 var flagsDefault = []cli.Flag{
@@ -44,7 +37,7 @@ func New() *cli.App {
 		Name:                   "ntfy",
 		Usage:                  "Simple pub-sub notification service",
 		UsageText:              "ntfy [OPTION..]",
-		HideVersion:            false,
+		HideVersion:            true,
 		UseShortOptionHandling: true,
 		Reader:                 os.Stdin,
 		Writer:                 os.Stdout,

cmd/publish.go

@@ -34,7 +34,6 @@ var flagsPublish = append(
 	&cli.BoolFlag{Name: "markdown", Aliases: []string{"md"}, EnvVars: []string{"NTFY_MARKDOWN"}, Usage: "Message is formatted as Markdown"},
 	&cli.StringFlag{Name: "template", Aliases: []string{"tpl"}, EnvVars: []string{"NTFY_TEMPLATE"}, Usage: "use templates to transform JSON message body"},
 	&cli.StringFlag{Name: "filename", Aliases: []string{"name", "n"}, EnvVars: []string{"NTFY_FILENAME"}, Usage: "filename for the attachment"},
-	&cli.StringFlag{Name: "sequence-id", Aliases: []string{"sequence_id", "sid", "S"}, EnvVars: []string{"NTFY_SEQUENCE_ID"}, Usage: "sequence ID for updating notifications"},
 	&cli.StringFlag{Name: "file", Aliases: []string{"f"}, EnvVars: []string{"NTFY_FILE"}, Usage: "file to upload as an attachment"},
 	&cli.StringFlag{Name: "email", Aliases: []string{"mail", "e"}, EnvVars: []string{"NTFY_EMAIL"}, Usage: "also send to e-mail address"},
 	&cli.StringFlag{Name: "user", Aliases: []string{"u"}, EnvVars: []string{"NTFY_USER"}, Usage: "username[:password] used to auth against the server"},
@@ -71,7 +70,6 @@ Examples:
   ntfy pub --icon="http://some.tld/icon.png" 'Icon!'      # Send notification with custom icon
   ntfy pub --attach="http://some.tld/file.zip" files      # Send ZIP archive from URL as attachment
   ntfy pub --file=flower.jpg flowers 'Nice!'              # Send image.jpg as attachment
-  ntfy pub -S my-id mytopic 'Update me'                   # Send with sequence ID for updates
   echo 'message' | ntfy publish mytopic                   # Send message from stdin
   ntfy pub -u phil:mypass secret Psst                     # Publish with username/password
   ntfy pub --wait-pid 1234 mytopic                        # Wait for process 1234 to exit before publishing
@@ -103,7 +101,6 @@ func execPublish(c *cli.Context) error {
 	markdown := c.Bool("markdown")
 	template := c.String("template")
 	filename := c.String("filename")
-	sequenceID := c.String("sequence-id")
 	file := c.String("file")
 	email := c.String("email")
 	user := c.String("user")
@@ -157,9 +154,6 @@ func execPublish(c *cli.Context) error {
 	if filename != "" {
 		options = append(options, client.WithFilename(filename))
 	}
-	if sequenceID != "" {
-		options = append(options, client.WithSequenceID(sequenceID))
-	}
 	if email != "" {
 		options = append(options, client.WithEmail(email))
 	}

cmd/publish_test.go

@@ -2,6 +2,9 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/stretchr/testify/require"
+	"heckel.io/ntfy/v2/test"
+	"heckel.io/ntfy/v2/util"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -11,14 +14,9 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/v2/test"
-	"heckel.io/ntfy/v2/util"
 )
 
 func TestCLI_Publish_Subscribe_Poll_Real_Server(t *testing.T) {
-	t.Skip("temporarily disabled") // FIXME
 	testMessage := util.RandomString(10)
 	app, _, _, _ := newTestApp()
 	require.Nil(t, app.Run([]string{"ntfy", "publish", "ntfytest", "ntfy unit test " + testMessage}))

cmd/serve.go

@@ -10,15 +10,14 @@ import (
 	"net"
 	"net/netip"
 	"net/url"
-	"path/filepath"
-	"runtime"
+	"os"
+	"os/signal"
 	"strings"
-	"text/template"
+	"syscall"
 	"time"
 
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
-	"heckel.io/ntfy/v2/ban"
 	"heckel.io/ntfy/v2/log"
 	"heckel.io/ntfy/v2/payments"
 	"heckel.io/ntfy/v2/server"
@@ -41,8 +40,6 @@ var flagsServe = append(
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "key-file", Aliases: []string{"key_file", "K"}, EnvVars: []string{"NTFY_KEY_FILE"}, Usage: "private key file, if listen-https is set"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "cert-file", Aliases: []string{"cert_file", "E"}, EnvVars: []string{"NTFY_CERT_FILE"}, Usage: "certificate file, if listen-https is set"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "firebase-key-file", Aliases: []string{"firebase_key_file", "F"}, EnvVars: []string{"NTFY_FIREBASE_KEY_FILE"}, Usage: "Firebase credentials file; if set additionally publish to FCM topic"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "database-url", Aliases: []string{"database_url"}, EnvVars: []string{"NTFY_DATABASE_URL"}, Usage: "PostgreSQL connection string for database-backed stores (e.g. postgres://user:pass@host:5432/ntfy)"}),
-	altsrc.NewStringSliceFlag(&cli.StringSliceFlag{Name: "database-replica-urls", Aliases: []string{"database_replica_urls"}, EnvVars: []string{"NTFY_DATABASE_REPLICA_URLS"}, Usage: "PostgreSQL read replica connection strings for offloading read queries"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "cache-file", Aliases: []string{"cache_file", "C"}, EnvVars: []string{"NTFY_CACHE_FILE"}, Usage: "cache file used for message caching"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "cache-duration", Aliases: []string{"cache_duration", "b"}, EnvVars: []string{"NTFY_CACHE_DURATION"}, Value: util.FormatDuration(server.DefaultCacheDuration), Usage: "buffer messages for this time to allow `since` requests"}),
 	altsrc.NewIntFlag(&cli.IntFlag{Name: "cache-batch-size", Aliases: []string{"cache_batch_size"}, EnvVars: []string{"NTFY_BATCH_SIZE"}, Usage: "max size of messages to batch together when writing to message cache (if zero, writes are synchronous)"}),
@@ -54,8 +51,7 @@ var flagsServe = append(
 	altsrc.NewStringSliceFlag(&cli.StringSliceFlag{Name: "auth-users", Aliases: []string{"auth_users"}, EnvVars: []string{"NTFY_AUTH_USERS"}, Usage: "pre-provisioned declarative users"}),
 	altsrc.NewStringSliceFlag(&cli.StringSliceFlag{Name: "auth-access", Aliases: []string{"auth_access"}, EnvVars: []string{"NTFY_AUTH_ACCESS"}, Usage: "pre-provisioned declarative access control entries"}),
 	altsrc.NewStringSliceFlag(&cli.StringSliceFlag{Name: "auth-tokens", Aliases: []string{"auth_tokens"}, EnvVars: []string{"NTFY_AUTH_TOKENS"}, Usage: "pre-provisioned declarative access tokens"}),
-	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "auth-access-cache", Aliases: []string{"auth_access_cache"}, EnvVars: []string{"NTFY_AUTH_ACCESS_CACHE"}, Value: user.DefaultAccessCacheEnabled, Usage: "enables the in-memory ACL cache (high-volume servers only)"}),
-	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, or S3 URL (s3://ACCESS_KEY:SECRET_KEY@BUCKET[/PREFIX]?region=REGION[&endpoint=ENDPOINT])"}),
+	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"}, Value: util.FormatSize(server.DefaultAttachmentTotalSizeLimit), 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"}, Value: util.FormatSize(server.DefaultAttachmentFileSizeLimit), Usage: "per-file attachment size limit (e.g. 300k, 2M, 100M)"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "attachment-expiry-duration", Aliases: []string{"attachment_expiry_duration", "X"}, EnvVars: []string{"NTFY_ATTACHMENT_EXPIRY_DURATION"}, Value: util.FormatDuration(server.DefaultAttachmentExpiryDuration), Usage: "duration after which uploaded attachments will be deleted (e.g. 3h, 20h)"}),
@@ -74,7 +70,6 @@ var flagsServe = append(
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-user", Aliases: []string{"smtp_sender_user"}, EnvVars: []string{"NTFY_SMTP_SENDER_USER"}, Usage: "SMTP user (if e-mail sending is enabled)"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-pass", Aliases: []string{"smtp_sender_pass"}, EnvVars: []string{"NTFY_SMTP_SENDER_PASS"}, Usage: "SMTP password (if e-mail sending is enabled)"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-from", Aliases: []string{"smtp_sender_from"}, EnvVars: []string{"NTFY_SMTP_SENDER_FROM"}, Usage: "SMTP sender address (if e-mail sending is enabled)"}),
-	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "smtp-sender-verify", Aliases: []string{"smtp_sender_verify"}, EnvVars: []string{"NTFY_SMTP_SENDER_VERIFY"}, Value: false, Usage: "require verified email addresses for sending email notifications"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-server-listen", Aliases: []string{"smtp_server_listen"}, EnvVars: []string{"NTFY_SMTP_SERVER_LISTEN"}, Usage: "SMTP server address (ip:port) for incoming emails, e.g. :25"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-server-domain", Aliases: []string{"smtp_server_domain"}, EnvVars: []string{"NTFY_SMTP_SERVER_DOMAIN"}, Usage: "SMTP domain for incoming e-mail, e.g. ntfy.sh"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-server-addr-prefix", Aliases: []string{"smtp_server_addr_prefix"}, EnvVars: []string{"NTFY_SMTP_SERVER_ADDR_PREFIX"}, Usage: "SMTP email address prefix for topics to prevent spam (e.g. 'ntfy-')"}),
@@ -82,7 +77,6 @@ var flagsServe = append(
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "twilio-auth-token", Aliases: []string{"twilio_auth_token"}, EnvVars: []string{"NTFY_TWILIO_AUTH_TOKEN"}, Usage: "Twilio auth token"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "twilio-phone-number", Aliases: []string{"twilio_phone_number"}, EnvVars: []string{"NTFY_TWILIO_PHONE_NUMBER"}, Usage: "Twilio number to use for outgoing calls"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "twilio-verify-service", Aliases: []string{"twilio_verify_service"}, EnvVars: []string{"NTFY_TWILIO_VERIFY_SERVICE"}, Usage: "Twilio Verify service ID, used for phone number verification"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "twilio-call-format", Aliases: []string{"twilio_call_format"}, EnvVars: []string{"NTFY_TWILIO_CALL_FORMAT"}, Usage: "Twilio/TwiML format string for phone calls"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "message-size-limit", Aliases: []string{"message_size_limit"}, EnvVars: []string{"NTFY_MESSAGE_SIZE_LIMIT"}, Value: util.FormatSize(server.DefaultMessageSizeLimit), Usage: "size limit for the message (see docs for limitations)"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "message-delay-limit", Aliases: []string{"message_delay_limit"}, EnvVars: []string{"NTFY_MESSAGE_DELAY_LIMIT"}, Value: util.FormatDuration(server.DefaultMessageDelayMax), Usage: "max duration a message can be scheduled into the future"}),
 	altsrc.NewIntFlag(&cli.IntFlag{Name: "global-topic-limit", Aliases: []string{"global_topic_limit", "T"}, EnvVars: []string{"NTFY_GLOBAL_TOPIC_LIMIT"}, Value: server.DefaultTotalTopicLimit, Usage: "total number of topics allowed"}),
@@ -96,14 +90,8 @@ var flagsServe = append(
 	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-message-daily-limit", Aliases: []string{"visitor_message_daily_limit"}, EnvVars: []string{"NTFY_VISITOR_MESSAGE_DAILY_LIMIT"}, Value: server.DefaultVisitorMessageDailyLimit, Usage: "max messages per visitor per day, derived from request limit if unset"}),
 	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-email-limit-burst", Aliases: []string{"visitor_email_limit_burst"}, EnvVars: []string{"NTFY_VISITOR_EMAIL_LIMIT_BURST"}, Value: server.DefaultVisitorEmailLimitBurst, Usage: "initial limit of e-mails per visitor"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "visitor-email-limit-replenish", Aliases: []string{"visitor_email_limit_replenish"}, EnvVars: []string{"NTFY_VISITOR_EMAIL_LIMIT_REPLENISH"}, Value: util.FormatDuration(server.DefaultVisitorEmailLimitReplenish), Usage: "interval at which burst limit is replenished (one per x)"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-topic-creation-limit-burst", Aliases: []string{"visitor_topic_creation_limit_burst"}, EnvVars: []string{"NTFY_VISITOR_TOPIC_CREATION_LIMIT_BURST"}, Value: server.DefaultVisitorTopicCreationLimitBurst, Usage: "burst of new topic creations per visitor (0 = disabled)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "visitor-topic-creation-limit-replenish", Aliases: []string{"visitor_topic_creation_limit_replenish"}, EnvVars: []string{"NTFY_VISITOR_TOPIC_CREATION_LIMIT_REPLENISH"}, Value: util.FormatDuration(server.DefaultVisitorTopicCreationLimitReplenish), Usage: "interval at which topic-creation tokens are refilled (one per x)"}),
 	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-prefix-bits-ipv4", Aliases: []string{"visitor_prefix_bits_ipv4"}, EnvVars: []string{"NTFY_VISITOR_PREFIX_BITS_IPV4"}, Value: server.DefaultVisitorPrefixBitsIPv4, Usage: "number of bits of the IPv4 address to use for rate limiting (default: 32, full address)"}),
 	altsrc.NewIntFlag(&cli.IntFlag{Name: "visitor-prefix-bits-ipv6", Aliases: []string{"visitor_prefix_bits_ipv6"}, EnvVars: []string{"NTFY_VISITOR_PREFIX_BITS_IPV6"}, Value: server.DefaultVisitorPrefixBitsIPv6, Usage: "number of bits of the IPv6 address to use for rate limiting (default: 64, /64 subnet)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "ban-file", Aliases: []string{"ban_file"}, EnvVars: []string{"NTFY_BAN_FILE"}, Value: "", Usage: "if set, append IPs of abusive visitors to this file for fail2ban to tail (empty disables)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "ban-window", Aliases: []string{"ban_window"}, EnvVars: []string{"NTFY_BAN_WINDOW"}, Value: util.FormatDuration(server.DefaultBanWindow), Usage: "rolling window over which weighted strikes are counted for the ban file"}),
-	altsrc.NewIntFlag(&cli.IntFlag{Name: "ban-threshold", Aliases: []string{"ban_threshold"}, EnvVars: []string{"NTFY_BAN_THRESHOLD"}, Value: server.DefaultBanThreshold, Usage: "weighted strikes per window before an offender is banned"}),
-	altsrc.NewStringSliceFlag(&cli.StringSliceFlag{Name: "ban-weights", Aliases: []string{"ban_weights"}, EnvVars: []string{"NTFY_BAN_WEIGHTS"}, Value: cli.NewStringSlice(server.DefaultBanWeights...), Usage: "per-code strike weights as KEY:WEIGHT, where KEY is an ntfy code, an HTTP status, a PREFIX*, or '*' (weight 0 exempts)"}),
 	altsrc.NewBoolFlag(&cli.BoolFlag{Name: "behind-proxy", Aliases: []string{"behind_proxy", "P"}, EnvVars: []string{"NTFY_BEHIND_PROXY"}, Value: false, Usage: "if set, use forwarded header (e.g. X-Forwarded-For, X-Client-IP) to determine visitor IP address (for rate limiting)"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "proxy-forwarded-header", Aliases: []string{"proxy_forwarded_header"}, EnvVars: []string{"NTFY_PROXY_FORWARDED_HEADER"}, Value: "X-Forwarded-For", Usage: "use specified header to determine visitor IP address (for rate limiting)"}),
 	altsrc.NewStringFlag(&cli.StringFlag{Name: "proxy-trusted-hosts", Aliases: []string{"proxy_trusted_hosts"}, EnvVars: []string{"NTFY_PROXY_TRUSTED_HOSTS"}, Value: "", Usage: "comma-separated list of trusted IP addresses, hosts, or CIDRs to remove from forwarded header"}),
@@ -155,8 +143,6 @@ func execServe(c *cli.Context) error {
 	keyFile := c.String("key-file")
 	certFile := c.String("cert-file")
 	firebaseKeyFile := c.String("firebase-key-file")
-	databaseURL := c.String("database-url")
-	databaseReplicaURLs := c.StringSlice("database-replica-urls")
 	webPushPrivateKey := c.String("web-push-private-key")
 	webPushPublicKey := c.String("web-push-public-key")
 	webPushFile := c.String("web-push-file")
@@ -175,7 +161,6 @@ func execServe(c *cli.Context) error {
 	authUsersRaw := c.StringSlice("auth-users")
 	authAccessRaw := c.StringSlice("auth-access")
 	authTokensRaw := c.StringSlice("auth-tokens")
-	authAccessCacheEnabled := c.Bool("auth-access-cache")
 	attachmentCacheDir := c.String("attachment-cache-dir")
 	attachmentTotalSizeLimitStr := c.String("attachment-total-size-limit")
 	attachmentFileSizeLimitStr := c.String("attachment-file-size-limit")
@@ -195,7 +180,6 @@ func execServe(c *cli.Context) error {
 	smtpSenderUser := c.String("smtp-sender-user")
 	smtpSenderPass := c.String("smtp-sender-pass")
 	smtpSenderFrom := c.String("smtp-sender-from")
-	smtpSenderVerify := c.Bool("smtp-sender-verify")
 	smtpServerListen := c.String("smtp-server-listen")
 	smtpServerDomain := c.String("smtp-server-domain")
 	smtpServerAddrPrefix := c.String("smtp-server-addr-prefix")
@@ -203,7 +187,6 @@ func execServe(c *cli.Context) error {
 	twilioAuthToken := c.String("twilio-auth-token")
 	twilioPhoneNumber := c.String("twilio-phone-number")
 	twilioVerifyService := c.String("twilio-verify-service")
-	twilioCallFormat := c.String("twilio-call-format")
 	messageSizeLimitStr := c.String("message-size-limit")
 	messageDelayLimitStr := c.String("message-delay-limit")
 	totalTopicLimit := c.Int("global-topic-limit")
@@ -217,14 +200,8 @@ func execServe(c *cli.Context) error {
 	visitorMessageDailyLimit := c.Int("visitor-message-daily-limit")
 	visitorEmailLimitBurst := c.Int("visitor-email-limit-burst")
 	visitorEmailLimitReplenishStr := c.String("visitor-email-limit-replenish")
-	visitorTopicCreationLimitBurst := c.Int("visitor-topic-creation-limit-burst")
-	visitorTopicCreationLimitReplenishStr := c.String("visitor-topic-creation-limit-replenish")
 	visitorPrefixBitsIPv4 := c.Int("visitor-prefix-bits-ipv4")
 	visitorPrefixBitsIPv6 := c.Int("visitor-prefix-bits-ipv6")
-	banFile := c.String("ban-file")
-	banWindowStr := c.String("ban-window")
-	banThreshold := c.Int("ban-threshold")
-	banWeightsRaw := c.StringSlice("ban-weights")
 	behindProxy := c.Bool("behind-proxy")
 	proxyForwardedHeader := c.String("proxy-forwarded-header")
 	proxyTrustedHosts := util.SplitNoEmpty(c.String("proxy-trusted-hosts"), ",")
@@ -268,10 +245,6 @@ func execServe(c *cli.Context) error {
 	if err != nil {
 		return fmt.Errorf("invalid visitor email limit replenish: %s", visitorEmailLimitReplenishStr)
 	}
-	visitorTopicCreationLimitReplenish, err := util.ParseDuration(visitorTopicCreationLimitReplenishStr)
-	if err != nil {
-		return fmt.Errorf("invalid visitor topic creation limit replenish: %s", visitorTopicCreationLimitReplenishStr)
-	}
 	webPushExpiryDuration, err := util.ParseDuration(webPushExpiryDurationStr)
 	if err != nil {
 		return fmt.Errorf("invalid web push expiry duration: %s", webPushExpiryDurationStr)
@@ -280,16 +253,6 @@ func execServe(c *cli.Context) error {
 	if err != nil {
 		return fmt.Errorf("invalid web push expiry warning duration: %s", webPushExpiryWarningDurationStr)
 	}
-	banWindow, err := util.ParseDuration(banWindowStr)
-	if err != nil {
-		return fmt.Errorf("invalid ban window: %s", banWindowStr)
-	}
-
-	// Parse abuse ban-feed weights ("KEY:WEIGHT" list, "*" fallback)
-	banWeights, err := ban.ParseWeights(banWeightsRaw)
-	if err != nil {
-		return err
-	}
 
 	// Convert sizes to bytes
 	messageSizeLimit, err := util.ParseSize(messageSizeLimitStr)
@@ -316,18 +279,12 @@ func execServe(c *cli.Context) error {
 	}
 
 	// Check values
-	if databaseURL != "" && !strings.HasPrefix(databaseURL, "postgres://") && !strings.HasPrefix(databaseURL, "postgresql://") {
-		return errors.New("if database-url is set, it must start with postgres:// or postgresql://")
-	} else if databaseURL != "" && (authFile != "" || cacheFile != "" || webPushFile != "") {
-		return errors.New("if database-url is set, auth-file, cache-file, and web-push-file must not be set")
-	} else if len(databaseReplicaURLs) > 0 && databaseURL == "" {
-		return errors.New("database-replica-urls can only be used if database-url is also set")
-	} else if firebaseKeyFile != "" && !util.FileExists(firebaseKeyFile) {
+	if firebaseKeyFile != "" && !util.FileExists(firebaseKeyFile) {
 		return errors.New("if set, FCM key file must exist")
 	} else if firebaseKeyFile != "" && !server.FirebaseAvailable {
 		return errors.New("cannot set firebase-key-file, support for Firebase is not available (nofirebase)")
-	} else if webPushPublicKey != "" && (webPushPrivateKey == "" || (webPushFile == "" && databaseURL == "") || webPushEmailAddress == "" || baseURL == "") {
-		return errors.New("if web push is enabled, web-push-private-key, web-push-public-key, web-push-file (or database-url), web-push-email-address, and base-url should be set. run 'ntfy webpush keys' to generate keys")
+	} else if webPushPublicKey != "" && (webPushPrivateKey == "" || webPushFile == "" || webPushEmailAddress == "" || baseURL == "") {
+		return errors.New("if web push is enabled, web-push-private-key, web-push-public-key, web-push-file, web-push-email-address, and base-url should be set. run 'ntfy webpush keys' to generate keys")
 	} else if keepaliveInterval < 5*time.Second {
 		return errors.New("keepalive interval cannot be lower than five seconds")
 	} else if managerInterval < 5*time.Second {
@@ -342,8 +299,6 @@ func execServe(c *cli.Context) error {
 		return errors.New("if listen-https is set, both key-file and cert-file must be set")
 	} else if smtpSenderAddr != "" && (baseURL == "" || smtpSenderFrom == "") {
 		return errors.New("if smtp-sender-addr is set, base-url, and smtp-sender-from must also be set")
-	} else if smtpSenderVerify && smtpSenderAddr == "" {
-		return errors.New("if smtp-sender-verify is set, smtp-sender-addr must also be set")
 	} else if smtpServerListen != "" && smtpServerDomain == "" {
 		return errors.New("if smtp-server-listen is set, smtp-server-domain must also be set")
 	} else if attachmentCacheDir != "" && baseURL == "" {
@@ -365,8 +320,8 @@ func execServe(c *cli.Context) error {
 		return errors.New("if upstream-base-url is set, base-url must also be set")
 	} else if upstreamBaseURL != "" && baseURL != "" && baseURL == upstreamBaseURL {
 		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 == "" && databaseURL == "" && (enableSignup || enableLogin || requireLogin || enableReservations || stripeSecretKey != "") {
-		return errors.New("cannot set enable-signup, enable-login, require-login, enable-reserve-topics, or stripe-secret-key if auth-file or database-url is not set")
+	} else if authFile == "" && (enableSignup || enableLogin || requireLogin || enableReservations || stripeSecretKey != "") {
+		return errors.New("cannot set enable-signup, enable-login, require-login, enable-reserve-topics, or stripe-secret-key if auth-file is not set")
 	} else if enableSignup && !enableLogin {
 		return errors.New("cannot set enable-signup without also setting enable-login")
 	} else if requireLogin && !enableLogin {
@@ -375,8 +330,8 @@ func execServe(c *cli.Context) error {
 		return errors.New("cannot set stripe-secret-key or stripe-webhook-key, support for payments is not available in this build (nopayments)")
 	} else if stripeSecretKey != "" && (stripeWebhookKey == "" || baseURL == "") {
 		return errors.New("if stripe-secret-key is set, stripe-webhook-key and base-url must also be set")
-	} else if twilioAccount != "" && (twilioAuthToken == "" || twilioPhoneNumber == "" || twilioVerifyService == "" || baseURL == "" || (authFile == "" && databaseURL == "")) {
-		return errors.New("if twilio-account is set, twilio-auth-token, twilio-phone-number, twilio-verify-service, base-url, and auth-file (or database-url) must also be set")
+	} else if twilioAccount != "" && (twilioAuthToken == "" || twilioPhoneNumber == "" || twilioVerifyService == "" || baseURL == "" || authFile == "") {
+		return errors.New("if twilio-account is set, twilio-auth-token, twilio-phone-number, twilio-verify-service, base-url, and auth-file must also be set")
 	} else if messageSizeLimit > server.DefaultMessageSizeLimit {
 		log.Warn("message-size-limit is greater than 4K, this is not recommended and largely untested, and may lead to issues with some clients")
 		if messageSizeLimit > 5*1024*1024 {
@@ -392,16 +347,6 @@ func execServe(c *cli.Context) error {
 		return errors.New("visitor-prefix-bits-ipv4 must be between 1 and 32")
 	} else if visitorPrefixBitsIPv6 < 1 || visitorPrefixBitsIPv6 > 128 {
 		return errors.New("visitor-prefix-bits-ipv6 must be between 1 and 128")
-	} else if banFile != "" && banWindow <= 0 {
-		return errors.New("if ban-file is set, ban-window must be greater than zero")
-	} else if banFile != "" && banThreshold <= 0 {
-		return errors.New("if ban-file is set, ban-threshold must be greater than zero")
-	} else if banFile != "" && len(banWeights) == 0 {
-		return errors.New("if ban-file is set, ban-weights must not be empty")
-	} else if banFile != "" && !util.FileExists(filepath.Dir(banFile)) {
-		return fmt.Errorf("if ban-file is set, its directory (%s) must exist", filepath.Dir(banFile))
-	} else if runtime.GOOS == "windows" && listenUnix != "" {
-		return errors.New("listen-unix is not supported on Windows")
 	}
 
 	// Backwards compatibility
@@ -464,15 +409,6 @@ func execServe(c *cli.Context) error {
 		payments.Setup(stripeSecretKey)
 	}
 
-	// Parse Twilio template
-	var twilioCallFormatTemplate *template.Template
-	if twilioCallFormat != "" {
-		twilioCallFormatTemplate, err = template.New("").Parse(twilioCallFormat)
-		if err != nil {
-			return fmt.Errorf("failed to parse twilio-call-format template: %w", err)
-		}
-	}
-
 	// Add default forbidden topics
 	disallowedTopics = append(disallowedTopics, server.DefaultDisallowedTopics...)
 
@@ -498,7 +434,6 @@ func execServe(c *cli.Context) error {
 	conf.AuthUsers = authUsers
 	conf.AuthAccess = authAccess
 	conf.AuthTokens = authTokens
-	conf.AuthAccessCacheEnabled = authAccessCacheEnabled
 	conf.AttachmentCacheDir = attachmentCacheDir
 	conf.AttachmentTotalSizeLimit = attachmentTotalSizeLimit
 	conf.AttachmentFileSizeLimit = attachmentFileSizeLimit
@@ -514,7 +449,6 @@ func execServe(c *cli.Context) error {
 	conf.SMTPSenderUser = smtpSenderUser
 	conf.SMTPSenderPass = smtpSenderPass
 	conf.SMTPSenderFrom = smtpSenderFrom
-	conf.SMTPSenderVerify = smtpSenderVerify
 	conf.SMTPServerListen = smtpServerListen
 	conf.SMTPServerDomain = smtpServerDomain
 	conf.SMTPServerAddrPrefix = smtpServerAddrPrefix
@@ -522,7 +456,6 @@ func execServe(c *cli.Context) error {
 	conf.TwilioAuthToken = twilioAuthToken
 	conf.TwilioPhoneNumber = twilioPhoneNumber
 	conf.TwilioVerifyService = twilioVerifyService
-	conf.TwilioCallFormat = twilioCallFormatTemplate
 	conf.MessageSizeLimit = int(messageSizeLimit)
 	conf.MessageDelayMax = messageDelayLimit
 	conf.TotalTopicLimit = totalTopicLimit
@@ -536,14 +469,8 @@ func execServe(c *cli.Context) error {
 	conf.VisitorMessageDailyLimit = visitorMessageDailyLimit
 	conf.VisitorEmailLimitBurst = visitorEmailLimitBurst
 	conf.VisitorEmailLimitReplenish = visitorEmailLimitReplenish
-	conf.VisitorTopicCreationLimitBurst = visitorTopicCreationLimitBurst
-	conf.VisitorTopicCreationLimitReplenish = visitorTopicCreationLimitReplenish
 	conf.VisitorPrefixBitsIPv4 = visitorPrefixBitsIPv4
 	conf.VisitorPrefixBitsIPv6 = visitorPrefixBitsIPv6
-	conf.BanFile = banFile
-	conf.BanWindow = banWindow
-	conf.BanThreshold = banThreshold
-	conf.BanWeights = banWeights
 	conf.BehindProxy = behindProxy
 	conf.ProxyForwardedHeader = proxyForwardedHeader
 	conf.ProxyTrustedPrefixes = trustedProxyPrefixes
@@ -557,8 +484,6 @@ func execServe(c *cli.Context) error {
 	conf.EnableMetrics = enableMetrics
 	conf.MetricsListenHTTP = metricsListenHTTP
 	conf.ProfileListenHTTP = profileListenHTTP
-	conf.DatabaseURL = databaseURL
-	conf.DatabaseReplicaURLs = databaseReplicaURLs
 	conf.WebPushPrivateKey = webPushPrivateKey
 	conf.WebPushPublicKey = webPushPublicKey
 	conf.WebPushFile = webPushFile
@@ -566,17 +491,7 @@ func execServe(c *cli.Context) error {
 	conf.WebPushStartupQueries = webPushStartupQueries
 	conf.WebPushExpiryDuration = webPushExpiryDuration
 	conf.WebPushExpiryWarningDuration = webPushExpiryWarningDuration
-	conf.BuildVersion = c.App.Version
-	conf.BuildDate = maybeFromMetadata(c.App.Metadata, MetadataKeyDate)
-	conf.BuildCommit = maybeFromMetadata(c.App.Metadata, MetadataKeyCommit)
-
-	// Check if we should run as a Windows service
-	if ranAsService, err := maybeRunAsService(conf); err != nil {
-		log.Fatal("%s", err.Error())
-	} else if ranAsService {
-		log.Info("Exiting.")
-		return nil
-	}
+	conf.Version = c.App.Version
 
 	// Set up hot-reloading of config
 	go sigHandlerConfigReload(config)
@@ -592,6 +507,22 @@ func execServe(c *cli.Context) error {
 	return nil
 }
 
+func sigHandlerConfigReload(config string) {
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, syscall.SIGHUP)
+	for range sigs {
+		log.Info("Partially hot reloading configuration ...")
+		inputSource, err := newYamlSourceFromFile(config, flagsServe)
+		if err != nil {
+			log.Warn("Hot reload failed: %s", err.Error())
+			continue
+		}
+		if err := reloadLogLevel(inputSource); err != nil {
+			log.Warn("Reloading log level failed: %s", err.Error())
+		}
+	}
+}
+
 func parseIPHostPrefix(host string) (prefixes []netip.Prefix, err error) {
 	// Try parsing as prefix, e.g. 10.0.1.0/24 or 2001:db8::/32
 	prefix, err := netip.ParsePrefix(host)
@@ -723,17 +654,24 @@ func parseTokens(users []*user.User, tokensRaw []string) (map[string][]*user.Tok
 	return tokens, nil
 }
 
-func maybeFromMetadata(m map[string]any, key string) string {
-	if m == nil {
-		return ""
+func reloadLogLevel(inputSource altsrc.InputSourceContext) error {
+	newLevelStr, err := inputSource.String("log-level")
+	if err != nil {
+		return fmt.Errorf("cannot load log level: %s", err.Error())
 	}
-	v, exists := m[key]
-	if !exists {
-		return ""
+	overrides, err := inputSource.StringSlice("log-level-overrides")
+	if err != nil {
+		return fmt.Errorf("cannot load log level overrides (1): %s", err.Error())
 	}
-	s, ok := v.(string)
-	if !ok {
-		return ""
+	log.ResetLevelOverrides()
+	if err := applyLogLevelOverrides(overrides); err != nil {
+		return fmt.Errorf("cannot load log level overrides (2): %s", err.Error())
 	}
-	return s
+	log.SetLevel(log.ToLevel(newLevelStr))
+	if len(overrides) > 0 {
+		log.Info("Log level is %v, %d override(s) in place", strings.ToUpper(newLevelStr), len(overrides))
+	} else {
+		log.Info("Log level is %v", strings.ToUpper(newLevelStr))
+	}
+	return nil
 }

cmd/serve_unix.go

@@ -1,55 +0,0 @@
-//go:build (darwin || linux || dragonfly || freebsd || netbsd || openbsd) && !noserver
-
-package cmd
-
-import (
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/urfave/cli/v2/altsrc"
-	"heckel.io/ntfy/v2/log"
-	"heckel.io/ntfy/v2/server"
-)
-
-func sigHandlerConfigReload(config string) {
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGHUP)
-	for range sigs {
-		log.Info("Partially hot reloading configuration ...")
-		inputSource, err := newYamlSourceFromFile(config, flagsServe)
-		if err != nil {
-			log.Warn("Hot reload failed: %s", err.Error())
-			continue
-		}
-		if err := reloadLogLevel(inputSource); err != nil {
-			log.Warn("Reloading log level failed: %s", err.Error())
-		}
-	}
-}
-
-func reloadLogLevel(inputSource altsrc.InputSourceContext) error {
-	newLevelStr, err := inputSource.String("log-level")
-	if err != nil {
-		return err
-	}
-	overrides, err := inputSource.StringSlice("log-level-overrides")
-	if err != nil {
-		return err
-	}
-	log.ResetLevelOverrides()
-	if err := applyLogLevelOverrides(overrides); err != nil {
-		return err
-	}
-	log.SetLevel(log.ToLevel(newLevelStr))
-	if len(overrides) > 0 {
-		log.Info("Log level is %v, %d override(s) in place", newLevelStr, len(overrides))
-	} else {
-		log.Info("Log level is %v", newLevelStr)
-	}
-	return nil
-}
-
-func maybeRunAsService(conf *server.Config) (bool, error) {
-	return false, nil
-}

cmd/serve_windows.go

@@ -1,100 +0,0 @@
-//go:build windows && !noserver
-
-package cmd
-
-import (
-	"fmt"
-	"sync"
-
-	"golang.org/x/sys/windows/svc"
-	"heckel.io/ntfy/v2/log"
-	"heckel.io/ntfy/v2/server"
-)
-
-const serviceName = "ntfy"
-
-// sigHandlerConfigReload is a no-op on Windows since SIGHUP is not available.
-// Windows users can restart the service to reload configuration.
-func sigHandlerConfigReload(config string) {
-	log.Debug("Config hot-reload via SIGHUP is not supported on Windows")
-}
-
-// runAsWindowsService runs the ntfy server as a Windows service
-func runAsWindowsService(conf *server.Config) error {
-	return svc.Run(serviceName, &windowsService{conf: conf})
-}
-
-// windowsService implements the svc.Handler interface
-type windowsService struct {
-	conf   *server.Config
-	server *server.Server
-	mu     sync.Mutex
-}
-
-// Execute is the main entry point for the Windows service
-func (s *windowsService) Execute(args []string, requests <-chan svc.ChangeRequest, status chan<- svc.Status) (bool, uint32) {
-	const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown
-	status <- svc.Status{State: svc.StartPending}
-
-	// Create and start the server
-	var err error
-	s.mu.Lock()
-	s.server, err = server.New(s.conf)
-	s.mu.Unlock()
-	if err != nil {
-		log.Error("Failed to create server: %s", err.Error())
-		return true, 1
-	}
-
-	// Start server in a goroutine
-	serverErrChan := make(chan error, 1)
-	go func() {
-		serverErrChan <- s.server.Run()
-	}()
-
-	status <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
-	log.Info("Windows service started")
-
-	for {
-		select {
-		case err := <-serverErrChan:
-			if err != nil {
-				log.Error("Server error: %s", err.Error())
-				return true, 1
-			}
-			return false, 0
-		case req := <-requests:
-			switch req.Cmd {
-			case svc.Interrogate:
-				status <- req.CurrentStatus
-			case svc.Stop, svc.Shutdown:
-				log.Info("Windows service stopping...")
-				status <- svc.Status{State: svc.StopPending}
-				s.mu.Lock()
-				if s.server != nil {
-					s.server.Stop()
-				}
-				s.mu.Unlock()
-				return false, 0
-			default:
-				log.Warn("Unexpected service control request: %d", req.Cmd)
-			}
-		}
-	}
-}
-
-// maybeRunAsService checks if the process is running as a Windows service,
-// and if so, runs the server as a service. Returns true if it ran as a service.
-func maybeRunAsService(conf *server.Config) (bool, error) {
-	isService, err := svc.IsWindowsService()
-	if err != nil {
-		return false, fmt.Errorf("failed to detect Windows service mode: %w", err)
-	} else if !isService {
-		return false, nil
-	}
-	log.Info("Running as Windows service")
-	if err := runAsWindowsService(conf); err != nil {
-		return true, fmt.Errorf("failed to run as Windows service: %w", err)
-	}
-	return true, nil
-}

cmd/subscribe.go

@@ -3,21 +3,28 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"os"
-	"os/exec"
-	"sort"
-	"strings"
-
 	"github.com/urfave/cli/v2"
 	"heckel.io/ntfy/v2/client"
 	"heckel.io/ntfy/v2/log"
 	"heckel.io/ntfy/v2/util"
+	"os"
+	"os/exec"
+	"os/user"
+	"path/filepath"
+	"sort"
+	"strings"
 )
 
 func init() {
 	commands = append(commands, cmdSubscribe)
 }
 
+const (
+	clientRootConfigFileUnixAbsolute    = "/etc/ntfy/client.yml"
+	clientUserConfigFileUnixRelative    = "ntfy/client.yml"
+	clientUserConfigFileWindowsRelative = "ntfy\\client.yml"
+)
+
 var flagsSubscribe = append(
 	append([]cli.Flag{}, flagsDefault...),
 	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, Usage: "client config file"},
@@ -303,16 +310,45 @@ func loadConfig(c *cli.Context) (*client.Config, error) {
 	if filename != "" {
 		return client.LoadConfig(filename)
 	}
-	if client.DefaultConfigFile != "" {
-		if s, _ := os.Stat(client.DefaultConfigFile); s != nil {
-			return client.LoadConfig(client.DefaultConfigFile)
+	configFile, err := defaultClientConfigFile()
+	if err != nil {
+		log.Warn("Could not determine default client config file: %s", err.Error())
+	} else {
+		if s, _ := os.Stat(configFile); s != nil {
+			return client.LoadConfig(configFile)
 		}
-		log.Debug("Config file %s not found", client.DefaultConfigFile)
+		log.Debug("Config file %s not found", configFile)
 	}
 	log.Debug("Loading default config")
 	return client.NewConfig(), nil
 }
 
+//lint:ignore U1000 Conditionally used in different builds
+func defaultClientConfigFileUnix() (string, error) {
+	u, err := user.Current()
+	if err != nil {
+		return "", fmt.Errorf("could not determine current user: %w", err)
+	}
+	configFile := clientRootConfigFileUnixAbsolute
+	if u.Uid != "0" {
+		homeDir, err := os.UserConfigDir()
+		if err != nil {
+			return "", fmt.Errorf("could not determine user config dir: %w", err)
+		}
+		return filepath.Join(homeDir, clientUserConfigFileUnixRelative), nil
+	}
+	return configFile, nil
+}
+
+//lint:ignore U1000 Conditionally used in different builds
+func defaultClientConfigFileWindows() (string, error) {
+	homeDir, err := os.UserConfigDir()
+	if err != nil {
+		return "", fmt.Errorf("could not determine user config dir: %w", err)
+	}
+	return filepath.Join(homeDir, clientUserConfigFileWindowsRelative), nil
+}
+
 func logMessagePrefix(m *client.Message) string {
 	return fmt.Sprintf("%s/%s", util.ShortTopicURL(m.TopicURL), m.ID)
 }

cmd/subscribe_darwin.go

@@ -1,5 +1,3 @@
-//go:build darwin
-
 package cmd
 
 const (
@@ -12,3 +10,7 @@ or "~/Library/Application Support/ntfy/client.yml" for all other users.`
 var (
 	scriptLauncher = []string{"sh", "-c"}
 )
+
+func defaultClientConfigFile() (string, error) {
+	return defaultClientConfigFileUnix()
+}

cmd/subscribe_unix.go

@@ -12,3 +12,7 @@ or ~/.config/ntfy/client.yml for all other users.`
 var (
 	scriptLauncher = []string{"sh", "-c"}
 )
+
+func defaultClientConfigFile() (string, error) {
+	return defaultClientConfigFileUnix()
+}

cmd/subscribe_windows.go

@@ -1,5 +1,3 @@
-//go:build windows
-
 package cmd
 
 const (
@@ -11,3 +9,7 @@ const (
 var (
 	scriptLauncher = []string{"cmd.exe", "/Q", "/C"}
 )
+
+func defaultClientConfigFile() (string, error) {
+	return defaultClientConfigFileWindows()
+}

cmd/user.go

@@ -6,17 +6,13 @@ import (
 	"crypto/subtle"
 	"errors"
 	"fmt"
+	"heckel.io/ntfy/v2/server"
+	"heckel.io/ntfy/v2/user"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/urfave/cli/v2"
 	"github.com/urfave/cli/v2/altsrc"
-	"heckel.io/ntfy/v2/db"
-	"heckel.io/ntfy/v2/db/pg"
-	"heckel.io/ntfy/v2/mail"
-	"heckel.io/ntfy/v2/server"
-	"heckel.io/ntfy/v2/user"
 	"heckel.io/ntfy/v2/util"
 )
 
@@ -33,18 +29,12 @@ var flagsUser = append(
 	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, EnvVars: []string{"NTFY_CONFIG_FILE"}, Value: server.DefaultConfigFile, DefaultText: server.DefaultConfigFile, Usage: "config file"},
 	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-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: "database-url", Aliases: []string{"database_url"}, EnvVars: []string{"NTFY_DATABASE_URL"}, Usage: "PostgreSQL connection string for database-backed stores"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "base-url", Aliases: []string{"base_url", "B"}, EnvVars: []string{"NTFY_BASE_URL"}, Usage: "externally visible base URL for this host (e.g. https://ntfy.sh)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-addr", Aliases: []string{"smtp_sender_addr"}, EnvVars: []string{"NTFY_SMTP_SENDER_ADDR"}, Usage: "SMTP server address (host:port) for outgoing emails"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-user", Aliases: []string{"smtp_sender_user"}, EnvVars: []string{"NTFY_SMTP_SENDER_USER"}, Usage: "SMTP user (if e-mail sending is enabled)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-pass", Aliases: []string{"smtp_sender_pass"}, EnvVars: []string{"NTFY_SMTP_SENDER_PASS"}, Usage: "SMTP password (if e-mail sending is enabled)"}),
-	altsrc.NewStringFlag(&cli.StringFlag{Name: "smtp-sender-from", Aliases: []string{"smtp_sender_from"}, EnvVars: []string{"NTFY_SMTP_SENDER_FROM"}, Usage: "SMTP sender address (if e-mail sending is enabled)"}),
 )
 
 var cmdUser = &cli.Command{
 	Name:      "user",
 	Usage:     "Manage/show users",
-	UsageText: "ntfy user [list|add|remove|change-pass|reset-pass|change-role] ...",
+	UsageText: "ntfy user [list|add|remove|change-pass|change-role] ...",
 	Flags:     flagsUser,
 	Before:    initConfigFileInputSourceFunc("config", flagsUser, initLogFunc),
 	Category:  categoryServer,
@@ -105,30 +95,6 @@ Example:
 
 You may set the NTFY_PASSWORD environment variable to pass the new password or NTFY_PASSWORD_HASH to pass
 directly the bcrypt hash. This is useful if you are updating users via scripts.
-`,
-		},
-		{
-			Name:      "reset-pass",
-			Aliases:   []string{"rp"},
-			Usage:     "Generates a password reset link for a user",
-			UsageText: "ntfy user reset-pass [--send-email] USERNAME",
-			Action:    execUserResetPass,
-			Flags: []cli.Flag{
-				&cli.BoolFlag{Name: "send-email", Aliases: []string{"e"}, Usage: "also email the reset link to the user's primary email"},
-			},
-			Description: `Generate a password reset link for the given user and print it to stdout.
-
-The user completes the reset by opening the link in a browser and choosing a new password;
-the admin never learns or chooses the new password. The link is single-use and expires after
-one hour. This is an admin override of the self-service reset flow -- unlike self-service, it
-does not require the user to have a verified primary email (the token is bound to the user).
-
-With --send-email, the link is additionally emailed to the user's primary email address (this
-requires SMTP to be configured and the user to have a verified primary email).
-
-Example:
-  ntfy user reset-pass phil               # Print a reset link for user phil
-  ntfy user reset-pass --send-email phil  # Print and email the reset link
 `,
 		},
 		{
@@ -288,6 +254,7 @@ func execUserDel(c *cli.Context) error {
 func execUserChangePass(c *cli.Context) error {
 	username := c.Args().Get(0)
 	password, hashed := os.LookupEnv("NTFY_PASSWORD_HASH")
+
 	if !hashed {
 		password = os.Getenv("NTFY_PASSWORD")
 	}
@@ -316,61 +283,6 @@ func execUserChangePass(c *cli.Context) error {
 	return nil
 }
 
-func execUserResetPass(c *cli.Context) error {
-	username := c.Args().Get(0)
-	sendEmail := c.Bool("send-email")
-	baseURL := strings.TrimSuffix(c.String("base-url"), "/")
-	if username == "" {
-		return errors.New("username expected, type 'ntfy user reset-pass --help' for help")
-	} else if username == userEveryone || username == user.Everyone {
-		return errors.New("username not allowed")
-	} else if baseURL == "" {
-		return errors.New("base-url must be configured to generate a reset link")
-	}
-	manager, err := createUserManager(c)
-	if err != nil {
-		return err
-	}
-	u, err := manager.User(username)
-	if errors.Is(err, user.ErrUserNotFound) {
-		return fmt.Errorf("user %s does not exist", username)
-	} else if err != nil {
-		return err
-	} else if u.Provisioned {
-		return fmt.Errorf("user %s is provisioned in the config file; its password cannot be reset", username)
-	}
-	// Resolve the primary email up front if we need to send -- fail before creating a token
-	var primaryEmail string
-	if sendEmail {
-		primaryEmail, err = manager.PrimaryEmail(u.ID)
-		if err != nil {
-			return err
-		} else if primaryEmail == "" {
-			return fmt.Errorf("user %s has no primary email; cannot send reset link (omit --send-email to just print it)", username)
-		}
-	}
-	// The reset token is bound to the user, not an email -- so this works even with no SMTP
-	token, err := manager.AddMagicLink(user.MagicLinkKindPasswordReset, u.ID, "", time.Hour)
-	if err != nil {
-		return err
-	}
-	link := baseURL + "/account/password/reset/" + token
-	fmt.Fprintln(c.App.Writer, link)
-	if sendEmail {
-		sender := mail.NewSender(&mail.Config{
-			SMTPAddr: c.String("smtp-sender-addr"),
-			SMTPUser: c.String("smtp-sender-user"),
-			SMTPPass: c.String("smtp-sender-pass"),
-			From:     c.String("smtp-sender-from"),
-		})
-		if err := sender.SendPasswordReset(primaryEmail, link); err != nil {
-			return fmt.Errorf("failed to send reset email to %s: %w", primaryEmail, err)
-		}
-		fmt.Fprintf(c.App.ErrWriter, "reset link emailed to %s\n", primaryEmail)
-	}
-	return nil
-}
-
 func execUserChangeRole(c *cli.Context) error {
 	username := c.Args().Get(0)
 	role := user.Role(c.Args().Get(1))
@@ -398,7 +310,7 @@ func execUserHash(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	hash, err := user.HashPassword(password, user.DefaultUserPasswordBcryptCost)
+	hash, err := user.HashPassword(password)
 	if err != nil {
 		return fmt.Errorf("failed to hash password: %w", err)
 	}
@@ -453,31 +365,24 @@ func createUserManager(c *cli.Context) (*user.Manager, error) {
 	authFile := c.String("auth-file")
 	authStartupQueries := c.String("auth-startup-queries")
 	authDefaultAccess := c.String("auth-default-access")
-	databaseURL := c.String("database-url")
+	if authFile == "" {
+		return nil, errors.New("option auth-file not set; auth is unconfigured for this server")
+	} else if !util.FileExists(authFile) {
+		return nil, errors.New("auth-file does not exist; please start the server at least once to create it")
+	}
 	authDefault, err := user.ParsePermission(authDefaultAccess)
 	if err != nil {
 		return nil, errors.New("if set, auth-default-access must start set to 'read-write', 'read-only', 'write-only' or 'deny-all'")
 	}
 	authConfig := &user.Config{
+		Filename:            authFile,
+		StartupQueries:      authStartupQueries,
 		DefaultAccess:       authDefault,
 		ProvisionEnabled:    false, // Hack: Do not re-provision users on manager initialization
 		BcryptCost:          user.DefaultUserPasswordBcryptCost,
 		QueueWriterInterval: user.DefaultUserStatsQueueWriterInterval,
-		AccessCacheEnabled:  false, // Do not cache for CLI commands
 	}
-	if databaseURL != "" {
-		host, dbErr := pg.Open(databaseURL)
-		if dbErr != nil {
-			return nil, dbErr
-		}
-		return user.NewPostgresManager(db.New(host, nil), authConfig)
-	} else if authFile != "" {
-		if !util.FileExists(authFile) {
-			return nil, errors.New("auth-file does not exist; please start the server at least once to create it")
-		}
-		return user.NewSQLiteManager(authFile, authStartupQueries, authConfig)
-	}
-	return nil, errors.New("option database-url or auth-file not set; auth is unconfigured for this server")
+	return user.NewManager(authConfig)
 }
 
 func readPasswordAndConfirm(c *cli.Context) (string, error) {

cmd/user_test.go

@@ -1,15 +1,14 @@
 package cmd
 
 import (
-	"os"
-	"path/filepath"
-	"testing"
-
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"
 	"heckel.io/ntfy/v2/server"
 	"heckel.io/ntfy/v2/test"
 	"heckel.io/ntfy/v2/user"
+	"os"
+	"path/filepath"
+	"testing"
 )
 
 func TestCLI_User_Add(t *testing.T) {
@@ -122,69 +121,6 @@ func TestCLI_User_Delete(t *testing.T) {
 	require.Contains(t, err.Error(), "user phil does not exist")
 }
 
-func TestCLI_User_ResetPass(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, _ := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-
-	// Prints a working-looking reset link when base-url is set
-	app, _, stdout, _ := newTestApp()
-	require.Nil(t, runUserCommand(app, conf, "--base-url=https://ntfy.example.com", "reset-pass", "phil"))
-	require.Contains(t, stdout.String(), "https://ntfy.example.com/account/password/reset/")
-}
-
-func TestCLI_User_ResetPass_NoBaseURL(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, _ := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-
-	app, _, _, _ = newTestApp()
-	err := runUserCommand(app, conf, "reset-pass", "phil")
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "base-url")
-}
-
-func TestCLI_User_ResetPass_SendEmailNoPrimary(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	app, stdin, _, _ := newTestApp()
-	stdin.WriteString("mypass\nmypass")
-	require.Nil(t, runUserCommand(app, conf, "add", "phil"))
-
-	// --send-email requires a primary email; phil has none
-	app, _, _, _ = newTestApp()
-	err := runUserCommand(app, conf, "--base-url=https://ntfy.example.com", "reset-pass", "--send-email", "phil")
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "no primary email")
-}
-
-func TestCLI_User_ResetPass_ProvisionedRejected(t *testing.T) {
-	s, conf, port := newTestServerWithAuth(t)
-	defer test.StopServer(t, s, port)
-
-	// Seed a provisioned user into the auth database via config provisioning
-	m, err := user.NewSQLiteManager(conf.AuthFile, "", &user.Config{
-		ProvisionEnabled: true,
-		Users: []*user.User{
-			{Name: "provuser", Hash: "$2a$10$YLiO8U21sX1uhZamTLJXHuxgVC0Z/GKISibrKCLohPgtG7yIxSk4C", Role: user.RoleUser},
-		},
-	})
-	require.Nil(t, err)
-	require.Nil(t, m.Close())
-
-	app, _, _, _ := newTestApp()
-	err = runUserCommand(app, conf, "--base-url=https://ntfy.example.com", "reset-pass", "provuser")
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "provisioned")
-}
-
 func newTestServerWithAuth(t *testing.T) (s *server.Server, conf *server.Config, port int) {
 	configFile := filepath.Join(t.TempDir(), "server-dummy.yml")
 	require.Nil(t, os.WriteFile(configFile, []byte(""), 0600)) // Dummy config file to avoid lookup of real server.yml
@@ -192,7 +128,6 @@ func newTestServerWithAuth(t *testing.T) (s *server.Server, conf *server.Config,
 	conf.File = configFile
 	conf.AuthFile = filepath.Join(t.TempDir(), "user.db")
 	conf.AuthDefault = user.PermissionDenyAll
-	conf.AuthAccessCacheEnabled = false
 	s, port = test.StartServerWithConfig(t, conf)
 	return
 }

db/db.go

@@ -1,146 +0,0 @@
-package db
-
-import (
-	"context"
-	"database/sql"
-	"sync/atomic"
-	"time"
-
-	"heckel.io/ntfy/v2/log"
-)
-
-const (
-	tag                            = "db"
-	replicaHealthCheckInitialDelay = 5 * time.Second
-	replicaHealthCheckInterval     = 30 * time.Second
-	replicaHealthCheckTimeout      = 10 * time.Second
-)
-
-// DB wraps a primary *sql.DB and optional read replicas. All standard query/exec methods
-// delegate to the primary. The ReadOnly() method returns a *sql.DB from a healthy replica
-// (round-robin), falling back to the primary if no replicas are configured or all are unhealthy.
-type DB struct {
-	primary  *Host
-	replicas []*Host
-	counter  atomic.Uint64
-	cancel   context.CancelFunc
-}
-
-// New creates a new DB that wraps the given primary and optional replica connections.
-// If replicas is nil or empty, ReadOnly() simply returns the primary.
-// Replicas start unhealthy and are checked immediately by a background goroutine.
-func New(primary *Host, replicas []*Host) *DB {
-	ctx, cancel := context.WithCancel(context.Background())
-	d := &DB{
-		primary:  primary,
-		replicas: replicas,
-		cancel:   cancel,
-	}
-	if len(d.replicas) > 0 {
-		go d.healthCheckLoop(ctx)
-	}
-	return d
-}
-
-// Query delegates to the primary database.
-func (d *DB) Query(query string, args ...any) (*sql.Rows, error) {
-	return d.primary.DB.Query(query, args...)
-}
-
-// QueryRow delegates to the primary database.
-func (d *DB) QueryRow(query string, args ...any) *sql.Row {
-	return d.primary.DB.QueryRow(query, args...)
-}
-
-// Exec delegates to the primary database.
-func (d *DB) Exec(query string, args ...any) (sql.Result, error) {
-	return d.primary.DB.Exec(query, args...)
-}
-
-// Begin delegates to the primary database.
-func (d *DB) Begin() (*sql.Tx, error) {
-	return d.primary.DB.Begin()
-}
-
-// Ping delegates to the primary database.
-func (d *DB) Ping() error {
-	return d.primary.DB.Ping()
-}
-
-// Primary returns the underlying primary *sql.DB. This is only intended for
-// one-time schema setup during store initialization, not for regular queries.
-func (d *DB) Primary() *sql.DB {
-	return d.primary.DB
-}
-
-// ReadOnly returns a *sql.DB suitable for read-only queries. It round-robins across healthy
-// replicas. If all replicas are unhealthy or none are configured, the primary is returned.
-func (d *DB) ReadOnly() *sql.DB {
-	if len(d.replicas) == 0 {
-		return d.primary.DB
-	}
-	n := len(d.replicas)
-	start := int(d.counter.Add(1) - 1)
-	for i := 0; i < n; i++ {
-		r := d.replicas[(start+i)%n]
-		if r.healthy.Load() {
-			return r.DB
-		}
-	}
-	return d.primary.DB
-}
-
-// MarkReplicasHealthyForTest immediately marks all configured replicas as healthy, bypassing the
-// async health-check loop's initial delay. It exists so tests can deterministically route
-// ReadOnly() to a replica without waiting; it is not used in production code.
-func (d *DB) MarkReplicasHealthyForTest() {
-	for _, r := range d.replicas {
-		r.healthy.Store(true)
-	}
-}
-
-// Close closes the primary database and all replicas, and stops the health-check goroutine.
-func (d *DB) Close() error {
-	d.cancel()
-	for _, r := range d.replicas {
-		r.DB.Close()
-	}
-	return d.primary.DB.Close()
-}
-
-// healthCheckLoop checks replicas immediately, then periodically on a ticker.
-func (d *DB) healthCheckLoop(ctx context.Context) {
-	select {
-	case <-ctx.Done():
-		return
-	case <-time.After(replicaHealthCheckInitialDelay):
-		d.checkReplicas(ctx)
-	}
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-time.After(replicaHealthCheckInterval):
-			d.checkReplicas(ctx)
-		}
-	}
-}
-
-// checkReplicas pings each replica with a timeout and updates its health status.
-func (d *DB) checkReplicas(ctx context.Context) {
-	for _, r := range d.replicas {
-		wasHealthy := r.healthy.Load()
-		pingCtx, cancel := context.WithTimeout(ctx, replicaHealthCheckTimeout)
-		err := r.DB.PingContext(pingCtx)
-		cancel()
-		if err != nil {
-			r.healthy.Store(false)
-			log.Tag(tag).Error("Database replica %s is unhealthy: %s", r.Addr, err)
-		} else {
-			r.healthy.Store(true)
-			if !wasHealthy {
-				log.Tag(tag).Info("Database replica %s is healthy", r.Addr)
-			}
-		}
-	}
-}

db/pg/pg.go

@@ -1,126 +0,0 @@
-package pg
-
-import (
-	"database/sql"
-	"fmt"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	_ "github.com/jackc/pgx/v5/stdlib" // PostgreSQL driver
-
-	"heckel.io/ntfy/v2/db"
-)
-
-// Advisory lock keys. PostgreSQL advisory locks share one database-wide key space, so every
-// ntfy key is defined here, following the "ntfy"+2586+letter scheme
-const (
-	SchemaLockKey = int64(0x6e7466792586a) // Schema setup serialization (transaction-scoped, see db/schema)
-)
-
-// Open opens a PostgreSQL connection pool for a primary database. It pings the database
-// to verify connectivity before returning.
-func Open(dsn string) (*db.Host, error) {
-	d, err := open(dsn)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open database: %w", err)
-	}
-	if err := d.DB.Ping(); err != nil {
-		return nil, fmt.Errorf("database ping failed on %v: %w", d.Addr, err)
-	}
-	return d, nil
-}
-
-// OpenReplica opens a PostgreSQL connection pool for a read replica. Unlike Open, it does
-// not ping the database, since replicas are health-checked in the background by db.DB.
-func OpenReplica(dsn string) (*db.Host, error) {
-	return open(dsn)
-}
-
-// open opens a PostgreSQL database connection pool from a DSN string. It supports custom
-// query parameters for pool configuration: pool_max_conns (default 10), pool_max_idle_conns,
-// pool_conn_max_lifetime, and pool_conn_max_idle_time. These parameters are stripped from
-// the DSN before passing it to the driver.
-func open(dsn string) (*db.Host, error) {
-	u, err := url.Parse(dsn)
-	if err != nil {
-		return nil, fmt.Errorf("invalid database URL: %w", err)
-	}
-	switch u.Scheme {
-	case "postgres", "postgresql":
-		// OK
-	default:
-		return nil, fmt.Errorf("invalid database URL scheme %q, must be \"postgres\" or \"postgresql\" (URL: %s)", u.Scheme, censorPassword(u))
-	}
-	q := u.Query()
-	maxOpenConns, err := extractIntParam(q, "pool_max_conns", 10)
-	if err != nil {
-		return nil, err
-	}
-	maxIdleConns, err := extractIntParam(q, "pool_max_idle_conns", 0)
-	if err != nil {
-		return nil, err
-	}
-	connMaxLifetime, err := extractDurationParam(q, "pool_conn_max_lifetime", 0)
-	if err != nil {
-		return nil, err
-	}
-	connMaxIdleTime, err := extractDurationParam(q, "pool_conn_max_idle_time", 0)
-	if err != nil {
-		return nil, err
-	}
-	u.RawQuery = q.Encode()
-	d, err := sql.Open("pgx", u.String())
-	if err != nil {
-		return nil, err
-	}
-	d.SetMaxOpenConns(maxOpenConns)
-	if maxIdleConns > 0 {
-		d.SetMaxIdleConns(maxIdleConns)
-	}
-	if connMaxLifetime > 0 {
-		d.SetConnMaxLifetime(connMaxLifetime)
-	}
-	if connMaxIdleTime > 0 {
-		d.SetConnMaxIdleTime(connMaxIdleTime)
-	}
-	return &db.Host{
-		Addr: u.Host,
-		DB:   d,
-	}, nil
-}
-
-func extractIntParam(q url.Values, key string, defaultValue int) (int, error) {
-	s := q.Get(key)
-	if s == "" {
-		return defaultValue, nil
-	}
-	q.Del(key)
-	v, err := strconv.Atoi(s)
-	if err != nil {
-		return 0, fmt.Errorf("invalid %s value %q: %w", key, s, err)
-	}
-	return v, nil
-}
-
-// censorPassword returns a string representation of the URL with the password replaced by "*****".
-func censorPassword(u *url.URL) string {
-	if password, hasPassword := u.User.Password(); hasPassword {
-		return strings.Replace(u.String(), ":"+password+"@", ":*****@", 1)
-	}
-	return u.String()
-}
-
-func extractDurationParam(q url.Values, key string, defaultValue time.Duration) (time.Duration, error) {
-	s := q.Get(key)
-	if s == "" {
-		return defaultValue, nil
-	}
-	q.Del(key)
-	d, err := time.ParseDuration(s)
-	if err != nil {
-		return 0, fmt.Errorf("invalid %s value %q: %w", key, s, err)
-	}
-	return d, nil
-}

db/pg/pg_test.go

@@ -1,53 +0,0 @@
-package pg
-
-import (
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestOpen_InvalidScheme(t *testing.T) {
-	_, err := Open("postgresql+psycopg2://user:pass@localhost/db")
-	require.Error(t, err)
-	require.Contains(t, err.Error(), `invalid database URL scheme "postgresql+psycopg2"`)
-	require.Contains(t, err.Error(), "*****")
-	require.NotContains(t, err.Error(), "pass")
-}
-
-func TestOpen_InvalidURL(t *testing.T) {
-	_, err := Open("not a valid url\x00")
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "invalid database URL")
-}
-
-func TestCensorPassword(t *testing.T) {
-	tests := []struct {
-		name     string
-		url      string
-		expected string
-	}{
-		{
-			name:     "with password",
-			url:      "postgres://user:secret@localhost/db",
-			expected: "postgres://user:*****@localhost/db",
-		},
-		{
-			name:     "without password",
-			url:      "postgres://localhost/db",
-			expected: "postgres://localhost/db",
-		},
-		{
-			name:     "user only",
-			url:      "postgres://user@localhost/db",
-			expected: "postgres://user@localhost/db",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			u, err := url.Parse(tt.url)
-			require.NoError(t, err)
-			require.Equal(t, tt.expected, censorPassword(u))
-		})
-	}
-}

db/schema/schema.go

@@ -1,111 +0,0 @@
-// Package schema tracks and migrates database schemas, and Migrate creates or upgrades a
-// store's schema inside a single transaction. On PostgreSQL, all stores share one database, so
-// versions live in a shared schema_version table keyed by store name. On SQLite, every store is
-// its own database file, so the version lives in the schemaVersion table keyed by id = 1.
-package schema
-
-import (
-	"database/sql"
-	"errors"
-	"fmt"
-
-	"heckel.io/ntfy/v2/db/pg"
-	"heckel.io/ntfy/v2/log"
-)
-
-const (
-	tag = "schema"
-)
-
-const (
-	sqliteCreateVersionTableQuery = `CREATE TABLE IF NOT EXISTS schemaVersion (id INT PRIMARY KEY, version INT NOT NULL)`
-	sqliteSelectVersionQuery      = `SELECT version FROM schemaVersion WHERE id = 1`
-	sqliteUpsertVersionQuery      = `INSERT INTO schemaVersion (id, version) VALUES (1, ?) ON CONFLICT (id) DO UPDATE SET version = excluded.version`
-
-	postgresCreateVersionTableQuery = `CREATE TABLE IF NOT EXISTS schema_version (store TEXT PRIMARY KEY, version INT NOT NULL)`
-	postgresSelectVersionQuery      = `SELECT version FROM schema_version WHERE store = $1`
-	postgresUpsertVersionQuery      = `INSERT INTO schema_version (store, version) VALUES ($1, $2) ON CONFLICT (store) DO UPDATE SET version = EXCLUDED.version`
-	postgresAdvisoryLockQuery       = `SELECT pg_advisory_xact_lock($1)` // Transaction-scoped lock to avoid migration races
-)
-
-// Migrate creates or upgrades the named store's schema to targetVersion in one transaction, or
-// creates a new database using the "create" function.
-func Migrate(db *sql.DB, dialect Dialect, store string, targetVersion int, create MigrateFunc, migrations map[int]MigrateFunc) error {
-	if dialect != Postgres && dialect != SQLite {
-		return fmt.Errorf("unsupported schema dialect %d", dialect)
-	}
-	tx, err := db.Begin()
-	if err != nil {
-		return fmt.Errorf("cannot begin %s schema transaction: %w", store, err)
-	}
-	defer tx.Rollback()
-	if dialect == Postgres {
-		// Serialize setup across nodes: CREATE TABLE IF NOT EXISTS is not atomic, and
-		// concurrently cold-booting nodes would otherwise race on DDL and crash
-		if _, err := tx.Exec(postgresAdvisoryLockQuery, pg.SchemaLockKey); err != nil {
-			return fmt.Errorf("cannot acquire %s schema advisory lock: %w", store, err)
-		}
-	}
-	if _, err := tx.Exec(createVersionTableQuery(dialect)); err != nil {
-		return fmt.Errorf("cannot create schema version table: %w", err)
-	}
-	version, err := readVersion(tx, dialect, store)
-	if errors.Is(err, sql.ErrNoRows) {
-		// Fresh database: create the store's tables at the target version
-		if err := create(tx); err != nil {
-			return fmt.Errorf("cannot create %s schema: %w", store, err)
-		}
-		if err := writeVersion(tx, dialect, store, targetVersion); err != nil {
-			return fmt.Errorf("cannot write %s schema version: %w", store, err)
-		}
-		return tx.Commit()
-	} else if err != nil {
-		return fmt.Errorf("cannot read %s schema version: %w", store, err)
-	}
-	if version == targetVersion {
-		return tx.Commit()
-	}
-	if version > targetVersion {
-		return fmt.Errorf("unexpected %s schema version %d, this version of ntfy supports up to %d", store, version, targetVersion)
-	}
-	for v := version; v < targetVersion; v++ {
-		migrate, ok := migrations[v]
-		if !ok {
-			return fmt.Errorf("cannot find %s migration step from version %d to %d", store, v, v+1)
-		}
-		log.Tag(tag).Info("Migrating %s database schema: from %d to %d", store, v, v+1)
-		if err := migrate(tx); err != nil {
-			return fmt.Errorf("%s migration step from version %d to %d failed: %w", store, v, v+1, err)
-		}
-	}
-	if err := writeVersion(tx, dialect, store, targetVersion); err != nil {
-		return fmt.Errorf("cannot write %s schema version: %w", store, err)
-	}
-	return tx.Commit()
-}
-
-func createVersionTableQuery(dialect Dialect) string {
-	if dialect == Postgres {
-		return postgresCreateVersionTableQuery
-	}
-	return sqliteCreateVersionTableQuery
-}
-
-func readVersion(tx *sql.Tx, dialect Dialect, store string) (version int, err error) {
-	if dialect == Postgres {
-		err = tx.QueryRow(postgresSelectVersionQuery, store).Scan(&version)
-	} else {
-		err = tx.QueryRow(sqliteSelectVersionQuery).Scan(&version)
-	}
-	return
-}
-
-func writeVersion(tx *sql.Tx, dialect Dialect, store string, version int) error {
-	var err error
-	if dialect == Postgres {
-		_, err = tx.Exec(postgresUpsertVersionQuery, store, version)
-	} else {
-		_, err = tx.Exec(sqliteUpsertVersionQuery, version)
-	}
-	return err
-}

db/schema/schema_test.go

@@ -1,190 +0,0 @@
-package schema_test
-
-import (
-	"database/sql"
-	"fmt"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/v2/db/pg"
-	"heckel.io/ntfy/v2/db/schema"
-	dbtest "heckel.io/ntfy/v2/db/test"
-
-	_ "github.com/mattn/go-sqlite3"
-)
-
-const testCreateQuery = `CREATE TABLE IF NOT EXISTS things (id TEXT PRIMARY KEY, name TEXT NOT NULL)`
-
-func testCreate(tx *sql.Tx) error {
-	_, err := tx.Exec(testCreateQuery)
-	return err
-}
-
-func openTestPostgres(t *testing.T) *sql.DB {
-	t.Helper()
-	host, err := pg.Open(dbtest.CreateTestPostgresSchema(t))
-	require.Nil(t, err)
-	t.Cleanup(func() { host.DB.Close() })
-	return host.DB
-}
-
-func openTestSQLite(t *testing.T) *sql.DB {
-	t.Helper()
-	d, err := sql.Open("sqlite3", filepath.Join(t.TempDir(), "test.db"))
-	require.Nil(t, err)
-	t.Cleanup(func() { d.Close() })
-	return d
-}
-
-func forEachDialect(t *testing.T, f func(t *testing.T, d *sql.DB, dialect schema.Dialect)) {
-	t.Run("postgres", func(t *testing.T) {
-		f(t, openTestPostgres(t), schema.Postgres)
-	})
-	t.Run("sqlite", func(t *testing.T) {
-		f(t, openTestSQLite(t), schema.SQLite)
-	})
-}
-
-func TestMigrate_FreshCreate(t *testing.T) {
-	forEachDialect(t, func(t *testing.T, d *sql.DB, dialect schema.Dialect) {
-		// A fresh database jumps straight to the target version; migration steps are not consulted
-		require.Nil(t, schema.Migrate(d, dialect, "things", 3, testCreate, nil))
-		_, err := d.Exec(`INSERT INTO things (id, name) VALUES ('a', 'thing a')`)
-		require.Nil(t, err)
-		require.Equal(t, 3, storeVersion(t, d, dialect, "things"))
-		// Idempotent: a second node boots against the migrated schema
-		require.Nil(t, schema.Migrate(d, dialect, "things", 3, testCreate, nil))
-	})
-}
-
-func TestMigrate_AppliesMigrationSteps(t *testing.T) {
-	forEachDialect(t, func(t *testing.T, d *sql.DB, dialect schema.Dialect) {
-		require.Nil(t, schema.Migrate(d, dialect, "things", 1, testCreate, nil))
-		// A newer version of the code migrates 1 -> 3 step by step, in order
-		migrations := map[int]schema.MigrateFunc{
-			1: func(tx *sql.Tx) error {
-				_, err := tx.Exec(`ALTER TABLE things ADD COLUMN color TEXT NOT NULL DEFAULT ''`)
-				return err
-			},
-			2: func(tx *sql.Tx) error {
-				_, err := tx.Exec(`ALTER TABLE things ADD COLUMN size INT NOT NULL DEFAULT 0`)
-				return err
-			},
-		}
-		require.Nil(t, schema.Migrate(d, dialect, "things", 3, testCreate, migrations))
-		_, err := d.Exec(`INSERT INTO things (id, name, color, size) VALUES ('b', 'thing b', 'red', 2)`)
-		require.Nil(t, err)
-		require.Equal(t, 3, storeVersion(t, d, dialect, "things"))
-	})
-}
-
-func TestMigrate_ClosureCarriesConfig(t *testing.T) {
-	// Migrations needing config take it via closure at map-construction time; there is no
-	// params plumbing in the framework itself
-	migrationsFor := func(defaultName string) map[int]schema.MigrateFunc {
-		return map[int]schema.MigrateFunc{
-			1: schema.AsMigrateFunc(fmt.Sprintf(`ALTER TABLE things ADD COLUMN nick TEXT NOT NULL DEFAULT '%s'`, defaultName)),
-		}
-	}
-	forEachDialect(t, func(t *testing.T, d *sql.DB, dialect schema.Dialect) {
-		require.Nil(t, schema.Migrate(d, dialect, "things", 1, testCreate, nil))
-		_, err := d.Exec(`INSERT INTO things (id, name) VALUES ('a', 'thing a')`)
-		require.Nil(t, err)
-		require.Nil(t, schema.Migrate(d, dialect, "things", 2, testCreate, migrationsFor("configured-default")))
-		var nick string
-		require.Nil(t, d.QueryRow(`SELECT nick FROM things WHERE id = 'a'`).Scan(&nick))
-		require.Equal(t, "configured-default", nick)
-	})
-}
-
-func TestMigrate_InvalidDialect(t *testing.T) {
-	d := openTestSQLite(t)
-	err := schema.Migrate(d, schema.Dialect(99), "things", 1, testCreate, nil)
-	require.Error(t, err)
-}
-
-func TestMigrate_RefusesFutureVersion(t *testing.T) {
-	forEachDialect(t, func(t *testing.T, d *sql.DB, dialect schema.Dialect) {
-		require.Nil(t, schema.Migrate(d, dialect, "things", 2, testCreate, map[int]schema.MigrateFunc{}))
-		err := schema.Migrate(d, dialect, "things", 1, testCreate, nil)
-		require.Error(t, err)
-	})
-}
-
-func TestMigrate_MissingStepFails(t *testing.T) {
-	forEachDialect(t, func(t *testing.T, d *sql.DB, dialect schema.Dialect) {
-		require.Nil(t, schema.Migrate(d, dialect, "things", 1, testCreate, nil))
-		err := schema.Migrate(d, dialect, "things", 3, testCreate, nil) // No step 1 -> 2 registered
-		require.Error(t, err)
-	})
-}
-
-func TestMigrate_StoresAreIndependent(t *testing.T) {
-	// Postgres only: stores share one database, tracked as rows in schema_version. On SQLite
-	// every store has its own database file, so independence is by file.
-	d := openTestPostgres(t)
-	require.Nil(t, schema.Migrate(d, schema.Postgres, "things", 1, testCreate, nil))
-	require.Nil(t, schema.Migrate(d, schema.Postgres, "gadgets", 4, func(tx *sql.Tx) error {
-		_, err := tx.Exec(`CREATE TABLE IF NOT EXISTS gadgets (id TEXT PRIMARY KEY)`)
-		return err
-	}, nil))
-	require.Equal(t, 1, storeVersion(t, d, schema.Postgres, "things"))
-	require.Equal(t, 4, storeVersion(t, d, schema.Postgres, "gadgets"))
-}
-
-func TestMigrate_SQLiteReadsExistingSchemaVersionTable(t *testing.T) {
-	// Existing ntfy SQLite databases (message, user, webpush) track their version in a
-	// schemaVersion (id, version) table keyed by id = 1; the framework uses that table as-is
-	// on SQLite, so existing databases migrate without any adoption step
-	d := openTestSQLite(t)
-	_, err := d.Exec(testCreateQuery)
-	require.Nil(t, err)
-	_, err = d.Exec(`CREATE TABLE schemaVersion (id INT PRIMARY KEY, version INT NOT NULL)`)
-	require.Nil(t, err)
-	_, err = d.Exec(`INSERT INTO schemaVersion VALUES (1, 1)`)
-	require.Nil(t, err)
-	migrations := map[int]schema.MigrateFunc{
-		1: func(tx *sql.Tx) error {
-			_, err := tx.Exec(`ALTER TABLE things ADD COLUMN color TEXT NOT NULL DEFAULT ''`)
-			return err
-		},
-	}
-	require.Nil(t, schema.Migrate(d, schema.SQLite, "things", 2, testCreate, migrations))
-	_, err = d.Exec(`INSERT INTO things (id, name, color) VALUES ('a', 'thing a', 'red')`)
-	require.Nil(t, err)
-	require.Equal(t, 2, storeVersion(t, d, schema.SQLite, "things"))
-}
-
-func TestMigrate_ConcurrentFreshCreate(t *testing.T) {
-	// Postgres only: concurrent cold-boots must not race on DDL (CREATE TABLE IF NOT EXISTS is
-	// not atomic); Migrate serializes via an advisory lock. SQLite has a single writer.
-	schemaDSN := dbtest.CreateTestPostgresSchema(t)
-	const n = 8
-	errs := make(chan error, n)
-	for i := 0; i < n; i++ {
-		go func() {
-			host, err := pg.Open(schemaDSN)
-			if err != nil {
-				errs <- err
-				return
-			}
-			defer host.DB.Close()
-			errs <- schema.Migrate(host.DB, schema.Postgres, "things", 1, testCreate, nil)
-		}()
-	}
-	for i := 0; i < n; i++ {
-		require.Nil(t, <-errs)
-	}
-}
-
-func storeVersion(t *testing.T, d *sql.DB, dialect schema.Dialect, store string) int {
-	t.Helper()
-	var version int
-	if dialect == schema.Postgres {
-		require.Nil(t, d.QueryRow(`SELECT version FROM schema_version WHERE store = $1`, store).Scan(&version), fmt.Sprintf("store %s", store))
-	} else {
-		require.Nil(t, d.QueryRow(`SELECT version FROM schemaVersion WHERE id = 1`).Scan(&version), fmt.Sprintf("store %s", store))
-	}
-	return version
-}

db/schema/types.go

@@ -1,31 +0,0 @@
-package schema
-
-import "database/sql"
-
-// Dialect selects the SQL flavor Migrate speaks to the version table.
-type Dialect int
-
-// Supported dialects; SQLite is the zero value
-const (
-	SQLite Dialect = iota
-	Postgres
-)
-
-// MigrateFunc applies one schema change inside the setup transaction: the initial creation of
-// a store's tables, or one step upgrading a store from version N to N+1. Migrations needing
-// config capture it via closure, e.g. func migrations(cacheDuration time.Duration) map[int]MigrateFunc.
-type MigrateFunc func(tx *sql.Tx) error
-
-// AsMigrateFunc converts a simple query to a migration function
-func AsMigrateFunc(query string) MigrateFunc {
-	return func(tx *sql.Tx) error {
-		_, err := tx.Exec(query)
-		return err
-	}
-}
-
-// NopMigrateFunc is a migration step that does nothing, for versions where a dialect has no
-// work to do (e.g. when only the other dialect's schema changed).
-func NopMigrateFunc(_ *sql.Tx) error {
-	return nil
-}

db/test/schema.go

@@ -1,185 +0,0 @@
-package dbtest
-
-import (
-	"database/sql"
-	"fmt"
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-// Querier is the subset of *sql.DB / *db.DB needed to introspect a schema.
-type Querier interface {
-	Query(query string, args ...any) (*sql.Rows, error)
-}
-
-// SQLiteSchema returns a normalized, comparable description of the database schema: tables
-// with their columns, named indexes, and foreign keys. Column order, declared type spelling
-// (INT vs INTEGER) and default values are not part of the description, so the schema produced
-// by a migration chain can be compared to a freshly created one.
-func SQLiteSchema(t testing.TB, d Querier) string {
-	t.Helper()
-	lines := make([]string, 0)
-	for _, table := range sqliteTables(t, d) {
-		lines = append(lines, "table "+table)
-		lines = append(lines, sqliteColumns(t, d, table)...)
-		lines = append(lines, sqliteForeignKeys(t, d, table)...)
-		lines = append(lines, sqliteIndexes(t, d, table)...)
-	}
-	return strings.Join(lines, "\n")
-}
-
-// PostgresSchema is SQLiteSchema's PostgreSQL counterpart, describing the current schema's
-// tables, columns, constraints and indexes in a normalized, comparable way.
-func PostgresSchema(t testing.TB, d Querier) string {
-	t.Helper()
-	lines := make([]string, 0)
-	for _, table := range postgresTables(t, d) {
-		lines = append(lines, "table "+table)
-		lines = append(lines, postgresColumns(t, d, table)...)
-	}
-	lines = append(lines, postgresConstraints(t, d)...)
-	lines = append(lines, postgresIndexes(t, d)...)
-	return strings.Join(lines, "\n")
-}
-
-func sqliteTables(t testing.TB, d Querier) []string {
-	t.Helper()
-	return queryStrings(t, d, `SELECT name FROM sqlite_master WHERE type = 'table' AND name NOT LIKE 'sqlite_%' ORDER BY name`)
-}
-
-func sqliteColumns(t testing.TB, d Querier, table string) []string {
-	t.Helper()
-	rows, err := d.Query(fmt.Sprintf(`PRAGMA table_info(%q)`, table))
-	require.Nil(t, err)
-	defer rows.Close()
-	lines := make([]string, 0)
-	for rows.Next() {
-		var cid, notNull, pk int
-		var name, typ string
-		var dflt sql.NullString
-		require.Nil(t, rows.Scan(&cid, &name, &typ, &notNull, &dflt, &pk))
-		typ = strings.ToUpper(typ)
-		if typ == "INT" { // INT and INTEGER are the same affinity; migrations spell them inconsistently
-			typ = "INTEGER"
-		}
-		lines = append(lines, fmt.Sprintf("  col %s %s notnull=%d pk=%d", name, typ, notNull, pk))
-	}
-	require.Nil(t, rows.Err())
-	sort.Strings(lines)
-	return lines
-}
-
-func sqliteForeignKeys(t testing.TB, d Querier, table string) []string {
-	t.Helper()
-	rows, err := d.Query(fmt.Sprintf(`PRAGMA foreign_key_list(%q)`, table))
-	require.Nil(t, err)
-	defer rows.Close()
-	lines := make([]string, 0)
-	for rows.Next() {
-		var id, seq int
-		var refTable, from, onUpdate, onDelete, match string
-		var to sql.NullString // NULL when referencing the parent's primary key implicitly
-		require.Nil(t, rows.Scan(&id, &seq, &refTable, &from, &to, &onUpdate, &onDelete, &match))
-		lines = append(lines, fmt.Sprintf("  fk %s -> %s(%s) on_delete=%s", from, refTable, to.String, onDelete))
-	}
-	require.Nil(t, rows.Err())
-	sort.Strings(lines)
-	return lines
-}
-
-func sqliteIndexes(t testing.TB, d Querier, table string) []string {
-	t.Helper()
-	rows, err := d.Query(fmt.Sprintf(`PRAGMA index_list(%q)`, table))
-	require.Nil(t, err)
-	type index struct {
-		name            string
-		unique, partial int
-	}
-	indexes := make([]index, 0)
-	for rows.Next() {
-		var seq, unique, partial int
-		var name, origin string
-		require.Nil(t, rows.Scan(&seq, &name, &unique, &origin, &partial))
-		// Skip auto-indexes backing PRIMARY KEY/UNIQUE table constraints; those are described
-		// by the column and constraint listings already
-		if strings.HasPrefix(name, "sqlite_autoindex_") {
-			continue
-		}
-		indexes = append(indexes, index{name, unique, partial})
-	}
-	require.Nil(t, rows.Err())
-	require.Nil(t, rows.Close())
-	lines := make([]string, 0, len(indexes))
-	for _, idx := range indexes {
-		cols := queryStrings(t, d, fmt.Sprintf(`SELECT name FROM pragma_index_info(%q) ORDER BY seqno`, idx.name))
-		lines = append(lines, fmt.Sprintf("  index %s unique=%d partial=%d cols=(%s)", idx.name, idx.unique, idx.partial, strings.Join(cols, ",")))
-	}
-	sort.Strings(lines)
-	return lines
-}
-
-func postgresTables(t testing.TB, d Querier) []string {
-	t.Helper()
-	return queryStrings(t, d, `SELECT table_name FROM information_schema.tables WHERE table_schema = current_schema() AND table_type = 'BASE TABLE' ORDER BY table_name`)
-}
-
-func postgresColumns(t testing.TB, d Querier, table string) []string {
-	t.Helper()
-	rows, err := d.Query(`SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_schema = current_schema() AND table_name = $1 ORDER BY column_name`, table)
-	require.Nil(t, err)
-	defer rows.Close()
-	lines := make([]string, 0)
-	for rows.Next() {
-		var name, typ, nullable string
-		require.Nil(t, rows.Scan(&name, &typ, &nullable))
-		lines = append(lines, fmt.Sprintf("  col %s %s nullable=%s", name, typ, nullable))
-	}
-	require.Nil(t, rows.Err())
-	return lines
-}
-
-func postgresConstraints(t testing.TB, d Querier) []string {
-	t.Helper()
-	return queryStrings(t, d, `
-		SELECT 'constraint ' || conrelid::regclass::text || ': ' || pg_get_constraintdef(oid)
-		FROM pg_constraint
-		WHERE connamespace = current_schema()::regnamespace
-		ORDER BY 1
-	`)
-}
-
-func postgresIndexes(t testing.TB, d Querier) []string {
-	t.Helper()
-	rows, err := d.Query(`SELECT indexname, indexdef, schemaname FROM pg_indexes WHERE schemaname = current_schema() ORDER BY indexname`)
-	require.Nil(t, err)
-	defer rows.Close()
-	lines := make([]string, 0)
-	for rows.Next() {
-		var name, def, schema string
-		require.Nil(t, rows.Scan(&name, &def, &schema))
-		// The index definition qualifies the table with the (test-specific) schema name; strip
-		// it so snapshots from different test schemas compare equal
-		def = strings.ReplaceAll(def, schema+".", "")
-		lines = append(lines, "index "+def)
-	}
-	require.Nil(t, rows.Err())
-	return lines
-}
-
-func queryStrings(t testing.TB, d Querier, query string) []string {
-	t.Helper()
-	rows, err := d.Query(query)
-	require.Nil(t, err)
-	defer rows.Close()
-	values := make([]string, 0)
-	for rows.Next() {
-		var value string
-		require.Nil(t, rows.Scan(&value))
-		values = append(values, value)
-	}
-	require.Nil(t, rows.Err())
-	return values
-}

db/test/test.go

@@ -1,64 +0,0 @@
-package dbtest
-
-import (
-	"fmt"
-	"net/url"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"heckel.io/ntfy/v2/db"
-	"heckel.io/ntfy/v2/db/pg"
-	"heckel.io/ntfy/v2/util"
-)
-
-const testPoolMaxConns = "2"
-
-// CreateTestPostgresSchema creates a temporary PostgreSQL schema and returns the DSN pointing to it.
-// It registers a cleanup function to drop the schema when the test finishes.
-// If NTFY_TEST_DATABASE_URL is not set, the test is skipped.
-func CreateTestPostgresSchema(t *testing.T) string {
-	t.Helper()
-	dsn := os.Getenv("NTFY_TEST_DATABASE_URL")
-	if dsn == "" {
-		t.Skip("NTFY_TEST_DATABASE_URL not set")
-	}
-	schema := fmt.Sprintf("test_%s", util.RandomString(10))
-	u, err := url.Parse(dsn)
-	require.Nil(t, err)
-	q := u.Query()
-	q.Set("pool_max_conns", testPoolMaxConns)
-	u.RawQuery = q.Encode()
-	dsn = u.String()
-	setupHost, err := pg.Open(dsn)
-	require.Nil(t, err)
-	_, err = setupHost.DB.Exec(fmt.Sprintf("CREATE SCHEMA %s", schema))
-	require.Nil(t, err)
-	require.Nil(t, setupHost.DB.Close())
-	q.Set("search_path", schema)
-	u.RawQuery = q.Encode()
-	schemaDSN := u.String()
-	t.Cleanup(func() {
-		cleanHost, err := pg.Open(dsn)
-		if err == nil {
-			cleanHost.DB.Exec(fmt.Sprintf("DROP SCHEMA %s CASCADE", schema))
-			cleanHost.DB.Close()
-		}
-	})
-	return schemaDSN
-}
-
-// CreateTestPostgres creates a temporary PostgreSQL schema and returns an open *db.DB connection to it.
-// It registers cleanup functions to close the DB and drop the schema when the test finishes.
-// If NTFY_TEST_DATABASE_URL is not set, the test is skipped.
-func CreateTestPostgres(t *testing.T) *db.DB {
-	t.Helper()
-	schemaDSN := CreateTestPostgresSchema(t)
-	testHost, err := pg.Open(schemaDSN)
-	require.Nil(t, err)
-	d := db.New(testHost, nil)
-	t.Cleanup(func() {
-		d.Close()
-	})
-	return d
-}

db/types.go

@@ -1,25 +0,0 @@
-package db
-
-import (
-	"database/sql"
-	"sync/atomic"
-)
-
-// Beginner is an interface for types that can begin a database transaction.
-// Both *sql.DB and *DB implement this.
-type Beginner interface {
-	Begin() (*sql.Tx, error)
-}
-
-// Querier is an interface for types that can execute SQL queries.
-// *sql.DB, *sql.Tx, and *DB all implement this.
-type Querier interface {
-	Query(query string, args ...any) (*sql.Rows, error)
-}
-
-// Host pairs a *sql.DB with the host:port it was opened against.
-type Host struct {
-	Addr    string // "host:port"
-	DB      *sql.DB
-	healthy atomic.Bool
-}

db/util.go

@@ -1,36 +0,0 @@
-package db
-
-import "database/sql"
-
-// ExecTx executes a function within a database transaction. If the function returns an error,
-// the transaction is rolled back. Otherwise, the transaction is committed.
-func ExecTx(db Beginner, f func(tx *sql.Tx) error) error {
-	tx, err := db.Begin()
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-	if err := f(tx); err != nil {
-		return err
-	}
-	return tx.Commit()
-}
-
-// QueryTx executes a function within a database transaction and returns the result. If the function
-// returns an error, the transaction is rolled back. Otherwise, the transaction is committed.
-func QueryTx[T any](db Beginner, f func(tx *sql.Tx) (T, error)) (T, error) {
-	tx, err := db.Begin()
-	if err != nil {
-		var zero T
-		return zero, err
-	}
-	defer tx.Rollback()
-	t, err := f(tx)
-	if err != nil {
-		return t, err
-	}
-	if err := tx.Commit(); err != nil {
-		return t, err
-	}
-	return t, nil
-}

docs/contact.md

@@ -1,51 +0,0 @@
-# Contact
-
-This service is run by [Philipp C. Heckel](https://heckel.io). There are several ways to get in touch with me and the 
-ntfy community. Please choose the appropriate channel based on your needs.
-
-## Support
-
-### Community support
-
-For general questions, feature discussions, and community help, please use one of these public channels:
-
-| Channel           | Link                                                                                 | Description                                                |
-|-------------------|--------------------------------------------------------------------------------------|------------------------------------------------------------|
-| **Discord**       | [discord.gg/cT7ECsZj9w](https://discord.gg/cT7ECsZj9w)                               | Real-time chat with the community (I'm `binwiederhier`)    |
-| **Matrix**        | [#ntfy:matrix.org](https://matrix.to/#/#ntfy:matrix.org)                             | Bridged from Discord, same community (I'm `binwiederhier`) |
-| **Matrix Space**  | [#ntfy-space:matrix.org](https://matrix.to/#/#ntfy-space:matrix.org)                 | Matrix space with all ntfy rooms                           |
-| **GitHub Issues** | [github.com/binwiederhier/ntfy/issues](https://github.com/binwiederhier/ntfy/issues) | Bug reports and feature requests                           |
-
-!!! info "Why public channels?"
-    Answering questions in public channels benefits the entire community. Other users can learn from the 
-    discussion, and answers can be referenced later. This is much more scalable than 1-on-1 support.
-
-### Paid support
-
-If you are subscribed to a [ntfy Pro](https://ntfy.sh/#pricing) plan, you are entitled to priority support 
-via the following channels:
-
-| Channel               | Contact                                             | Description                              |
-|-----------------------|-----------------------------------------------------|------------------------------------------|
-| **General Support**   | [support@mail.ntfy.sh](mailto:support@mail.ntfy.sh) | Direct email support for Pro subscribers |
-| **Billing Inquiries** | [billing@mail.ntfy.sh](mailto:billing@mail.ntfy.sh) | Inquire about billing issues             |
-| **Discord/Matrix**    | Mention your Pro status                             | Priority responses in community channels |
-
-Please include your ntfy.sh username when contacting support so we can verify your subscription status.
-
-## Security issues
-
-If you discover a security vulnerability, please report it responsibly via [security@mail.ntfy.sh](mailto:security@mail.ntfy.sh). See also: [SECURITY.md](https://github.com/binwiederhier/ntfy/blob/main/SECURITY.md).
-
-## Abuse reports
-
-To report spam, phishing, or other abuse of ntfy.sh, please email [abuse@mail.ntfy.sh](mailto:abuse@mail.ntfy.sh).
-Please include the topic name and any relevant message details so we can investigate.
-
-## Other inquiries
-
-For questions about our [privacy policy](privacy.md), data handling, or to exercise your data rights 
-(access, deletion, etc.), please email [privacy@mail.ntfy.sh](mailto:privacy@mail.ntfy.sh).
-
-For business inquiries, partnerships, press, or other general questions that don't fit the categories above, please
-use [contact@mail.ntfy.sh](mailto:contact@mail.ntfy.sh).

docs/contributing.md

@@ -1,43 +0,0 @@
-# Contributing
-
-Thank you for your interest in contributing to ntfy! There are many ways to help, whether you're a developer,
-translator, or just an enthusiastic user.
-
-## Code contributions
-
-If you'd like to contribute code to ntfy:
-
-1. Check out the [development guide](develop.md) to set up your environment
-2. Look at [open issues](https://github.com/binwiederhier/ntfy/issues) for ideas, or propose your own
-3. For larger features or architectural changes, please reach out on [Discord/Matrix](contact.md) first to discuss 
-   before investing significant time
-4. Submit a pull request on GitHub
-
-All contributions are welcome, from small bug fixes to major features.
-
-## Translations
-
-Help make ntfy accessible to users around the world! We use Hosted Weblate for translations:
-
-- **Weblate**: [hosted.weblate.org/projects/ntfy](https://hosted.weblate.org/projects/ntfy/)
-
-You can start translating immediately without any coding knowledge.
-
-## Documentation
-
-Found a typo? Want to improve the docs? Documentation contributions are very welcome:
-
-- Edit any page directly on GitHub using the edit button
-- Submit a pull request with your improvements
-
-## Bug reports and feature requests
-
-- **GitHub Issues**: [github.com/binwiederhier/ntfy/issues](https://github.com/binwiederhier/ntfy/issues)
-
-Please search existing issues before creating a new one to avoid duplicates.
-
-## Code of Conduct
-
-Please be respectful and constructive in all interactions. See the 
-[Code of Conduct](https://github.com/binwiederhier/ntfy/blob/main/CODE_OF_CONDUCT.md) for details.
-

docs/develop.md

@@ -2,7 +2,7 @@
 Hurray 🥳 🎉, you are interested in writing code for ntfy! **That's awesome.** 😎
 
 I tried my very best to write up detailed instructions, but if at any point in time you run into issues, don't 
-hesitate to reach out via one of the channels listed on the [contact page](contact.md).
+hesitate to **contact me on [Discord](https://discord.gg/cT7ECsZj9w) or [Matrix](https://matrix.to/#/#ntfy:matrix.org)**.
 
 ## ntfy server
 The ntfy server source code is available [on GitHub](https://github.com/binwiederhier/ntfy). The codebase for the
@@ -65,8 +65,8 @@ These steps **assume Ubuntu**. Steps may vary on different Linux distributions.
 
 First, install [Go](https://go.dev/) (see [official instructions](https://go.dev/doc/install)):
 ``` shell
-wget https://go.dev/dl/go1.25.8.linux-amd64.tar.gz
-sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.25.8.linux-amd64.tar.gz
+wget https://go.dev/dl/go1.19.1.linux-amd64.tar.gz
+sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.19.1.linux-amd64.tar.gz
 export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
 go version   # verifies that it worked
 ```
@@ -77,11 +77,9 @@ go install github.com/goreleaser/goreleaser@latest
 goreleaser -v   # verifies that it worked
 ```
 
-Install [nodejs](https://nodejs.org/en/) (see [official instructions](https://nodejs.org/en/download/package-manager/)).
-Use a current LTS release (Node 24 is what CI builds with; anything older than Node 20 will not work
-with the current Vite-based web build):
+Install [nodejs](https://nodejs.org/en/) (see [official instructions](https://nodejs.org/en/download/package-manager/)):
 ``` shell
-curl -fsSL https://deb.nodesource.com/setup_24.x | sudo -E bash -
+curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
 sudo apt-get install -y nodejs
 npm -v   # verifies that it worked
 ```
@@ -257,7 +255,6 @@ Reference: <https://stackoverflow.com/questions/34160509/options-for-testing-ser
     go run main.go \
       --log-level debug \
       serve \
-        --base-url http://localhost \
         --web-push-public-key KEY \
         --web-push-private-key KEY \
         --web-push-email-address <email> \
@@ -343,6 +340,10 @@ Then either follow the steps for building with or without Firebase.
 Without Firebase, you may want to still change the default `app_base_url` in [values.xml](https://github.com/binwiederhier/ntfy-android/blob/main/app/src/main/res/values/values.xml)
 if you're self-hosting the server. Then run:
 ```
+# Remove Google dependencies (FCM)
+sed -i -e '/google-services/d' build.gradle
+sed -i -e '/google-services/d' app/build.gradle
+
 # To build an unsigned .apk (app/build/outputs/apk/fdroid/*.apk)
 ./gradlew assembleFdroidRelease
 
@@ -350,8 +351,6 @@ if you're self-hosting the server. Then run:
 ./gradlew bundleFdroidRelease
 ```
 
-The F-Droid flavor automatically excludes Google Services dependencies.
-
 ### Build Play flavor (FCM)
 !!! info
     I do build the ntfy Android app using IntelliJ IDEA (Android Studio), so I don't know if these Gradle commands will
@@ -442,6 +441,6 @@ To have instant notifications/better notification delivery when using firebase,
 1. In XCode, find the NTFY app target. **Not** the NSE app target.
 1. Find the Asset/ folder in the project navigator
 1. Drag the `GoogleService-Info.plist` file into the Asset/ folder that you get from the firebase console. It can be 
-   found in the "Project settings" > "General" > "Your apps"  with a button labeled "GoogleService-Info.plist"
+   found in the "Project settings" > "General" > "Your apps"  with a button labled "GoogleService-Info.plist"
 
 After that, you should be all set!

docs/examples.md

@@ -641,32 +641,6 @@ or by simply providing traccar with a valid username/password combination.
         <entry key='sms.http.password'>mypass</entry>
 ```
 
-## Flowtriq DDoS detection
-[Flowtriq](https://flowtriq.com) is a real-time DDoS detection and mitigation platform. Its Linux agent, ftagent,
-supports webhook alerts that can POST directly to an ntfy topic, so you get push notifications on your phone
-whenever an attack is detected.
-
-Configure the webhook URL in your ftagent configuration to point to your ntfy topic:
-
-```yaml
-# /etc/ftagent/ftagent.yml
-alerts:
-  webhooks:
-    - url: https://ntfy.sh/flowtriq-attacks
-      method: POST
-```
-
-You can also use curl to test the integration manually with a sample attack alert:
-
-```bash
-curl \
-  -H "Title: DDoS Attack Detected" \
-  -H "Priority: urgent" \
-  -H "Tags: rotating_light" \
-  -d "Attack detected on 203.0.113.5: 14.2 Gbps UDP flood from 3,482 sources" \
-  ntfy.sh/flowtriq-attacks
-```
-
 ## Terminal Notifications for Long-Running Commands
 
 This example provides a simple way to send notifications using [ntfy.sh](https://ntfy.sh) when a terminal command completes. It includes success or failure indicators based on the command's exit status.
@@ -687,8 +661,6 @@ Add the following function and alias to your `.bashrc` or `.bash_profile`:
        local token=$(< ~/.ntfy_token)  # Securely read the token
        local status_icon="$([ $exit_status -eq 0 ] && echo magic_wand || echo warning)"
        local last_command=$(history | tail -n1 | sed -e 's/^[[:space:]]*[0-9]\{1,\}[[:space:]]*//' -e 's/[;&|][[:space:]]*alert$//')
-       # for zsh users, use the same sed pattern but get the history differently.
-       # local last_command=$(history "$HISTCMD" | sed -e 's/^[[:space:]]*[0-9]\{1,\}[[:space:]]*//' -e 's/[;&|][[:space:]]*alert$//')
 
        curl -s -X POST "https://n.example.dev/alerts" \
            -H "Authorization: Bearer $token" \
@@ -720,4 +692,4 @@ To test failure notifications:
 false; alert  # Always fails (exit 1)
 ls --invalid; alert  # Invalid option
 cat nonexistent_file; alert  # File not found
-```
+```

docs/faq.md

@@ -71,8 +71,7 @@ The web app is a static website without a backend (other than the ntfy API). All
 cache and local storage. That means it does not need to be protected with a login screen, and it poses no additional 
 security risk. So technically, it does not need to be disabled.
 
-However, if you still want, you can require login with the `require-login: true` option,
-or disable it with the `web-root: disable` option in the `server.yml` file. 
+However, if you still want to disable it, you can do so with the `web-root: disable` option in the `server.yml` file. 
 
 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.
@@ -95,11 +94,11 @@ I would be humbled if you helped me carry the server and developer account costs
 appreciated.
 
 ## Can I email you? Can I DM you on Discord/Matrix?
-For community support, please use the public channels listed on the [contact page](contact.md). I generally 
-**do not respond to direct messages** about ntfy, unless you are paying for a [ntfy Pro](https://ntfy.sh/#pricing) 
-plan (see [paid support](contact.md#paid-support)), or you are inquiring about business 
-opportunities (see [other inquiries](contact.md#other-inquiries)).
+While I love chatting on [Discord](https://discord.gg/cT7ECsZj9w), [Matrix](https://matrix.to/#/#ntfy-space:matrix.org), 
+[Lemmy](https://discuss.ntfy.sh/c/ntfy), or [GitHub](https://github.com/binwiederhier/ntfy/issues), I generally 
+**do not respond to emails about ntfy or direct messages** about ntfy, unless you are paying for a 
+[ntfy Pro](https://ntfy.sh/#pricing) plan, or you are inquiring about business opportunities. 
 
 I am sorry, but answering individual questions about ntfy on a 1-on-1 basis is not scalable. Answering your questions 
-in public forums benefits others, since I can link to the discussion at a later point in time, or other users
+in the above-mentioned forums benefits others, since I can link to the discussion at a later point in time, or other users
 may be able to help out. I hope you understand.

docs/index.md

@@ -4,7 +4,7 @@ or POST requests. I use it to notify myself when scripts fail, or long-running c
 
 ## Step 1: Get the app
 <a href="https://play.google.com/store/apps/details?id=io.heckel.ntfy"><img width="170" src="static/img/badge-googleplay.png"></a>
-<a href="https://f-droid.org/en/packages/io.heckel.ntfy/"><img width="170" src="static/img/badge-fdroid.svg"></a>
+<a href="https://f-droid.org/en/packages/io.heckel.ntfy/"><img width="170" src="static/img/badge-fdroid.png"></a>
 <a href="https://apps.apple.com/us/app/ntfy/id1625396347"><img width="150" src="static/img/badge-appstore.png"></a>
 
 To [receive notifications on your phone](subscribe/phone.md), install the app, either via Google Play, App Store or F-Droid.

docs/install.md

@@ -28,130 +28,42 @@ resources to get started. _I am not affiliated with Kris or Alex, I just liked t
 Please check out the [releases page](https://github.com/binwiederhier/ntfy/releases) for binaries and
 deb/rpm packages.
 
-### Download and run
-The steps below allow you to download ntfy server and run it in a pinch. But it won't be enough to install it permanently
-as a service starting at boot time.
-
 === "x86_64/amd64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_amd64.tar.gz
-    tar zxvf ntfy_2.27.0_linux_amd64.tar.gz
-    sudo cp -a ntfy_2.27.0_linux_amd64/ntfy /usr/local/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.27.0_linux_amd64/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_amd64.tar.gz
+    tar zxvf ntfy_2.15.0_linux_amd64.tar.gz
+    sudo cp -a ntfy_2.15.0_linux_amd64/ntfy /usr/local/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.15.0_linux_amd64/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "armv6"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_armv6.tar.gz
-    tar zxvf ntfy_2.27.0_linux_armv6.tar.gz
-    sudo cp -a ntfy_2.27.0_linux_armv6/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.27.0_linux_armv6/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_armv6.tar.gz
+    tar zxvf ntfy_2.15.0_linux_armv6.tar.gz
+    sudo cp -a ntfy_2.15.0_linux_armv6/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.15.0_linux_armv6/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "armv7/armhf"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_armv7.tar.gz
-    tar zxvf ntfy_2.27.0_linux_armv7.tar.gz
-    sudo cp -a ntfy_2.27.0_linux_armv7/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.27.0_linux_armv7/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_armv7.tar.gz
+    tar zxvf ntfy_2.15.0_linux_armv7.tar.gz
+    sudo cp -a ntfy_2.15.0_linux_armv7/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.15.0_linux_armv7/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
 === "arm64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_arm64.tar.gz
-    tar zxvf ntfy_2.27.0_linux_arm64.tar.gz
-    sudo cp -a ntfy_2.27.0_linux_arm64/ntfy /usr/bin/ntfy
-    sudo mkdir /etc/ntfy && sudo cp ntfy_2.27.0_linux_arm64/{client,server}/*.yml /etc/ntfy
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_arm64.tar.gz
+    tar zxvf ntfy_2.15.0_linux_arm64.tar.gz
+    sudo cp -a ntfy_2.15.0_linux_arm64/ntfy /usr/bin/ntfy
+    sudo mkdir /etc/ntfy && sudo cp ntfy_2.15.0_linux_arm64/{client,server}/*.yml /etc/ntfy
     sudo ntfy serve
     ```
 
-### Install as a service
-If you want to install ntfy server permanently as a service, and your OS/distribution of choice doesn't offer a package,
-there are a few more steps to follow.
-
-Create the ntfy user and group:
-```bash
-useradd --system --home-dir /var/lib/ntfy --shell /bin/false --comment "User for the simple HTTP-based pub-sub notification service" ntfy
-```
-
-Depending on your init system, the following steps will diverge.
-
-#### On systemd systems
-Install the ntfy server unit file (which contains parameters to start the service at boot time):
-
-=== "x86_64/amd64"
-    ```bash
-    sudo mv ntfy_2.27.0_linux_amd64/server/ntfy.service /etc/systemd/system/
-    sudo chmod 644 /etc/systemd/system/ntfy.service
-    ```
-
-=== "armv6"
-    ```bash
-    sudo mv ntfy_2.27.0_linux_armv6/server/ntfy.service /etc/systemd/system/
-    sudo chmod 644 /etc/systemd/system/ntfy.service
-    ```
-
-=== "armv7/armhf"
-    ```bash
-    sudo mv ntfy_2.27.0_linux_armv7/server/ntfy.service /etc/systemd/system/
-    sudo chmod 644 /etc/systemd/system/ntfy.service
-    ```
-
-=== "arm64"
-    ```bash
-    sudo mv ntfy_2.27.0_linux_arm64/server/ntfy.service /etc/systemd/system/
-    sudo chmod 644 /etc/systemd/system/ntfy.service
-    ```
-
-Then notify systemd we have added a new service and start the service:
-
-```bash
-sudo systemctl daemon-reload
-sudo systemctl start ntfy
-```
-
-#### On OpenRC systems
-Install the ntfy server service script:
-
-=== "x86_64/amd64"
-    ```bash
-    sudo mv ntfy_2.27.0_linux_amd64/server/ntfy.openrc /etc/init.d/ntfy
-    sudo chmod 755 /etc/init.d/ntfy
-    ```
-
-=== "armv6"
-    ```bash
-    sudo mv ntfy_2.27.0_linux_armv6/server/ntfy.openrc /etc/init.d/ntfy
-    sudo chmod 755 /etc/init.d/ntfy
-    ```
-
-=== "armv7/armhf"
-    ```bash
-    sudo mv ntfy_2.27.0_linux_armv7/server/ntfy.openrc /etc/init.d/ntfy
-    sudo chmod 755 /etc/init.d/ntfy
-    ```
-
-=== "arm64"
-    ```bash
-    sudo mv ntfy_2.27.0_linux_arm64/server/ntfy.openrc /etc/init.d/ntfy
-    sudo chmod 755 /etc/init.d/ntfy
-    ```
-
-Start the ntfy server service:
-
-```bash
-sudo rc-service ntfy start
-```
-
-Add the ntfy server service to the default runlevel (so that it starts at boot time):
-
-```bash
-sudo rc-update add ntfy default
-```
-
 ## Debian/Ubuntu repository
 
 !!! info
@@ -159,7 +71,7 @@ sudo rc-update add ntfy default
     The old repository [archive.heckel.io](https://archive.heckel.io/apt) is still available for now, but will likely
     go away soon. I suspect I will phase it out some time in early 2026.
 
-Installation via Debian/Ubuntu repository (fingerprint `55BA 774A 6F5E E674 31E4  B6B7 CFDB 962D 4F1E C4AF`):
+Installation via Debian/Ubuntu repository (fingerprint `55BA 774A 6F5E E674 31E4  6B7C CFDB 962D 4F1E C4AF`):
 
 === "x86_64/amd64"
     ```bash
@@ -204,7 +116,7 @@ Manually installing the .deb file:
 
 === "x86_64/amd64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_amd64.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_amd64.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -212,7 +124,7 @@ Manually installing the .deb file:
 
 === "armv6"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_armv6.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_armv6.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -220,7 +132,7 @@ Manually installing the .deb file:
 
 === "armv7/armhf"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_armv7.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_armv7.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -228,7 +140,7 @@ Manually installing the .deb file:
 
 === "arm64"
     ```bash
-    wget https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_arm64.deb
+    wget https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_arm64.deb
     sudo dpkg -i ntfy_*.deb
     sudo systemctl enable ntfy
     sudo systemctl start ntfy
@@ -238,35 +150,33 @@ Manually installing the .deb file:
 
 === "x86_64/amd64"
     ```bash
-    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_linux_amd64.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.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.27.0/ntfy_2.27.0_linux_armv6.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.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.27.0/ntfy_2.27.0_linux_armv7.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.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.27.0/ntfy_2.27.0_linux_arm64.rpm
+    sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_linux_arm64.rpm
     sudo systemctl enable ntfy 
     sudo systemctl start ntfy
     ```
 
 ## Arch Linux
-<span class="community-badge" title="This package is maintained by the community, not the ntfy developers"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></svg> Community maintained</span>
-
 ntfy can be installed using an [AUR package](https://aur.archlinux.org/packages/ntfysh-bin/). 
 You can use an [AUR helper](https://wiki.archlinux.org/title/AUR_helpers) like `paru`, `yay` or others to download, 
 build and install ntfy and keep it up to date.
@@ -281,9 +191,7 @@ cd ntfysh-bin
 makepkg -si
 ```
 
-## NixOS / Nix 
-<span class="community-badge" title="This package is maintained by the community, not the ntfy developers"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></svg> Community maintained</span>
-
+## NixOS / Nix
 ntfy is packaged in nixpkgs as `ntfy-sh`. It can be installed by adding the package name to the configuration file and calling `nixos-rebuild`. Alternatively, the following command can be used to install ntfy in the current user environment:
 ```
 nix-env -iA ntfy-sh
@@ -291,28 +199,20 @@ nix-env -iA ntfy-sh
 
 NixOS also supports [declarative setup of the ntfy server](https://search.nixos.org/options?channel=unstable&show=services.ntfy-sh.enable&from=0&size=50&sort=relevance&type=packages&query=ntfy). 
 
-## FreeBSD
-<span class="community-badge" title="This package is maintained by the community, not the ntfy developers"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></svg> Community maintained</span>
-
-ntfy is ported to FreeBSD and available via the ports collection as [sysutils/go-ntfy](https://www.freshports.org/sysutils/go-ntfy/). You can install it via `pkg`:
-```
-pkg install go-ntfy
-```
-
 ## 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.27.0/ntfy_2.27.0_darwin_all.tar.gz), 
+To install, please [download the tarball](https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.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.27.0/ntfy_2.27.0_darwin_all.tar.gz > ntfy_2.27.0_darwin_all.tar.gz
-tar zxvf ntfy_2.27.0_darwin_all.tar.gz
-sudo cp -a ntfy_2.27.0_darwin_all/ntfy /usr/local/bin/ntfy
+curl -L https://github.com/binwiederhier/ntfy/releases/download/v2.15.0/ntfy_2.15.0_darwin_all.tar.gz > ntfy_2.15.0_darwin_all.tar.gz
+tar zxvf ntfy_2.15.0_darwin_all.tar.gz
+sudo cp -a ntfy_2.15.0_darwin_all/ntfy /usr/local/bin/ntfy
 mkdir ~/Library/Application\ Support/ntfy 
-cp ntfy_2.27.0_darwin_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
+cp ntfy_2.15.0_darwin_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
 ntfy --help
 ```
 
@@ -321,8 +221,6 @@ ntfy --help
     development as well. Check out the [build instructions](develop.md) for details.
 
 ## Homebrew
-<span class="community-badge" title="This package is maintained by the community, not the ntfy developers"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></svg> Community maintained</span>
-
 To install the [ntfy CLI](subscribe/cli.md) (`ntfy publish` and `ntfy subscribe` only) via Homebrew (Linux and macOS),
 simply run:
 ```
@@ -330,29 +228,19 @@ brew install ntfy
 ```
 
 ## Windows
-The ntfy server and CLI are fully supported on Windows. You can run the ntfy server directly or as a Windows service.
-To install, you can either
-
-* [Download the latest ZIP](https://github.com/binwiederhier/ntfy/releases/download/v2.27.0/ntfy_2.27.0_windows_amd64.zip),
+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.15.0/ntfy_2.15.0_windows_amd64.zip),
 extract it and place the `ntfy.exe` binary somewhere in your `%Path%`. 
-* Or install ntfy from the [Scoop](https://scoop.sh) main repository via `scoop install ntfy`
 
-Once installed, you can run the ntfy CLI commands like so:
+The default path for the client config file is at `%AppData%\ntfy\client.yml` (not created automatically, sample in the ZIP file).
 
-```
-ntfy.exe -h
-```
+Also available in [Scoop's](https://scoop.sh) Main repository:
 
-The default configuration file location on Windows is `%ProgramData%\ntfy\server.yml` (e.g., `C:\ProgramData\ntfy\server.yml`)
-for the server, and `%AppData%\ntfy\client.yml` for the client. You may need to create the directory and config file manually.
+`scoop install ntfy`
 
-To install the ntfy server as a Windows service, you can use the built-in `sc` command. For example, run this in an
-elevated command prompt (adjust the path to `ntfy.exe` accordingly):
-
-```
-sc create ntfy binPath="C:\path\to\ntfy.exe serve" start=auto
-sc start ntfy
-```
+!!! info
+    There is currently no installer for Windows, and the binary is not signed. If this is desired, please create a
+    [GitHub issue](https://github.com/binwiederhier/ntfy/issues) to let me know.
 
 ## Docker
 The [ntfy image](https://hub.docker.com/r/binwiederhier/ntfy) is available for amd64, armv6, armv7 and arm64. It should 
@@ -655,18 +543,18 @@ kubectl apply -k /ntfy
                       cpu: 150m
                       memory: 150Mi
               volumeMounts:
-                - mountPath: /etc/ntfy/server.yml
-                  subPath: server.yml
-                  name: config-volume # generated via configMapGenerator from kustomization file
-                - mountPath: /var/cache/ntfy
-                  name: cache-volume # cache volume mounted to persistent volume
-          volumes:
-            - name: config-volume
-              configMap: # uses configmap generator to parse server.yml to configmap
-                name: server-config
-            - name: cache-volume
-              persistentVolumeClaim: # stores /cache/ntfy in defined pv
-                claimName: ntfy-pvc
+                  - mountPath: /etc/ntfy
+                    subPath: server.yml
+                    name: config-volume # generated vie configMapGenerator from kustomization file
+                  - mountPath: /var/cache/ntfy
+                    name: cache-volume #cache volume mounted to persistent volume
+            volumes:
+              - name: config-volume
+                configMap:  # uses configmap generator to parse server.yml to configmap
+                  name: server-config
+              - name: cache-volume
+                persistentVolumeClaim: # stores /cache/ntfy in defined pv
+                  claimName: ntfy-pvc
     ```
   
 === "ntfy-pvc.yaml"
@@ -726,31 +614,3 @@ kubectl apply -k /ntfy
     cache-file: "/var/cache/ntfy/cache.db"
     attachment-cache-dir: "/var/cache/ntfy/attachments"
     ```
-
-## Helm
-<span class="community-badge" title="This package is maintained by the community, not the ntfy developers"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></svg> Community maintained</span>
-
-If you prefer [Helm](https://helm.sh/), ntfy can be deployed using the third-party
-[HelmForge chart](https://helmforge.dev/docs/charts/ntfy), which packages the official
-`binwiederhier/ntfy` image with persistent storage, Service, Ingress, optional Prometheus metrics, and more.
-This chart is **not** maintained by the ntfy developers.
-
-!!! warning
-    The HelmForge project is young and maintained by a small community. Review the chart before deploying it,
-    and use it at your own risk.
-
-```bash
-helm repo add helmforge https://repo.helmforge.dev
-helm repo update
-helm install ntfy helmforge/ntfy
-```
-
-Alternatively, install it directly from the OCI registry:
-
-```bash
-helm install ntfy oci://ghcr.io/helmforgedev/helm/ntfy
-```
-
-Because ntfy's default SQLite storage is single-writer, run the chart as a single instance rather than
-treating it as a horizontally scalable deployment. See the [chart documentation](https://helmforge.dev/docs/charts/ntfy)
-for the full list of configurable values.

docs/integrations.md

@@ -43,7 +43,6 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [Miniflux](https://miniflux.app/docs/ntfy.html) - Minimalist and opinionated feed reader
 - [Beszel](https://beszel.dev/guide/notifications/ntfy) - Server monitoring platform
 - [Simple Observability](https://simpleobservability.com/docs/alerts/ntfy) - Server monitoring and observability platform
-- [Sifio](https://sifio.net) - Aggregate updates from RSS, social media, and other sources, then deliver them to ntfy, Slack, Notion and more
 
 ## Integration via HTTP/SMTP/etc.
 
@@ -55,7 +54,6 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [Proxmox-Ntfy](https://github.com/qtsone/proxmox-ntfy) - Python script that monitors Proxmox tasks and sends notifications using the Ntfy service.
 - [Scrutiny](https://github.com/AnalogJ/scrutiny) - WebUI for smartd S.M.A.R.T monitoring. Scrutiny includes shoutrrr/ntfy integration ([see integration README](https://github.com/AnalogJ/scrutiny?tab=readme-ov-file#notifications))
 - [UptimeObserver](https://uptimeobserver.com) - Uptime Monitoring tool for Websites, APIs, SSL Certificates, DNS, Domain Names and Ports. [Integration Guide](https://support.uptimeobserver.com/integrations/ntfy/)
-- [Flowtriq](https://flowtriq.com) - Real-time DDoS detection and mitigation platform (integration via [webhook alerts](https://flowtriq.com))
 
 ## [UnifiedPush](https://unifiedpush.org/users/apps/) integrations
 
@@ -84,16 +82,15 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [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)
 - [aiontfy](https://github.com/tr4nt0r/aiontfy) - Asynchronous client library for publishing and subscribing to ntfy (Python)
-- [ex_ntfy](https://github.com/houllette/ex_ntfy) - Elixir SDK covering publishing, polling, and streaming subscriptions for ntfy servers (Elixir)
 
 ## CLIs + GUIs
 
 - [ntfy.sh.sh](https://github.com/mininmobile/ntfy.sh.sh) - Run scripts on ntfy.sh events
 - [ntfy-desktop](https://codeberg.org/zvava/ntfy-desktop) - Cross-platform desktop application for ntfy
 - [ntfy-desktop](https://github.com/Aetherinox/ntfy-desktop) - Desktop client for Windows, Linux, and MacOS with push notifications
-- [ntfy Desktop (Windows)](https://github.com/simoneferrari/ntfy-desktop) - Native Windows desktop client with multi-server support, toast notifications and message history, built with WPF and .NET (C#)
+- [ntfy svelte front-end](https://github.com/novatorem/Ntfy) - Front-end built with svelte
 - [wio-ntfy-ticker](https://github.com/nachotp/wio-ntfy-ticker) - Ticker display for a ntfy.sh topic
-- [ntfysh-windows](https://github.com/mshafer1/ntfysh-windows) - A ntfy client for Windows Desktop
+- [ntfysh-windows](https://github.com/lucas-bortoli/ntfysh-windows) - A ntfy client for Windows Desktop
 - [ntfyr](https://github.com/haxwithaxe/ntfyr) - A simple commandline tool to send notifications to ntfy
 - [ntfy.py](https://github.com/ioqy/ntfy-client-python) - ntfy.py is a simple nfty.sh client for sending notifications
 - [wlzntfy](https://github.com/Walzen-Group/ntfy-toaster) - A minimalistic, receive-only toast notification client for Windows 11
@@ -101,7 +98,6 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [Daily Fact Ntfy](https://github.com/thiswillbeyourgithub/Daily_Fact_Ntfy) - Generate [llm](https://github.com/simonw/llm) generated fact every day about any topic you're interested in.
 - [ntfyexec](https://github.com/alecthomas/ntfyexec) - Send a notification through ntfy.sh if a command fails
 - [Ntfy Desktop](https://github.com/emmaexe/ntfyDesktop) - Fully featured desktop client for Linux, built with Qt and C++.
-- [Ntfy App](https://github.com/rubix-studios-pty-ltd/ntfy-app) - Tauri/Rust desktop client for Windows, Linux and MacOS with push notifications.
 
 ## Projects + scripts 
 
@@ -111,7 +107,6 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [ntfy-long-zsh-command](https://github.com/robfox92/ntfy-long-zsh-command) - Notifies you once a long-running command completes (zsh)
 - [ntfy-shellscripts](https://github.com/nickexyz/ntfy-shellscripts) - A few scripts for the ntfy project (Shell)
 - [alertmanager-ntfy-relay](https://github.com/therobbielee/alertmanager-ntfy-relay) - ntfy.sh relay for Alertmanager (Go)
-- [oci-notifications-ntfy-relay](https://github.com/Ryan02I5/oci-notifications-ntfy-relay) - Minimal OCI Notifications / Oracle Functions relay to ntfy topics (Python)
 - [QuickStatus](https://github.com/corneliusroot/QuickStatus) - A shell script to alert to any immediate problems upon login (Shell)
 - [ntfy.el](https://github.com/shombando/ntfy) - Send notifications from Emacs (Emacs)
 - [backup-projects](https://gist.github.com/anthonyaxenov/826ba65abbabd5b00196bc3e6af76002) - Stupidly simple backup script for own projects (Shell)
@@ -187,15 +182,9 @@ I've added a ⭐ to projects or posts that have a significant following, or had
 - [ntfy-bridge](https://github.com/AlexGaudon/ntfy-bridge) - An application to bridge Discord messages (or webhooks) to ntfy.
 - [ntailfy](https://github.com/leukosaima/ntailfy) - ntfy notifications when Tailscale devices connect/disconnect (Go)
 - [BRun](https://github.com/cbrake/brun) - Native Linux automation platform connecting triggers to actions without containers (Go)
-- [Uptime Monitor](https://uptime-monitor.org) - Self-hosted, enterprise-grade uptime monitoring and alerting system (TS)
-- [send_to_ntfy_extension](https://github.com/TheDuffman85/send_to_ntfy_extension/) ⭐ - A browser extension to send the notifications to ntfy (JS)
-- [SIA-Server](https://github.com/ZebMcKayhan/SIA-Server) - A light weight, self-hosted notification Server for Honywell Galaxy Flex alarm systems (Python)
-- [zabbix-ntfy](https://github.com/torgrimt/zabbix-ntfy) - Zabbix server Mediatype to add support for ntfy.sh services
-- [Rubix Notify](https://wordpress.org/plugins/rubix-notify) - WordPress Integration with ntfy (PHP + React).
 
 ## Blog + forum posts
 
-- [Push alerts for WHM using ntfy](https://rubixstudios.com.au/insights/push-alerts-for-whm-using-ntfy) - rubixstudios.com.au - 5/2026
 - [Device notifications via HTTP with ntfy](https://alistairshepherd.uk/writing/ntfy/) - alistairshepherd.uk - 6/2025
 - [Notifications about (almost) anything with ntfy.sh](https://hamatti.org/posts/notifications-about-almost-anything-with-ntfy-sh/) - hamatti.org - 6/2025
 - [I set up a self-hosted notification service for everything, and I'll never look back](https://www.xda-developers.com/set-up-self-hosted-notification-service/) ⭐ - xda-developers.com - 5/2025
@@ -313,7 +302,7 @@ ntfy community. Thanks to everyone running a public server. **You guys rock!**
 | URL                                               | Country            |
 |---------------------------------------------------|--------------------|
 | [ntfy.sh](https://ntfy.sh/) (*Official*)          | 🇺🇸 United States |
-| [ntfy.tedomum.fr](https://ntfy.tedomum.fr/)     | 🇫🇷 France        |
+| [ntfy.tedomum.net](https://ntfy.tedomum.net/)     | 🇫🇷 France        |
 | [ntfy.jae.fi](https://ntfy.jae.fi/)               | 🇫🇮 Finland       |
 | [ntfy.adminforge.de](https://ntfy.adminforge.de/) | 🇩🇪 Germany       |
 | [ntfy.envs.net](https://ntfy.envs.net)            | 🇩🇪 Germany       |

docs/privacy.md

@@ -1,198 +1,12 @@
 # Privacy policy
 
-**Last updated:** June 15, 2026
+I love free software, and I'm doing this because it's fun. I have no bad intentions, and **I will
+never monetize or sell your information, and this service and software will always stay free and open.**
 
-This privacy policy describes how ntfy ("we", "us", or "our") collects, uses, and handles your information
-when you use the ntfy.sh service, web app, and mobile applications (Android and iOS).
+Neither the server nor the app record any personal information, or share any of the messages and topics with
+any outside service. All data is exclusively used to make the service function properly. The only external service
+I use is Firebase Cloud Messaging (FCM) service, which is required to provide instant Android notifications (see
+[FAQ](faq.md) for details). To avoid FCM altogether, download the F-Droid version.
 
-## Our commitment to privacy
-
-We love free software, and we're doing this because it's fun. We have no bad intentions, and **we will
-never monetize or sell your information**. The ntfy service and software will always stay free and open source.
-If you don't trust us or your messages are sensitive, you can [self-host your own ntfy server](install.md).
-
-## Information we collect
-
-### Account information (optional)
-
-If you create an account on ntfy.sh, we collect:
-
-- **Username** - A unique identifier you choose
-- **Password** - Stored as a secure bcrypt hash (we never store your plaintext password)
-- **Email address** - If you add an email address to your account for account recovery and password resets, for use
-  with the email notification feature, or if you subscribe to a paid plan (for billing purposes via Stripe). Email
-  addresses you add to your account are verified by sending a confirmation link.
-- **Phone number** - Only if you enable the phone call notification feature (verified via SMS/call)
-
-You can use ntfy without creating an account. Anonymous usage is fully supported.
-
-### Messages and notifications
-
-- **Message content** - Messages you publish are temporarily cached on our servers (default: 12 hours) to support 
-  message polling and to overcome client network disruptions. Messages are deleted after the cache duration expires.
-- **Attachments** - File attachments are temporarily stored (default: 3 hours) and then automatically deleted.
-- **Topic names** - The topic names you publish to or subscribe to are processed by our servers.
-
-### Technical information
-
-- **IP addresses** - Used for rate limiting to prevent abuse. May be temporarily logged for debugging purposes,
-  though this is typically turned off.
-- **Access tokens** - If you create access tokens, we store the token value, an optional label, last access time, 
-  and the IP address of the last access.
-- **Web push subscriptions** - If you enable browser notifications, we store your browser's push subscription 
-  endpoint to deliver notifications.
-
-### Billing information (paid plans only)
-
-If you subscribe to a paid plan, payment processing is handled by Stripe. We store:
-
-- Stripe customer ID
-- Subscription status and billing period
-
-We do not store your credit card numbers or payment details directly. These are handled entirely by Stripe.
-
-## Third-party services
-
-To provide the ntfy.sh service, we use the following third-party services:
-
-### Firebase Cloud Messaging (FCM)
-
-We use Google's Firebase Cloud Messaging to deliver push notifications to Android and iOS devices. When you 
-receive a notification through the mobile apps (Google Play or App Store versions):
-
-- Message metadata and content may be transmitted through Google's FCM infrastructure
-- Google's [privacy policy](https://policies.google.com/privacy) applies to their handling of this data
-
-**To avoid FCM entirely:** Download the [F-Droid version](https://f-droid.org/en/packages/io.heckel.ntfy/) of 
-the Android app and use a self-hosted server, or use the instant delivery feature with your own server.
-
-### Twilio (phone calls)
-
-If you use the phone call notification feature (`X-Call` header), we use Twilio to:
-
-- Make voice calls to your verified phone number
-- Send SMS or voice calls for phone number verification
-
-Your phone number is shared with Twilio to deliver these services. Twilio's 
-[privacy policy](https://www.twilio.com/legal/privacy) applies.
-
-### Amazon SES (email delivery)
-
-If you use the email notification feature (`X-Email` header), or when ntfy sends account-related emails (email 
-address verification and password reset links), we use Amazon Simple Email Service (SES) to deliver emails. The 
-recipient email address and message content are transmitted through Amazon's infrastructure. Amazon's 
-[privacy policy](https://aws.amazon.com/privacy/) applies.
-
-### Stripe (payments)
-
-If you subscribe to a paid plan, payments are processed by Stripe. Your payment information is handled directly 
-by Stripe and is subject to Stripe's [privacy policy](https://stripe.com/privacy).
-
-Note: We have explicitly disabled Stripe's telemetry features in our integration.
-
-### Web push providers
-
-If you enable browser notifications in the ntfy web app, push messages are delivered through your browser 
-vendor's push service:
-
-- Google (Chrome)
-- Mozilla (Firefox)
-- Apple (Safari)
-- Microsoft (Edge)
-
-Your browser's push subscription endpoint is shared with these providers to deliver notifications.
-
-## Mobile applications
-
-### Android app
-
-The Android app is available from two sources:
-
-- **Google Play Store** - Uses Firebase Cloud Messaging for push notifications. Firebase Analytics is 
-  **explicitly disabled** in our app.
-- **F-Droid** - Does not include any Google services or Firebase. Uses a foreground service to maintain 
-  a direct connection to the server.
-
-The Android app stores the following data locally on your device:
-
-- Subscribed topics and their settings
-- Cached notifications
-- User credentials (if you add a server with authentication)
-- Application logs (for debugging, stored locally only)
-
-### iOS app
-
-The iOS app uses Firebase Cloud Messaging (via Apple Push Notification service) to deliver notifications. 
-The app stores the following data locally on your device:
-
-- Subscribed topics
-- Cached notifications
-- User credentials (if configured)
-
-## Web application
-
-The ntfy web app is a static website that stores all data locally in your browser:
-
-- **IndexedDB** - Stores your subscriptions and cached notifications
-- **Local Storage** - Stores your preferences and session information
-
-No cookies are used for tracking. The web app does not have a backend beyond the ntfy API.
-
-## Data retention
-
-| Data type              | Retention period                                  |
-|------------------------|---------------------------------------------------|
-| Messages               | 12 hours (configurable by server operators)       |
-| Attachments            | 3 hours (configurable by server operators)        |
-| User accounts          | Until you delete your account                     |
-| Access tokens          | Until you revoke them or delete your account      |
-| Email addresses        | Until you remove them or delete your account      |
-| Phone numbers          | Until you remove them or delete your account      |
-| Web push subscriptions | 60 days of inactivity, then automatically removed |
-| Server logs            | Varies; debugging logs are typically temporary    |
-
-## Self-hosting
-
-If you prefer complete control over your data, you can [self-host your own ntfy server](install.md). 
-When self-hosting:
-
-- You control all data storage and retention
-- You can choose whether to use Firebase, Twilio, email delivery, or any other integrations
-- No data is shared with ntfy.sh or any third party (unless you configure those integrations)
-
-The server and all apps are fully open source:
-
-- Server: [github.com/binwiederhier/ntfy](https://github.com/binwiederhier/ntfy)
-- Android app: [github.com/binwiederhier/ntfy-android](https://github.com/binwiederhier/ntfy-android)
-- iOS app: [github.com/binwiederhier/ntfy-ios](https://github.com/binwiederhier/ntfy-ios)
-
-## Data security
-
-- All connections to ntfy.sh are encrypted using TLS/HTTPS
-- Passwords are hashed using bcrypt before storage
-- Access tokens are generated using cryptographically secure random values
-- The server does not log message content by default
-
-## Your rights
-
-You have the right to:
-
-- **Access** - View your account information and data
-- **Delete** - Delete your account and associated data via the web app
-- **Export** - Your messages are available via the API while cached
-
-To delete your account, use the account settings in the web app or contact us.
-
-## Changes to this policy
-
-We may update this privacy policy from time to time. Changes will be posted on this page with an updated 
-"Last updated" date. You may also review all changes in the [Git history](https://github.com/binwiederhier/ntfy/commits/main/docs/privacy.md). 
-
-For significant changes, we may provide additional notice on Discord/Matrix or through the
-[announcements](https://ntfy.sh/announcements) ntfy topic.
-
-## Contact
-
-For privacy-related inquiries, please email [privacy@mail.ntfy.sh](mailto:privacy@mail.ntfy.sh).
-
-For all other contact options, see the [contact page](contact.md).
+For debugging purposes, the ntfy server may temporarily log request paths, remote IP addresses or even topics 
+or messages, though typically this is turned off.

docs/publish/template-functions.md

@@ -1174,7 +1174,7 @@ keys $myDict | sortAlpha
 ```
 
 When supplying multiple dictionaries, the keys will be concatenated. Use the `uniq`
-function along with `sortAlpha` to get a unique, sorted list of keys.
+function along with `sortAlpha` to get a unqiue, sorted list of keys.
 
 ```
 keys $myDict $myOtherDict | uniq | sortAlpha

docs/releases.md

@@ -4,520 +4,14 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
 
 ## Current stable releases
 
-| Component        | Version | Release date  |
-|------------------|---------|---------------|
-| ntfy server      | v2.27.0 | Aug 4, 2026   |
-| ntfy Android app | v1.25.2 | July 23, 2026 |
-| ntfy iOS app     | v1.7.0  | May 30, 2026  |
+| Component                                | Version | Release date |
+|------------------------------------------|---------|--------------|
+| ntfy server                              | v2.15.0 | Nov 16, 2025 |
+| ntfy Android app (_is being rolled out_) | v1.20.0 | Dec 28, 2025 |
+| ntfy iOS app                             | v1.3    | Nov 26, 2023 |
 
 Please check out the release notes for [upcoming releases](#not-released-yet) below.
 
-### ntfy server v2.27.0
-Released August 4, 2026
-
-This release lets you sign in with your verified email address instead of your username, which should help if you ever
-signed up with an email and then forgot which username you picked. It also hardens the message templating engine against
-a few ways a small template could eat a lot of memory, and it drops the "experimental" label from
-[PostgreSQL support](config.md#postgresql), which has been running ntfy.sh for a while now.
-
-I also did a bunch of refactoring in, mostly in preparation for being able to cluster ntfy nodes and scale the service
-horizontally. It'll be a while until then, ... baby steps.
-
-**Security:**
-
-* Limit message templates (`Template: yes`) to 32 KB, limit `printf` widths and precisions to below 1000, and limit `indent`/`nindent` to 100 spaces, preventing excessive memory use from a single small template
-* Exclude secrets from the config hash served to the web app, preventing a rather theoretical information leak
-
-**Features:**
-
-* Allow logging in with your verified primary email address (in addition to your username), so a password reset no longer leaves you unable to sign in when you only remember the email you signed up with
-
-**Bug fixes + maintenance:**
-
-* Fix Twilio phone calls and phone number verifications failing silently when Twilio rejected the request, and move the Twilio integration into its own `twilio` package
-* Move the Prometheus metrics into a dedicated `metrics` package
-* Message cache databases from ntfy older than v1.10.0 (November 2021) can no longer be migrated; upgrade via an older ntfy version first, or delete the cache database
-* Fix `user_phone` table in the SQLite user database referencing a dropped table after the v2.14 schema migration; repaired automatically by a new migration
-
-## ntfy Android v1.25.2
-Released July 23, 2026
-
-This release makes the "connection lost" alert configurable and turns it off by default. Folks did not like it and many reached out
-or even gave ntfy bad reviews. I heard you! You can re-enable the alert in the advanced settings.
-
-The release also tries to be smarter about not retrying the connection at all if the app is in flight mode, or has no network. If there
-is no network, ntfy now keeps the foreground service alive and shows a "Waiting for network" notification, then resumes automatically
-once connectivity returns.
-
-Another change related to the networking is that we now force-reconnect when the connection is changed, e.g. during transitions
-from Wi-Fi to cellular network, or vice versa. That should allow for faster transitions during hand-overs.
-
-We also increase the client-side WebSocket ping interval from 1 minute to 3 minutes, which should slightly improve battery life,
-especially when paired with increaseing the server-side `keepalive-interval` in your self-hosted server.
-
-**Features:**
-
-* Add configurable "Alert when connection is lost" setting, turned off by default ([#1665](https://github.com/binwiederhier/ntfy/issues/1665), [#1662](https://github.com/binwiederhier/ntfy/issues/1662), [#1652](https://github.com/binwiederhier/ntfy/issues/1652), [#1655](https://github.com/binwiederhier/ntfy/issues/1655), thanks to [@tintamarre](https://github.com/tintamarre), [@sjozs](https://github.com/sjozs), [@TheRealOne78](https://github.com/TheRealOne78), and [@DAE51D](https://github.com/DAE51D) for reporting)
-* Handle "no network" gracefully: when the device is offline or in airplane mode, ntfy now stops retrying, suppresses the connection-lost alert, and keeps the foreground service alive with a "Waiting for network" notification, resuming instant delivery automatically when connectivity returns ([ntfy-android#165](https://github.com/binwiederhier/ntfy-android/pull/165), thanks to [@tintamarre](https://github.com/tintamarre) for the contribution, and [#1709](https://github.com/binwiederhier/ntfy/issues/1709), thanks to [@isaitgirl](https://github.com/isaitgirl) for reporting)
-* Improve battery life by increasing WebSocket client ping interval from 1 min to 3 min, and reconnect instantly on Wi-Fi/cellular/VPN transitions ([ntfy-android#113](https://github.com/binwiederhier/ntfy-android/pull/113), thanks to [@ftilde](https://github.com/ftilde) for the investigation)
-* Disable UnifiedPush components when UnifiedPush is disabled in settings ([ntfy-android#168](https://github.com/binwiederhier/ntfy-android/pull/168), thanks to [@p1gp1g](https://github.com/p1gp1g) for the contribution)
-
-**Bug fixes + maintenance:**
-
-* Fix the "connection lost" alert briefly disappearing and re-firing when roaming between networks (e.g. Wi-Fi to cellular), by no longer cancelling it during the transient no-network gap of a handover
-* Fix the "connection lost" alert repeatedly waking the screen while a server stayed unreachable, by no longer re-posting the alert once it is already showing
-* Fix the "connection lost" alert firing late, erratically, or not at all when a connection kept dropping (e.g. a flaky server) rather than being refused outright, by tracking how long the connection has been down independently of whether the drop warrants a UI error
-* Undo automatic phone number linking for numbers in message body ([ntfy-android#170](https://github.com/binwiederhier/ntfy-android/pull/170), thanks to [@acortelyou](https://github.com/acortelyou) for the contribution)
-* Fix subscription icons disappearing after a few days due to Android clearing cache ([#1322](https://github.com/binwiederhier/ntfy/issues/1322), thanks to [@mcanning](https://github.com/mcanning) for reporting)
-* Fix UnifiedPush `failed_reason` being sent as an enum instead of a string, which caused an exception in receiving apps that read it as a string extra ([ntfy-android#182](https://github.com/binwiederhier/ntfy-android/pull/182), thanks to [@p1gp1g](https://github.com/p1gp1g) for the contribution)
-
-### ntfy server v2.26.3
-Released July 20, 2026
-
-This is a hotfix release, useful pretty much only for ntfy.sh. It was adds the ability to track abusive IPs more
-efficiently, reducing the load on the IP banning services and preventing them from falling behind and leaving abusers
-unbanned for too long. It works by tracking HTTP errors, and writing out a ban file that fail2ban can read and ban
-offenders instantly. See [ban-feed](config.md#ban-feed) for details.
-
-**Features:**
-
-* Add an abuse ban-feed: when enabled via `ban-file`, ntfy tracks a weighted strike budget per visitor and appends abusive IPs to a file that fail2ban can tail and ban on sight (`ban-file`, `ban-window`, `ban-threshold`, `ban-weights`; see [ban-feed docs](config.md#ban-feed))
-
-### ntfy server v2.26.0
-Released July 9, 2026
-
-This release hardens **message templates**, which are now executed with a hard-capped execution timeout. This closes
-a denial-of-service hole.
-
-On the web app side, it adds configurable **date and time formats**, a smoother loading and page-transition experience,
-and a fix that strips unsafe URL protocols from rendered Markdown.
-
-**Security:**
-
-* Prevent a CPU denial of service via message templates (`Template: yes`) ([#1826](https://github.com/binwiederhier/ntfy/pull/1826), thanks to [@alanturing881](https://github.com/alanturing881), [@5ud0er](https://github.com/5ud0er) and [@jvoisin](https://github.com/jvoisin) for reporting)
-
-**Features:**
-
-* Web app: Add "Date format" and "Time format" settings (Settings -> Appearance), with ISO 8601, day/month/year (slash or dot) and month/day/year date options and a 12-/24-hour clock option, and base the default format on your browser/system locale rather than the selected display language. When logged in, both settings sync across devices via your account ([#1647](https://github.com/binwiederhier/ntfy/issues/1647), thanks to [@wsw70](https://github.com/wsw70) for reporting)
-
-**Bug fixes + maintenance:**
-
-* Web app: Smooth transitions and loading animation, remove flickering
-* Web app: `GET /account` now reads from the primary database instead of a read replica, so the account view no longer shows stale data right after a change when replicas lag behind
-* Docs: Document the third-party HelmForge Helm chart as a Kubernetes installation option ([#1727](https://github.com/binwiederhier/ntfy/issues/1727), thanks to [@mberlofa](https://github.com/mberlofa))
-* Web app: Strip unsafe URL protocols (`javascript:`, `data:`, ...) from links and images in Markdown-rendered messages, so they no longer trigger an uncaught "React has blocked a javascript: URL" error (thanks to [@jvoisin](https://github.com/jvoisin) for reporting)
-
-## ntfy server v2.25.0
-Released June 24, 2026
-
-This release adds **password reset** via email, and reworks email verification to use durable,
-link-based magic links (replacing the old in-memory 6-digit codes). Email stays optional at
-signup; a user can reset their password only once they have a verified "primary" (recovery)
-email.
-
-All of this work is probably not useful for self-hosters, but it hopefully will be useful for me,
-since I do have to reset accounts on a regular basis.
-
-**Security issues:**
-
-* Generate access tokens, IDs, and magic-link tokens with a cryptographically secure RNG (`crypto/rand`) instead of a clock-seeded PRNG
-
-**Features:**
-
-* Add password reset via emailed magic link, with a "Forgot password" link on the login page and a `ntfy user reset-pass` CLI command for admins
-* Rework email verification to use durable, single-use, expiring magic links instead of in-memory 6-digit codes, and add a "primary" email (used for account recovery and as the `X-Email: yes` target) with verified/unverified state in the account UI
-* You can now clear/read messages and delete messages with a GET request ([#1771](https://github.com/binwiederhier/ntfy/issues/1771), thanks to [@lemmi](https://github.com/lemmi) for reporting and to [@wunter8](https://github.com/wunter8) for implementing)
-* Add a reload button to the web app's action bar when running as an installed PWA, which clears the service worker caches and hard-refreshes the app ([#1281](https://github.com/binwiederhier/ntfy/issues/1281), thanks to [@leanza](https://github.com/leanza) for reporting)
-* Add a "Back to app" link to the web app's login, signup, and password-reset pages (alongside the existing links), which previously had no way back to the app
-
-**Bug fixes + maintenance:**
-
-* `X-Email: yes` (also `true`/`1`) now sends to your primary verified email regardless of the `smtp-sender-verify` setting (previously it was rejected unless verification was enabled); it requires being logged in with a verified address
-* Grant users full access to their own sync topic (`st_...`) so cross-device subscription sync works under `auth-default-access: deny-all` ([#733](https://github.com/binwiederhier/ntfy/issues/733), [#1795](https://github.com/binwiederhier/ntfy/pull/1795), thanks to [@lmorchard](https://github.com/lmorchard) for the contribution)
-* Support HTTP (non-TLS) S3-compatible endpoints by preserving the endpoint scheme, e.g. for a local MinIO instance ([#1794](https://github.com/binwiederhier/ntfy/pull/1794), [#1734](https://github.com/binwiederhier/ntfy/issues/1734), thanks to [@sskender](https://github.com/sskender) for the contribution, and [@Kernald](https://github.com/Kernald) for reporting)
-* Stop silently stripping spaces from passwords while typing in the web app's login, signup, and password-reset forms ([#1246](https://github.com/binwiederhier/ntfy/issues/1246), thanks to [@aldem](https://github.com/aldem) for reporting)
-* Update web app dependencies, including major-version upgrades to Vite (6 -> 8, now Rolldown-based), Material UI (5 -> 9), and Dexie (3 -> 4) ([#1800](https://github.com/binwiederhier/ntfy/pull/1800), [#1764](https://github.com/binwiederhier/ntfy/pull/1764), [#1767](https://github.com/binwiederhier/ntfy/pull/1767), [#1762](https://github.com/binwiederhier/ntfy/pull/1762), [#1766](https://github.com/binwiederhier/ntfy/pull/1766), [#1765](https://github.com/binwiederhier/ntfy/pull/1765), thanks Dependabot)
-* Play notification sounds in the web app even when the Notification API is unavailable, e.g. over plain HTTP or in browsers without notification support ([#1772](https://github.com/binwiederhier/ntfy/pull/1772), thanks to [@mitya12342](https://github.com/mitya12342) for the contribution)
-* Stop escaping `<`, `>`, and `&` as `\u003c`/`\u003e`/`\u0026` in JSON responses ([#1511](https://github.com/binwiederhier/ntfy/issues/1511), [#1512](https://github.com/binwiederhier/ntfy/pull/1512), thanks to [@wunter8](https://github.com/wunter8) for the contribution)
-* Fix the web app navbar not reflecting a topic reservation (lock icon, and "Reserve topic" -> "Change reservation"/"Remove reservation" menu) until a page reload, by persisting reservation and display-name changes onto already-subscribed topics during account sync
-* Reduce the web app's initial bundle size by ~300 KB (~50 KB gzipped) by lazy-loading the emoji picker dataset and the Markdown renderer, and by importing Material UI icons individually
-
-## ntfy server v2.24.0
-Released June 4, 2026
-
-The main feature for this release is an in-memory ACL cache (`auth-access-cache`) that can help bring down the read load
-on the production database. The topic authorization queries are consistently the highest ranking queries on the database,
-so this will help quite a bit. The current database load is quite low, but I'm expecting it to increase as more users join
-and use ntfy.
-
-**Security issues:**
-
-* Fix case-insensitive ACL topic matching on SQLite: an access control rule for `secret` no longer also matches a request for `SECRET`. SQLite's `LIKE` is case-insensitive for ASCII by default. PostgreSQL was unaffected. It's honestly incredible that this issue remained undetected for so long, especially while ntfy.sh was running on SQLite (it now runs on PostgreSQL).
-
-**Features:**
-
-* Add opt-in in-memory ACL cache (`auth-access-cache`) that serves topic authorization without a database round-trip; off by default, intended for high-volume servers
-* Add `ntfy --version` flag to the CLI ([#1722](https://github.com/binwiederhier/ntfy/issues/1722), [#1748](https://github.com/binwiederhier/ntfy/pull/1748), thanks to [@sskender](https://github.com/sskender) for the contribution, and [@Saucy9607](https://github.com/Saucy9607) for reporting)
-
-**Bug fixes + maintenance:**
-
-* Extend account token automatically from the PWA service worker, so installed PWAs don't get logged out ([#1669](https://github.com/binwiederhier/ntfy/pull/1669), [#1203](https://github.com/binwiederhier/ntfy/issues/1203), [#1533](https://github.com/binwiederhier/ntfy/issues/1533), thanks to [@nihalgonsalves](https://github.com/nihalgonsalves) for the contribution)
-* Fix `rel` attribute on auto-linked notification URLs so `noreferrer`/`noopener` are actually applied ([#1720](https://github.com/binwiederhier/ntfy/pull/1720), thanks to [@dmitrylyzo](https://github.com/dmitrylyzo) for the contribution)
-* Add systemd sandboxing/hardening to the `ntfy.service` unit ([#1467](https://github.com/binwiederhier/ntfy/pull/1467), thanks to [@Velocifyer](https://github.com/Velocifyer) for the contribution)
-* Fix `cmd` package build on macOS (darwin) so the server compiles from source ([#1631](https://github.com/binwiederhier/ntfy/issues/1631), [#1696](https://github.com/binwiederhier/ntfy/pull/1696), thanks to [@ShipItAndPray](https://github.com/ShipItAndPray) for the contribution, and [@XYenon](https://github.com/XYenon) for reporting)
-
-## ntfy iOS app v1.7.0
-Released May 30, 2026
-
-This release brings **image and attachment support** to the iOS app, finally closing one of the longest-standing iOS
-feature gaps. Images sent via the `Attach` header (or as a PUT body) are now previewed inline in the notification banner
-and inside the app, and other attachments can be downloaded, previewed via Quick Look, and shared from the notification
-row. There's also a new "Download attachments" setting to control auto-download by size.
-
-**Features:**
-
-* Show image previews in notifications and inline in the notification list, with tap-to-zoom Quick Look preview and share sheet ([ntfy-ios#40](https://github.com/binwiederhier/ntfy-ios/pull/40), [#276](https://github.com/binwiederhier/ntfy/issues/276), [#1226](https://github.com/binwiederhier/ntfy/issues/1226), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Download non-image attachments on demand with progress indication, persist them locally, and reuse files already fetched by the notification service extension ([ntfy-ios#40](https://github.com/binwiederhier/ntfy-ios/pull/40), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Add "Download attachments" setting with size thresholds (Never, Under 100 KB / 500 KB / 1 MB / 5 MB / 10 MB / 50 MB, Always) to control automatic attachment downloads ([ntfy-ios#40](https://github.com/binwiederhier/ntfy-ios/pull/40), thanks to [@am7590](https://github.com/am7590) for the contribution)
-
-**Bug fixes + maintenance:**
-
-* Improve background download reliability so attachments continue downloading when the app is suspended ([ntfy-ios#40](https://github.com/binwiederhier/ntfy-ios/pull/40), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Reorganize notification and subscription views into their own folders and split out `NotificationRowView` for readability ([ntfy-ios#40](https://github.com/binwiederhier/ntfy-ios/pull/40), thanks to [@am7590](https://github.com/am7590) for the contribution)
-
-## ntfy server v2.23.0
-Released May 17, 2026
-
-**Features:**
-
-* Add per-visitor rate limit on new topic creations (`visitor-topic-creation-limit-burst` / `visitor-topic-creation-limit-replenish`, defaults 100 burst / 1m replenish) to mitigate topic-enumeration / squatting attacks that inflate the in-memory topic map
-
-**Bug fixes + maintenance:**
-
-* Remove `stacktrace-js`, `stacktrace-gps`, `humanize-duration`, and `js-base64` from the web app to reduce dependency and security footprint
-* Restrict the publish dialog's local file preview to safe image types (png/jpg/gif/webp) to prevent same-origin script execution from blob URLs when previewing a crafted SVG ([GHSA-j8hr-p342-xrmh](https://github.com/binwiederhier/ntfy/security/advisories/GHSA-j8hr-p342-xrmh), thanks to [@Venukamatchi](https://github.com/Venukamatchi) for reporting)
-
-## ntfy iOS app v1.6.0
-Released May 12, 2026
-
-**Bug fixes + maintenance:**
-
-* Fix crash in iOS v1.5.1 ([#1736](https://github.com/binwiederhier/ntfy/issues/1736), thanks to [@russ-who](https://github.com/russ-who) for reporting and [@am7590](https://github.com/am7590) for fixing)
-
-**Features:**
-
-* Tap a notification to open its click URL, or copy the message text if no click URL is set; inline URLs in message text are now tappable as well ([ntfy-ios#37](https://github.com/binwiederhier/ntfy-ios/pull/37), thanks to [@am7590](https://github.com/am7590) for the contribution)
-
-## ntfy iOS app v1.5.1
-Released April 27, 2026
-
-This release continues the iOS stability push from v1.4.1, with improved background polling reliability, better error
-handling and logging, and a few small UI fixes. The minimum supported iOS version is now iOS 15.
-
-**Features:**
-
-* Bump minimum iOS version to iOS 15 ([ntfy-ios#36](https://github.com/binwiederhier/ntfy-ios/pull/36), thanks to [@am7590](https://github.com/am7590) for the contribution)
-
-**Bug fixes + maintenance:**
-
-* Improve background poll reliability by waiting for polls to finish before calling the fetch completion handler, and saving notifications on the Core Data context queue ([ntfy-ios#34](https://github.com/binwiederhier/ntfy-ios/pull/34), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Make `poll_request` parsing more tolerant and surface concrete poll errors instead of failing silently ([ntfy-ios#34](https://github.com/binwiederhier/ntfy-ios/pull/34), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Poll subscriptions when the subscribed topics list appears, for more reactive updates ([ntfy-ios#34](https://github.com/binwiederhier/ntfy-ios/pull/34), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Fix bug where tapping "Add user" a second time would briefly open and then dismiss the add user view ([ntfy-ios#35](https://github.com/binwiederhier/ntfy-ios/pull/35), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Split `SettingsView` into separate files to improve readability ([ntfy-ios#35](https://github.com/binwiederhier/ntfy-ios/pull/35), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Add Firebase subscribe/unsubscribe logging to aid debugging ([ntfy-ios#34](https://github.com/binwiederhier/ntfy-ios/pull/34), thanks to [@am7590](https://github.com/am7590) for the contribution)
-
-## ntfy server v2.22.0
-Released April 21, 2026
-
-**Bug fixes + maintenance:**
-
-* Tighten web push endpoint allow-list regex to prevent SSRF via unanchored pattern matching ([GHSA-w9hq-5jg7-q4j7](https://github.com/binwiederhier/ntfy/security/advisories/GHSA-w9hq-5jg7-q4j7), thanks to [@MightyNawaf](https://github.com/MightyNawaf) for reporting)
-* Fix web app not allowing access tokens to be changed to never expire ([#1693](https://github.com/binwiederhier/ntfy/issues/1693)/[#1694](https://github.com/binwiederhier/ntfy/pull/1694), thanks to [@lastsamurai26](https://github.com/lastsamurai26) for reporting and to [@ShipItAndPray](https://github.com/ShipItAndPray) for fixing)
-* Fix web app crashing on account page for tokens without a last access time ([#1651](https://github.com/binwiederhier/ntfy/issues/1651), [#1684](https://github.com/binwiederhier/ntfy/issues/1684), thanks to [@Pulsar7](https://github.com/Pulsar7) and [@rzhli](https://github.com/rzhli) for reporting)
-
-## ntfy iOS app v1.4.1
-Released April 14, 2026
-
-This is the first iOS release in 3 years, focusing on stability fixes as per the [iOS improvement plan](https://github.com/binwiederhier/ntfy/issues/1680).
-
-**Bug fixes + maintenance:**
-
-* Fix crash when deleting notifications ([ntfy-ios#33](https://github.com/binwiederhier/ntfy-ios/pull/33), [#1642](https://github.com/binwiederhier/ntfy/issues/1642), [#377](https://github.com/binwiederhier/ntfy/issues/377), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Fix topic normalization for base URLs and refresh list after sending test notification ([ntfy-ios#32](https://github.com/binwiederhier/ntfy-ios/pull/32), [#337](https://github.com/binwiederhier/ntfy/issues/337), thanks to [@am7590](https://github.com/am7590) for the contribution)
-
-## ntfy server v2.21.0
-Released March 30, 2026
-
-This release adds the ability to verify email addresses using the `smtp-sender-verify` flag. This is a change that is
-required because ntfy.sh was used to send unsolicited emails and the AWS SES account was suspended. Going forward,
-ntfy.sh won't be able to send emails unless the email address was verified ahead of time.
-
-**Features:**
-
-* Add verified email recipients feature with `smtp-sender-verify` config flag, allowing server admins to require email
-  address verification before sending email notifications ([#1681](https://github.com/binwiederhier/ntfy/pull/1681))
-
-## ntfy server v2.20.1
-Released March 27, 2026
-
-This is a small bugfix release that only affects high volume S3 backends that struggle with HTTP/2.
-
-**Bug fixes + maintenance:**
-
-* [Attachments](config.md#attachments): Add `disable_http2=true` S3 URL option to work around HTTP/2 stream errors with DigitalOcean Spaces and other S3-compatible providers ([#1678](https://github.com/binwiederhier/ntfy/issues/1678)/[#1679](https://github.com/binwiederhier/ntfy/pull/1679))
-
-## ntfy server v2.20.0
-Released March 26, 2026
-
-This release is another step towards making it possible to help scale ntfy up and out 🔥! With this release, you can store
-attachments in an S3-compatible object store as an alterative to the directory. See [attachment store](config.md#attachments)
-for details.
-
-!!! warning
-    With this release, ntfy will take full control over the attachment directory or S3 bucket. Files/objects in the configured `attachment-cache-dir`
-    that match the message ID format (12 chars, matching `^[A-Za-z0-9]{12}$`), and have no entries in the message database will be deleted.
-    **Do not use a directory or S3 bucket as `attachment-cache-dir` that is also used for something else.**
-
-    This is a small behavioral change that was necessary because the old logic often left attachments behind and would not clean them
-    up. Unless you have re-used the attachment directory for anything else (which is hopefully never done), this should not affect
-    you at all.
-
-**Features:**
-
-* Add S3-compatible object storage as an alternative [attachment store](config.md#attachments) via `attachment-cache-dir` config option ([#1656](https://github.com/binwiederhier/ntfy/pull/1656)/[#1672](https://github.com/binwiederhier/ntfy/pull/1672))
-
-**Bug fixes + maintenance:**
-
-* Reject invalid e-mail addresses (e.g. multiple comma-separated recipients) with HTTP 400
-* Add OpenRC init service file ([#1650](https://github.com/binwiederhier/ntfy/pull/1650), thanks to [@ageru](https://github.com/ageru) for the contribution)
-
-## ntfy server v2.19.2
-Released March 16, 2026
-
-This is another small bugfix release for PostgreSQL, avoiding races between primary and read replica, as well as to
-further reduce primary load.
-
-**Bug fixes + maintenance:**
-
-* Fix race condition in web push subscription causing FK constraint violation when concurrent requests hit the same endpoint
-* Route authorization query to read-only database replica to reduce primary database load
-
-## ntfy server v2.19.1
-Released March 15, 2026
-
-This is a bugfix release to avoid PostgreSQL insert failures due to invalid UTF-8 messages. It also fixes `database-url`
-validation incorrectly rejecting `postgresql://` connection strings.
-
-**Bug fixes + maintenance:**
-
-* Fix invalid UTF-8 in HTTP headers (e.g. Latin-1 encoded text) causing PostgreSQL insert failures and dropping entire message batches
-* Fix `database-url` validation rejecting `postgresql://` connection strings ([#1657](https://github.com/binwiederhier/ntfy/issues/1657)/[#1658](https://github.com/binwiederhier/ntfy/pull/1658))
-
-## ntfy server v2.19.0
-Released March 15, 2026
-
-This is a fast-follow release that enables Postgres read replica support.
-
-To offload read-heavy queries from the primary database, you can optionally configure one or more read replicas
-using the `database-replica-urls` option. When configured, non-critical read-only queries (e.g. fetching messages, 
-checking access permissions, etc) are distributed across the replicas using round-robin, while all writes and
-correctness-critical reads continue to go to the primary. If a replica becomes unhealthy, ntfy automatically falls back
-to the primary until the replica recovers.
-
-**Features:**
-
-* Support [PostgreSQL read replicas](config.md#postgresql) for offloading non-critical read queries via `database-replica-urls` config option ([#1648](https://github.com/binwiederhier/ntfy/pull/1648))
-* Add interactive [config generator](config.md#config-generator) to the documentation to help create server configuration files ([#1654](https://github.com/binwiederhier/ntfy/pull/1654))
-
-**Bug fixes + maintenance:**
-
-* Web: Throttle notification sound in web app to play at most once every 2 seconds (similar to [#1550](https://github.com/binwiederhier/ntfy/issues/1550), thanks to [@jlaffaye](https://github.com/jlaffaye) for reporting)
-* Web: Add hover tooltips to icon buttons in web app account and preferences pages ([#1565](https://github.com/binwiederhier/ntfy/issues/1565), thanks to [@jermanuts](https://github.com/jermanuts) for reporting)
-
-## ntfy server v2.18.0
-Released March 7, 2026
-
-This is the biggest release I've ever done on the server. It's 14,997 added lines of code, and 10,202 lines removed, all from
-one [pull request](https://github.com/binwiederhier/ntfy/pull/1619) that adds [PostgreSQL support](config.md#postgresql).
-
-The code was written by Cursor and Claude, but reviewed and heavily tested over 2-3 weeks by me. I created comparison documents,
-went through all queries multiple times and reviewed the logic over and over again. I also did load tests and manual regression tests,
-which took lots of evenings.
-
-I'll not instantly switch ntfy.sh over. Instead, I'm kindly asking the community to test the Postgres support and report back to me
-if things are working (or not working). There is a [one-off migration tool](https://github.com/binwiederhier/ntfy/tree/main/tools/pgimport) (entirely written by AI) that you can use to migrate.
-
-**Features:**
-
-* Add experimental [PostgreSQL support](config.md#postgresql) as an alternative database backend (message cache, user manager, web push subscriptions) via `database-url` config option ([#1114](https://github.com/binwiederhier/ntfy/issues/1114)/[#1619](https://github.com/binwiederhier/ntfy/pull/1619), thanks to [@brettinternet](https://github.com/brettinternet) for reporting)
-
-**Bug fixes + maintenance:**
-
-* Preserve `<br>` line breaks in HTML-only emails received via SMTP ([#690](https://github.com/binwiederhier/ntfy/issues/690), [#1620](https://github.com/binwiederhier/ntfy/pull/1620), thanks to [@uzkikh](https://github.com/uzkikh) for the fix and to [@teastrainer](https://github.com/teastrainer) for reporting)
-
-## ntfy Android v1.24.0
-Released March 5, 2026
-
-This is a tiny release that will revert the "reconnecting ..." behavior of the foreground notification. Lots of people
-have complained about it, so I'm replacing it with a notification that shows up when the server connection has failed
-for >15 minutes, hoping that people will be less annoyed by that.
-
-**Features:**
-
-* Show notification when connection to server has been lost for 15+ minutes, with dismiss, snooze and never-show-again actions
-
-**Bug fixes + maintenance:**
-
-* Fix crash in settings when fragment is detached during backup/restore or log operations
-
-## ntfy Android v1.23.0
-Released February 22, 2026
-
-This release adds support for search within a topic, and adds [copy action](publish.md#copy-to-clipboard) support
-to the Android app.
-
-**Features:**
-
-* Search within a topic ([#141](https://github.com/binwiederhier/ntfy/issues/141), [ntfy-android#153](https://github.com/binwiederhier/ntfy-android/pull/153), thanks to [@Copephobia](https://github.com/Copephobia) and [@StoyanYonkov](https://github.com/StoyanYonkov) for reporting and sponsoring)
-* Add "reconnecting to N topics ..." to foreground notification ([#1101](https://github.com/binwiederhier/ntfy/issues/1101), thanks to [@milosivanovic](https://github.com/milosivanovic) for reporting)
-* Improved default server dialog with full-screen UI and stricter URL validation ([#1582](https://github.com/binwiederhier/ntfy/issues/1582))
-* Show last notification time for UnifiedPush subscriptions ([#1230](https://github.com/binwiederhier/ntfy/issues/1230), [#1454](https://github.com/binwiederhier/ntfy/issues/1454), thanks to [@Tealk](https://github.com/Tealk) and [@user4andre](https://github.com/user4andre) for reporting)
-* Support "copy" action button to copy a value to the clipboard ([#1364](https://github.com/binwiederhier/ntfy/issues/1364), thanks to [@SudoWatson](https://github.com/SudoWatson) for reporting)
-
-**Bug fixes + maintenance:**
-
-* Fix `clear=true` on action buttons not marking notification as read ([#1029](https://github.com/binwiederhier/ntfy/issues/1029), thanks to [@ElFishi](https://github.com/ElFishi) for reporting)
-* Fix crash when default server URL is missing scheme by auto-prepending `https://` ([#1582](https://github.com/binwiederhier/ntfy/issues/1582), thanks to [@hard-zero1](https://github.com/hard-zero1))
-* Fix notification timestamp to use original send time instead of receive time ([#1112](https://github.com/binwiederhier/ntfy/issues/1112), thanks to [@voruti](https://github.com/voruti) for reporting)
-* Fix notifications being missed after service restart by using persisted lastNotificationId ([#1591](https://github.com/binwiederhier/ntfy/issues/1591), thanks to @Epifeny for reporting)
-
-## ntfy server v2.17.0
-Released February 8, 2026
-
-This release adds support for templating in the priority field, a new "copy" action button to copy values to the clipboard,
-a red notification dot on the favicon for unread messages, and an admin-only version endpoint. It also includes several
-crash fixes, web app improvements, and documentation updates.
-
-❤️ If you like ntfy, **please consider sponsoring me** via [GitHub Sponsors](https://github.com/sponsors/binwiederhier), [Liberapay](https://en.liberapay.com/ntfy/), Bitcoin (`1626wjrw3uWk9adyjCfYwafw4sQWujyjn8`), 
-or by buying a [paid plan via the web app](https://ntfy.sh/app). ntfy will always remain open source.
-
-**Features:**
-
-* Server: Support templating in the priority field ([#1426](https://github.com/binwiederhier/ntfy/issues/1426), thanks to [@seantomburke](https://github.com/seantomburke) for reporting)
-* Server: Add admin-only `GET /v1/version` endpoint returning server version, build commit, and date ([#1599](https://github.com/binwiederhier/ntfy/issues/1599), thanks to [@crivchri](https://github.com/crivchri) for reporting)
-* Server/Web: [Support "copy" action](publish.md#copy-to-clipboard) button to copy a value to the clipboard ([#1364](https://github.com/binwiederhier/ntfy/issues/1364), thanks to [@SudoWatson](https://github.com/SudoWatson) for reporting)
-* Web: Show red notification dot on favicon when there are unread messages ([#1017](https://github.com/binwiederhier/ntfy/issues/1017), thanks to [@ad-si](https://github.com/ad-si) for reporting)
-
-**Bug fixes + maintenance:**
-
-* Server: Fix crash when commit string is shorter than 7 characters in non-GitHub-Action builds ([#1493](https://github.com/binwiederhier/ntfy/issues/1493), thanks to [@cyrinux](https://github.com/cyrinux) for reporting)
-* Server: Fix server crash (nil pointer panic) when subscriber disconnects during publish ([#1598](https://github.com/binwiederhier/ntfy/pull/1598))
-* Server: Fix log spam from `http: response.WriteHeader on hijacked connection` for WebSocket errors ([#1362](https://github.com/binwiederhier/ntfy/issues/1362), thanks to [@bonfiresh](https://github.com/bonfiresh) for reporting)
-* Server: Use `slices.Contains` from stdlib to simplify code ([#1406](https://github.com/binwiederhier/ntfy/pull/1406), thanks to [@tanhuaan](https://github.com/tanhuaan))
-* Web: Fix `clear=true` on action buttons not clearing the notification ([#1029](https://github.com/binwiederhier/ntfy/issues/1029), thanks to [@ElFishi](https://github.com/ElFishi) for reporting)
-* Web: Fix Markdown message line height to match plain text (1.5 instead of 1.2) ([#1139](https://github.com/binwiederhier/ntfy/issues/1139), thanks to [@etfz](https://github.com/etfz) for reporting)
-* Web: Fix long lines (e.g. JSON) being truncated by adding horizontal scroll ([#1363](https://github.com/binwiederhier/ntfy/issues/1363), thanks to [@v3DJG6GL](https://github.com/v3DJG6GL) for reporting)
-* Web: Fix Windows notification icon being cut off ([#884](https://github.com/binwiederhier/ntfy/issues/884), thanks to [@ZhangTianrong](https://github.com/ZhangTianrong) for reporting)
-* Web: Use full URL in curl example on empty topic pages ([#1435](https://github.com/binwiederhier/ntfy/issues/1435), [#1535](https://github.com/binwiederhier/ntfy/pull/1535), thanks to [@elmatadoor](https://github.com/elmatadoor) for reporting and [@jjasghar](https://github.com/jjasghar) for the PR)
-* Web: Add validation feedback for service URL when adding user ([#1566](https://github.com/binwiederhier/ntfy/issues/1566), thanks to [@jermanuts](https://github.com/jermanuts))
-* Docs: Remove obsolete `version` field from docker-compose examples ([#1333](https://github.com/binwiederhier/ntfy/issues/1333), thanks to [@seals187](https://github.com/seals187) for reporting and [@cyb3rko](https://github.com/cyb3rko) for fixing)
-* Docs: Fix Kustomize config in installation docs ([#1367](https://github.com/binwiederhier/ntfy/issues/1367), thanks to [@toby-griffiths](https://github.com/toby-griffiths))
-* Docs: Use SVG F-Droid badge and add app store badges to README ([#1170](https://github.com/binwiederhier/ntfy/issues/1170), thanks to [@PanderMusubi](https://github.com/PanderMusubi) for reporting)
-
-## ntfy Android app v1.22.2
-Released January 20, 2026
-
-This release adds support for [updating and deleting notifications](publish.md#updating-deleting-notifications) (requires server v2.16.0),
-as well as [certificate management for self-signed certs and mTLS client certificates](subscribe/phone.md#manage-certificates),
-and a new connection error dialog to help [troubleshoot connection issues](subscribe/phone.md#troubleshooting).
-
-<div id="v1221-screenshots-1" class="screenshots">
-    <a href="../../static/img/android-screenshot-notification-update-1.png"><img src="../../static/img/android-screenshot-notification-update-1.png"/></a>
-    <a href="../../static/img/android-screenshot-notification-update-2.png"><img src="../../static/img/android-screenshot-notification-update-2.png"/></a>
-</div>
-
-<div id="v1221-screenshots-2" class="screenshots">
-    <a href="../../static/img/android-screenshot-certs-warning-dialog.jpg"><img src="../../static/img/android-screenshot-certs-warning-dialog.jpg"/></a>
-    <a href="../../static/img/android-screenshot-certs-manage.jpg"><img src="../../static/img/android-screenshot-certs-manage.jpg"/></a>
-    <a href="../../static/img/android-screenshot-connection-error-dialog.jpg"><img src="../../static/img/android-screenshot-connection-error-dialog.jpg"/></a>
-</div>
-
-**Features:**
-
-* Support for [updating and deleting notifications](publish.md#updating-deleting-notifications)
-  ([#303](https://github.com/binwiederhier/ntfy/issues/303), [#1536](https://github.com/binwiederhier/ntfy/pull/1536),
-  [ntfy-android#151](https://github.com/binwiederhier/ntfy-android/pull/151), thanks to [@wunter8](https://github.com/wunter8)
-  for the initial implementation)
-* Support for self-signed certs and client certs for mTLS ([#215](https://github.com/binwiederhier/ntfy/issues/215),
-  [#530](https://github.com/binwiederhier/ntfy/issues/530), [ntfy-android#149](https://github.com/binwiederhier/ntfy-android/pull/149),
-  thanks to [@cyb3rko](https://github.com/cyb3rko) for reviewing)
-* Connection error dialog to help diagnose connection issues
-
-**Bug fixes + maintenance:**
-
-* Use server-specific user for attachment downloads ([#1529](https://github.com/binwiederhier/ntfy/issues/1529),
-  thanks to [@ManInDark](https://github.com/ManInDark) for reporting and testing)
-* Fix crash in sharing dialog (thanks to [@rogeliodh](https://github.com/rogeliodh))
-* Fix crash when exiting multi-delete in detail view
-* Fix potential crashes with icon downloader and backuper
-
-## ntfy server v2.16.0
-Released January 19, 2026
-
-This release adds support for updating and deleting notifications, heartbeat-style / dead man's switch notifications,
-custom Twilio call formats, and makes `ntfy serve` work on Windows. It also adds a "New version available" banner to the web app.
-
-This one is very exciting, as it brings a lot of highly requested features to ntfy.
-
-**Features:**
-
-* Support for [updating and deleting notifications](publish.md#updating-deleting-notifications) ([#303](https://github.com/binwiederhier/ntfy/issues/303), [#1536](https://github.com/binwiederhier/ntfy/pull/1536),
-  [ntfy-android#151](https://github.com/binwiederhier/ntfy-android/pull/151), thanks to [@wunter8](https://github.com/wunter8) for the initial implementation)
-* Support for heartbeat-style / [dead man's switch](https://en.wikipedia.org/wiki/Dead_man%27s_switch) notifications aka
-  [updating and deleting scheduled notifications](publish.md#scheduled-delivery) ([#1556](https://github.com/binwiederhier/ntfy/pull/1556),
-  [#1142](https://github.com/binwiederhier/ntfy/pull/1142), [#954](https://github.com/binwiederhier/ntfy/issues/954),
-  thanks to [@GamerGirlandCo](https://github.com/GamerGirlandCo) for the initial implementation)
-* Configure [custom Twilio call format](config.md#phone-calls) for phone calls ([#1289](https://github.com/binwiederhier/ntfy/pull/1289), thanks to [@mmichaa](https://github.com/mmichaa) for the initial implementation)
-* `ntfy serve` now works on Windows, including support for running it as a Windows service ([#1104](https://github.com/binwiederhier/ntfy/issues/1104),
-  [#1552](https://github.com/binwiederhier/ntfy/pull/1552), originally [#1328](https://github.com/binwiederhier/ntfy/pull/1328),
-  thanks to [@wtf911](https://github.com/wtf911))
-* Web app: "New version available" banner ([#1554](https://github.com/binwiederhier/ntfy/pull/1554))
-
-## ntfy Android app v1.21.1
-Released January 6, 2026
-
-This is the first feature release in a long time. After all the SDK updates, fixes to comply with the Google Play policies
-and the framework updates, this release ships a lot of highly requested features: Sending messages through the app (WhatsApp-style),
-support for passing headers to your proxy, an in-app language switcher, and more.
-
-<div id="v1211-screenshots" class="screenshots">
-    <a href="../../static/img/android-screenshot-publish-message-bar.jpg"><img src="../../static/img/android-screenshot-publish-message-bar.jpg"/></a>
-    <a href="../../static/img/android-screenshot-publish-dialog.jpg"><img src="../../static/img/android-screenshot-publish-dialog.jpg"/></a>
-    <a href="../../static/img/android-screenshot-custom-headers.jpg"><img src="../../static/img/android-screenshot-custom-headers.jpg"/></a>
-    <a href="../../static/img/android-screenshot-language-selection.jpg"><img src="../../static/img/android-screenshot-language-selection.jpg"/></a>
-</div>
-
-If you are waiting for a feature, please 👍 the corresponding [GitHub issue](https://github.com/binwiederhier/ntfy/issues?q=is%3Aissue%20state%3Aopen%20sort%3Areactions-%2B1-desc).
-If you like ntfy, please consider purchasing [ntfy Pro](https://ntfy.sh/app) to support us.
-
-**Features:**
-
-* Allow publishing messages through the message bar and publish dialog ([#98](https://github.com/binwiederhier/ntfy/issues/98), [ntfy-android#144](https://github.com/binwiederhier/ntfy-android/pull/144))
-* Define custom HTTP headers to support authenticated proxies, tunnels and SSO ([ntfy-android#116](https://github.com/binwiederhier/ntfy-android/issues/116), [#1018](https://github.com/binwiederhier/ntfy/issues/1018), [ntfy-android#132](https://github.com/binwiederhier/ntfy-android/pull/132), [ntfy-android#146](https://github.com/binwiederhier/ntfy-android/pull/146), thanks to [@CrazyWolf13](https://github.com/CrazyWolf13))
-* Implement UnifiedPush "raise to foreground" requirement ([ntfy-android#98](https://github.com/binwiederhier/ntfy-android/pull/98), [ntfy-android#148](https://github.com/binwiederhier/ntfy-android/pull/148), thanks to [@p1gp1g](https://github.com/p1gp1g))
-* Language selector to allow overriding the system language ([#1508](https://github.com/binwiederhier/ntfy/issues/1508), [ntfy-android#145](https://github.com/binwiederhier/ntfy-android/pull/145), thanks to [@hudsonm62](https://github.com/hudsonm62) for reporting)
-* Highlight phone numbers and email addresses in notifications ([#957](https://github.com/binwiederhier/ntfy/issues/957), [ntfy-android#71](https://github.com/binwiederhier/ntfy-android/pull/71), thanks to [@brennenputh](https://github.com/brennenputh), and [@XylenSky](https://github.com/XylenSky) for reporting)
-* Support for port and display name in [ntfy://](subscribe/phone.md#ntfy-links) links ([ntfy-android#130](https://github.com/binwiederhier/ntfy-android/pull/130), thanks to [@godovski](https://github.com/godovski))
-
-**Bug fixes + maintenance:**
-
-* Add support for (technically incorrect) 'image/jpg' MIME type ([ntfy-android#142](https://github.com/binwiederhier/ntfy-android/pull/142), thanks to [@Murilobeluco](https://github.com/Murilobeluco))
-* Unify "copy to clipboard" notifications, use Android 13 style ([ntfy-android#61](https://github.com/binwiederhier/ntfy-android/pull/61), thanks to [@thgoebel](https://github.com/thgoebel))
-* Fix crash in user add dialog (onAddUser)
-* Fix ForegroundServiceDidNotStartInTimeException (attempt 2, see [#1520](https://github.com/binwiederhier/ntfy/issues/1520))
-* Hide "Exact alarms" setting if battery optimization exemption has been granted ([#1456](https://github.com/binwiederhier/ntfy/issues/1456), thanks for reporting [@HappyLer](https://github.com/HappyLer))
-
 ## ntfy Android app v1.20.0
 Released December 28, 2025
 
@@ -2078,15 +1572,18 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
 
 ## Not released yet
 
-### ntfy iOS app v1.8.0 (UNRELEASED)
+### ntfy Android app v1.21.x
 
 **Features:**
 
-* Deliver priority 5 (max/urgent) notifications as critical alerts that bypass silent mode and Do Not Disturb ([ntfy-ios#44](https://github.com/binwiederhier/ntfy-ios/pull/44), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Apply the attachment auto-download size setting to all attachment types, not just images ([ntfy-ios#43](https://github.com/binwiederhier/ntfy-ios/pull/43), thanks to [@am7590](https://github.com/am7590) for the contribution)
+* Allow publishing messages through the message bar and publish dialog ([#98](https://github.com/binwiederhier/ntfy/issues/98), [ntfy-android#144](https://github.com/binwiederhier/ntfy-android/pull/144))
+* Define custom HTTP headers to support authenticated proxies, tunnels and SSO ([ntfy-android#116](https://github.com/binwiederhier/ntfy-android/issues/116), [#1018](https://github.com/binwiederhier/ntfy/issues/1018), [ntfy-android#132](https://github.com/binwiederhier/ntfy-android/pull/132), [ntfy-android#146](https://github.com/binwiederhier/ntfy-android/pull/146), thanks to [@CrazyWolf13](https://github.com/CrazyWolf13))
+* Implement UnifiedPush "raise to foreground" requirement ([ntfy-android#98](https://github.com/binwiederhier/ntfy-android/pull/98), [ntfy-android#148](https://github.com/binwiederhier/ntfy-android/pull/148), thanks to [@p1gp1g](https://github.com/p1gp1g))
+* Language selector to allow overriding the system language ([#1508](https://github.com/binwiederhier/ntfy/issues/1508), [ntfy-android#145](https://github.com/binwiederhier/ntfy-android/pull/145), thanks to [@hudsonm62](https://github.com/hudsonm62) for reporting)
+* Highlight phone numbers and email addresses in notifications ([#957](https://github.com/binwiederhier/ntfy/issues/957), [ntfy-android#71](https://github.com/binwiederhier/ntfy-android/pull/71), thanks to [@brennenputh](https://github.com/brennenputh), and [@XylenSky](https://github.com/XylenSky) for reporting)
+* Support for port and display name in [ntfy://](subscribe/phone.md#ntfy-links) links ([ntfy-android#130](https://github.com/binwiederhier/ntfy-android/pull/130), thanks to [@godovski](https://github.com/godovski))
 
 **Bug fixes + maintenance:**
 
-* Restore the native swipe-to-go-back gesture in the topic detail view ([ntfy-ios#45](https://github.com/binwiederhier/ntfy-ios/pull/45), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Fix saved attachments being left "in use" so they couldn't be deleted in the Files app ([ntfy-ios#43](https://github.com/binwiederhier/ntfy-ios/pull/43), thanks to [@am7590](https://github.com/am7590) for the contribution)
-* Improve poll request subscription matching for protected topics so notifications resolve to the real message content, with better logging ([ntfy-ios#43](https://github.com/binwiederhier/ntfy-ios/pull/43), thanks to [@am7590](https://github.com/am7590) for the contribution)
+* Add support for (technically incorrect) 'image/jpg' MIME type ([ntfy-android#142](https://github.com/binwiederhier/ntfy-android/pull/142), thanks to [@Murilobeluco](https://github.com/Murilobeluco))
+* Unify "copy to clipboard" notifications, use Android 13 style ([ntfy-android#61](https://github.com/binwiederhier/ntfy-android/pull/61), thanks to [@thgoebel](https://github.com/thgoebel))

docs/static/css/config-generator.css

@@ -1,853 +0,0 @@
-/* Config Generator */
-
-/* Hidden utility */
-.cg-hidden {
-    display: none !important;
-}
-
-/* Open button */
-.cg-open-btn {
-    display: inline-block;
-    padding: 8px 20px;
-    background: var(--md-primary-fg-color);
-    color: #fff;
-    border: none;
-    border-radius: 4px;
-    font-size: 0.85rem;
-    font-weight: 500;
-    cursor: pointer;
-    font-family: inherit;
-    transition: opacity 0.15s;
-}
-
-.cg-open-btn:hover {
-    opacity: 0.85;
-}
-
-/* Modal overlay */
-.cg-modal {
-    position: fixed;
-    inset: 0;
-    z-index: 1000;
-}
-
-.cg-modal-backdrop {
-    position: absolute;
-    inset: 0;
-    background: rgba(0, 0, 0, 0.5);
-}
-
-.cg-modal-dialog {
-    position: absolute;
-    inset: 24px;
-    display: flex;
-    flex-direction: column;
-    background: #fff;
-    border-radius: 10px;
-    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.25);
-    overflow: hidden;
-    font-size: 0.78rem;
-}
-
-.cg-modal-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 12px 20px;
-    border-bottom: 1px solid #ddd;
-    flex-shrink: 0;
-}
-
-.cg-modal-header-left {
-    display: flex;
-    align-items: baseline;
-    gap: 12px;
-    min-width: 0;
-}
-
-.cg-modal-title {
-    font-weight: 600;
-    font-size: 0.95rem;
-    white-space: nowrap;
-}
-
-.cg-badge-beta {
-    display: inline-block;
-    padding: 1px 8px;
-    margin-left: 8px;
-    background: var(--md-primary-fg-color);
-    color: #fff;
-    font-size: 0.6rem;
-    font-weight: 600;
-    border-radius: 10px;
-    letter-spacing: 0.5px;
-    vertical-align: middle;
-}
-
-.cg-modal-desc {
-    font-size: 0.75rem;
-    color: #888;
-}
-
-.cg-modal-header-actions {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.cg-modal-reset {
-    background: none;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 0.75rem;
-    color: #777;
-    cursor: pointer;
-    padding: 4px 12px;
-    font-family: inherit;
-    transition: color 0.15s, border-color 0.15s;
-}
-
-.cg-modal-reset:hover {
-    color: #333;
-    border-color: #999;
-}
-
-.cg-modal-close {
-    background: none;
-    border: none;
-    font-size: 1.4rem;
-    color: #999;
-    cursor: pointer;
-    padding: 0 4px;
-    line-height: 1;
-}
-
-.cg-modal-close:hover {
-    color: #333;
-}
-
-/* Modal body: left + right */
-.cg-modal-body {
-    display: flex;
-    flex: 1;
-    min-height: 0;
-    overflow: hidden;
-}
-
-/* Left panel */
-#cg-left {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    border-right: 1px solid #ddd;
-    min-width: 0;
-}
-
-.cg-nav {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 0;
-    border-bottom: 1px solid #ddd;
-    flex-shrink: 0;
-    padding: 0 16px;
-}
-
-.cg-nav-tab {
-    padding: 9px 14px;
-    cursor: pointer;
-    font-size: 0.78rem;
-    font-weight: 500;
-    color: #777;
-    border-bottom: 2px solid transparent;
-    margin-bottom: -1px;
-    user-select: none;
-    transition: color 0.15s, border-color 0.15s;
-    white-space: nowrap;
-}
-
-.cg-nav-tab:hover {
-    color: #444;
-}
-
-.cg-nav-tab.active {
-    color: var(--md-primary-fg-color);
-    border-bottom-color: var(--md-primary-fg-color);
-}
-
-.cg-panels {
-    flex: 1;
-    overflow-y: auto;
-    padding: 16px 20px;
-}
-
-.cg-panel {
-    display: none;
-}
-
-.cg-panel.active {
-    display: block;
-}
-
-.cg-panel-desc {
-    font-size: 0.75rem;
-    color: #888;
-    margin-bottom: 12px;
-    line-height: 1.5;
-}
-
-.cg-panel-desc a {
-    color: var(--md-primary-fg-color);
-}
-
-.cg-help {
-    color: var(--md-primary-fg-color);
-    text-decoration: none;
-    margin-left: 4px;
-    vertical-align: middle;
-    flex-shrink: 0;
-    transition: color 0.15s;
-}
-
-.cg-help:hover {
-    color: var(--md-primary-fg-color--dark, #2a6e5f);
-}
-
-/* Right panel */
-#cg-right {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    min-width: 0;
-}
-
-.cg-output-tabs {
-    display: flex;
-    border-bottom: 1px solid #ddd;
-    flex-shrink: 0;
-    padding: 0 16px;
-}
-
-.cg-output-tab {
-    padding: 9px 14px;
-    cursor: pointer;
-    font-size: 0.78rem;
-    font-weight: 500;
-    border-bottom: 2px solid transparent;
-    margin-bottom: -1px;
-    color: #777;
-    transition: color 0.15s, border-color 0.15s;
-    user-select: none;
-    white-space: nowrap;
-}
-
-.cg-output-tab:hover {
-    color: #444;
-}
-
-.cg-output-tab.active {
-    color: var(--md-primary-fg-color);
-    border-bottom-color: var(--md-primary-fg-color);
-}
-
-.cg-btn-copy {
-    margin-left: auto;
-    background: none;
-    color: #777;
-    border: none;
-    border-bottom: 2px solid transparent;
-    margin-bottom: -1px;
-    padding: 9px 10px;
-    cursor: pointer;
-    line-height: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transition: color 0.15s;
-}
-
-.cg-btn-copy:hover {
-    color: #333;
-}
-
-.cg-output-wrap {
-    flex: 1;
-    overflow: auto;
-    padding: 16px 20px;
-    display: flex;
-    flex-direction: column;
-}
-
-.cg-output-wrap pre {
-    margin: 0;
-    padding: 8px 10px;
-    background: #f5f5f5;
-    color: #333;
-    border: 1px solid #ddd;
-    border-radius: 6px;
-    overflow-x: auto;
-    font-size: 0.76rem;
-    line-height: 1.5;
-    flex: 1;
-    white-space: pre;
-}
-
-.cg-empty-msg {
-    color: #888;
-    font-style: italic;
-}
-
-.cg-warning {
-    padding: 6px 10px;
-    margin-top: 8px;
-    background: #fff3cd;
-    color: #856404;
-    border: 1px solid #ffc107;
-    border-radius: 4px;
-    font-size: 0.76rem;
-}
-
-/* Form fields */
-.cg-field {
-    margin-bottom: 0;
-    padding: 8px 12px;
-}
-
-.cg-field:nth-child(odd) {
-    background: #f8f8f8;
-}
-
-.cg-field:nth-child(even) {
-    background: #fff;
-}
-
-.cg-field > label {
-    display: block;
-    font-weight: 500;
-    margin-bottom: 4px;
-    font-size: 0.78rem;
-    color: #555;
-}
-
-.cg-field input[type="text"],
-.cg-field input[type="password"],
-.cg-field select {
-    width: 100%;
-    padding: 6px 8px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 0.78rem;
-    font-family: inherit;
-    box-sizing: border-box;
-    background: #fff;
-}
-
-.cg-field input[type="text"]:focus,
-.cg-field input[type="password"]:focus,
-.cg-field select:focus {
-    border-color: var(--md-primary-fg-color);
-    outline: none;
-    box-shadow: 0 0 0 2px rgba(51, 133, 116, 0.15);
-}
-
-.cg-checkbox {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    margin-bottom: 10px;
-}
-
-.cg-checkbox input[type="checkbox"] {
-    accent-color: var(--md-primary-fg-color);
-}
-
-.cg-checkbox label {
-    font-weight: 500;
-    font-size: 0.78rem;
-    margin: 0;
-    cursor: pointer;
-}
-
-.cg-radio-group {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-}
-
-.cg-radio-group label {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    font-weight: 400;
-    font-size: 0.78rem;
-    cursor: pointer;
-}
-
-.cg-radio-group input[type="radio"] {
-    accent-color: var(--md-primary-fg-color);
-}
-
-/* Inline field: label + control side by side */
-.cg-inline-field {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-}
-
-.cg-inline-field > label {
-    margin-bottom: 0;
-    width: 60%;
-    flex-shrink: 0;
-}
-
-.cg-panel:not(#cg-panel-general) .cg-inline-field > label {
-    width: 50%;
-}
-
-.cg-inline-field > input[type="text"],
-.cg-inline-field > select {
-    padding: 4px 10px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 0.75rem;
-    font-family: inherit;
-    box-sizing: border-box;
-    line-height: 1.4;
-    background: #fff;
-}
-
-.cg-inline-field > input[type="text"]:focus,
-.cg-inline-field > select:focus {
-    border-color: var(--md-primary-fg-color);
-    outline: none;
-    box-shadow: 0 0 0 2px rgba(51, 133, 116, 0.15);
-}
-
-#cg-email-in-section {
-    margin-top: 20px;
-}
-
-.cg-pg-label {
-    font-size: 0.75rem;
-    color: #888;
-    font-style: italic;
-}
-
-/* Button group toggle */
-.cg-btn-group {
-    display: flex;
-    flex-shrink: 0;
-}
-
-.cg-btn-group label {
-    cursor: pointer;
-    margin: 0;
-}
-
-.cg-btn-group input[type="radio"] {
-    display: none;
-}
-
-.cg-btn-group span {
-    display: block;
-    padding: 4px 14px;
-    font-size: 0.75rem;
-    font-weight: 500;
-    line-height: 1.4;
-    border: 1px solid #ccc;
-    color: #555;
-    background: #fff;
-    transition: background 0.15s, color 0.15s, border-color 0.15s;
-    user-select: none;
-}
-
-.cg-btn-group label:first-child span {
-    border-radius: 4px 0 0 4px;
-}
-
-.cg-btn-group label:last-child span {
-    border-radius: 0 4px 4px 0;
-}
-
-.cg-btn-group label + label span {
-    margin-left: -1px;
-}
-
-.cg-btn-group input[type="radio"]:checked + span {
-    background: var(--md-primary-fg-color);
-    color: #fff;
-    border-color: var(--md-primary-fg-color);
-    position: relative;
-    z-index: 1;
-}
-
-.cg-feature-grid {
-    display: flex;
-    flex-direction: column;
-    gap: 5px;
-}
-
-.cg-feature-row {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.cg-feature-grid label {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    font-size: 0.78rem;
-    cursor: pointer;
-}
-
-.cg-feature-grid input[type="checkbox"] {
-    accent-color: var(--md-primary-fg-color);
-}
-
-.cg-btn-configure {
-    background: none;
-    border: 1px solid var(--md-primary-fg-color);
-    border-radius: 10px;
-    color: var(--md-primary-fg-color);
-    font-size: 0.68rem;
-    font-family: inherit;
-    padding: 1px 10px;
-    cursor: pointer;
-    white-space: nowrap;
-    transition: background 0.15s, color 0.15s;
-}
-
-.cg-btn-configure:hover {
-    background: var(--md-primary-fg-color);
-    color: #fff;
-}
-
-/* Repeatable rows */
-.cg-repeatable-row {
-    display: flex;
-    gap: 6px;
-    align-items: center;
-    margin-bottom: 6px;
-    flex-wrap: wrap;
-}
-
-.cg-repeatable-row input,
-.cg-repeatable-row select {
-    flex: 1;
-    min-width: 80px;
-    padding: 5px 6px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 0.75rem;
-    font-family: inherit;
-    box-sizing: border-box;
-}
-
-.cg-repeatable-row input:focus,
-.cg-repeatable-row select:focus {
-    border-color: var(--md-primary-fg-color);
-    outline: none;
-}
-
-.cg-repeatable-row input:disabled,
-.cg-repeatable-row select:disabled {
-    background: #eee;
-    color: #999;
-    cursor: not-allowed;
-}
-
-.cg-btn-remove {
-    background: none;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    cursor: pointer;
-    font-size: 0.9rem;
-    padding: 5px 8px;
-    color: #999;
-    line-height: 1;
-}
-
-.cg-btn-remove:hover {
-    background: #fee;
-    border-color: #c66;
-    color: #c33;
-}
-
-.cg-btn-add {
-    background: none;
-    border: 1px dashed #bbb;
-    border-radius: 4px;
-    cursor: pointer;
-    padding: 5px 10px;
-    font-size: 0.75rem;
-    color: #777;
-    margin-top: 2px;
-}
-
-.cg-btn-add:hover {
-    border-color: var(--md-primary-fg-color);
-    color: var(--md-primary-fg-color);
-}
-
-/* Dark mode */
-body[data-md-color-scheme="slate"] .cg-modal-dialog {
-    background: #1e1e2e;
-}
-
-body[data-md-color-scheme="slate"] .cg-modal-header {
-    border-bottom-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .cg-modal-title {
-    color: #ddd;
-}
-
-body[data-md-color-scheme="slate"] .cg-modal-desc {
-    color: #777;
-}
-
-body[data-md-color-scheme="slate"] .cg-modal-reset {
-    border-color: #555;
-    color: #888;
-}
-
-body[data-md-color-scheme="slate"] .cg-modal-reset:hover {
-    border-color: #888;
-    color: #ddd;
-}
-
-body[data-md-color-scheme="slate"] .cg-modal-close {
-    color: #777;
-}
-
-body[data-md-color-scheme="slate"] .cg-modal-close:hover {
-    color: #ddd;
-}
-
-body[data-md-color-scheme="slate"] #cg-left {
-    border-right-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .cg-nav {
-    border-bottom-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .cg-nav-tab {
-    color: #888;
-}
-
-body[data-md-color-scheme="slate"] .cg-nav-tab:hover {
-    color: #bbb;
-}
-
-body[data-md-color-scheme="slate"] .cg-output-tabs {
-    border-bottom-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .cg-output-tab {
-    color: #888;
-}
-
-body[data-md-color-scheme="slate"] .cg-output-tab:hover {
-    color: #bbb;
-}
-
-body[data-md-color-scheme="slate"] .cg-btn-copy {
-    color: #777;
-}
-
-body[data-md-color-scheme="slate"] .cg-btn-copy:hover {
-    color: #bbb;
-}
-
-body[data-md-color-scheme="slate"] .cg-output-wrap pre {
-    background: #161620;
-    color: #ddd;
-    border-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .cg-field:nth-child(odd) {
-    background: #232334;
-}
-
-body[data-md-color-scheme="slate"] .cg-field:nth-child(even) {
-    background: #1e1e2e;
-}
-
-body[data-md-color-scheme="slate"] .cg-panel-desc {
-    color: #777;
-}
-
-body[data-md-color-scheme="slate"] .cg-field > label {
-    color: #aaa;
-}
-
-body[data-md-color-scheme="slate"] .cg-field input[type="text"],
-body[data-md-color-scheme="slate"] .cg-field input[type="password"],
-body[data-md-color-scheme="slate"] .cg-field select {
-    background: #2a2a3a;
-    border-color: #555;
-    color: #ddd;
-}
-
-body[data-md-color-scheme="slate"] .cg-btn-group span {
-    background: #2a2a3a;
-    border-color: #555;
-    color: #aaa;
-}
-
-body[data-md-color-scheme="slate"] .cg-btn-group input[type="radio"]:checked + span {
-    background: var(--md-primary-fg-color);
-    color: #fff;
-    border-color: var(--md-primary-fg-color);
-}
-
-body[data-md-color-scheme="slate"] .cg-checkbox label {
-    color: #ccc;
-}
-
-body[data-md-color-scheme="slate"] .cg-radio-group label {
-    color: #ccc;
-}
-
-body[data-md-color-scheme="slate"] .cg-feature-grid label {
-    color: #ccc;
-}
-
-body[data-md-color-scheme="slate"] .cg-repeatable-row input,
-body[data-md-color-scheme="slate"] .cg-repeatable-row select {
-    background: #2a2a3a;
-    border-color: #555;
-    color: #ddd;
-}
-
-body[data-md-color-scheme="slate"] .cg-repeatable-row input:disabled,
-body[data-md-color-scheme="slate"] .cg-repeatable-row select:disabled {
-    background: #1a1a28;
-    color: #666;
-}
-
-body[data-md-color-scheme="slate"] .cg-btn-remove {
-    border-color: #555;
-    color: #888;
-}
-
-body[data-md-color-scheme="slate"] .cg-btn-add {
-    border-color: #555;
-    color: #888;
-}
-
-body[data-md-color-scheme="slate"] .cg-warning {
-    background: #3a2e00;
-    color: #ffc107;
-    border-color: #665200;
-}
-
-/* Mobile toggle bar (hidden on desktop) */
-.cg-mobile-toggle {
-    display: none;
-}
-
-/* Responsive */
-@media (max-width: 900px) {
-    .cg-modal-dialog {
-        inset: 0;
-        border-radius: 0;
-    }
-
-    .cg-modal-header {
-        padding: 8px 16px;
-    }
-
-    .cg-modal-title {
-        font-size: 0.85rem;
-    }
-
-    .cg-modal-desc {
-        display: none;
-    }
-
-    .cg-modal-body {
-        flex-direction: column;
-    }
-
-    .cg-mobile-toggle {
-        display: flex;
-        flex-shrink: 0;
-        border-bottom: 1px solid #ddd;
-    }
-
-    .cg-mobile-toggle-btn {
-        flex: 1;
-        padding: 8px 0;
-        border: none;
-        background: #f5f5f5;
-        font-size: 0.78rem;
-        font-weight: 500;
-        font-family: inherit;
-        color: #777;
-        cursor: pointer;
-        transition: background 0.15s, color 0.15s;
-    }
-
-    .cg-mobile-toggle-btn.active {
-        background: #fff;
-        color: var(--md-primary-fg-color);
-        box-shadow: inset 0 -2px 0 var(--md-primary-fg-color);
-    }
-
-    #cg-left {
-        border-right: none;
-        flex: 1;
-        min-height: 0;
-    }
-
-    #cg-right {
-        flex: 1;
-        display: none;
-        min-height: 0;
-    }
-
-    #cg-right.cg-mobile-active {
-        display: flex;
-    }
-
-    #cg-left.cg-mobile-hidden {
-        display: none;
-    }
-
-    .cg-nav {
-        overflow-x: auto;
-        flex-wrap: nowrap;
-        -webkit-overflow-scrolling: touch;
-    }
-
-    .cg-inline-field {
-        flex-direction: column;
-        align-items: stretch;
-        gap: 4px;
-    }
-
-    .cg-inline-field > label {
-        width: 100%;
-    }
-
-    .cg-panel:not(#cg-panel-general) .cg-inline-field > label {
-        width: 100%;
-    }
-}
-
-/* Dark mode mobile toggle */
-body[data-md-color-scheme="slate"] .cg-mobile-toggle {
-    border-bottom-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .cg-mobile-toggle-btn {
-    background: #2a2a3a;
-    color: #888;
-}
-
-body[data-md-color-scheme="slate"] .cg-mobile-toggle-btn.active {
-    background: #1e1e2e;
-    color: var(--md-primary-fg-color);
-}

docs/static/css/extra.css

@@ -1,10 +1,10 @@
 :root > * {
-    --md-primary-fg-color: #338574;
+    --md-primary-fg-color:        #338574;
     --md-primary-fg-color--light: #338574;
-    --md-primary-fg-color--dark: #338574;
-    --md-footer-bg-color: #353744;
-    --md-text-font: "Roboto";
-    --md-code-font: "Roboto Mono";
+    --md-primary-fg-color--dark:  #338574;
+    --md-footer-bg-color:         #353744;
+    --md-text-font:               "Roboto";
+    --md-code-font:               "Roboto Mono";
 }
 
 .md-header__button.md-logo :is(img, svg) {
@@ -34,7 +34,7 @@ figure img, figure video {
 }
 
 header {
-    background: linear-gradient(150deg, rgba(51, 133, 116, 1) 0%, rgba(86, 189, 168, 1) 100%);
+    background: linear-gradient(150deg, rgba(51,133,116,1) 0%, rgba(86,189,168,1) 100%);
 }
 
 body[data-md-color-scheme="default"] header {
@@ -92,8 +92,8 @@ figure video {
 }
 
 .screenshots img {
-    max-height: 350px;
-    max-width: 350px;
+    max-height: 230px;
+    max-width: 300px;
     margin: 3px;
     border-radius: 5px;
     filter: drop-shadow(2px 2px 2px #ddd);
@@ -107,7 +107,7 @@ figure video {
     opacity: 0;
     visibility: hidden;
     position: fixed;
-    left: 0;
+    left:0;
     right: 0;
     top: 0;
     bottom: 0;
@@ -119,7 +119,7 @@ figure video {
 }
 
 .lightbox.show {
-    background-color: rgba(0, 0, 0, 0.75);
+    background-color: rgba(0,0,0, 0.75);
     opacity: 1;
     visibility: visible;
     z-index: 1000;
@@ -214,30 +214,3 @@ figure video {
     font-weight: 400;
     src: url('../fonts/roboto-mono-v22-latin-regular.woff2') format('woff2');
 }
-
-/* Community maintained badge */
-.community-badge {
-    display: inline-flex;
-    align-items: center;
-    gap: 0.35em;
-    background-color: rgba(51, 133, 116, 0.1);
-    border: 1px solid rgba(51, 133, 116, 0.3);
-    border-radius: 0.7em;
-    padding: 0.1em 0.7em;
-    font-size: 0.75rem;
-    color: #338574;
-    margin-top: 0;
-    margin-bottom: 0.5em;
-}
-
-.community-badge svg {
-    width: 1em;
-    height: 1em;
-    fill: currentColor;
-}
-
-body[data-md-color-scheme="slate"] .community-badge {
-    background-color: rgba(86, 189, 168, 0.15);
-    border-color: rgba(86, 189, 168, 0.4);
-    color: #56bda8;
-}

docs/static/css/topic-generator.css

@@ -1,235 +0,0 @@
-/* Topic name generator (Publishing page) */
-/* Styled to mirror the config generator (header + left form / right output panels). */
-
-.tg-generator {
-    margin: 16px 0 24px;
-    border: 1px solid #ddd;
-    border-radius: 10px;
-    background: #fff;
-    overflow: hidden;
-    font-size: 0.78rem;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.06);
-}
-
-/* Header (matches .cg-modal-header) */
-.tg-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 10px 16px;
-    border-bottom: 1px solid #ddd;
-}
-
-.tg-title {
-    font-weight: 600;
-    font-size: 0.9rem;
-}
-
-.tg-reset {
-    background: none;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 0.72rem;
-    color: #777;
-    cursor: pointer;
-    padding: 4px 12px;
-    font-family: inherit;
-    transition: color 0.15s, border-color 0.15s;
-}
-
-.tg-reset:hover {
-    color: #333;
-    border-color: #999;
-}
-
-/* Body: left (form) + right (output), matches .cg-modal-body */
-.tg-body {
-    display: flex;
-    min-height: 0;
-}
-
-.tg-left {
-    flex: 1;
-    border-right: 1px solid #ddd;
-    padding: 16px 18px;
-    min-width: 0;
-}
-
-.tg-right {
-    flex: 1;
-    padding: 16px 18px;
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    min-width: 0;
-}
-
-/* One output per block: label on its own line, then value field + copy button */
-.tg-output-row {
-    display: flex;
-    flex-direction: column;
-    min-width: 0;
-}
-
-.tg-output-line {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    min-width: 0;
-}
-
-/* Form field (matches .cg-field) */
-.tg-field > label {
-    display: block;
-    font-weight: 500;
-    margin-bottom: 4px;
-    font-size: 0.78rem;
-    color: #555;
-}
-
-.tg-field input[type="text"] {
-    width: 100%;
-    padding: 6px 8px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    font-size: 0.78rem;
-    font-family: inherit;
-    box-sizing: border-box;
-    background: #fff;
-}
-
-.tg-field input[type="text"]:focus {
-    border-color: var(--md-primary-fg-color);
-    outline: none;
-    box-shadow: 0 0 0 2px rgba(51, 133, 116, 0.15);
-}
-
-.tg-note {
-    margin-top: 10px;
-    font-size: 0.72rem;
-    color: #999;
-    line-height: 1.5;
-}
-
-.tg-note code {
-    font-size: 0.72rem;
-    padding: 1px 4px;
-}
-
-.tg-output-label {
-    margin-bottom: 4px;
-    white-space: nowrap;
-    font-weight: 500;
-    font-size: 0.78rem;
-    color: #555;
-}
-
-/* Copy button (matches .cg-btn-copy) */
-.tg-btn-copy {
-    background: none;
-    color: #777;
-    border: none;
-    padding: 2px 4px;
-    cursor: pointer;
-    line-height: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transition: color 0.15s;
-}
-
-.tg-btn-copy:hover {
-    color: #333;
-}
-
-/* Output block (matches .cg-output-wrap pre). Scoped under .tg-generator so the margin
-   reset beats the theme's .md-typeset pre rule, which otherwise adds a stray top margin. */
-.tg-generator .tg-output {
-    flex: 1;
-    min-width: 0;
-    margin: 0;
-    padding: 6px 9px;
-    background: #f5f5f5;
-    color: var(--md-default-fg-color);
-    border: 1px solid #ddd;
-    border-radius: 6px;
-    overflow-x: auto;
-    font-family: var(--md-code-font-family, monospace);
-    font-size: 0.72rem;
-    line-height: 1.5;
-    white-space: pre-wrap;
-    word-break: break-all;
-    overflow-wrap: anywhere;
-}
-
-/* Dark mode */
-body[data-md-color-scheme="slate"] .tg-generator {
-    background: #1e1e2e;
-    border-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .tg-header {
-    border-bottom-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .tg-title {
-    color: #ddd;
-}
-
-body[data-md-color-scheme="slate"] .tg-reset {
-    border-color: #555;
-    color: #888;
-}
-
-body[data-md-color-scheme="slate"] .tg-reset:hover {
-    border-color: #888;
-    color: #ddd;
-}
-
-body[data-md-color-scheme="slate"] .tg-left {
-    border-right-color: #444;
-}
-
-body[data-md-color-scheme="slate"] .tg-field > label,
-body[data-md-color-scheme="slate"] .tg-output-label {
-    color: #aaa;
-}
-
-body[data-md-color-scheme="slate"] .tg-btn-copy {
-    color: #888;
-}
-
-body[data-md-color-scheme="slate"] .tg-btn-copy:hover {
-    color: #bbb;
-}
-
-body[data-md-color-scheme="slate"] .tg-field input[type="text"] {
-    background: #2a2a3a;
-    border-color: #555;
-    color: #ddd;
-}
-
-body[data-md-color-scheme="slate"] .tg-note {
-    color: #777;
-}
-
-body[data-md-color-scheme="slate"] .tg-output {
-    background: #161620;
-    border-color: #444;
-}
-
-/* Responsive: stack panels like the config generator does on mobile */
-@media (max-width: 700px) {
-    .tg-body {
-        flex-direction: column;
-    }
-
-    .tg-left {
-        border-right: none;
-        border-bottom: 1px solid #ddd;
-    }
-
-    body[data-md-color-scheme="slate"] .tg-left {
-        border-bottom-color: #444;
-    }
-}

docs/static/img/badge-fdroid.svg

@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="43 43 560 164"
-   version="1.1"
-   id="svg78"
-   sodipodi:docname="get-it-on-en.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview80"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
-  <defs
-     id="defs8">
-    <radialGradient
-       xlink:href="#a"
-       id="b"
-       cx="113"
-       cy="-12.89"
-       r="59.662"
-       fx="113"
-       fy="-12.89"
-       gradientTransform="matrix(0 1.96105 -1.97781 0 254.507 78.763)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="a">
-      <stop
-         offset="0"
-         style="stop-color:#fff;stop-opacity:.09803922"
-         id="stop3" />
-      <stop
-         offset="1"
-         style="stop-color:#fff;stop-opacity:0"
-         id="stop5" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="translate(-289,-312.362)"
-     id="g76">
-    <path
-       id="rect10"
-       style="display:inline;overflow:visible;stroke:#a6a6a6;stroke-width:4;marker:none"
-       d="m 352,355.362 h 520 c 11.08,0 20,8.92 20,20 v 124 c 0,11.08 -8.92,20 -20,20 H 352 c -11.08,0 -20,-8.92 -20,-20 v -124 c 0,-11.08 8.92,-20 20,-20 z" />
-    <g
-       aria-label="GET IT ON"
-       id="text14"
-       style="font-size:12.3952px;line-height:100%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans';letter-spacing:0;word-spacing:0;display:inline;overflow:visible;fill:#ffffff;stroke-width:1px;marker:none">
-      <path
-         d="m 529.2627,398.81787 v -6.6817 h -5.49866 v -2.76599 h 8.83117 v 10.68072 q -1.94952,1.383 -4.29895,2.09949 -2.34942,0.69983 -5.01544,0.69983 -5.83191,0 -9.1311,-3.39917 -3.28253,-3.41583 -3.28253,-9.49768 0,-6.09851 3.28253,-9.49768 3.29919,-3.41583 9.1311,-3.41583 2.43274,0 4.61554,0.59985 2.19947,0.59985 4.04901,1.76623 v 3.58246 q -1.86621,-1.58294 -3.96569,-2.38275 -2.09949,-0.7998 -4.41559,-0.7998 -4.56555,0 -6.86499,2.54937 -2.28278,2.54938 -2.28278,7.59815 0,5.0321 2.28278,7.58148 2.29944,2.54938 6.86499,2.54938 1.78289,0 3.18255,-0.29993 1.39966,-0.31659 2.51606,-0.96643 z"
-         style="font-size:34.125px"
-         id="path83" />
-      <path
-         d="m 538.74371,377.48975 h 15.7295 v 2.83264 h -12.36365 v 7.36487 h 11.84711 v 2.83264 h -11.84711 v 9.01446 h 12.66357 v 2.83264 h -16.02942 z"
-         style="font-size:34.125px"
-         id="path85" />
-      <path
-         d="m 556.85596,377.48975 h 21.04486 v 2.83264 h -8.83118 V 402.367 h -3.38251 v -22.04461 h -8.83117 z"
-         style="font-size:34.125px"
-         id="path87" />
-      <path
-         d="m 591.99738,377.48975 h 3.36584 V 402.367 h -3.36584 z"
-         style="font-size:34.125px"
-         id="path89" />
-      <path
-         d="m 598.61243,377.48975 h 21.04486 v 2.83264 h -8.83118 V 402.367 h -3.38251 v -22.04461 h -8.83117 z"
-         style="font-size:34.125px"
-         id="path91" />
-      <path
-         d="m 643.85138,379.77252 q -3.66577,0 -5.83191,2.73267 -2.14947,2.73266 -2.14947,7.44818 0,4.69885 2.14947,7.43152 2.16614,2.73266 5.83191,2.73266 3.66577,0 5.79858,-2.73266 2.14948,-2.73267 2.14948,-7.43152 0,-4.71552 -2.14948,-7.44818 -2.13281,-2.73267 -5.79858,-2.73267 z m 0,-2.73266 q 5.23206,0 8.36462,3.5158 3.13257,3.49915 3.13257,9.39771 0,5.8819 -3.13257,9.3977 -3.13256,3.49915 -8.36462,3.49915 -5.24872,0 -8.39795,-3.49915 -3.13257,-3.49914 -3.13257,-9.3977 0,-5.89856 3.13257,-9.39771 3.14923,-3.5158 8.39795,-3.5158 z"
-         style="font-size:34.125px"
-         id="path93" />
-      <path
-         d="m 660.61395,377.48975 h 4.53223 l 11.03064,20.81158 v -20.81158 h 3.26587 V 402.367 h -4.53223 L 663.87982,381.55542 V 402.367 h -3.26587 z"
-         style="font-size:34.125px"
-         id="path95" />
-    </g>
-    <g
-       aria-label="F-Droid"
-       id="text18"
-       style="font-weight:700;font-size:29.7088px;line-height:100%;font-family:Rokkitt;-inkscape-font-specification:'Rokkitt Bold';letter-spacing:0;word-spacing:0;display:inline;overflow:visible;fill:#ffffff;stroke-width:1px;marker:none">
-      <path
-         d="m 510.81067,481.24332 v 8.11767 h 27.97119 v -8.11767 l -7.23633,-1.3916 v -18.55469 h 23.65723 v -10.43701 h -23.65723 v -18.60108 h 22.03369 l 0.60303,8.07129 h 10.39063 v -18.5083 h -53.76221 v 8.16406 l 7.18994,1.3916 v 48.47413 z"
-         style="font-size:95px;line-height:100%;font-family:'Roboto Slab';-inkscape-font-specification:'Roboto Slab Bold'"
-         id="path98" />
-      <path
-         d="m 599.13098,465.70377 v -10.43702 h -26.16211 v 10.43702 z"
-         style="font-size:95px;line-height:100%;font-family:'Roboto Slab';-inkscape-font-specification:'Roboto Slab Bold'"
-         id="path100" />
-      <path
-         d="m 637.67834,421.82193 h -30.3833 v 8.16406 l 7.18995,1.3916 v 48.47413 l -7.18995,1.3916 v 8.11767 h 30.3833 c 16.51368,0 28.43506,-11.59668 28.43506,-28.15674 v -11.1792 c 0,-16.51367 -11.92138,-28.20312 -28.43506,-28.20312 z m -9.64843,10.43701 h 8.95263 c 9.69483,0 15.53955,7.23633 15.53955,17.67334 v 11.27197 c 0,10.57618 -5.84472,17.76612 -15.53955,17.76612 h -8.95263 z"
-         style="font-size:95px;line-height:100%;font-family:'Roboto Slab';-inkscape-font-specification:'Roboto Slab Bold'"
-         id="path102" />
-      <path
-         d="m 674.09192,481.24332 v 8.11767 h 26.5332 v -8.11767 l -6.49414,-1.3916 v -24.58497 c 1.48438,-2.82959 3.89649,-4.31396 7.88574,-4.12841 l 6.67969,0.3247 1.43799,-12.47802 c -1.29883,-0.46387 -3.43262,-0.74219 -5.33447,-0.74219 -4.87061,0 -8.62793,3.06152 -10.99366,8.25683 l -0.0928,-1.11328 -0.51025,-6.21582 h -19.80713 v 8.16407 l 7.18994,1.3916 v 31.12549 z"
-         style="font-size:95px;line-height:100%;font-family:'Roboto Slab';-inkscape-font-specification:'Roboto Slab Bold'"
-         id="path104" />
-      <path
-         d="m 713.24231,463.80191 v 0.97412 c 0,15.07569 8.85986,25.55908 23.75,25.55908 14.70459,0 23.61084,-10.48339 23.61084,-25.55908 v -0.97412 c 0,-15.0293 -8.85986,-25.55908 -23.70361,-25.55908 -14.79737,0 -23.65723,10.57617 -23.65723,25.55908 z m 13.54492,0.97412 v -0.97412 c 0,-8.90625 3.06152,-15.12207 10.11231,-15.12207 7.05078,0 10.20507,6.21582 10.20507,15.12207 v 0.97412 c 0,9.0918 -3.10791,15.16846 -10.1123,15.16846 -7.18994,0 -10.20508,-6.03027 -10.20508,-15.16846 z"
-         style="font-size:95px;line-height:100%;font-family:'Roboto Slab';-inkscape-font-specification:'Roboto Slab Bold'"
-         id="path106" />
-      <path
-         d="M 786.16223,428.548 V 416.99771 H 772.15344 V 428.548 Z m -20.08545,52.69532 v 8.11767 h 26.57959 v -8.11767 l -6.49414,-1.3916 v -40.68116 h -20.78125 v 8.16407 l 7.23633,1.3916 v 31.12549 z"
-         style="font-size:95px;line-height:100%;font-family:'Roboto Slab';-inkscape-font-specification:'Roboto Slab Bold'"
-         id="path108" />
-      <path
-         d="m 829.76575,483.23795 1.0205,6.12304 h 18.22999 v -8.11767 l -6.49415,-1.3916 v -62.85401 h -20.78125 v 8.16406 l 7.23633,1.39161 v 17.99804 c -3.01513,-4.03564 -7.05078,-6.30859 -12.06054,-6.30859 -12.43164,0 -19.62159,10.62256 -19.62159,26.44043 v 0.97412 c 0,14.84375 7.14356,24.67773 19.52881,24.67773 5.52002,0 9.7876,-2.45849 12.9419,-7.09716 z m -18.92578,-17.58057 v -0.97412 c 0,-9.46289 2.87597,-15.91065 9.50927,-15.91065 3.89649,0 6.77246,1.85547 8.62793,5.05616 v 21.2915 c -1.85547,3.01514 -4.77783,4.68506 -8.7207,4.68506 -6.67969,0 -9.4165,-5.38086 -9.4165,-14.14795 z"
-         style="font-size:95px;line-height:100%;font-family:'Roboto Slab';-inkscape-font-specification:'Roboto Slab Bold'"
-         id="path110" />
-    </g>
-    <path
-       d="m 2.589,1006.862 4.25,5.5"
-       style="fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:#769616;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(-2.63159,0,0,2.63157,483.158,-2270.475)"
-       id="path20" />
-    <path
-       d="m 2.611,1005.61 c -0.453,0.011 -0.761,0.188 -0.98,0.448 2.027,2.409 2.368,2.792 5.135,6.221 1.02,1.32 2.082,0.638 1.062,-0.681 l -4.25,-5.5 a 1.24,1.24 0 0 0 -0.967,-0.489"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.298039;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       transform="matrix(-2.63159,0,0,2.63157,483.158,-2270.475)"
-       id="path22" />
-    <path
-       d="m 1.622,1006.07 a 1.25,1.25 0 0 0 -0.022,1.557 l 4.25,5.5 c 1.02,1.319 1.15,-0.613 1.15,-0.613 0,0 -3.735,-4.51 -5.378,-6.443"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.2;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       transform="matrix(-2.63159,0,0,2.63157,483.158,-2270.475)"
-       id="path24" />
-    <path
-       d="m 2.338,1005.844 c -0.438,0 -0.96,0.142 -0.824,0.799 0.103,0.501 4.66,6.074 4.66,6.074 1.02,1.32 2.494,0.677 1.474,-0.642 l -4.234,-5.473 c -0.26,-0.29 -0.608,-0.744 -1.076,-0.758"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       transform="matrix(-2.63159,0,0,2.63157,483.158,-2270.475)"
-       id="path26" />
-    <path
-       d="m 2.589,1006.862 4.25,5.5"
-       style="fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:#769616;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(2.63159,0,0,2.63157,356.842,-2270.475)"
-       id="path28" />
-    <path
-       d="m 2.611,1005.61 c -0.453,0.011 -0.761,0.188 -0.98,0.448 2.027,2.409 2.368,2.792 5.135,6.221 1.02,1.32 2.082,0.638 1.062,-0.681 l -4.25,-5.5 a 1.24,1.24 0 0 0 -0.967,-0.489"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.298039;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       transform="matrix(2.63159,0,0,2.63157,356.842,-2270.475)"
-       id="path30" />
-    <path
-       d="m 1.622,1006.07 a 1.25,1.25 0 0 0 -0.022,1.557 l 4.25,5.5 c 1.02,1.319 1.15,-0.613 1.15,-0.613 0,0 -3.735,-4.51 -5.378,-6.443"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.2;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       transform="matrix(2.63159,0,0,2.63157,356.842,-2270.475)"
-       id="path32" />
-    <path
-       d="m 2.338,1005.844 c -0.438,0 -0.96,0.142 -0.824,0.799 0.103,0.501 4.66,6.074 4.66,6.074 1.02,1.32 2.494,0.677 1.474,-0.642 l -4.234,-5.473 c -0.26,-0.29 -0.608,-0.744 -1.076,-0.758"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       transform="matrix(2.63159,0,0,2.63157,356.842,-2270.475)"
-       id="path34" />
-    <g
-       transform="matrix(2.63159,0,0,2.63157,467.369,-2270.475)"
-       id="g44">
-      <path
-         id="rect36"
-         style="opacity:1;fill:#aeea00;stroke-width:3;stroke-linecap:round;stroke-miterlimit:3"
-         d="m -34,1010.36 h 32 c 1.662,0 3,1.338 3,3 v 6.92 c 0,1.662 -1.338,3 -3,3 h -32 c -1.662,0 -3,-1.338 -3,-3 v -6.92 c 0,-1.662 1.338,-3 3,-3 z" />
-      <path
-         id="rect38"
-         style="opacity:1;fill:#263238;fill-opacity:0.2;stroke-width:3;stroke-linecap:round;stroke-miterlimit:3"
-         d="m -34,1013.279 h 32 c 1.662,0 3,1.338 3,3 v 4 c 0,1.662 -1.338,3 -3,3 h -32 c -1.662,0 -3,-1.338 -3,-3 v -4 c 0,-1.662 1.338,-3 3,-3 z" />
-      <path
-         id="rect40"
-         style="opacity:1;fill:#ffffff;fill-opacity:0.298039;stroke-width:3;stroke-linecap:round;stroke-miterlimit:3"
-         d="m -34,1010.362 h 32 c 1.662,0 3,1.338 3,3 v 4 c 0,1.662 -1.338,3 -3,3 h -32 c -1.662,0 -3,-1.338 -3,-3 v -4 c 0,-1.662 1.338,-3 3,-3 z" />
-      <path
-         id="rect42"
-         style="opacity:1;fill:#aeea00;stroke-width:3;stroke-linecap:round;stroke-miterlimit:3"
-         d="m -34,1011.5 h 32 c 1.662,0 3,1.0954 3,2.456 v 5.729 c 0,1.3606 -1.338,2.456 -3,2.456 h -32 c -1.662,0 -3,-1.0954 -3,-2.456 v -5.729 c 0,-1.3606 1.338,-2.456 3,-2.456 z" />
-    </g>
-    <g
-       transform="matrix(2.63159,0,0,2.63157,356.842,-2270.745)"
-       id="g54">
-      <path
-         id="rect46"
-         style="opacity:1;fill:#1976d2;stroke-width:3;stroke-linecap:round;stroke-miterlimit:3"
-         d="m 8,1024.522 h 32 c 1.662,0 3,1.338 3,3 v 19.84 c 0,1.662 -1.338,3 -3,3 H 8 c -1.662,0 -3,-1.338 -3,-3 v -19.84 c 0,-1.662 1.338,-3 3,-3 z" />
-      <path
-         id="rect48"
-         style="opacity:1;fill:#263238;fill-opacity:0.2;stroke-width:3;stroke-linecap:round;stroke-miterlimit:3"
-         d="m 8,1037.3621 h 32 c 1.662,0 3,1.338 3,3 v 7 c 0,1.662 -1.338,3 -3,3 H 8 c -1.662,0 -3,-1.338 -3,-3 v -7 c 0,-1.662 1.338,-3 3,-3 z" />
-      <path
-         id="rect50"
-         style="opacity:1;fill:#ffffff;fill-opacity:0.2;stroke-width:3;stroke-linecap:round;stroke-miterlimit:3"
-         d="m 8,1024.442 h 32 c 1.662,0 3,1.338 3,3 v 7 c 0,1.662 -1.338,3 -3,3 H 8 c -1.662,0 -3,-1.338 -3,-3 v -7 c 0,-1.662 1.338,-3 3,-3 z" />
-      <path
-         id="rect52"
-         style="opacity:1;fill:#1976d2;stroke-width:3;stroke-linecap:round;stroke-miterlimit:3"
-         d="m 8,1025.662 h 32 c 1.662,0 3,1.2122 3,2.718 v 18.124 c 0,1.5058 -1.338,2.718 -3,2.718 H 8 c -1.662,0 -3,-1.2122 -3,-2.718 v -18.124 c 0,-1.5058 1.338,-2.718 3,-2.718 z" />
-    </g>
-    <g
-       transform="matrix(2.63159,0,0,2.63157,356.842,396.264)"
-       id="g60">
-      <path
-         d="m 24,17.75 c -2.88,0 -5.32,1.985 -6.033,4.65 H 21.18 A 3.22,3.22 0 0 1 24,20.75 3.23,3.23 0 0 1 27.25,24 3.23,3.23 0 0 1 24,27.25 3.22,3.22 0 0 1 21.07,25.4 h -3.154 c 0.642,2.766 3.132,4.85 6.084,4.85 3.434,0 6.25,-2.816 6.25,-6.25 0,-3.434 -2.816,-6.25 -6.25,-6.25"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0d47a1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-         id="path56" />
-      <path
-         id="circle58"
-         style="opacity:1;fill:none;fill-opacity:0.403922;stroke:#0d47a1;stroke-width:1.9;stroke-linecap:round"
-         d="M 33.55,24 A 9.5500002,9.5500002 0 0 1 24,33.55 9.5500002,9.5500002 0 0 1 14.45,24 9.5500002,9.5500002 0 0 1 24,14.45 9.5500002,9.5500002 0 0 1 33.55,24 Z" />
-    </g>
-    <g
-       transform="matrix(2.63159,0,0,2.63157,356.842,-2269.159)"
-       id="g66">
-      <path
-         id="ellipse62"
-         style="opacity:1;fill:#263238;fill-opacity:0.2;stroke-width:1.9;stroke-linecap:round;stroke-opacity:0.697211"
-         d="m 17.75,1016.487 a 3.375,3.875 0 0 1 -3.375,3.875 3.375,3.875 0 0 1 -3.375,-3.875 3.375,3.875 0 0 1 3.375,-3.875 3.375,3.875 0 0 1 3.375,3.875 z" />
-      <path
-         id="circle64"
-         style="opacity:1;fill:#ffffff;stroke-width:1.9;stroke-linecap:round;stroke-opacity:0.697211"
-         d="m 17.75,1016.987 a 3.375,3.375 0 0 1 -3.375,3.375 3.375,3.375 0 0 1 -3.375,-3.375 3.375,3.375 0 0 1 3.375,-3.375 3.375,3.375 0 0 1 3.375,3.375 z" />
-    </g>
-    <g
-       transform="matrix(2.63159,0,0,2.63157,408.158,-2269.159)"
-       id="g72">
-      <path
-         id="ellipse68"
-         style="opacity:1;fill:#263238;fill-opacity:0.2;stroke-width:1.9;stroke-linecap:round;stroke-opacity:0.697211"
-         d="m 17.75,1016.487 a 3.375,3.875 0 0 1 -3.375,3.875 3.375,3.875 0 0 1 -3.375,-3.875 3.375,3.875 0 0 1 3.375,-3.875 3.375,3.875 0 0 1 3.375,3.875 z" />
-      <path
-         id="circle70"
-         style="opacity:1;fill:#ffffff;stroke-width:1.9;stroke-linecap:round;stroke-opacity:0.697211"
-         d="m 17.75,1016.987 a 3.375,3.375 0 0 1 -3.375,3.375 3.375,3.375 0 0 1 -3.375,-3.375 3.375,3.375 0 0 1 3.375,-3.375 3.375,3.375 0 0 1 3.375,3.375 z" />
-    </g>
-    <path
-       d="m 282.715,299.835 a 3.29,3.29 0 0 0 -2.662,5.336 l 9.474,12.261 A 7.9,7.9 0 0 0 289,320.257 v 18.21 a 7.877,7.877 0 0 0 7.895,7.895 h 84.21 A 7.877,7.877 0 0 0 389,338.468 v -18.211 c 0,-0.999 -0.19,-1.949 -0.525,-2.826 l 9.472,-12.26 a 3.29,3.29 0 0 0 -2.433,-5.334 3.29,3.29 0 0 0 -2.772,1.31 l -9.013,11.666 a 7.9,7.9 0 0 0 -2.624,-0.45 h -84.21 c -0.922,0 -1.8,0.163 -2.622,0.45 l -9.015,-11.666 a 3.29,3.29 0 0 0 -2.543,-1.312 m 14.18,49.527 A 7.877,7.877 0 0 0 289,357.257 v 52.21 a 7.877,7.877 0 0 0 7.895,7.895 h 84.21 A 7.877,7.877 0 0 0 389,409.468 v -52.211 a 7.877,7.877 0 0 0 -7.895,-7.895 z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#b);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.57895;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-       transform="translate(81,76)"
-       id="path74" />
-  </g>
-</svg>

docs/static/js/topic-generator.js

@@ -1,121 +0,0 @@
-// Topic name generator for the ntfy docs
-//
-// A tiny helper that lives on the "Publishing" page. The user types a memorable
-// prefix (e.g. "backups"), and the widget appends a random, hard-to-guess suffix
-// (e.g. "backups-x7Kp2mQ9"). The result is a valid, unguessable topic name.
-//
-// Topic names on the server must match ^[-_A-Za-z0-9]{1,64}$ (see server.go), so as
-// the user types we strip anything that isn't allowed (spaces, slashes, punctuation,
-// emoji, ...) live and cap the whole thing at 64 characters. The random suffix is
-// generated once on load and can be re-rolled with the "Regenerate suffix" button.
-(function () {
-  // Allowed topic characters per the server regex ^[-_A-Za-z0-9]{1,64}$
-  const ALLOWED = /[^-_A-Za-z0-9]/g;
-  const MAX_LEN = 64;
-
-  // Suffix alphabet: full base62 (letters + digits). We deliberately keep look-alikes
-  // (0/O, l/1) for maximum entropy -- this is a generated suffix, not something typed by
-  // hand. Hyphen/underscore are excluded so the "-" separator stays visually clear.
-  const SUFFIX_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  const SUFFIX_LEN = 10;
-
-  // randomSuffix returns a cryptographically random string from SUFFIX_ALPHABET.
-  // It uses rejection sampling to avoid the modulo bias that a plain `byte % 62` would
-  // introduce (256 is not a multiple of 62), keeping every character equally likely.
-  function randomSuffix() {
-    const n = SUFFIX_ALPHABET.length;
-    const limit = Math.floor(256 / n) * n; // largest multiple of n that fits in a byte
-    const buf = new Uint8Array(1);
-    let out = "";
-    while (out.length < SUFFIX_LEN) {
-      crypto.getRandomValues(buf);
-      if (buf[0] < limit) {
-        out += SUFFIX_ALPHABET[buf[0] % n];
-      }
-    }
-    return out;
-  }
-
-  // sanitize strips everything that isn't a valid topic character.
-  function sanitize(value) {
-    return value.replace(ALLOWED, "");
-  }
-
-  function initTopicGenerator() {
-    const root = document.getElementById("tg-widget");
-    if (!root) return;
-
-    const input = root.querySelector("#tg-input");
-    const outputName = root.querySelector("#tg-output-name");
-    const outputUrl = root.querySelector("#tg-output-url");
-    const reroll = root.querySelector("#tg-reroll");
-
-    let suffix = randomSuffix();
-
-    // update recomputes the live preview from the (sanitized) input + current suffix.
-    function update() {
-      // Sanitize in place so the user sees disallowed characters disappear as they type.
-      const cleaned = sanitize(input.value);
-      if (cleaned !== input.value) {
-        const pos = input.selectionStart - (input.value.length - cleaned.length);
-        // Reassigning .value and setSelectionRange make the browser scroll the field into
-        // view (there is no preventScroll option for setSelectionRange), which jumps the
-        // whole page. Capture the scroll position and restore it afterwards.
-        const scrollX = window.scrollX;
-        const scrollY = window.scrollY;
-        input.value = cleaned;
-        // Best-effort caret restore so removing a bad char doesn't jump the cursor to the end.
-        try { input.setSelectionRange(pos, pos); } catch { /* ignore */ }
-        window.scrollTo(scrollX, scrollY);
-      }
-
-      // Compose "<prefix>-<suffix>", capped at the 64-char topic limit. With no prefix,
-      // fall back to just the random suffix so the output is always a valid topic.
-      let topic;
-      if (cleaned === "") {
-        topic = suffix;
-      } else {
-        const maxPrefix = MAX_LEN - suffix.length - 1; // room for "-" + suffix
-        const prefix = cleaned.slice(0, Math.max(0, maxPrefix));
-        topic = prefix === "" ? suffix : prefix + "-" + suffix;
-      }
-
-      outputName.textContent = topic;
-      outputUrl.textContent = "https://ntfy.sh/" + topic;
-    }
-
-    input.addEventListener("input", update);
-    reroll.addEventListener("click", function () {
-      suffix = randomSuffix();
-      update();
-      input.focus();
-    });
-
-    // Copy buttons: copy the target output and briefly swap the clipboard icon for a checkmark,
-    // mirroring the config generator's copy button behavior.
-    const copyIcon = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"14\" height=\"14\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><rect x=\"9\" y=\"9\" width=\"13\" height=\"13\" rx=\"2\" ry=\"2\"></rect><path d=\"M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1\"></path></svg>";
-    const checkIcon = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"14\" height=\"14\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><polyline points=\"20 6 9 17 4 12\"></polyline></svg>";
-    root.querySelectorAll(".tg-btn-copy").forEach(function (btn) {
-      btn.addEventListener("click", function () {
-        const target = root.querySelector("#" + btn.dataset.copy);
-        if (!target || !target.textContent) return;
-        navigator.clipboard.writeText(target.textContent).then(function () {
-          btn.innerHTML = checkIcon;
-          btn.style.color = "var(--md-primary-fg-color)";
-          setTimeout(function () {
-            btn.innerHTML = copyIcon;
-            btn.style.color = "";
-          }, 2000);
-        });
-      });
-    });
-
-    update();
-  }
-
-  if (document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", initTopicGenerator);
-  } else {
-    initTopicGenerator();
-  }
-})();

docs/subscribe/api.md

@@ -324,21 +324,20 @@ format of the message. It's very straight forward:
 
 **Message**:
 
-| Field         | Required | Type                                                                            | Example                                               | Description                                                                                                                          |
-|---------------|----------|---------------------------------------------------------------------------------|-------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|
-| `id`          | ✔️       | *string*                                                                        | `hwQ2YpKdmg`                                          | Randomly chosen message identifier                                                                                                   |
-| `time`        | ✔️       | *number*                                                                        | `1635528741`                                          | Message date time, as Unix time stamp                                                                                                |  
-| `expires`     | (✔)️     | *number*                                                                        | `1673542291`                                          | Unix time stamp indicating when the message will be deleted, not set if `Cache: no` is sent                                          |  
-| `event`       | ✔️       | `open`, `keepalive`, `message`, `message_delete`, `message_clear`, `poll_request` | `message`                                             | Message type, typically you'd be only interested in `message`                                                                        |
-| `topic`       | ✔️       | *string*                                                                        | `topic1,topic2`                                       | Comma-separated list of topics the message is associated with; only one for all `message` events, but may be a list in `open` events |
-| `sequence_id` | -        | *string*                                                                        | `my-sequence-123`                                     | Sequence ID for [updating/deleting notifications](../publish.md#updating-deleting-notifications)                                 |
-| `message`     | -        | *string*                                                                        | `Some message`                                        | Message body; always present in `message` events                                                                                     |
-| `title`       | -        | *string*                                                                        | `Some title`                                          | Message [title](../publish.md#message-title); if not set defaults to `ntfy.sh/<topic>`                                               |
-| `tags`        | -        | *string array*                                                                  | `["tag1","tag2"]`                                     | List of [tags](../publish.md#tags-emojis) that may or not map to emojis                                                              |
-| `priority`    | -        | *1, 2, 3, 4, or 5*                                                              | `4`                                                   | Message [priority](../publish.md#message-priority) with 1=min, 3=default and 5=max                                                   |
-| `click`       | -        | *URL*                                                                           | `https://example.com`                                 | Website opened when notification is [clicked](../publish.md#click-action)                                                            |
-| `actions`     | -        | *JSON array*                                                                    | *see [actions buttons](../publish.md#action-buttons)* | [Action buttons](../publish.md#action-buttons) that can be displayed in the notification                                             |
-| `attachment`  | -        | *JSON object*                                                                   | *see below*                                           | Details about an attachment (name, URL, size, ...)                                                                                   |
+| Field        | Required | Type                                              | Example                                               | Description                                                                                                                          |
+|--------------|----------|---------------------------------------------------|-------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|
+| `id`         | ✔️       | *string*                                          | `hwQ2YpKdmg`                                          | Randomly chosen message identifier                                                                                                   |
+| `time`       | ✔️       | *number*                                          | `1635528741`                                          | Message date time, as Unix time stamp                                                                                                |  
+| `expires`    | (✔)️     | *number*                                          | `1673542291`                                          | Unix time stamp indicating when the message will be deleted, not set if `Cache: no` is sent                                          |  
+| `event`      | ✔️       | `open`, `keepalive`, `message`, or `poll_request` | `message`                                             | Message type, typically you'd be only interested in `message`                                                                        |
+| `topic`      | ✔️       | *string*                                          | `topic1,topic2`                                       | Comma-separated list of topics the message is associated with; only one for all `message` events, but may be a list in `open` events |
+| `message`    | -        | *string*                                          | `Some message`                                        | Message body; always present in `message` events                                                                                     |
+| `title`      | -        | *string*                                          | `Some title`                                          | Message [title](../publish.md#message-title); if not set defaults to `ntfy.sh/<topic>`                                               |
+| `tags`       | -        | *string array*                                    | `["tag1","tag2"]`                                     | List of [tags](../publish.md#tags-emojis) that may or not map to emojis                                                              |
+| `priority`   | -        | *1, 2, 3, 4, or 5*                                | `4`                                                   | Message [priority](../publish.md#message-priority) with 1=min, 3=default and 5=max                                                   |
+| `click`      | -        | *URL*                                             | `https://example.com`                                 | Website opened when notification is [clicked](../publish.md#click-action)                                                            |
+| `actions`    | -        | *JSON array*                                      | *see [actions buttons](../publish.md#action-buttons)* | [Action buttons](../publish.md#action-buttons) that can be displayed in the notification                                             |
+| `attachment` | -        | *JSON object*                                     | *see below*                                           | Details about an attachment (name, URL, size, ...)                                                                                   |
 
 **Attachment** (part of the message, see [attachments](../publish.md#attachments) for details):
 

docs/subscribe/phone.md

@@ -5,7 +5,7 @@ on GitHub ([Android](https://github.com/binwiederhier/ntfy-android), [iOS](https
 contribute, or [build your own](../develop.md).
 
 <a href="https://play.google.com/store/apps/details?id=io.heckel.ntfy"><img width="170" src="../../static/img/badge-googleplay.png"></a>
-<a href="https://f-droid.org/en/packages/io.heckel.ntfy/"><img width="170" src="../../static/img/badge-fdroid.svg"></a>
+<a href="https://f-droid.org/en/packages/io.heckel.ntfy/"><img width="170" src="../../static/img/badge-fdroid.png"></a>
 <a href="https://apps.apple.com/us/app/ntfy/id1625396347"><img width="150" src="../../static/img/badge-appstore.png"></a>
 
 You can get the Android app from [Google Play](https://play.google.com/store/apps/details?id=io.heckel.ntfy), 
@@ -82,8 +82,9 @@ you'll see as a permanent notification that looks like this:
   <figcaption>Instant delivery foreground notification</figcaption>
 </figure>
 
-To turn off this notification, long-press on the foreground notification (screenshot above) and navigate to the 
-settings. Then toggle the "Subscription Service" off:
+Android does not allow you to dismiss this notification, unless you turn off the notification channel in the settings.
+To do so, long-press on the foreground notification (screenshot above) and navigate to the settings. Then toggle the 
+"Subscription Service" off:
 
 <figure markdown>
   ![foreground service](../static/img/notification-settings.png){ width=500 }
@@ -99,29 +100,7 @@ The reason for this is [Firebase Cloud Messaging (FCM)](https://firebase.google.
 notifications. Firebase is overall pretty bad at delivering messages in time, but on Android, most apps are stuck with it.
 
 The ntfy Android app uses Firebase only for the main host `ntfy.sh`, and only in the Google Play flavor of the app.
-It won't use Firebase for any self-hosted servers, and not at all in the F-Droid flavor.
-
-!!! info "F-Droid: Always instant delivery"
-    Since the F-Droid build does not include Firebase, **all subscriptions use instant delivery by default**, and 
-    there is no option to disable it. The F-Droid app hides all mentions of "instant delivery" in the UI, since 
-    showing options that can't be changed would only be confusing.
-
-## Publishing messages
-_Supported on:_ :material-android:
-
-The Android app allows you to **publish messages directly from the app**, without needing to use curl or any other 
-tool. When enabled in the settings (Settings → General → Show message bar), a **message bar** appears at the bottom 
-of the topic view (it's enabled by default). You can type a message and tap the send button to publish it instantly.
-If the message bar is disabled, you can tap the floating action button (FAB) at the bottom right instead.
-
-For more options, tap the expand button next to the send button to open the full **publish dialog**. The dialog lets 
-you compose a full notification with all available options, including title, tags, priority, click URL, email 
-forwarding, delayed delivery, attachments, Markdown formatting, and phone calls.
-
-<div id="publish-screenshots" class="screenshots">
-    <a href="../../static/img/android-screenshot-publish-message-bar.jpg"><img src="../../static/img/android-screenshot-publish-message-bar.jpg"/></a>
-    <a href="../../static/img/android-screenshot-publish-dialog.jpg"><img src="../../static/img/android-screenshot-publish-dialog.jpg"/></a>
-</div>
+It won't use Firebase for any self-hosted servers, and not at all in the the F-Droid flavor.
 
 ## Share to topic
 _Supported on:_ :material-android:
@@ -156,67 +135,6 @@ or to simply directly link to a topic from a mobile website.
 | <span style="white-space: nowrap">`ntfy://<host>/<topic>?display=<name>`</span> | `ntfy://ntfy.sh/mytopic?display=My+Topic` | Same as above, but also defines a display name for the topic.                                                                                                                                       |
 | <span style="white-space: nowrap">`ntfy://<host>/<topic>?secure=false`</span>   | `ntfy://example.com/mytopic?secure=false` | Same as above, except that this will use HTTP instead of HTTPS as topic URL. This is equivalent to the web view `http://example.com/mytopic` (HTTP!)                                                |
 
-## Advanced settings
-
-### Custom headers
-_Supported on:_ :material-android:
-
-If your ntfy server is behind an **authenticated proxy or tunnel** (e.g., Cloudflare Access, Tailscale Funnel, or 
-a reverse proxy with basic auth), you can configure custom HTTP headers that will be sent with every request to 
-that server. You could set headers such as `Authorization`, `CF-Access-Client-Id`, or any other headers required by
-your setup. To add custom headers, go to **Settings → Advanced → Custom headers**.
-
-<div id="custom-headers-screenshots" class="screenshots">
-    <a href="../../static/img/android-screenshot-custom-headers.jpg"><img src="../../static/img/android-screenshot-custom-headers.jpg"/></a>
-    <a href="../../static/img/android-screenshot-custom-headers-add.jpg"><img src="../../static/img/android-screenshot-custom-headers-add.jpg"/></a>
-</div>
-
-!!! warning
-    If you have a user configured for a server, you cannot add an `Authorization` header for that server, as ntfy
-    sets this header automatically. Similarly, if you have a custom `Authorization` header, you cannot add a user
-    for that server.
-
-### Manage certificates
-_Supported on:_ :material-android:
-
-If you're running a self-hosted ntfy server with a **self-signed certificate** or need to use **mutual TLS (mTLS)** 
-for client authentication, you can manage certificates in the app settings.
-
-Go to **Settings → Advanced → Manage certificates** to:
-
-- **Add trusted certificates**: Import a server certificate (PEM format) to trust when connecting to your ntfy server.
-  This is useful for self-signed certificates that are not trusted by the Android system.
-- **Add client certificates**: Import a client certificate (PKCS#12 format) for mutual TLS authentication. This 
-  certificate will be presented to the server when connecting.
-
-When you subscribe to a topic on a server with an untrusted certificate, the app will show a security warning and 
-allow you to review and trust the certificate.
-
-<div id="certificates-screenshots" class="screenshots">
-    <a href="../../static/img/android-screenshot-certs-manage.jpg"><img src="../../static/img/android-screenshot-certs-manage.jpg"/></a>
-    <a href="../../static/img/android-screenshot-certs-warning-dialog.jpg"><img src="../../static/img/android-screenshot-certs-warning-dialog.jpg"/></a>
-</div>
-
-### Language
-_Supported on:_ :material-android:
-
-The Android app supports many languages and uses the **system language by default**. If you'd like to use the app in 
-a different language than your system, you can override it in **Settings → General → Language**.
-
-<div id="language-screenshots" class="screenshots">
-    <a href="../../static/img/android-screenshot-language-selection.jpg"><img src="../../static/img/android-screenshot-language-selection.jpg"/></a>
-    <a href="../../static/img/android-screenshot-language-german.jpg"><img src="../../static/img/android-screenshot-language-german.jpg"/></a>
-    <a href="../../static/img/android-screenshot-language-hebrew.jpg"><img src="../../static/img/android-screenshot-language-hebrew.jpg"/></a>
-    <a href="../../static/img/android-screenshot-language-chinese.jpg"><img src="../../static/img/android-screenshot-language-chinese.jpg"/></a>
-</div>
-
-The app currently supports over 30 languages, including English, German, French, Spanish, Chinese, Japanese, and many
-more. Languages with more than 80% of strings translated are shown in the language picker.
-
-!!! tip "Help translate ntfy"
-    If you'd like to help translate ntfy into your language or improve existing translations, please visit the
-    [ntfy Weblate project](https://hosted.weblate.org/projects/ntfy/). Contributions are very welcome!
-
 ## Integrations
 
 ### UnifiedPush
@@ -250,13 +168,10 @@ Here's an example using [MacroDroid](https://play.google.com/store/apps/details?
 and [Tasker](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm), but any app that can catch 
 broadcasts is supported:
 
-<div id="integration-screenshots-receive-1" class="screenshots">
+<div id="integration-screenshots-receive" class="screenshots">
     <a href="../../static/img/android-screenshot-macrodroid-overview.png"><img src="../../static/img/android-screenshot-macrodroid-overview.png"/></a>
     <a href="../../static/img/android-screenshot-macrodroid-trigger.png"><img src="../../static/img/android-screenshot-macrodroid-trigger.png"/></a>
     <a href="../../static/img/android-screenshot-macrodroid-action.png"><img src="../../static/img/android-screenshot-macrodroid-action.png"/></a>
-</div>
-
-<div id="integration-screenshots-receive-2" class="screenshots">
     <a href="../../static/img/android-screenshot-tasker-profiles.png"><img src="../../static/img/android-screenshot-tasker-profiles.png"/></a>
     <a href="../../static/img/android-screenshot-tasker-event-edit.png"><img src="../../static/img/android-screenshot-tasker-event-edit.png"/></a>
     <a href="../../static/img/android-screenshot-tasker-task-edit.png"><img src="../../static/img/android-screenshot-tasker-task-edit.png"/></a>
@@ -324,29 +239,3 @@ The following intent extras are supported when for the intent with the `io.hecke
 | `message` ❤️ | ✔        | *String*                      | `Some message`    | Message body; **you must set this**                                                |
 | `tags`       | -        | *String*                      | `tag1,tag2,..`    | Comma-separated list of [tags](../publish.md#tags-emojis)                          |
 | `priority`   | -        | *String or Int (between 1-5)* | `4`               | Message [priority](../publish.md#message-priority) with 1=min, 3=default and 5=max |
-
-## Troubleshooting
-
-### Connection error dialog
-_Supported on:_ :material-android:
-
-If the app has trouble connecting to a ntfy server, a **warning icon** will appear in the app bar. Tapping it opens
-the **connection error dialog**, which shows detailed information about the connection problem and helps you diagnose
-the issue.
-
-<div id="connection-error-screenshots" class="screenshots">
-    <a href="../../static/img/android-screenshot-connection-error-warning.jpg"><img src="../../static/img/android-screenshot-connection-error-warning.jpg"/></a>
-    <a href="../../static/img/android-screenshot-connection-error-dialog.jpg"><img src="../../static/img/android-screenshot-connection-error-dialog.jpg"/></a>
-</div>
-
-Common connection errors include:
-
-| Error | Description |
-|-------|-------------|
-| Connection refused | The server may be down or the address may be incorrect |
-| WebSocket not supported | The server may not support WebSocket connections, or a proxy is blocking them |
-| Not authorized (401/403) | Username/password may be incorrect, or access credentials have expired |
-| Certificate not trusted | The server is using a self-signed certificate (see [Manage certificates](#manage-certificates)) |
-
-If you're having persistent connection issues, you can also check the app logs under **Settings → Advanced → Record logs**
-and share them for debugging.

docs/terms.md

@@ -1,257 +0,0 @@
-# Terms of Service
-
-**Last updated:** January 26, 2026
-
-Please read these Terms of Service ("Terms") carefully before using the ntfy.sh website and service (the "Service") 
-operated by ntfy LLC ("us", "we", or "our").
-
-Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms. These 
-Terms apply to all visitors, users, and others who access or use the Service.
-
-**By accessing or using the Service, you agree to be bound by these Terms. If you disagree with any part of the 
-Terms, you may not access the Service.**
-
-## Service description
-
-ntfy (pronounced "notify") is a simple HTTP-based pub-sub notification service. It allows you to send push 
-notifications to your phone or desktop via scripts from any computer, using a REST API. The Service includes:
-
-- The ntfy.sh hosted server
-- The ntfy web application
-- The ntfy mobile applications (Android and iOS)
-- The ntfy command-line interface (CLI)
-
-The server software and mobile applications are open source and can be [self-hosted](install.md). These Terms 
-apply specifically to the ntfy.sh hosted service.
-
-## Subscriptions and billing
-
-### Free tier
-
-You may use the Service without creating an account or subscribing to a paid plan. Free usage is subject to 
-rate limits and other restrictions as described in our documentation.
-
-### Paid plans
-
-Some features of the Service are available only through paid subscription plans ("Subscriptions"). You will 
-be billed in advance on a recurring basis ("Billing Cycle"). Billing cycles are available on a monthly or 
-annual basis.
-
-At the end of each Billing Cycle, your Subscription will automatically renew under the same conditions unless 
-you cancel it or we cancel it. You may cancel your Subscription renewal through your account settings in the 
-web application.
-
-A valid payment method is required to process payment for your Subscription. You shall provide us with accurate 
-and complete billing information. By submitting such payment information, you authorize us to charge all 
-Subscription fees incurred through your account to your payment method.
-
-Payment processing is handled by Stripe. Your payment information is subject to Stripe's 
-[privacy policy](https://stripe.com/privacy) and [terms of service](https://stripe.com/legal).
-
-Should automatic billing fail to occur for any reason, we will retry the payment according to Stripe's retry 
-schedule. If payment continues to fail after multiple attempts, your Subscription will be canceled and your 
-account will revert to the free tier.
-
-### Fee changes
-
-We may, in our sole discretion and at any time, modify the Subscription fees for paid plans. Any fee change 
-will become effective at the end of the then-current Billing Cycle.
-
-We will provide you with reasonable prior notice of any change in Subscription fees to give you an opportunity 
-to cancel your Subscription before such change becomes effective.
-
-Your continued use of the Service after a fee change comes into effect constitutes your agreement to pay the 
-modified Subscription fee.
-
-## Refunds
-
-Refund requests for Subscriptions may be considered on a case-by-case basis and granted at the sole discretion 
-of ntfy LLC. To request a refund, please contact us at [billing@mail.ntfy.sh](mailto:billing@mail.ntfy.sh).
-
-## User accounts
-
-When you create an account with us, you must provide information that is accurate, complete, and current at 
-all times. Failure to do so constitutes a breach of the Terms, which may result in immediate termination of 
-your account.
-
-You are responsible for:
-
-- Safeguarding the password that you use to access the Service
-- Any activities or actions under your account, whether your password is with our Service or a third-party service
-- Keeping your account credentials confidential
-
-You agree not to disclose your password to any third party. You must notify us immediately upon becoming aware 
-of any breach of security or unauthorized use of your account.
-
-You represent that you are at least 18 years old, or that you are at least the minimum age required to form
-a binding contract in your jurisdiction, and have the legal authority to enter into these Terms.
-
-## Acceptable use
-
-You agree not to use the Service to:
-
-- Send spam, unsolicited messages, or messages to recipients who have not consented to receive them
-- Distribute malware, viruses, or any other malicious software
-- Transmit illegal content or content that violates the rights of others
-- Harass, abuse, or harm another person or group
-- Impersonate any person or entity, or falsely state or misrepresent your affiliation with a person or entity
-- Interfere with or disrupt the Service or servers or networks connected to the Service
-- Attempt to gain unauthorized access to the Service, other accounts, or computer systems
-- Use the Service for any illegal purpose or in violation of any applicable laws or regulations
-- Circumvent rate limits or other technical restrictions
-- Use the Service in a manner that could reasonably be expected to impose an unreasonable or disproportionately
-  large load on our infrastructure
-
-We reserve the right to investigate and take appropriate action against anyone who, in our sole discretion, 
-violates this provision, including removing content, terminating accounts, and reporting to law enforcement.
-
-### Topic names
-
-Topic names on ntfy.sh are public. If you use the Service without access controls, your topic name functions 
-as a password. You are responsible for choosing topic names that cannot be easily guessed. We are not responsible 
-for any unauthorized access to messages published to easily guessable topic names.
-
-For reserved topics and access control features, consider subscribing to a paid plan.
-
-## Intellectual property
-
-### Open source software
-
-The ntfy server, web application, and mobile applications are open source software, dual-licensed under the 
-[Apache License 2.0](https://github.com/binwiederhier/ntfy/blob/main/LICENSE) and 
-[GPLv2](https://github.com/binwiederhier/ntfy/blob/main/LICENSE.GPLv2). You are free to use, modify, and 
-distribute the software in accordance with these licenses.
-
-### Trademarks
-
-The ntfy name, logo, and branding are trademarks of ntfy LLC. Our trademarks may not be used in connection 
-with any product or service without our prior written consent.
-
-### Your content
-
-You retain ownership of any content you transmit through the Service. By using the Service, you grant us a 
-limited license to process and transmit your content solely for the purpose of providing the Service.
-
-## Service availability
-
-The Service is provided on a "best effort" basis. We do not guarantee any specific uptime or availability.
-
-We strive to maintain high availability, but the Service may be interrupted for maintenance, updates, or 
-due to circumstances beyond our control. We will make reasonable efforts to notify users of planned 
-maintenance when possible.
-
-For applications requiring guaranteed uptime or specific service level agreements, we recommend 
-[self-hosting your own ntfy server](install.md).
-
-A [status page](https://ntfy.statuspage.io/) is available to check the current operational status of the Service.
-
-## Third-party services
-
-The Service relies on third-party services to provide certain functionality:
-
-- **Firebase Cloud Messaging (FCM)** - For push notifications to Android and iOS devices
-- **Twilio** - For phone call notifications
-- **Amazon SES** - For email notifications
-- **Stripe** - For payment processing
-
-Your use of these features is subject to the respective third-party terms and privacy policies. For more 
-details, see our [privacy policy](privacy.md).
-
-## Links to other websites
-
-Our Service may contain links to third-party websites or services that are not owned or controlled by us.
-
-We have no control over, and assume no responsibility for, the content, privacy policies, or practices of 
-any third-party websites or services. You acknowledge and agree that we shall not be responsible or liable, 
-directly or indirectly, for any damage or loss caused by or in connection with the use of any such content, 
-goods, or services available through any such websites or services.
-
-## Termination
-
-We may terminate or suspend your account immediately, without prior notice or liability, for any reason 
-whatsoever, including without limitation if you breach these Terms.
-
-Upon termination, your right to use the Service will immediately cease. If you wish to terminate your account, 
-you may do so through your account settings or by simply discontinuing use of the Service.
-
-Termination of your account will result in the deletion of your account data in accordance with our 
-[privacy policy](privacy.md).
-
-We may retain certain data as required to comply with legal obligations, resolve disputes, and enforce our
-agreements, as described in our privacy policy.
-
-## Limitation of liability
-
-In no event shall ntfy LLC, nor its owner, employees, partners, agents, suppliers, or affiliates, be liable 
-for any indirect, incidental, special, consequential, or punitive damages, including without limitation:
-
-- Loss of profits, data, use, goodwill, or other intangible losses
-- Damages resulting from your access to, use of, or inability to access or use the Service
-- Damages resulting from any conduct or content of any third party on the Service
-- Damages resulting from any content obtained from the Service
-- Damages resulting from unauthorized access, use, or alteration of your transmissions or content
-
-This limitation applies whether based on warranty, contract, tort (including negligence), or any other legal 
-theory, whether or not we have been informed of the possibility of such damage, and even if a remedy set 
-forth herein is found to have failed of its essential purpose.
-
-## Indemnification
-
-You agree to defend, indemnify, and hold harmless ntfy LLC and its owner, employees, partners, agents, suppliers,
-and affiliates from and against any claims, damages, obligations, losses, liabilities, costs, or debt, and
-expenses (including but not limited to attorney's fees) arising from:
-
-- Your use of and access to the Service
-- Your violation of any term of these Terms
-- Your violation of any applicable law or regulation
-- Your content, including any claim that your content infringes or misappropriates the rights of any third party
-
-## Disclaimer
-
-Your use of the Service is at your sole risk. The Service is provided on an "AS IS" and "AS AVAILABLE" basis, 
-without warranties of any kind, whether express or implied, including but not limited to implied warranties of 
-merchantability, fitness for a particular purpose, non-infringement, or course of performance.
-
-ntfy LLC does not warrant that:
-
-- The Service will function uninterrupted, secure, or available at any particular time or location
-- Any errors or defects will be corrected
-- The Service is free of viruses or other harmful components
-- The results of using the Service will meet your requirements
-- Messages will be delivered successfully or in a timely manner
-
-If your use case requires guaranteed message delivery, high availability, or handling of sensitive data, we 
-strongly recommend [self-hosting your own ntfy server](install.md) where you have full control over the 
-infrastructure and data.
-
-## Governing law
-
-These Terms shall be governed and construed in accordance with the laws of the State of Connecticut, United States,
-without regard to its conflict of law provisions.
-
-Any legal action or proceeding arising under these Terms shall be brought exclusively in the federal or state
-courts located in Connecticut, and the parties hereby consent to personal jurisdiction and venue therein.
-
-Our failure to enforce any right or provision of these Terms will not be considered a waiver of those rights. 
-If any provision of these Terms is held to be invalid or unenforceable by a court, the remaining provisions 
-of these Terms will remain in effect.
-
-These Terms constitute the entire agreement between us regarding our Service and supersede any prior agreements 
-we might have had regarding the Service.
-
-## Changes to these Terms
-
-We reserve the right, at our sole discretion, to modify or replace these Terms at any time. If a revision is 
-material, we will try to provide at least 30 days' notice prior to any new terms taking effect.
-
-What constitutes a material change will be determined at our sole discretion. Changes will be posted on this 
-page with an updated "Last updated" date. You may also review all changes in the 
-[Git history](https://github.com/binwiederhier/ntfy/commits/main/docs/terms.md).
-
-By continuing to access or use our Service after those revisions become effective, you agree to be bound by 
-the revised Terms. If you do not agree to the new Terms, please stop using the Service.
-
-## Contact
-
-If you have any questions about these Terms, please see our [contact page](contact.md) or email us at 
-[support@mail.ntfy.sh](mailto:support@mail.ntfy.sh).

docs/troubleshooting.md

@@ -1,7 +1,7 @@
 # Troubleshooting
 This page lists a few suggestions of what to do when things don't work as expected. This is not a complete list. 
-If this page does not help, feel free to reach out via one of the channels listed on the [contact page](contact.md).
-We're happy to help.
+If this page does not help, feel free to drop by the [Discord](https://discord.gg/cT7ECsZj9w) or [Matrix](https://matrix.to/#/#ntfy:matrix.org)
+and ask there. We're happy to help.
 
 ## ntfy server
 If you host your own ntfy server, and you're having issues with any component, it is always helpful to enable debugging/tracing
@@ -129,15 +129,3 @@ keyboard.
 
 ## iOS app
 Sorry, there is no way to debug or get the logs from the iOS app (yet), outside of running the app in Xcode.
-
-## Other
-
-### "Reconnecting..." / Late notifications on mobile (self-hosted)
-
-If all of your topics are showing as "Reconnecting" and notifications are taking a long time (30+ minutes) to come in, or if you're only getting new pushes with a manual refresh, double-check your configuration:
-
-* If ntfy is behind a reverse proxy (such as Nginx):
-    * Make sure `behind-proxy` is enabled in ntfy's config.
-    * Make sure WebSockets are enabled in the reverse proxy config.
-* Make sure you have granted permission to access all of your topics, either to a logged-in user account or to `everyone`. All subscribed topics are joined into a single WebSocket/JSON request, so a single topic that receives `403 Forbidden` will prevent the entire request from going through.
-    * In particular, double-check that `everyone` has permission to write to `up*` and your user has permission to read `up*` if you are using UnifiedPush.

go.mod

@@ -1,25 +1,27 @@
 module heckel.io/ntfy/v2
 
-go 1.25.8
+go 1.24.0
+
+toolchain go1.24.5
 
 require (
-	cloud.google.com/go/firestore v1.24.0 // indirect
-	cloud.google.com/go/storage v1.64.0 // indirect
+	cloud.google.com/go/firestore v1.20.0 // indirect
+	cloud.google.com/go/storage v1.58.0 // indirect
 	github.com/BurntSushi/toml v1.6.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
-	github.com/emersion/go-smtp v0.24.0
-	github.com/gabriel-vasile/mimetype v1.4.15
+	github.com/emersion/go-smtp v0.18.0
+	github.com/gabriel-vasile/mimetype v1.4.12
 	github.com/gorilla/websocket v1.5.3
-	github.com/mattn/go-sqlite3 v1.14.49
+	github.com/mattn/go-sqlite3 v1.14.32
 	github.com/olebedev/when v1.1.0
 	github.com/stretchr/testify v1.11.1
 	github.com/urfave/cli/v2 v2.27.7
-	golang.org/x/crypto v0.54.0
-	golang.org/x/oauth2 v0.36.0 // indirect
-	golang.org/x/sync v0.22.0
-	golang.org/x/term v0.45.0
-	golang.org/x/time v0.15.0
-	google.golang.org/api v0.291.0
+	golang.org/x/crypto v0.46.0
+	golang.org/x/oauth2 v0.34.0 // indirect
+	golang.org/x/sync v0.19.0
+	golang.org/x/term v0.38.0
+	golang.org/x/time v0.14.0
+	google.golang.org/api v0.258.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -28,49 +30,48 @@ replace github.com/emersion/go-smtp => github.com/emersion/go-smtp v0.17.0 // Pi
 require github.com/pkg/errors v0.9.1 // indirect
 
 require (
-	firebase.google.com/go/v4 v4.21.0
+	firebase.google.com/go/v4 v4.18.0
 	github.com/SherClockHolmes/webpush-go v1.4.0
-	github.com/jackc/pgx/v5 v5.10.0
+	github.com/jackc/pgx/v5 v5.8.0
 	github.com/microcosm-cc/bluemonday v1.0.27
-	github.com/prometheus/client_golang v1.24.1
+	github.com/prometheus/client_golang v1.23.2
 	github.com/stripe/stripe-go/v74 v74.30.0
-	golang.org/x/sys v0.47.0
-	golang.org/x/text v0.40.0
+	golang.org/x/text v0.32.0
 )
 
 require (
-	cel.dev/expr v0.25.2 // indirect
+	cel.dev/expr v0.25.1 // indirect
 	cloud.google.com/go v0.123.0 // indirect
-	cloud.google.com/go/auth v0.22.0 // indirect
+	cloud.google.com/go/auth v0.18.0 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
-	cloud.google.com/go/iam v1.12.0 // indirect
-	cloud.google.com/go/longrunning v1.2.0 // indirect
-	cloud.google.com/go/monitoring v1.30.0 // indirect
+	cloud.google.com/go/iam v1.5.3 // indirect
+	cloud.google.com/go/longrunning v0.7.0 // indirect
+	cloud.google.com/go/monitoring v1.24.3 // indirect
 	github.com/AlekSi/pointer v1.2.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.35.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.59.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.59.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.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.3.0 // indirect
-	github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 // indirect
+	github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 // indirect
-	github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.3.3 // indirect
-	github.com/felixge/httpsnoop v1.1.0 // indirect
-	github.com/go-jose/go-jose/v4 v4.1.4 // indirect
-	github.com/go-logr/logr v1.4.4 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.3 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
+	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.19 // indirect
-	github.com/googleapis/gax-go/v2 v2.23.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
+	github.com/googleapis/gax-go/v2 v2.16.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -79,27 +80,29 @@ require (
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.70.1 // indirect
-	github.com/prometheus/procfs v0.21.1 // indirect
+	github.com/prometheus/common v0.67.4 // indirect
+	github.com/prometheus/procfs v0.19.2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spiffe/go-spiffe/v2 v2.8.1 // indirect
+	github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.44.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.69.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect
-	go.opentelemetry.io/otel v1.44.0 // indirect
-	go.opentelemetry.io/otel/metric v1.44.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.44.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.44.0 // indirect
-	go.opentelemetry.io/otel/trace v1.44.0 // indirect
-	golang.org/x/net v0.57.0 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
+	go.opentelemetry.io/otel v1.39.0 // indirect
+	go.opentelemetry.io/otel/metric v1.39.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
+	go.opentelemetry.io/otel/trace v1.39.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
 	google.golang.org/appengine/v2 v2.0.6 // indirect
-	google.golang.org/genproto v0.0.0-20260803160001-6ac0973c030d // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d // indirect
-	google.golang.org/grpc v1.83.0 // indirect
+	google.golang.org/genproto v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
+	google.golang.org/grpc v1.77.0 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,41 +1,41 @@
-cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs=
-cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
+cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
+cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
 cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
 cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
-cloud.google.com/go/auth v0.22.0 h1:Xp9wAKkLoeaYb5pYZZoQGz4E9sdPxIbzS3gywZE3ciQ=
-cloud.google.com/go/auth v0.22.0/go.mod h1:M9o2Oz+YI2jAfxewJgb1vyI3vceHF+eohmxyzmrl+9s=
+cloud.google.com/go/auth v0.18.0 h1:wnqy5hrv7p3k7cShwAU/Br3nzod7fxoqG+k0VZ+/Pk0=
+cloud.google.com/go/auth v0.18.0/go.mod h1:wwkPM1AgE1f2u6dG443MiWoD8C3BtOywNsUMcUTVDRo=
 cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
 cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
 cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
-cloud.google.com/go/firestore v1.24.0 h1:x0Z3hrgjYgo2wI9whuBRQcNc2hYwzZDQy/7pkUXbXcs=
-cloud.google.com/go/firestore v1.24.0/go.mod h1:5aojyjN4olKUnBZDCRWwM+NsdrrCX3t1qfyERZGOonM=
-cloud.google.com/go/iam v1.12.0 h1:Aki3bX9aHUDKPHfnRJfDcTdVedvy6quGBQcTqx3DRXk=
-cloud.google.com/go/iam v1.12.0/go.mod h1:FEZ4lXpADAC2AIpQY7LANNjjwyQ2jK439CI2VaD+sLY=
-cloud.google.com/go/logging v1.19.0 h1:NCqhdVUg3wQ8Cobdf16FDSuTGi3+6+hdSBHrY5TsR6Q=
-cloud.google.com/go/logging v1.19.0/go.mod h1:i40NZCHC9Gqvod4yE+yQfDWwlgwW/SrshkkGibCHxcA=
-cloud.google.com/go/longrunning v1.2.0 h1:WjYH3YHBGCxGJP9M4dWGHBfXr/cFIjMkNgWcJj7/iMM=
-cloud.google.com/go/longrunning v1.2.0/go.mod h1:5KMQALFGOCtFoi2xSOA1u3H7WKlhmckgiyFw7+LGQp0=
-cloud.google.com/go/monitoring v1.30.0 h1:r/d+JUbyKmJ8b07iznuKfzVzrIXTWxHQ3lBRm3x2LlY=
-cloud.google.com/go/monitoring v1.30.0/go.mod h1:htlUR0QWVMrjFzZmN4LGnMAve9xB/eduwjmINxVZ8RM=
-cloud.google.com/go/storage v1.64.0 h1:KLpxI/oX9LxeRsNqn877d2WyeT3ryiEwnGt8pwcSPZg=
-cloud.google.com/go/storage v1.64.0/go.mod h1:lWyAtwvDZHdL3k68WVKbESP6bmWaV23ZJJ/JEVw/ZaQ=
-cloud.google.com/go/trace v1.16.0 h1:GmQovzFc5F0CNfl0VLgL64aoTtu7xsM0YajW2GlG9+E=
-cloud.google.com/go/trace v1.16.0/go.mod h1:r+bdAn16dKLSV1G2D5v3e58IlQlizfxWrUfjx7kM7X0=
-firebase.google.com/go/v4 v4.21.0 h1:HBZV4jrLtFYj8EwWyqEZOuRLfkfkV2bpnfyyXHOhPxY=
-firebase.google.com/go/v4 v4.21.0/go.mod h1:CDumIdA5oTiyDpLNVcQoW8ZrB5CTgyE2D45DuENIABg=
+cloud.google.com/go/firestore v1.20.0 h1:JLlT12QP0fM2SJirKVyu2spBCO8leElaW0OOtPm6HEo=
+cloud.google.com/go/firestore v1.20.0/go.mod h1:jqu4yKdBmDN5srneWzx3HlKrHFWFdlkgjgQ6BKIOFQo=
+cloud.google.com/go/iam v1.5.3 h1:+vMINPiDF2ognBJ97ABAYYwRgsaqxPbQDlMnbHMjolc=
+cloud.google.com/go/iam v1.5.3/go.mod h1:MR3v9oLkZCTlaqljW6Eb2d3HGDGK5/bDv93jhfISFvU=
+cloud.google.com/go/logging v1.13.1 h1:O7LvmO0kGLaHY/gq8cV7T0dyp6zJhYAOtZPX4TF3QtY=
+cloud.google.com/go/logging v1.13.1/go.mod h1:XAQkfkMBxQRjQek96WLPNze7vsOmay9H5PqfsNYDqvw=
+cloud.google.com/go/longrunning v0.7.0 h1:FV0+SYF1RIj59gyoWDRi45GiYUMM3K1qO51qoboQT1E=
+cloud.google.com/go/longrunning v0.7.0/go.mod h1:ySn2yXmjbK9Ba0zsQqunhDkYi0+9rlXIwnoAf+h+TPY=
+cloud.google.com/go/monitoring v1.24.3 h1:dde+gMNc0UhPZD1Azu6at2e79bfdztVDS5lvhOdsgaE=
+cloud.google.com/go/monitoring v1.24.3/go.mod h1:nYP6W0tm3N9H/bOw8am7t62YTzZY+zUeQ+Bi6+2eonI=
+cloud.google.com/go/storage v1.58.0 h1:PflFXlmFJjG/nBeR9B7pKddLQWaFaRWx4uUi/LyNxxo=
+cloud.google.com/go/storage v1.58.0/go.mod h1:cMWbtM+anpC74gn6qjLh+exqYcfmB9Hqe5z6adx+CLI=
+cloud.google.com/go/trace v1.11.7 h1:kDNDX8JkaAG3R2nq1lIdkb7FCSi1rCmsEtKVsty7p+U=
+cloud.google.com/go/trace v1.11.7/go.mod h1:TNn9d5V3fQVf6s4SCveVMIBS2LJUqo73GACmq/Tky0s=
+firebase.google.com/go/v4 v4.18.0 h1:S+g0P72oDGqOaG4wlLErX3zQmU9plVdu7j+Bc3R1qFw=
+firebase.google.com/go/v4 v4.18.0/go.mod h1:P7UfBpzc8+Z3MckX79+zsWzKVfpGryr6HLbAe7gCWfs=
 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 v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.35.0 h1:bN1gA3of5bXtbnLsRPrwfmbbe7A5UWFlcTHseujLnpc=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.35.0/go.mod h1:Yj5vHEz/aAepZGliRJsA6uvHAVAQyEwajq9ORCHPxzM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.59.0 h1:c/Ivw7FuawPLfrr+zB0LZKeCchO2cAHQpF2qZ6OV7rQ=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.59.0/go.mod h1:Zba7lknY/d78oxbKqFTmCsaGwfpzeJ3ktrrLXtnTV6g=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.59.0 h1:xTXsqDOj5k9mK3VVWHYUryryJCIdYfXxdjKFwpzINUw=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.59.0/go.mod h1:V9g30lTKzfUsEW+gpWssck6u9IhARajmipodImLLcwI=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.59.0 h1:18FRm6ZcN/x9+ZmhMr96hLcTtlLn2/gHPuDLVeg7XcY=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.59.0/go.mod h1:YqwkQPrWSC7+byyc1VlKbWLBF5JsW5IoL6xUkemYSXk=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 h1:lhhYARPUu3LmHysQ/igznQphfzynnqI3D75oUyw1HXk=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0/go.mod h1:l9rva3ApbBpEJxSNYnwT9N4CDLrWgtq3u8736C5hyJw=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.54.0 h1:xfK3bbi6F2RDtaZFtUdKO3osOBIhNb+xTs8lFW6yx9o=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.54.0/go.mod h1:vB2GH9GAYYJTO3mEn8oYwzEdhlayZIdQz6zdzgUIRvA=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 h1:s0WlVbf9qpvkh1c/uDAPElam0WrL7fHRIidgZJ7UqZI=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0/go.mod h1:Mf6O40IAyB9zR/1J8nGDDPirZQQPbYJni8Yisy7NTMc=
 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.4.0 h1:ocnzNKWN23T9nvHi6IfyrQjkIc0oJWv1B1pULsf9i3s=
@@ -46,8 +46,8 @@ 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/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 h1:aBangftG7EVZoUb69Os8IaYg++6uMOdKK83QtkkvJik=
-github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2/go.mod h1:qwXFYgsP6T7XnJtbKlf1HP8AjxZZyzxMmc+Lq5GjlU4=
+github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 h1:6xNmx7iTtyBRev0+D/Tv1FZd4SCg8axKApyNyRsAt/w=
+github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5/go.mod h1:KdCmV+x/BuvyMxRnYBlmVaq4OLiKW6iRQfvC62cvdkI=
 github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
 github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -58,31 +58,31 @@ github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 h1:oP4q0fw+fOSWn3
 github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6/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.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA=
-github.com/envoyproxy/go-control-plane v0.14.0/go.mod h1:NcS5X47pLl/hfqxU70yPwL9ZMkUlwlKxtAohpi2wBEU=
-github.com/envoyproxy/go-control-plane/envoy v1.37.0 h1:u3riX6BoYRfF4Dr7dwSOroNfdSbEPe9Yyl09/B6wBrQ=
-github.com/envoyproxy/go-control-plane/envoy v1.37.0/go.mod h1:DReE9MMrmecPy+YvQOAOHNYMALuowAnbjjEMkkWOi6A=
+github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329 h1:K+fnvUM0VZ7ZFJf0n4L/BRlnsb9pL/GuDG6FqaH+PwM=
+github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329/go.mod h1:Alz8LEClvR7xKsrq3qzoc4N0guvVNSS8KmSChGYr9hs=
+github.com/envoyproxy/go-control-plane/envoy v1.36.0 h1:yg/JjO5E7ubRyKX3m07GF3reDNEnfOboJ0QySbH736g=
+github.com/envoyproxy/go-control-plane/envoy v1.36.0/go.mod h1:ty89S1YCCVruQAm9OtKeEkQLTb+Lkz0k8v9W0Oxsv98=
 github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
 github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
-github.com/envoyproxy/protoc-gen-validate v1.3.3 h1:MVQghNeW+LZcmXe7SY1V36Z+WFMDjpqGAGacLe2T0ds=
-github.com/envoyproxy/protoc-gen-validate v1.3.3/go.mod h1:TsndJ/ngyIdQRhMcVVGDDHINPLWB7C82oDArY51KfB0=
-github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc=
-github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE=
-github.com/gabriel-vasile/mimetype v1.4.15 h1:05iP/CYtZ/w455R/KZM6rZ5ieAdh99UPtd+d3YzLmaI=
-github.com/gabriel-vasile/mimetype v1.4.15/go.mod h1:azpTcoLcDZRNgFou5j+APrqQx9HqVPWa6ijYQIIVswQ=
-github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
-github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
+github.com/envoyproxy/protoc-gen-validate v1.3.0 h1:TvGH1wof4H33rezVKWSpqKz5NXWg5VPuZ0uONDT6eb4=
+github.com/envoyproxy/protoc-gen-validate v1.3.0/go.mod h1:HvYl7zwPa5mffgyeTUHA9zHIH36nmrm7oCbo4YKoSWA=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
+github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
+github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8=
-github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
 github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
-github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
@@ -96,10 +96,10 @@ github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
 github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.19 h1:mMOE7DN2+p76/EdIrmAy9B9bH+yC4563vmnJ34QR8i4=
-github.com/googleapis/enterprise-certificate-proxy v0.3.19/go.mod h1:rSEsBUemEBZEexP2y6jPp16LUmUbjmSbcPMQizR0o4k=
-github.com/googleapis/gax-go/v2 v2.23.0 h1:Tchl7qkvE7Ip3y+ztvNufYFvkfqTe7NfLTYGIdJRLuE=
-github.com/googleapis/gax-go/v2 v2.23.0/go.mod h1:rBQKOVJCdb8IFEzg+FCwlt1LP/xMDGuqUXhUG+XMXEg=
+github.com/googleapis/enterprise-certificate-proxy v0.3.7 h1:zrn2Ee/nWmHulBx5sAVrGgAa0f2/R35S4DJwfFaUPFQ=
+github.com/googleapis/enterprise-certificate-proxy v0.3.7/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
+github.com/googleapis/gax-go/v2 v2.16.0 h1:iHbQmKLLZrexmb0OSsNGTeSTS0HO4YvFOG8g5E4Zd0Y=
+github.com/googleapis/gax-go/v2 v2.16.0/go.mod h1:o1vfQjjNZn4+dPnRdl/4ZD7S9414Y4xA+a/6Icj6l14=
 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.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
@@ -108,20 +108,20 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.10.0 h1:VhSvgU2jSli8o3AqIEOTJr7rZwAEUVo4E4XhR94Zfr0=
-github.com/jackc/pgx/v5 v5.10.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
+github.com/jackc/pgx/v5 v5.8.0 h1:TYPDoleBBme0xGSAX3/+NujXXtpZn9HBONkQC7IEZSo=
+github.com/jackc/pgx/v5 v5.8.0/go.mod h1:QVeDInX2m9VyzvNeiCJVjCkNFqzsNb43204HshNSZKw=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/klauspost/compress v1.19.1 h1:VsB4HPswih7mmZ8WleSFQ75c/Ui1M4trX5oAsJnhSlk=
-github.com/klauspost/compress v1.19.1/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/mattn/go-sqlite3 v1.14.49 h1:B8jBHC3xhxZgxztrgruTuLucebnULQnx4W7cF7SAE9w=
-github.com/mattn/go-sqlite3 v1.14.49/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w=
+github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
+github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -135,20 +135,20 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
-github.com/prometheus/client_golang v1.24.1/go.mod h1:F+oSRECHg4sse5ucfYpYDeIv/hu68Zo0uoHKetWnzcE=
+github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.70.1 h1:1HvjP4D5oL3t8RsPlwxA9onvvStjtIHYE5XuuwOi/PY=
-github.com/prometheus/common v0.70.1/go.mod h1:VdFUQDMZK3VLkurFUVhia6uys/0suUp86TJz5qbJRhc=
-github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
-github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
+github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc=
+github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
+github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
+github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spiffe/go-spiffe/v2 v2.8.1 h1:eXZMLsu+3MLEPJyGJkolqtVrteZfQdUpOWj6LTiDl/E=
-github.com/spiffe/go-spiffe/v2 v2.8.1/go.mod h1:47Q0Q9/AqGha8QLHp+kxpH4Wca7X7EnOtlIJy3mxZ3U=
+github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
+github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
@@ -165,38 +165,36 @@ github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342/go.mod h1:Ohn+xnUBi
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/detectors/gcp v1.44.0 h1:NmLfL734pJhM0JKaYd2Y28+nY9dPRWYAAbxhRCrKXPw=
-go.opentelemetry.io/contrib/detectors/gcp v1.44.0/go.mod h1:tNAsgd8avTGke1+MndXlU5Cru4PQ9Ai/cCNWQv/ZJ/s=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.69.0 h1:2yEATaop1/a1I4psnSLgWVPLWwCzkqWakgJy7xTDVy0=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.69.0/go.mod h1:D7J12YRapIekYyPWgGPlA/23pRmpSEZC5xJC/TTLI9U=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 h1:8tvICD4vSTOOsNrsI4Ljf6C+6UKvpTEH5XY3JMoyPoo=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0/go.mod h1:z9+yiacE0IHRqM4qFfkbt/JYlmYXgss8GY/jXoNuPJI=
-go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
-go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.44.0 h1:hqxVTu/GtBF+vJ8d1fzW7fRxZFvgoDjWcxwwCaFDYpU=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.44.0/go.mod h1:z5fVEF4X5v0ESvlJqBrrFlBVoj5EQuefZpzsu7R+x5Q=
-go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
-go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
-go.opentelemetry.io/otel/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA=
-go.opentelemetry.io/otel/metric/x v0.66.0/go.mod h1:d1+BDj9t96do0/1LoU1ayfCv79ZgNE41qbhBvnMOBZk=
-go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
-go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
-go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
-go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
-go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
-go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
+go.opentelemetry.io/contrib/detectors/gcp v1.39.0 h1:kWRNZMsfBHZ+uHjiH4y7Etn2FK26LAGkNFw7RHv1DhE=
+go.opentelemetry.io/contrib/detectors/gcp v1.39.0/go.mod h1:t/OGqzHBa5v6RHZwrDBJ2OirWc+4q/w2fTbLZwAKjTk=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0 h1:RN3ifU8y4prNWeEnQp2kRRHz8UwonAEYZl8tUzHEXAk=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0/go.mod h1:habDz3tEWiFANTo6oUE99EmaFUrCNYAAg3wiVmusm70=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGNANqpVFCndZvcuyKbl0g+UAVcbBcqGkG28H0Y=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0/go.mod h1:GQ/474YrbE4Jx8gZ4q5I4hrhUzM6UPzyrqJYV2AqPoQ=
+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
+go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 h1:wm/Q0GAAykXv83wzcKzGGqAnnfLFyFe7RslekZuv+VI=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0/go.mod h1:ra3Pa40+oKjvYh+ZD3EdxFZZB0xdMfuileHAm4nNN7w=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
+go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
+go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
+go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
+go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
-go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
+go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
+go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
-golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
 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/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -211,10 +209,10 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
-golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
-golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
-golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
+golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 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.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -222,8 +220,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
-golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 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=
@@ -236,8 +234,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
-golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 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=
@@ -247,8 +245,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
-golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
+golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
+golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -260,10 +258,10 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
-golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
-golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
-golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
+golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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=
@@ -272,20 +270,20 @@ golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 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=
-gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
-gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
-google.golang.org/api v0.291.0 h1:wfPbbY+mr9c7wZLqqzrHJLft/q8iFKREd6IgTBUene0=
-google.golang.org/api v0.291.0/go.mod h1:at7kwWbuonglBFEBoeMDAV1bguHqL3qf0BHFsv3coa0=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
+google.golang.org/api v0.258.0 h1:IKo1j5FBlN74fe5isA2PVozN3Y5pwNKriEgAXPOkDAc=
+google.golang.org/api v0.258.0/go.mod h1:qhOMTQEZ6lUps63ZNq9jhODswwjkjYYguA7fA3TBFww=
 google.golang.org/appengine/v2 v2.0.6 h1:LvPZLGuchSBslPBp+LAhihBeGSiRh1myRoYK4NtuBIw=
 google.golang.org/appengine/v2 v2.0.6/go.mod h1:WoEXGoXNfa0mLvaH5sV3ZSGXwVmy8yf7Z1JKf3J3wLI=
-google.golang.org/genproto v0.0.0-20260803160001-6ac0973c030d h1:33JLrUF0lFT31667SAtJzZAjLewV0ew5Mizks4caz0A=
-google.golang.org/genproto v0.0.0-20260803160001-6ac0973c030d/go.mod h1:I7vGRdTamb7ukERkgP9I+0e4p21O4ak3cM7ICA3krg8=
-google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d h1:FarXi840EJWSHYTN3ERkADbPWjl307+FGrA22KAVjjc=
-google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d h1:IL4hdHzcUv2l/gcg98/Rj3FbtE6axwqslOW8SW0C+S0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ=
-google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ=
+google.golang.org/genproto v0.0.0-20251213004720-97cd9d5aeac2 h1:stRtB2UVzFOWnorVuwF0BVVEjQ3AN6SjHWdg811UIQM=
+google.golang.org/genproto v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:yJ2HH4EHEDTd3JiLmhds6NkJ17ITVYOdV3m3VKOnws0=
+google.golang.org/genproto/googleapis/api v0.0.0-20251213004720-97cd9d5aeac2 h1:7LRqPCEdE4TP4/9psdaB7F2nhZFfBiGJomA5sojLWdU=
+google.golang.org/genproto/googleapis/api v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
+google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=

mail/sender.go

@@ -1,140 +0,0 @@
-package mail
-
-import (
-	"fmt"
-	"mime"
-	"net"
-	"net/smtp"
-	"strings"
-	"sync"
-	"time"
-
-	"heckel.io/ntfy/v2/log"
-	"heckel.io/ntfy/v2/model"
-)
-
-const (
-	tagMail = "mail"
-
-	emailVerificationSubject = "Verify your email for ntfy"
-	passwordResetSubject     = "Reset your ntfy password"
-)
-
-// Config holds the SMTP configuration for the mail sender
-type Config struct {
-	BaseURL  string // ntfy base URL, used to build topic URLs in notification emails
-	SMTPAddr string // SMTP server address (host:port)
-	SMTPUser string // SMTP auth username
-	SMTPPass string // SMTP auth password
-	From     string // Sender email address
-}
-
-// Sender sends all of ntfy's outgoing email: notification emails (the email-on-publish feature)
-// as well as the magic-link emails for email verification and password reset. realSender is the
-// SMTP-backed implementation; tests inject a fake.
-type Sender interface {
-	SendNotification(to string, m *model.Message, senderIP string) error
-	NotificationCounts() (total int64, success int64, failure int64)
-	SendEmailVerification(to, link string) error
-	SendPasswordReset(to, link string) error
-}
-
-// realSender is the SMTP-backed implementation of Sender. Pending verification/reset state lives
-// in the database (see user.Manager), not in this struct.
-type realSender struct {
-	config  *Config
-	success int64
-	failure int64
-	mu      sync.Mutex
-}
-
-// NewSender creates a new mail Sender with the given SMTP config
-func NewSender(config *Config) Sender {
-	return &realSender{config: config}
-}
-
-// SendNotification formats a ntfy message into a notification email and sends it via SMTP. It
-// tracks success/failure counts, exposed via Counts (used for the server stats).
-func (s *realSender) SendNotification(to string, m *model.Message, senderIP string) error {
-	message, err := formatMail(s.config.BaseURL, senderIP, s.config.From, to, m)
-	if err != nil {
-		s.count(false)
-		return err
-	}
-	log.Tag(tagMail).Field("email_to", to).Debug("Sending notification email")
-	err = s.sendRaw(to, []byte(message))
-	s.count(err == nil)
-	return err
-}
-
-// NotificationCounts returns the number of notification emails sent, broken down into total, success and failure
-func (s *realSender) NotificationCounts() (total int64, success int64, failure int64) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.success + s.failure, s.success, s.failure
-}
-
-// SendEmailVerification sends an email containing a magic link to verify ownership of the
-// recipient address. The link carries a one-time token validated against the database.
-func (s *realSender) SendEmailVerification(to, link string) error {
-	body := fmt.Sprintf(`Click the link below to verify this email address for your ntfy account:
-
-%s
-
-This link expires in 24 hours. If you did not request this, you can safely ignore this email.`, link)
-	return s.send(to, emailVerificationSubject, body)
-}
-
-// SendPasswordReset sends an email containing a magic link to set a new password. The link
-// carries a one-time token validated against the database.
-func (s *realSender) SendPasswordReset(to, link string) error {
-	body := fmt.Sprintf(`Click the link below to set a new password for your ntfy account:
-
-%s
-
-This link expires in 1 hour. If you did not request this, you can safely ignore this email -- your password will not change.`, link)
-	return s.send(to, passwordResetSubject, body)
-}
-
-// send sends a plain text email via SMTP
-func (s *realSender) send(to, subject, body string) error {
-	date := time.Now().UTC().Format(time.RFC1123Z)
-	encodedSubject := mime.BEncoding.Encode("utf-8", subject)
-	message := `From: ntfy <{from}>
-To: {to}
-Date: {date}
-Subject: {subject}
-Content-Type: text/plain; charset="utf-8"
-
-{body}`
-	message = strings.ReplaceAll(message, "{from}", s.config.From)
-	message = strings.ReplaceAll(message, "{to}", to)
-	message = strings.ReplaceAll(message, "{date}", date)
-	message = strings.ReplaceAll(message, "{subject}", encodedSubject)
-	message = strings.ReplaceAll(message, "{body}", body)
-	log.Tag(tagMail).Field("email_to", to).Debug("Sending email")
-	return s.sendRaw(to, []byte(message))
-}
-
-// sendRaw sends a raw email message via SMTP
-func (s *realSender) sendRaw(to string, message []byte) error {
-	host, _, err := net.SplitHostPort(s.config.SMTPAddr)
-	if err != nil {
-		return err
-	}
-	var auth smtp.Auth
-	if s.config.SMTPUser != "" {
-		auth = smtp.PlainAuth("", s.config.SMTPUser, s.config.SMTPPass, host)
-	}
-	return smtp.SendMail(s.config.SMTPAddr, auth, s.config.From, []string{to}, message)
-}
-
-func (s *realSender) count(ok bool) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if ok {
-		s.success++
-	} else {
-		s.failure++
-	}
-}

main.go

@@ -2,14 +2,12 @@ package main
 
 import (
 	"fmt"
-	"os"
-	"runtime"
-
 	"github.com/urfave/cli/v2"
 	"heckel.io/ntfy/v2/cmd"
+	"os"
+	"runtime"
 )
 
-// These variables are set during build time using -ldflags
 var (
 	version = "dev"
 	commit  = "unknown"
@@ -26,24 +24,13 @@ the Matrix room (https://matrix.to/#/#ntfy:matrix.org).
 
 ntfy %s (%s), runtime %s, built at %s
 Copyright (C) Philipp C. Heckel, licensed under Apache License 2.0 & GPLv2
-`, version, maybeShortCommit(commit), runtime.Version(), date)
+`, version, commit[:7], runtime.Version(), date)
 
 	app := cmd.New()
 	app.Version = version
-	app.Metadata = map[string]any{
-		cmd.MetadataKeyDate:   date,
-		cmd.MetadataKeyCommit: commit,
-	}
 
 	if err := app.Run(os.Args); err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 }
-
-func maybeShortCommit(commit string) string {
-	if len(commit) > 7 {
-		return commit[:7]
-	}
-	return commit
-}

message/cache.go

@@ -1,567 +0,0 @@
-package message
-
-import (
-	"database/sql"
-	"encoding/json"
-	"errors"
-	"net/netip"
-	"strings"
-	"sync"
-	"time"
-
-	"heckel.io/ntfy/v2/db"
-	"heckel.io/ntfy/v2/log"
-	"heckel.io/ntfy/v2/model"
-	"heckel.io/ntfy/v2/util"
-)
-
-const (
-	tagMessageCache = "message_cache"
-	schemaStore     = "message" // Store name in the schema_version table (see db/schema)
-)
-
-var errNoRows = errors.New("no rows found")
-
-// queries holds the database-specific SQL queries
-type queries struct {
-	insertMessage                    string
-	selectScheduledMessageIDsBySeqID string
-	deleteScheduledBySequenceID      string
-	updateMessagesForTopicExpiry     string
-	selectMessagesByID               string
-	selectMessagesSinceTime          string
-	selectMessagesSinceTimeScheduled string
-	selectMessagesSinceID            string
-	selectMessagesSinceIDScheduled   string
-	selectMessagesLatest             string
-	selectMessagesDue                string
-	deleteExpiredMessages            string
-	updateMessagePublished           string
-	selectMessagesCount              string
-	selectTopics                     string
-	markExpiredAttachmentsDeleted    string
-	selectAttachmentsSizeBySender    string
-	selectAttachmentsSizeByUserID    string
-	selectAttachmentsWithSizes       string
-	selectStats                      string
-	updateStats                      string
-	updateMessageTime                string
-}
-
-// Cache stores published messages
-type Cache struct {
-	db      *db.DB
-	queue   *util.BatchingQueue[*model.Message]
-	nop     bool
-	mu      *sync.Mutex // nil for PostgreSQL (concurrent writes supported), set for SQLite (single writer)
-	queries queries
-}
-
-func newCache(db *db.DB, queries queries, mu *sync.Mutex, batchSize int, batchTimeout time.Duration, nop bool) *Cache {
-	var queue *util.BatchingQueue[*model.Message]
-	if batchSize > 0 || batchTimeout > 0 {
-		queue = util.NewBatchingQueue[*model.Message](batchSize, batchTimeout)
-	}
-	c := &Cache{
-		db:      db,
-		queue:   queue,
-		nop:     nop,
-		mu:      mu,
-		queries: queries,
-	}
-	go c.processMessageBatches()
-	return c
-}
-
-func (c *Cache) maybeLock() {
-	if c.mu != nil {
-		c.mu.Lock()
-	}
-}
-
-func (c *Cache) maybeUnlock() {
-	if c.mu != nil {
-		c.mu.Unlock()
-	}
-}
-
-// AddMessage stores a message to the message cache synchronously, or queues it to be stored at a later date asynchronously.
-// The message is queued only if "batchSize" or "batchTimeout" are passed to the constructor.
-func (c *Cache) AddMessage(m *model.Message) error {
-	if c.queue != nil {
-		c.queue.Enqueue(m)
-		return nil
-	}
-	return c.addMessages([]*model.Message{m})
-}
-
-// AddMessages synchronously stores a batch of messages to the message cache
-func (c *Cache) AddMessages(ms []*model.Message) error {
-	return c.addMessages(ms)
-}
-
-func (c *Cache) addMessages(ms []*model.Message) error {
-	c.maybeLock()
-	defer c.maybeUnlock()
-	if c.nop {
-		return nil
-	}
-	if len(ms) == 0 {
-		return nil
-	}
-	start := time.Now()
-	tx, err := c.db.Begin()
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-	stmt, err := tx.Prepare(c.queries.insertMessage)
-	if err != nil {
-		return err
-	}
-	defer stmt.Close()
-	for _, m := range ms {
-		if m.Event != model.MessageEvent && m.Event != model.MessageDeleteEvent && m.Event != model.MessageClearEvent {
-			return model.ErrUnexpectedMessageType
-		}
-		published := m.Time <= time.Now().Unix()
-		tags := util.SanitizeUTF8(strings.Join(m.Tags, ","))
-		var attachmentName, attachmentType, attachmentURL string
-		var attachmentSize, attachmentExpires int64
-		var attachmentDeleted bool
-		if m.Attachment != nil {
-			attachmentName = util.SanitizeUTF8(m.Attachment.Name)
-			attachmentType = util.SanitizeUTF8(m.Attachment.Type)
-			attachmentSize = m.Attachment.Size
-			attachmentExpires = m.Attachment.Expires
-			attachmentURL = util.SanitizeUTF8(m.Attachment.URL)
-		}
-		var actionsStr string
-		if len(m.Actions) > 0 {
-			actionsBytes, err := json.Marshal(m.Actions)
-			if err != nil {
-				return err
-			}
-			actionsStr = string(actionsBytes)
-		}
-		var sender string
-		if m.Sender.IsValid() {
-			sender = m.Sender.String()
-		}
-		_, err := stmt.Exec(
-			m.ID,
-			m.SequenceID,
-			m.Time,
-			m.Event,
-			m.Expires,
-			util.SanitizeUTF8(m.Topic),
-			util.SanitizeUTF8(m.Message),
-			util.SanitizeUTF8(m.Title),
-			m.Priority,
-			tags,
-			util.SanitizeUTF8(m.Click),
-			util.SanitizeUTF8(m.Icon),
-			actionsStr,
-			attachmentName,
-			attachmentType,
-			attachmentSize,
-			attachmentExpires,
-			attachmentURL,
-			attachmentDeleted, // Always zero
-			sender,
-			m.User,
-			util.SanitizeUTF8(m.ContentType),
-			m.Encoding,
-			published,
-		)
-		if err != nil {
-			return err
-		}
-	}
-	if err := tx.Commit(); err != nil {
-		log.Tag(tagMessageCache).Err(err).Error("Writing %d message(s) failed (took %v)", len(ms), time.Since(start))
-		return err
-	}
-	log.Tag(tagMessageCache).Debug("Wrote %d message(s) in %v", len(ms), time.Since(start))
-	return nil
-}
-
-// Messages returns messages for a topic since the given marker, optionally including scheduled messages
-func (c *Cache) Messages(topic string, since model.SinceMarker, scheduled bool) ([]*model.Message, error) {
-	if since.IsNone() {
-		return make([]*model.Message, 0), nil
-	} else if since.IsLatest() {
-		return c.messagesLatest(topic)
-	} else if since.IsID() {
-		return c.messagesSinceID(topic, since, scheduled)
-	}
-	return c.messagesSinceTime(topic, since, scheduled)
-}
-
-func (c *Cache) messagesSinceTime(topic string, since model.SinceMarker, scheduled bool) ([]*model.Message, error) {
-	var rows *sql.Rows
-	var err error
-	rdb := c.db.ReadOnly()
-	if scheduled {
-		rows, err = rdb.Query(c.queries.selectMessagesSinceTimeScheduled, topic, since.Time().Unix())
-	} else {
-		rows, err = rdb.Query(c.queries.selectMessagesSinceTime, topic, since.Time().Unix())
-	}
-	if err != nil {
-		return nil, err
-	}
-	return readMessages(rows)
-}
-
-func (c *Cache) messagesSinceID(topic string, since model.SinceMarker, scheduled bool) ([]*model.Message, error) {
-	var rows *sql.Rows
-	var err error
-	rdb := c.db.ReadOnly()
-	if scheduled {
-		rows, err = rdb.Query(c.queries.selectMessagesSinceIDScheduled, topic, since.ID())
-	} else {
-		rows, err = rdb.Query(c.queries.selectMessagesSinceID, topic, since.ID())
-	}
-	if err != nil {
-		return nil, err
-	}
-	return readMessages(rows)
-}
-
-func (c *Cache) messagesLatest(topic string) ([]*model.Message, error) {
-	rows, err := c.db.ReadOnly().Query(c.queries.selectMessagesLatest, topic)
-	if err != nil {
-		return nil, err
-	}
-	return readMessages(rows)
-}
-
-// MessagesDue returns all messages that are due for publishing
-func (c *Cache) MessagesDue() ([]*model.Message, error) {
-	rows, err := c.db.Query(c.queries.selectMessagesDue, time.Now().Unix())
-	if err != nil {
-		return nil, err
-	}
-	return readMessages(rows)
-}
-
-// DeleteExpiredMessages deletes up to `limit` expired messages in a single query
-// and returns the number of deleted rows.
-func (c *Cache) DeleteExpiredMessages(limit int) (int64, error) {
-	c.maybeLock()
-	defer c.maybeUnlock()
-	result, err := c.db.Exec(c.queries.deleteExpiredMessages, time.Now().Unix(), limit)
-	if err != nil {
-		return 0, err
-	}
-	return result.RowsAffected()
-}
-
-// Message returns the message with the given ID, or ErrMessageNotFound if not found
-func (c *Cache) Message(id string) (*model.Message, error) {
-	rows, err := c.db.ReadOnly().Query(c.queries.selectMessagesByID, id)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	if !rows.Next() {
-		return nil, model.ErrMessageNotFound
-	}
-	return readMessage(rows)
-}
-
-// UpdateMessageTime updates the time column for a message by ID. This is only used for testing.
-func (c *Cache) UpdateMessageTime(messageID string, timestamp int64) error {
-	c.maybeLock()
-	defer c.maybeUnlock()
-	_, err := c.db.Exec(c.queries.updateMessageTime, timestamp, messageID)
-	return err
-}
-
-// MarkPublished marks a message as published
-func (c *Cache) MarkPublished(m *model.Message) error {
-	c.maybeLock()
-	defer c.maybeUnlock()
-	_, err := c.db.Exec(c.queries.updateMessagePublished, m.ID)
-	return err
-}
-
-// MessagesCount returns the total number of messages in the cache
-func (c *Cache) MessagesCount() (int, error) {
-	rows, err := c.db.ReadOnly().Query(c.queries.selectMessagesCount)
-	if err != nil {
-		return 0, err
-	}
-	defer rows.Close()
-	if !rows.Next() {
-		return 0, errNoRows
-	}
-	var count int
-	if err := rows.Scan(&count); err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// Topics returns a list of all topics with messages in the cache
-func (c *Cache) Topics() ([]string, error) {
-	rows, err := c.db.ReadOnly().Query(c.queries.selectTopics)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	return readStrings(rows)
-}
-
-// DeleteScheduledBySequenceID deletes unpublished (scheduled) messages with the given topic and sequence ID.
-// It returns the message IDs of the deleted messages, which can be used to clean up attachment files.
-func (c *Cache) DeleteScheduledBySequenceID(topic, sequenceID string) ([]string, error) {
-	c.maybeLock()
-	defer c.maybeUnlock()
-	return db.QueryTx(c.db, func(tx *sql.Tx) ([]string, error) {
-		rows, err := tx.Query(c.queries.selectScheduledMessageIDsBySeqID, topic, sequenceID)
-		if err != nil {
-			return nil, err
-		}
-		defer rows.Close()
-		ids, err := readStrings(rows)
-		if err != nil {
-			return nil, err
-		}
-		rows.Close() // Close rows before executing delete in same transaction
-		if _, err := tx.Exec(c.queries.deleteScheduledBySequenceID, topic, sequenceID); err != nil {
-			return nil, err
-		}
-		return ids, nil
-	})
-}
-
-// ExpireMessages marks messages in the given topics as expired
-func (c *Cache) ExpireMessages(topics ...string) error {
-	c.maybeLock()
-	defer c.maybeUnlock()
-	return db.ExecTx(c.db, func(tx *sql.Tx) error {
-		for _, t := range topics {
-			if _, err := tx.Exec(c.queries.updateMessagesForTopicExpiry, time.Now().Unix()-1, t); err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}
-
-// MarkExpiredAttachmentsDeleted marks up to `limit` expired attachments as deleted in a single
-// query and returns the number of updated rows.
-func (c *Cache) MarkExpiredAttachmentsDeleted(limit int) (int64, error) {
-	c.maybeLock()
-	defer c.maybeUnlock()
-	result, err := c.db.Exec(c.queries.markExpiredAttachmentsDeleted, time.Now().Unix(), limit)
-	if err != nil {
-		return 0, err
-	}
-	return result.RowsAffected()
-}
-
-// AttachmentBytesUsedBySender returns the total size of active attachments sent by the given sender
-func (c *Cache) AttachmentBytesUsedBySender(sender string) (int64, error) {
-	rows, err := c.db.ReadOnly().Query(c.queries.selectAttachmentsSizeBySender, sender, time.Now().Unix())
-	if err != nil {
-		return 0, err
-	}
-	return c.readAttachmentBytesUsed(rows)
-}
-
-// AttachmentBytesUsedByUser returns the total size of active attachments for the given user
-func (c *Cache) AttachmentBytesUsedByUser(userID string) (int64, error) {
-	rows, err := c.db.ReadOnly().Query(c.queries.selectAttachmentsSizeByUserID, userID, time.Now().Unix())
-	if err != nil {
-		return 0, err
-	}
-	return c.readAttachmentBytesUsed(rows)
-}
-
-// AttachmentsWithSizes returns a map of message ID to attachment size for all active
-// (non-expired, non-deleted) attachments. This is used to hydrate the attachment store's
-// size tracking on startup and during periodic sync.
-func (c *Cache) AttachmentsWithSizes() (map[string]int64, error) {
-	rows, err := c.db.ReadOnly().Query(c.queries.selectAttachmentsWithSizes, time.Now().Unix())
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	attachments := make(map[string]int64)
-	for rows.Next() {
-		var id string
-		var size int64
-		if err := rows.Scan(&id, &size); err != nil {
-			return nil, err
-		}
-		attachments[id] = size
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return attachments, nil
-}
-
-func (c *Cache) readAttachmentBytesUsed(rows *sql.Rows) (int64, error) {
-	defer rows.Close()
-	var size int64
-	if !rows.Next() {
-		return 0, errors.New("no rows found")
-	}
-	if err := rows.Scan(&size); err != nil {
-		return 0, err
-	} else if err := rows.Err(); err != nil {
-		return 0, err
-	}
-	return size, nil
-}
-
-// UpdateStats updates the total message count statistic
-func (c *Cache) UpdateStats(messages int64) error {
-	c.maybeLock()
-	defer c.maybeUnlock()
-	_, err := c.db.Exec(c.queries.updateStats, messages)
-	return err
-}
-
-// Stats returns the total message count statistic
-func (c *Cache) Stats() (messages int64, err error) {
-	rows, err := c.db.ReadOnly().Query(c.queries.selectStats)
-	if err != nil {
-		return 0, err
-	}
-	defer rows.Close()
-	if !rows.Next() {
-		return 0, errNoRows
-	}
-	if err := rows.Scan(&messages); err != nil {
-		return 0, err
-	}
-	return messages, nil
-}
-
-// Close closes the underlying database connection
-func (c *Cache) Close() error {
-	return c.db.Close()
-}
-
-func (c *Cache) processMessageBatches() {
-	if c.queue == nil {
-		return
-	}
-	for messages := range c.queue.Dequeue() {
-		if err := c.addMessages(messages); err != nil {
-			log.Tag(tagMessageCache).Err(err).Error("Cannot write message batch")
-		}
-	}
-}
-
-func readMessages(rows *sql.Rows) ([]*model.Message, error) {
-	defer rows.Close()
-	messages := make([]*model.Message, 0)
-	for rows.Next() {
-		m, err := readMessage(rows)
-		if err != nil {
-			return nil, err
-		}
-		messages = append(messages, m)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return messages, nil
-}
-
-func readMessage(rows *sql.Rows) (*model.Message, error) {
-	var timestamp, expires, attachmentSize, attachmentExpires int64
-	var priority int
-	var id, sequenceID, event, topic, msg, title, tagsStr, click, icon, actionsStr, attachmentName, attachmentType, attachmentURL, sender, user, contentType, encoding string
-	err := rows.Scan(
-		&id,
-		&sequenceID,
-		&timestamp,
-		&event,
-		&expires,
-		&topic,
-		&msg,
-		&title,
-		&priority,
-		&tagsStr,
-		&click,
-		&icon,
-		&actionsStr,
-		&attachmentName,
-		&attachmentType,
-		&attachmentSize,
-		&attachmentExpires,
-		&attachmentURL,
-		&sender,
-		&user,
-		&contentType,
-		&encoding,
-	)
-	if err != nil {
-		return nil, err
-	}
-	var tags []string
-	if tagsStr != "" {
-		tags = strings.Split(tagsStr, ",")
-	}
-	var actions []*model.Action
-	if actionsStr != "" {
-		if err := json.Unmarshal([]byte(actionsStr), &actions); err != nil {
-			return nil, err
-		}
-	}
-	senderIP, err := netip.ParseAddr(sender)
-	if err != nil {
-		senderIP = netip.Addr{} // if no IP stored in database, return invalid address
-	}
-	var att *model.Attachment
-	if attachmentName != "" && attachmentURL != "" {
-		att = &model.Attachment{
-			Name:    attachmentName,
-			Type:    attachmentType,
-			Size:    attachmentSize,
-			Expires: attachmentExpires,
-			URL:     attachmentURL,
-		}
-	}
-	return &model.Message{
-		ID:          id,
-		SequenceID:  sequenceID,
-		Time:        timestamp,
-		Expires:     expires,
-		Event:       event,
-		Topic:       topic,
-		Message:     msg,
-		Title:       title,
-		Priority:    priority,
-		Tags:        tags,
-		Click:       click,
-		Icon:        icon,
-		Actions:     actions,
-		Attachment:  att,
-		Sender:      senderIP,
-		User:        user,
-		ContentType: contentType,
-		Encoding:    encoding,
-	}, nil
-}
-
-func readStrings(rows *sql.Rows) ([]string, error) {
-	strs := make([]string, 0)
-	for rows.Next() {
-		var s string
-		if err := rows.Scan(&s); err != nil {
-			return nil, err
-		}
-		strs = append(strs, s)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return strs, nil
-}

message/cache_postgres.go

@@ -1,110 +0,0 @@
-package message
-
-import (
-	"time"
-
-	"heckel.io/ntfy/v2/db"
-	"heckel.io/ntfy/v2/db/schema"
-)
-
-// PostgreSQL runtime query constants
-const (
-	postgresInsertMessageQuery = `
-		INSERT INTO message (mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, attachment_deleted, sender, user_id, content_type, encoding, published)
-		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24)
-	`
-	postgresSelectScheduledMessageIDsBySeqIDQuery = `SELECT mid FROM message WHERE topic = $1 AND sequence_id = $2 AND published = FALSE`
-	postgresDeleteScheduledBySequenceIDQuery      = `DELETE FROM message WHERE topic = $1 AND sequence_id = $2 AND published = FALSE`
-	postgresUpdateMessagesForTopicExpiryQuery     = `UPDATE message SET expires = $1 WHERE topic = $2`
-	postgresSelectMessagesByIDQuery               = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user_id, content_type, encoding
-		FROM message
-		WHERE mid = $1
-	`
-	postgresSelectMessagesSinceTimeQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user_id, content_type, encoding
-		FROM message
-		WHERE topic = $1 AND time >= $2 AND published = TRUE
-		ORDER BY time, id
-	`
-	postgresSelectMessagesSinceTimeIncludeScheduledQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user_id, content_type, encoding
-		FROM message
-		WHERE topic = $1 AND time >= $2
-		ORDER BY time, id
-	`
-	postgresSelectMessagesSinceIDQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user_id, content_type, encoding
-		FROM message
-		WHERE topic = $1
-		  AND id > COALESCE((SELECT id FROM message WHERE mid = $2), 0)
-		  AND published = TRUE
-		ORDER BY time, id
-	`
-	postgresSelectMessagesSinceIDIncludeScheduledQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user_id, content_type, encoding
-		FROM message
-		WHERE topic = $1
-		  AND (id > COALESCE((SELECT id FROM message WHERE mid = $2), 0) OR published = FALSE)
-		ORDER BY time, id
-	`
-	postgresSelectMessagesLatestQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user_id, content_type, encoding
-		FROM message
-		WHERE topic = $1 AND published = TRUE
-		ORDER BY time DESC, id DESC
-		LIMIT 1
-	`
-	postgresSelectMessagesDueQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user_id, content_type, encoding
-		FROM message
-		WHERE time <= $1 AND published = FALSE
-		ORDER BY time, id
-	`
-	postgresUpdateMessagePublishedQuery = `UPDATE message SET published = TRUE WHERE mid = $1`
-	postgresSelectMessagesCountQuery    = `SELECT COUNT(*) FROM message`
-	postgresSelectTopicsQuery           = `SELECT topic FROM message GROUP BY topic`
-
-	postgresDeleteExpiredMessagesQuery         = `DELETE FROM message WHERE mid IN (SELECT mid FROM message WHERE expires <= $1 AND published = TRUE LIMIT $2)`
-	postgresMarkExpiredAttachmentsDeletedQuery = `UPDATE message SET attachment_deleted = TRUE WHERE mid IN (SELECT mid FROM message WHERE attachment_expires > 0 AND attachment_expires <= $1 AND attachment_deleted = FALSE LIMIT $2)`
-	postgresSelectAttachmentsSizeBySenderQuery = `SELECT COALESCE(SUM(attachment_size), 0) FROM message WHERE user_id = '' AND sender = $1 AND attachment_expires >= $2`
-	postgresSelectAttachmentsSizeByUserIDQuery = `SELECT COALESCE(SUM(attachment_size), 0) FROM message WHERE user_id = $1 AND attachment_expires >= $2`
-	postgresSelectAttachmentsWithSizesQuery    = `SELECT mid, attachment_size FROM message WHERE attachment_expires > $1 AND attachment_deleted = FALSE`
-
-	postgresSelectStatsQuery       = `SELECT value FROM message_stats WHERE key = 'messages'`
-	postgresUpdateStatsQuery       = `UPDATE message_stats SET value = $1 WHERE key = 'messages'`
-	postgresUpdateMessageTimeQuery = `UPDATE message SET time = $1 WHERE mid = $2`
-)
-
-var postgresQueries = queries{
-	insertMessage:                    postgresInsertMessageQuery,
-	selectScheduledMessageIDsBySeqID: postgresSelectScheduledMessageIDsBySeqIDQuery,
-	deleteScheduledBySequenceID:      postgresDeleteScheduledBySequenceIDQuery,
-	updateMessagesForTopicExpiry:     postgresUpdateMessagesForTopicExpiryQuery,
-	selectMessagesByID:               postgresSelectMessagesByIDQuery,
-	selectMessagesSinceTime:          postgresSelectMessagesSinceTimeQuery,
-	selectMessagesSinceTimeScheduled: postgresSelectMessagesSinceTimeIncludeScheduledQuery,
-	selectMessagesSinceID:            postgresSelectMessagesSinceIDQuery,
-	selectMessagesSinceIDScheduled:   postgresSelectMessagesSinceIDIncludeScheduledQuery,
-	selectMessagesLatest:             postgresSelectMessagesLatestQuery,
-	selectMessagesDue:                postgresSelectMessagesDueQuery,
-	deleteExpiredMessages:            postgresDeleteExpiredMessagesQuery,
-	updateMessagePublished:           postgresUpdateMessagePublishedQuery,
-	selectMessagesCount:              postgresSelectMessagesCountQuery,
-	selectTopics:                     postgresSelectTopicsQuery,
-	markExpiredAttachmentsDeleted:    postgresMarkExpiredAttachmentsDeletedQuery,
-	selectAttachmentsSizeBySender:    postgresSelectAttachmentsSizeBySenderQuery,
-	selectAttachmentsSizeByUserID:    postgresSelectAttachmentsSizeByUserIDQuery,
-	selectAttachmentsWithSizes:       postgresSelectAttachmentsWithSizesQuery,
-	selectStats:                      postgresSelectStatsQuery,
-	updateStats:                      postgresUpdateStatsQuery,
-	updateMessageTime:                postgresUpdateMessageTimeQuery,
-}
-
-// NewPostgresStore creates a new PostgreSQL-backed message cache store using an existing database connection pool.
-func NewPostgresStore(d *db.DB, batchSize int, batchTimeout time.Duration) (*Cache, error) {
-	if err := schema.Migrate(d.Primary(), schema.Postgres, schemaStore, postgresCurrentSchemaVersion, postgresCreateTables, postgresMigrations); err != nil {
-		return nil, err
-	}
-	return newCache(d, postgresQueries, nil, batchSize, batchTimeout, false), nil
-}

message/cache_postgres_schema.go

@@ -1,69 +0,0 @@
-package message
-
-import (
-	"heckel.io/ntfy/v2/db/schema"
-)
-
-// Initial PostgreSQL schema
-const (
-	postgresCurrentSchemaVersion = 15
-	postgresCreateTablesQuery    = `
-		CREATE TABLE IF NOT EXISTS message (
-			id BIGSERIAL PRIMARY KEY,
-			mid TEXT NOT NULL,
-			sequence_id TEXT NOT NULL,
-			time BIGINT NOT NULL,
-			event TEXT NOT NULL,
-			expires BIGINT NOT NULL,
-			topic TEXT NOT NULL,
-			message TEXT NOT NULL,
-			title TEXT NOT NULL,
-			priority INT NOT NULL,
-			tags TEXT NOT NULL,
-			click TEXT NOT NULL,
-			icon TEXT NOT NULL,
-			actions TEXT NOT NULL,
-			attachment_name TEXT NOT NULL,
-			attachment_type TEXT NOT NULL,
-			attachment_size BIGINT NOT NULL,
-			attachment_expires BIGINT NOT NULL,
-			attachment_url TEXT NOT NULL,
-			attachment_deleted BOOLEAN NOT NULL DEFAULT FALSE,
-			sender TEXT NOT NULL,
-			user_id TEXT NOT NULL,
-			content_type TEXT NOT NULL,
-			encoding TEXT NOT NULL,
-			published BOOLEAN NOT NULL DEFAULT FALSE
-		);
-		CREATE INDEX IF NOT EXISTS idx_message_mid ON message (mid);
-		CREATE INDEX IF NOT EXISTS idx_message_sequence_id ON message (sequence_id);
-		CREATE INDEX IF NOT EXISTS idx_message_topic_published_time ON message (topic, published, time, id);
-		CREATE INDEX IF NOT EXISTS idx_message_published_expires ON message (published, expires);
-		CREATE INDEX IF NOT EXISTS idx_message_attachment_expires ON message (attachment_expires) WHERE attachment_deleted = FALSE;
-		CREATE INDEX IF NOT EXISTS idx_message_sender_attachment_expires ON message (sender, attachment_expires) WHERE user_id = '';
-		CREATE INDEX IF NOT EXISTS idx_message_user_id_attachment_expires ON message (user_id, attachment_expires);
-		CREATE TABLE IF NOT EXISTS message_stats (
-			key TEXT PRIMARY KEY,
-			value BIGINT
-		);
-		INSERT INTO message_stats (key, value) VALUES ('messages', 0);
-	`
-)
-
-// PostgreSQL schema migrations
-const (
-	// 14 -> 15
-	postgresMigrate14To15CreateIndexQuery = `
-		CREATE INDEX IF NOT EXISTS idx_message_attachment_expires ON message (attachment_expires) WHERE attachment_deleted = FALSE;
-	`
-)
-
-var (
-	postgresCreateTables = schema.AsMigrateFunc(postgresCreateTablesQuery)
-
-	// postgresMigrations maps a schema version to the migration upgrading it to the next
-	// version. Always append migrations at the end, never insert in the middle.
-	postgresMigrations = map[int]schema.MigrateFunc{
-		14: schema.AsMigrateFunc(postgresMigrate14To15CreateIndexQuery),
-	}
-)

message/cache_postgres_test.go

@@ -1,76 +0,0 @@
-package message_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	dbtest "heckel.io/ntfy/v2/db/test"
-	"heckel.io/ntfy/v2/message"
-	"heckel.io/ntfy/v2/model"
-)
-
-func TestPostgresStore_Migration_From14(t *testing.T) {
-	// A pre-framework database at version 14: full v14 schema, version tracked in the
-	// hand-rolled schema_version table, and no idx_message_attachment_expires yet
-	testDB := dbtest.CreateTestPostgres(t)
-	_, err := testDB.Exec(`
-		CREATE TABLE message (
-			id BIGSERIAL PRIMARY KEY,
-			mid TEXT NOT NULL,
-			sequence_id TEXT NOT NULL,
-			time BIGINT NOT NULL,
-			event TEXT NOT NULL,
-			expires BIGINT NOT NULL,
-			topic TEXT NOT NULL,
-			message TEXT NOT NULL,
-			title TEXT NOT NULL,
-			priority INT NOT NULL,
-			tags TEXT NOT NULL,
-			click TEXT NOT NULL,
-			icon TEXT NOT NULL,
-			actions TEXT NOT NULL,
-			attachment_name TEXT NOT NULL,
-			attachment_type TEXT NOT NULL,
-			attachment_size BIGINT NOT NULL,
-			attachment_expires BIGINT NOT NULL,
-			attachment_url TEXT NOT NULL,
-			attachment_deleted BOOLEAN NOT NULL DEFAULT FALSE,
-			sender TEXT NOT NULL,
-			user_id TEXT NOT NULL,
-			content_type TEXT NOT NULL,
-			encoding TEXT NOT NULL,
-			published BOOLEAN NOT NULL DEFAULT FALSE
-		);
-		CREATE INDEX idx_message_mid ON message (mid);
-		CREATE INDEX idx_message_sequence_id ON message (sequence_id);
-		CREATE INDEX idx_message_topic_published_time ON message (topic, published, time, id);
-		CREATE INDEX idx_message_published_expires ON message (published, expires);
-		CREATE INDEX idx_message_sender_attachment_expires ON message (sender, attachment_expires) WHERE user_id = '';
-		CREATE INDEX idx_message_user_id_attachment_expires ON message (user_id, attachment_expires);
-		CREATE TABLE message_stats (key TEXT PRIMARY KEY, value BIGINT);
-		INSERT INTO message_stats (key, value) VALUES ('messages', 0);
-		CREATE TABLE schema_version (store TEXT PRIMARY KEY, version INT NOT NULL);
-		INSERT INTO schema_version (store, version) VALUES ('message', 14);
-	`)
-	require.Nil(t, err)
-	store, err := message.NewPostgresStore(testDB, 0, 0)
-	require.Nil(t, err)
-	// The 14 -> 15 step ran: version bumped, partial index created
-	var version int
-	require.Nil(t, testDB.QueryRow(`SELECT version FROM schema_version WHERE store = 'message'`).Scan(&version))
-	require.Equal(t, 15, version)
-	var indexCount int
-	require.Nil(t, testDB.QueryRow(`SELECT COUNT(*) FROM pg_indexes WHERE indexname = 'idx_message_attachment_expires' AND schemaname = current_schema()`).Scan(&indexCount))
-	require.Equal(t, 1, indexCount)
-	// And the store works
-	require.Nil(t, store.AddMessage(model.NewDefaultMessage("mytopic", "hi there")))
-	messages, err := store.Messages("mytopic", model.SinceAllMessages, false)
-	require.Nil(t, err)
-	require.Len(t, messages, 1)
-
-	// The migrated database must be structurally identical to a freshly created one
-	freshDB := dbtest.CreateTestPostgres(t)
-	_, err = message.NewPostgresStore(freshDB, 0, 0)
-	require.Nil(t, err)
-	require.Equal(t, dbtest.PostgresSchema(t, freshDB), dbtest.PostgresSchema(t, testDB))
-}

message/cache_sqlite.go

@@ -1,145 +0,0 @@
-package message
-
-import (
-	"database/sql"
-	"fmt"
-	"path/filepath"
-	"sync"
-	"time"
-
-	_ "github.com/mattn/go-sqlite3" // SQLite driver
-	"heckel.io/ntfy/v2/db"
-	"heckel.io/ntfy/v2/db/schema"
-	"heckel.io/ntfy/v2/util"
-)
-
-// SQLite runtime query constants
-const (
-	sqliteInsertMessageQuery = `
-		INSERT INTO messages (mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, attachment_deleted, sender, user, content_type, encoding, published)
-		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-	`
-	sqliteSelectScheduledMessageIDsBySeqIDQuery = `SELECT mid FROM messages WHERE topic = ? AND sequence_id = ? AND published = 0`
-	sqliteDeleteScheduledBySequenceIDQuery      = `DELETE FROM messages WHERE topic = ? AND sequence_id = ? AND published = 0`
-	sqliteUpdateMessagesForTopicExpiryQuery     = `UPDATE messages SET expires = ? WHERE topic = ?`
-	sqliteSelectMessagesByIDQuery               = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user, content_type, encoding
-		FROM messages
-		WHERE mid = ?
-	`
-	sqliteSelectMessagesSinceTimeQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user, content_type, encoding
-		FROM messages
-		WHERE topic = ? AND time >= ? AND published = 1
-		ORDER BY time, id
-	`
-	sqliteSelectMessagesSinceTimeIncludeScheduledQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user, content_type, encoding
-		FROM messages
-		WHERE topic = ? AND time >= ?
-		ORDER BY time, id
-	`
-	sqliteSelectMessagesSinceIDQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user, content_type, encoding
-		FROM messages
-		WHERE topic = ? AND id > COALESCE((SELECT id FROM messages WHERE mid = ?), 0) AND published = 1
-		ORDER BY time, id
-	`
-	sqliteSelectMessagesSinceIDIncludeScheduledQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user, content_type, encoding
-		FROM messages
-		WHERE topic = ? AND (id > COALESCE((SELECT id FROM messages WHERE mid = ?), 0) OR published = 0)
-		ORDER BY time, id
-	`
-	sqliteSelectMessagesLatestQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user, content_type, encoding
-		FROM messages
-		WHERE topic = ? AND published = 1
-		ORDER BY time DESC, id DESC
-		LIMIT 1
-	`
-	sqliteSelectMessagesDueQuery = `
-		SELECT mid, sequence_id, time, event, expires, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, user, content_type, encoding
-		FROM messages
-		WHERE time <= ? AND published = 0
-		ORDER BY time, id
-	`
-	sqliteUpdateMessagePublishedQuery = `UPDATE messages SET published = 1 WHERE mid = ?`
-	sqliteSelectMessagesCountQuery    = `SELECT COUNT(*) FROM messages`
-	sqliteSelectTopicsQuery           = `SELECT topic FROM messages GROUP BY topic`
-
-	sqliteDeleteExpiredMessagesQuery         = `DELETE FROM messages WHERE mid IN (SELECT mid FROM messages WHERE expires <= ? AND published = 1 LIMIT ?)`
-	sqliteMarkExpiredAttachmentsDeletedQuery = `UPDATE messages SET attachment_deleted = 1 WHERE mid IN (SELECT mid FROM messages WHERE attachment_expires > 0 AND attachment_expires <= ? AND attachment_deleted = 0 LIMIT ?)`
-	sqliteSelectAttachmentsSizeBySenderQuery = `SELECT IFNULL(SUM(attachment_size), 0) FROM messages WHERE user = '' AND sender = ? AND attachment_expires >= ?`
-	sqliteSelectAttachmentsSizeByUserIDQuery = `SELECT IFNULL(SUM(attachment_size), 0) FROM messages WHERE user = ? AND attachment_expires >= ?`
-	sqliteSelectAttachmentsWithSizesQuery    = `SELECT mid, attachment_size FROM messages WHERE attachment_expires > ? AND attachment_deleted = 0`
-
-	sqliteSelectStatsQuery       = `SELECT value FROM stats WHERE key = 'messages'`
-	sqliteUpdateStatsQuery       = `UPDATE stats SET value = ? WHERE key = 'messages'`
-	sqliteUpdateMessageTimeQuery = `UPDATE messages SET time = ? WHERE mid = ?`
-)
-
-var sqliteQueries = queries{
-	insertMessage:                    sqliteInsertMessageQuery,
-	selectScheduledMessageIDsBySeqID: sqliteSelectScheduledMessageIDsBySeqIDQuery,
-	deleteScheduledBySequenceID:      sqliteDeleteScheduledBySequenceIDQuery,
-	updateMessagesForTopicExpiry:     sqliteUpdateMessagesForTopicExpiryQuery,
-	selectMessagesByID:               sqliteSelectMessagesByIDQuery,
-	selectMessagesSinceTime:          sqliteSelectMessagesSinceTimeQuery,
-	selectMessagesSinceTimeScheduled: sqliteSelectMessagesSinceTimeIncludeScheduledQuery,
-	selectMessagesSinceID:            sqliteSelectMessagesSinceIDQuery,
-	selectMessagesSinceIDScheduled:   sqliteSelectMessagesSinceIDIncludeScheduledQuery,
-	selectMessagesLatest:             sqliteSelectMessagesLatestQuery,
-	selectMessagesDue:                sqliteSelectMessagesDueQuery,
-	deleteExpiredMessages:            sqliteDeleteExpiredMessagesQuery,
-	updateMessagePublished:           sqliteUpdateMessagePublishedQuery,
-	selectMessagesCount:              sqliteSelectMessagesCountQuery,
-	selectTopics:                     sqliteSelectTopicsQuery,
-	markExpiredAttachmentsDeleted:    sqliteMarkExpiredAttachmentsDeletedQuery,
-	selectAttachmentsSizeBySender:    sqliteSelectAttachmentsSizeBySenderQuery,
-	selectAttachmentsSizeByUserID:    sqliteSelectAttachmentsSizeByUserIDQuery,
-	selectAttachmentsWithSizes:       sqliteSelectAttachmentsWithSizesQuery,
-	selectStats:                      sqliteSelectStatsQuery,
-	updateStats:                      sqliteUpdateStatsQuery,
-	updateMessageTime:                sqliteUpdateMessageTimeQuery,
-}
-
-// NewSQLiteStore creates a SQLite file-backed cache
-func NewSQLiteStore(filename, startupQueries string, cacheDuration time.Duration, batchSize int, batchTimeout time.Duration, nop bool) (*Cache, error) {
-	parentDir := filepath.Dir(filename)
-	if !util.FileExists(parentDir) {
-		return nil, fmt.Errorf("cache database directory %s does not exist or is not accessible", parentDir)
-	}
-	d, err := sql.Open("sqlite3", filename)
-	if err != nil {
-		return nil, err
-	}
-	if err := runSQLiteStartupQueries(d, startupQueries); err != nil {
-		return nil, err
-	}
-	if err := schema.Migrate(d, schema.SQLite, schemaStore, sqliteCurrentSchemaVersion, sqliteCreateTables, sqliteMigrations(cacheDuration)); err != nil {
-		return nil, err
-	}
-	return newCache(db.New(&db.Host{DB: d}, nil), sqliteQueries, &sync.Mutex{}, batchSize, batchTimeout, nop), nil
-}
-
-// NewMemStore creates an in-memory cache
-func NewMemStore() (*Cache, error) {
-	return NewSQLiteStore(createMemoryFilename(), "", 0, 0, 0, false)
-}
-
-// NewNopStore creates an in-memory cache that discards all messages;
-// it is always empty and can be used if caching is entirely disabled
-func NewNopStore() (*Cache, error) {
-	return NewSQLiteStore(createMemoryFilename(), "", 0, 0, 0, true)
-}
-
-// createMemoryFilename creates a unique memory filename to use for the SQLite backend.
-// From mattn/go-sqlite3: "Each connection to ":memory:" opens a brand new in-memory
-// sql database, so if the stdlib's sql engine happens to open another connection and
-// you've only specified ":memory:", that connection will see a brand new database.
-// A workaround is to use "file::memory:?cache=shared" (or "file:foobar?mode=memory&cache=shared").
-// Every connection to this string will point to the same in-memory database."
-func createMemoryFilename() string {
-	return fmt.Sprintf("file:%s?mode=memory&cache=shared", util.RandomString(10))
-}